Sever wasip2's dependence on wasip1 headers #694
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit updates `wasi/api.h` to be fully undefined on WASIp2 targets. This prevents leaking WASIp1 definitions on unapplicable targets, such as `wasm32-wasip2` and the upcoming `wasm32-wasip3`. This involved changing a number of `#define`s from something symbolic to a number literal. Static assertions throughout the codebase, already present, assert that these numbers match WASIp1 ABI values and for WASIp2+ these numbers are just a libc abstraction, not part of the ABI.
alexcrichton
force-pushed
the
less-wasip1-header
branch
from
e9bd054 to
ab37a36
Compare
pchickey
approved these changes
Jan 5, 2026
alexcrichton
added a commit
to alexcrichton/wasi-libc
that referenced
this pull request
Jan 5, 2026
This fixes the order `#define`s showed up in for C++ introduced in WebAssembly#694 to fix the inclusion of this repository into wasi-sdk. I don't know of a great way to test this without building a whole C++ sysroot which seems out-of-scope, so this is something I think will best be left for "try to not break it and we'll catch it in wasi-sdk".
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit updates
wasi/api.hto be fully undefined on WASIp2 targets. This prevents leaking WASIp1 definitions on unapplicable targets, such aswasm32-wasip2and the upcomingwasm32-wasip3.This involved changing a number of
#defines from something symbolic to a number literal. Static assertions throughout the codebase, already present, assert that these numbers match WASIp1 ABI values and for WASIp2+ these numbers are just a libc abstraction, not part of the ABI.