Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update package dependencies: WAMR, WASI SDK, and parson #460

Merged
merged 4 commits into from
Jan 8, 2024

Conversation

cmickeyb
Copy link
Contributor

@cmickeyb cmickeyb commented Jan 4, 2024

This is not quite as simple as expected. With our
default configuration (LIBC on, WASI off) there are a couple errors in WAMR. Namely that os_is_handle_valid is not defined in sgx-platform.c and there is an include of libc_errno.h that appears to be outside the check for WASI includes.

Changes were made to work around these problems. Namely we explicitly include the libc header & source. And we add a file that defines the missing function.

Copy link
Member

@marcelamelara marcelamelara left a comment

Choose a reason for hiding this comment

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

Looks quite reasonable. Thanks @cmickeyb !

This is not quite as simple as expected. With our
default configuration (LIBC on, WASI off) there are
a couple errors in WAMR. Namely that os_is_handle_valid
is not defined in sgx-platform.c and there is an include
of libc_errno.h that appears to be outside the check for
WASI includes.

Changes were made to work around these problems. Namely
we explicitly include the libc header & source. And we
add a file that defines the missing function.

Signed-off-by: Mic Bowman <[email protected]>
The WAMR upgrade enables an upgrade for WASI SDK.
Needed to add definitions for a few additional
symbols.

Signed-off-by: Mic Bowman <[email protected]>
Update the parson library from https://github.com/kgabis/parson
to version 1.5.3.

Signed-off-by: Mic Bowman <[email protected]>
A couple of small fixes that affect behavior of contracts (these
showed up with pdo-contracts tests):

* make the default for '/' in a json string not to be escaped, this
  shows up in json encoding of keys
* add __cxa_pure_function implementation that is missing from WASI
  SDK

Signed-off-by: Mic Bowman <[email protected]>
@cmickeyb cmickeyb force-pushed the mic.jan04.wamr_update branch from 93b021d to df1df6f Compare January 6, 2024 00:14
@cmickeyb cmickeyb changed the title Update WAMR to version 1.3 Update package dependencies: WAMR, WASI SDK, and parson Jan 6, 2024
@marcelamelara marcelamelara merged commit 471953a into hyperledger-labs:main Jan 8, 2024
4 checks passed
@cmickeyb cmickeyb deleted the mic.jan04.wamr_update branch January 16, 2024 00:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants