Emscripten 3.1.60 (pyodide#5350)

Author: hoodmane

Makefile.envs

@@ -1,5 +1,5 @@
 export PYVERSION ?= 3.12.7
-export PYODIDE_EMSCRIPTEN_VERSION ?= 3.1.59
+export PYODIDE_EMSCRIPTEN_VERSION ?= 3.1.60
 export PYODIDE_VERSION ?= 0.28.0.dev0
 export PYODIDE_ABI_VERSION ?= 2025_0
 

emsdk/patches/0001-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch

@@ -1,4 +1,4 @@
-From 1afe76841eb678eaeb035e94661bc1d9c2d583d2 Mon Sep 17 00:00:00 2001
+From 91ad7e9df037971c814c5bd610fec5edca494a01 Mon Sep 17 00:00:00 2001
 From: Hood Chatham <[email protected]>
 Date: Fri, 2 Jun 2023 11:59:32 -0700
 Subject: [PATCH 1/6] Add back fs.findObject and fs.readFile in loadLibData

emsdk/patches/0002-Add-useful-error-when-symbol-resolution-fails.patch

@@ -1,4 +1,4 @@
-From 1e354e3a4bed3f805da49fbf3e3b4380fca21d02 Mon Sep 17 00:00:00 2001
+From 795760dbdaa1a3644db292ecc16ceffebe3335e4 Mon Sep 17 00:00:00 2001
 From: Hood Chatham <[email protected]>
 Date: Fri, 19 May 2023 12:19:00 -0700
 Subject: [PATCH 2/6] Add useful error when symbol resolution fails

emsdk/patches/0003-Changes-for-JSPI.patch

@@ -1,4 +1,4 @@
-From 5a2c98d6273f5ca9683be80bf1744abe70cd273b Mon Sep 17 00:00:00 2001
+From 936f05cb4e041c01d2c7e435a027ccfb8a5f9fbe Mon Sep 17 00:00:00 2001
 From: Hood Chatham <[email protected]>
 Date: Thu, 22 Jun 2023 18:53:22 -0700
 Subject: [PATCH 3/6] Changes for JSPI
@@ -45,7 +45,7 @@ index 216a1362e..e8c812fab 100644
  #endif
  #if !DISABLE_EXCEPTION_CATCHING
 diff --git a/src/parseTools.mjs b/src/parseTools.mjs
-index 7f20321c3..118a32078 100644
+index a22dd55a3..15dcf5941 100644
 --- a/src/parseTools.mjs
 +++ b/src/parseTools.mjs
 @@ -581,7 +581,7 @@ function makeThrow(excPtr) {

emsdk/patches/0004-Raise-when-no-argument-is-given.patch

@@ -1,4 +1,4 @@
-From 3a8066f2ddb8b94c1e7ba3e9da90502ee52d4d26 Mon Sep 17 00:00:00 2001
+From ef8d6220135a29ec94c1ab07eb6085ed80245d95 Mon Sep 17 00:00:00 2001
 From: ryanking13 <[email protected]>
 Date: Sat, 20 Jan 2024 19:02:32 +0900
 Subject: [PATCH 4/6] Raise when no argument is given
@@ -13,10 +13,10 @@ Upstream issue: https://github.com/emscripten-core/emscripten/issues/21116
  1 file changed, 3 insertions(+)
 
 diff --git a/emcc.py b/emcc.py
-index 5aff31081..e23508898 100644
+index 31cdd93cb..9861bcfcd 100644
 --- a/emcc.py
 +++ b/emcc.py
-@@ -632,6 +632,9 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR P
+@@ -636,6 +636,9 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR P
        print(libname)
      return 0
 

emsdk/patches/0005-Make-RTLD_LOCAL-work-correctly-for-preloaded-DSOs-21.patch

@@ -1,4 +1,4 @@
-From 8d8ac7d13ddb74a8b872af87c10c4b3481428d11 Mon Sep 17 00:00:00 2001
+From 43e48564c49b467ed539ac8c8834a1bb62fbb4e6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?=
  <[email protected]>
 Date: Wed, 12 Jun 2024 20:10:35 +0200

emsdk/patches/0006-Make-seek-work-on-dev-null-22886.patch

@@ -1,4 +1,4 @@
-From 4e6df798a1d98e4c568ffa93a33cc5fa013a5953 Mon Sep 17 00:00:00 2001
+From 35df36d7ac35fe2307c6275f7c7860b8b9878e14 Mon Sep 17 00:00:00 2001
 From: Hood Chatham <[email protected]>
 Date: Mon, 18 Nov 2024 20:55:25 +0100
 Subject: [PATCH 6/6] Make seek work on `/dev/null` (#22886)
@@ -12,7 +12,7 @@ This can be removed when we update to Emscripten 3.1.72.
  1 file changed, 1 insertion(+)
 
 diff --git a/src/library_fs.js b/src/library_fs.js
-index 20a724a0a..f23ea50ec 100644
+index cd9562d07..6e18be78e 100644
 --- a/src/library_fs.js
 +++ b/src/library_fs.js
 @@ -1343,6 +1343,7 @@ FS.staticInit();` +

src/js/generated_struct_info32.json

@@ -383,7 +383,10 @@
         "S_IFMT": 61440,
         "S_IFREG": 32768,
         "S_IFSOCK": 49152,
+        "S_IRGRP": 32,
+        "S_IROTH": 4,
         "S_IRUGO": 292,
+        "S_IRUSR": 256,
         "S_IRWXO": 7,
         "S_IRWXUGO": 511,
         "S_ISVTX": 512,