Skip to content

jerryscript: bump version#9808

Merged
emmanuelsearch merged 2 commits intoRIOT-OS:masterfrom
miri64:pkg/enh/bump-jerryscript
Aug 22, 2018
Merged

jerryscript: bump version#9808
emmanuelsearch merged 2 commits intoRIOT-OS:masterfrom
miri64:pkg/enh/bump-jerryscript

Conversation

@miri64
Copy link
Copy Markdown
Member

@miri64 miri64 commented Aug 21, 2018

Alternative to #9735, as it includes that fix in upstream.

Issues/PRs references

Closes #9735 when merged.

@miri64
jerryscript: bump version
73e036d 
Alternative to RIOT-OS#9735, as it [includes that fix in upstream][851f4].

[851f4]: jerryscript-project/jerryscript@851f4f0
@miri64 miri64 added Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation Area: pkg Area: External package ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Aug 21, 2018
@miri64 miri64 added this to the Release 2018.10 milestone Aug 21, 2018
@miri64 miri64 removed this from the Release 2018.10 milestone Aug 21, 2018
@miri64 miri64 mentioned this pull request Aug 21, 2018
Closed
miri64 added a commit to miri64/RIOT that referenced this pull request Aug 21, 2018
@miri64
Merge 'pkg/enh/bump-jerryscript' (RIOT-OS#9808)
72314fc
@miri64 miri64 mentioned this pull request Aug 21, 2018
Merged
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Aug 21, 2018

Mhh ek-lm4f120xl, mips-malta, and hifive1 don't seem to have nanosleep() implemented, though they have time.h provided with there respective libc. How do we proceed with them? (/cc @haukepetersen, @neiljay, @kenrabold)

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Aug 21, 2018

(or should I just blacklist them for the javascript example?)

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Aug 21, 2018 •
edited
Loading

My investigation so far:

  • ek-lm4f120xl is a Cortex-M4, but it isn't configured the same as other Cortex-M boards (it doesn't include makefiles/arch/cortexm.inc.mk e.g.) so that might be the issue here. (nope it is included,
    just found the include, so forget that)
  • mips-malta is the only MIPS board that isn't blacklisted for jerryscript so far (and from what I could gather at least for OpenWRT they support MIPS; however, there is no UART support for it yet)
  • hifive1 is the odd one out. I don't believe jerryscript supports RISC-V, but it used to compile.

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Aug 21, 2018

  • ek-lm4f120xl is a Cortex-M4, but it isn't configured the same as other Cortex-M boards (it doesn't include makefiles/arch/cortexm.inc.mk e.g.) so that might be the issue here. (nope it is included,
    just found the include, so forget that)

For some reason ek-lm4f120xl has both a time.h and a unistd.h in its include path when compiling jerryscript, while other comparable boards (e.g. stm32f4discovery) doesn't

@emmanuelsearch
Copy link
Copy Markdown
Member

emmanuelsearch commented Aug 21, 2018

OK. So how about just blacklisting mips-malta and hifive1 for now?

@kYc0o
Copy link
Copy Markdown
Contributor

kYc0o commented Aug 21, 2018

OK. So how about just blacklisting mips-malta and hifive1 for now?

+1.

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Aug 21, 2018

mips-malta doesn't have UART support for now anyways...

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Aug 21, 2018

Done

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Aug 21, 2018

Found a better solution :-) (just deactivated HAVE_TIME_H)

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Aug 21, 2018

Murdock likes it :-)

miri64 added a commit to miri64/RIOT that referenced this pull request Aug 21, 2018
@miri64
Merge 'pkg/enh/bump-jerryscript' (RIOT-OS#9808)
863722c
@kYc0o
Copy link
Copy Markdown
Contributor

kYc0o commented Aug 22, 2018

Perfect! Please squash.

@miri64
jerryscript: disable HAVE_TIME_H
dde802f 
Without this disabled `nanosleep()` is used, which isn't provided for
most our platforms (though the header `<time.h>` is).

Furthermore, that macro is only used in that instance throughout the
JerryScript codebase.
@miri64 miri64 force-pushed the pkg/enh/bump-jerryscript branch from 5169ef5 to dde802f Compare August 22, 2018 11:51
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Aug 22, 2018

Squashed

kYc0o
kYc0o approved these changes Aug 22, 2018
View reviewed changes
Copy link
Copy Markdown
Contributor

@kYc0o kYc0o left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK.

@emmanuelsearch
Copy link
Copy Markdown
Member

emmanuelsearch commented Aug 22, 2018

Looks good. Tested on IoT-lab M3.

@emmanuelsearch emmanuelsearch merged commit 1e32539 into RIOT-OS:master Aug 22, 2018
@miri64 miri64 deleted the pkg/enh/bump-jerryscript branch August 22, 2018 13:25
This was referenced Aug 22, 2018
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kYc0o kYc0o kYc0o approved these changes

@emmanuelsearch emmanuelsearch Awaiting requested review from emmanuelsearch

@kaspar030 kaspar030 Awaiting requested review from kaspar030

Assignees

No one assigned

Labels

Area: pkg Area: External package ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@miri64 @emmanuelsearch @kYc0o