Skip to content

gh-145177: Update Emscripten to 6.0.2 #153235

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.

Sign up for GitHub

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

Merged
freakboy3742 merged 1 commit into from
Jul 6, 2026
+1 −27
Merged

gh-145177: Update Emscripten to 6.0.2 #153235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Platforms/emscripten/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Any data that can vary between Python versions is to be kept in this file.
# This allows for blanket copying of the Emscripten build code between supported
# Python versions.
emscripten-version = "6.0.0"
emscripten-version = "6.0.2"
node-version = "24"
test-args = [
"-m", "test",
Expand Down
20 changes: 0 additions & 20 deletions Python/emscripten_syscalls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,26 +293,6 @@ int __syscall_poll(intptr_t fds, int nfds, int timeout) {
return __block_for_int(p);
}


// Workaround for an Emscripten bug: getentropy(buffer, 1) returns the single
// byte of entropy as the return code. Fixed upstream by
// emscripten-core/emscripten#27122
int __real_getentropy(void*, size_t);

int __wrap_getentropy(void *buffer, size_t len) {
if (len != 1) {
return __real_getentropy(buffer, len);
}
// Length is 1. Workaround is to get two bytes of entropy and write the
// first one into the original target buffer.
uint8_t tmp[2];
int ret = __real_getentropy(tmp, 2);
if (ret == 0) {
*(uint8_t *)buffer = tmp[0];
}
return ret;
}

#include <sys/ioctl.h>

int syscall_ioctl_orig(int fd, int request, void* varargs)
Expand Down
2 changes: 0 additions & 2 deletions configure
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2411,10 +2411,6 @@ AS_CASE([$ac_sys_system],
dnl Avoid bugs in JS fallback string decoding path
AS_VAR_APPEND([LINKFORSHARED], [" -sTEXTDECODER=2"])

dnl Workaround for a bug in Emscipten libc's getentropy. See
dnl __wrap_getentropy in Python/emscripten_syscalls.c.
AS_VAR_APPEND([LDFLAGS_NODIST], [" -Wl,--wrap=getentropy"])

AS_VAR_IF([enable_wasm_dynamic_linking], [yes], [
AS_VAR_APPEND([LINKFORSHARED], [" -sMAIN_MODULE"])
])
Expand Down
Loading