v23.6.1

haskell-wasm · Jan 22, 2025 · 65f6451 · 65f6451
1 parent c8e9d54
commit 65f6451
Show file tree

Hide file tree

Showing 3 changed files with 222 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -82,15 +82,15 @@ jobs:
         run: |
           set -euo pipefail
 
-          node_ver=v23.6.0
+          node_ver=v23.6.1
 
           pushd "$(mktemp -d)"
 
           curl -f -L --retry 5 https://github.com/nodejs/node/archive/refs/tags/$node_ver.tar.gz | tar xz --strip-components=1
           patch -p1 -i $GITHUB_WORKSPACE/bump-v8-wasm-limits.diff
           patch -p1 -i $GITHUB_WORKSPACE/lto.diff
 
-          make -j$(curl -f -L --retry 5 https://gitlab.haskell.org/ghc/ghc/-/raw/master/mk/detect-cpu-count.sh | sh) binary CONFIG_FLAGS="--enable-lto --v8-disable-maglev"
+          make -j$(curl -f -L --retry 5 https://gitlab.haskell.org/ghc/ghc/-/raw/master/mk/detect-cpu-count.sh | sh) binary CONFIG_FLAGS="--enable-lto"
 
           mkdir $GITHUB_WORKSPACE/dist
           mv node-$node_ver-*.tar.xz $GITHUB_WORKSPACE/dist

diff --git a/build-alpine.sh b/build-alpine.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-node_ver=v23.6.0
+node_ver=v23.6.1
 
 apk add \
   clang \
@@ -22,7 +22,8 @@ make -j"$(nproc)" binary \
   AR=llvm-ar \
   CC=clang \
   CXX=clang++ \
-  CONFIG_FLAGS="--enable-lto --fully-static --openssl-use-def-ca-store --v8-disable-maglev" \
+  CONFIG_FLAGS="--enable-lto --fully-static --openssl-use-def-ca-store" \
+  LDFLAGS=-Wl,-z,stack-size=8388608 \
   VARIATION="static"
 
 mkdir /workspace/dist

diff --git a/lto.diff b/lto.diff
@@ -1,5 +1,5 @@
 diff --git a/common.gypi b/common.gypi
-index 23196aae..4a3d643b 100644
+index a6a79adc..160b6eb6 100644
 --- a/common.gypi
 +++ b/common.gypi
 @@ -185,9 +185,9 @@
@@ -15,10 +15,10 @@ index 23196aae..4a3d643b 100644
            ],
          },
 diff --git a/deps/cares/configure b/deps/cares/configure
-index 76b0ddf3..08b743b3 100755
+index d02f117d..468461f7 100755
 --- a/deps/cares/configure
 +++ b/deps/cares/configure
-@@ -16126,11 +16126,6 @@ _LT_EOF
+@@ -16139,11 +16139,6 @@ _LT_EOF
 
 
  _lt_libdeps_save_CFLAGS=$CFLAGS
@@ -68,8 +68,101 @@ index 5f2c097f..42dad126 100644
              and self._Test(
                  "DEBUG_INFORMATION_FORMAT", "dwarf-with-dsym", default="dwarf"
              )
+diff --git a/deps/openssl/openssl-cli.gypi b/deps/openssl/openssl-cli.gypi
+index b4c278b4..79cafd6b 100644
+--- a/deps/openssl/openssl-cli.gypi
++++ b/deps/openssl/openssl-cli.gypi
+@@ -23,7 +23,7 @@
+     }],
+     # Avoid excessive LTO
+     ['enable_lto=="true"', {
+-      'ldflags': [ '-fno-lto' ],
++      'ldflags': [],
+     }],
+   ],
+ }
+diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp
+index ea3a2dc0..ea3780f7 100644
+--- a/deps/openssl/openssl.gyp
++++ b/deps/openssl/openssl.gyp
+@@ -75,7 +75,7 @@
+         }],
+         # Avoid excessive LTO
+         ['enable_lto=="true"', {
+-          'ldflags': [ '-fno-lto' ],
++          'ldflags': [],
+         }],
+      ]
+     }, {
+diff --git a/node.gyp b/node.gyp
+index a3688b8e..d320299f 100644
+--- a/node.gyp
++++ b/node.gyp
+@@ -1069,7 +1069,7 @@
+         }],
+         # Avoid excessive LTO
+         ['enable_lto=="true"', {
+-          'ldflags': [ '-fno-lto' ],
++          'ldflags': [],
+         }],
+       ],
+     }, # fuzz_env
+@@ -1112,7 +1112,7 @@
+         }],
+         # Avoid excessive LTO
+         ['enable_lto=="true"', {
+-          'ldflags': [ '-fno-lto' ],
++          'ldflags': [],
+         }],
+       ],
+     }, # fuzz_ClientHelloParser.cc
+@@ -1157,7 +1157,7 @@
+         }],
+         # Avoid excessive LTO
+         ['enable_lto=="true"', {
+-          'ldflags': [ '-fno-lto' ],
++          'ldflags': [],
+         }],
+       ],
+     }, # fuzz_strings
+@@ -1235,7 +1235,7 @@
+         }],
+         # Avoid excessive LTO
+         ['enable_lto=="true"', {
+-          'ldflags': [ '-fno-lto' ],
++          'ldflags': [],
+         }],
+       ],
+     }, # cctest
+@@ -1291,7 +1291,7 @@
+         }],
+         # Avoid excessive LTO
+         ['enable_lto=="true"', {
+-          'ldflags': [ '-fno-lto' ],
++          'ldflags': [],
+         }],
+       ],
+     }, # embedtest
+@@ -1333,7 +1333,7 @@
+         }],
+         # Avoid excessive LTO
+         ['enable_lto=="true"', {
+-          'ldflags': [ '-fno-lto' ],
++          'ldflags': [],
+         }],
+       ]
+     }, # overlapped-checker
+@@ -1439,7 +1439,7 @@
+         }],
+         # Avoid excessive LTO
+         ['enable_lto=="true"', {
+-          'ldflags': [ '-fno-lto' ],
++          'ldflags': [],
+         }],
+       ],
+     }, # node_mksnapshot
 diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
