Skip to content

Update to emscripten-core/emscripten#26860#7

Open
kleisauke wants to merge 1 commit into
emscriptenfrom
update-to-pr-26860
Open

Update to emscripten-core/emscripten#26860#7
kleisauke wants to merge 1 commit into
emscriptenfrom
update-to-pr-26860

Conversation

@kleisauke
Copy link
Copy Markdown
Collaborator

This change was generated by running ./system/lib/push_musl_changes.py
within the Emscripten repo.

Comment thread arch/emscripten/bits/limits.h Outdated
@@ -1 +1,3 @@
#define PAGE_SIZE 65536
// A value used historically in Emscripten, and which we don't have a strong
// reason to change so far.
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

This is the defined WebAssembly page size, so it kind of makes sense. i.e. its not just historical.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I'll remove this comment. It looks that I synced this with getpagesize() before commit emscripten-core/emscripten@0494e29 was introduced.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Removed with commit emscripten-core/emscripten@a62785a (and updated this PR accordingly).

Comment thread src/exit/exit.c Outdated

_Noreturn void exit(int code)
{
#ifdef _REENTRANT // XXX Emscripten: guard with _REENTRANT
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Why is this needed now?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

To fix a test failure in other.test_standalone_whole_archive:

wasm-ld: error: --shared-memory is disallowed by exit.o because it was not compiled with 'atomics' or 'bulk-memory' features.

See commit emscripten-core/emscripten@3d7b8f3.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Maybe a better fix for that would be to make libstandalonewasm into an MTLibrary?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Ah, I thought it was a --whole-archive quirk, but you're right, we can simply make libstandalonewasm inherit from MTLibrary to fix this.

Fixed via commit emscripten-core/emscripten@abfd52c and emscripten-core/emscripten@0f0d7c0.

@kleisauke kleisauke force-pushed the update-to-pr-26860 branch from 9600075 to a132375 Compare May 20, 2026 16:09
This change was generated by running ./system/lib/push_musl_changes.py
within the Emscripten repo.
@kleisauke kleisauke force-pushed the update-to-pr-26860 branch from a132375 to 0403aee Compare May 20, 2026 17:32
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.

2 participants