-index f567542b..604f6895 100644
+index aee1a542..162881d1 100644
 --- a/tools/gyp/pylib/gyp/xcode_emulation.py
 +++ b/tools/gyp/pylib/gyp/xcode_emulation.py
 @@ -638,7 +638,7 @@ class XcodeSettings:
@@ -90,3 +183,123 @@ index f567542b..604f6895 100644
              and self._Test(
                  "DEBUG_INFORMATION_FORMAT", "dwarf-with-dsym", default="dwarf"
              )
+diff --git a/tools/icu/icu-generic.gyp b/tools/icu/icu-generic.gyp
+index f007c652..ac69a873 100644
+--- a/tools/icu/icu-generic.gyp
++++ b/tools/icu/icu-generic.gyp
+@@ -454,7 +454,7 @@
+       'conditions': [
+         # Avoid excessive LTO
+         ['enable_lto=="true"', {
+-          'ldflags': [ '-fno-lto' ],
++          'ldflags': [],
+         }],
+       ],
+     },
+@@ -471,7 +471,7 @@
+       'conditions': [
+         # Avoid excessive LTO
+         ['enable_lto=="true"', {
+-          'ldflags': [ '-fno-lto' ],
++          'ldflags': [],
+         }],
+       ],
+     },
+@@ -489,7 +489,7 @@
+       'conditions': [
+         # Avoid excessive LTO
+         ['enable_lto=="true"', {
+-          'ldflags': [ '-fno-lto' ],
++          'ldflags': [],
+         }],
+       ],
+     },
+@@ -506,7 +506,7 @@
+       'conditions': [
+         # Avoid excessive LTO
+         ['enable_lto=="true"', {
+-          'ldflags': [ '-fno-lto' ],
++          'ldflags': [],
+         }],
+       ],
+     },
+diff --git a/tools/v8_gypfiles/d8.gyp b/tools/v8_gypfiles/d8.gyp
+index 4dd98972..27165061 100644
+--- a/tools/v8_gypfiles/d8.gyp
++++ b/tools/v8_gypfiles/d8.gyp
+@@ -65,7 +65,7 @@
+         }],
+         # Avoid excessive LTO
+         ['enable_lto=="true"', {
+-          'ldflags': [ '-fno-lto' ],
++          'ldflags': [],
+         }],
+       ],
+     },
+diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
+index 88c1297b..a640a7ff 100644
+--- a/tools/v8_gypfiles/v8.gyp
++++ b/tools/v8_gypfiles/v8.gyp
+@@ -1690,7 +1690,7 @@
+         }],
+         # Avoid excessive LTO
+         ['enable_lto=="true"', {
+-          'ldflags': [ '-fno-lto' ],
++          'ldflags': [],
+         }],
+       ],
+       'defines!': [
+@@ -1752,7 +1752,7 @@
+         }],
+         # Avoid excessive LTO
+         ['enable_lto=="true"', {
+-          'ldflags': [ '-fno-lto' ],
++          'ldflags': [],
+         }],
+       ],
+     },  # mksnapshot
+@@ -1769,7 +1769,7 @@
+         }],
+         # Avoid excessive LTO
+         ['enable_lto=="true"', {
+-          'ldflags': [ '-fno-lto' ],
++          'ldflags': [],
+         }],
+       ],
+       'defines!': [
+@@ -1807,7 +1807,7 @@
+         }],
+         # Avoid excessive LTO
+         ['enable_lto=="true"', {
+-          'ldflags': [ '-fno-lto' ],
++          'ldflags': [],
+         }],
+       ],
+       'dependencies': [
+@@ -1843,7 +1843,7 @@
+         }],
+         # Avoid excessive LTO
+         ['enable_lto=="true"', {
+-          'ldflags': [ '-fno-lto' ],
++          'ldflags': [],
+         }],
+       ],
+       'sources': [
+@@ -1863,7 +1863,7 @@
+         }],
+         # Avoid excessive LTO
+         ['enable_lto=="true"', {
+-          'ldflags': [ '-fno-lto' ],
++          'ldflags': [],
+         }],
+       ],
+       'actions': [
+@@ -1931,7 +1931,7 @@
+         ],
+         'conditions': [
+           ['enable_lto=="true"', {
+-            'cflags_cc': [ '-fno-lto' ],
++            'cflags_cc': [],
+           }],
+           # Changes in push_registers_asm.cc in V8 v12.8 requires using
+           # push_registers_masm on Windows even with ClangCL on x64