Skip to content

Commit 65f6451

Browse files
TerrorJackTerrorJack
committed
v23.6.1
1 parent c8e9d54 commit 65f6451

File tree

3 files changed

+222
-8
lines changed

3 files changed

+222
-8
lines changed

‎.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@ jobs:
8282
run: |
8383
set -euo pipefail
8484
85-
node_ver=v23.6.0
85+
node_ver=v23.6.1
8686
8787
pushd "$(mktemp -d)"
8888
8989
curl -f -L --retry 5 https://github.com/nodejs/node/archive/refs/tags/$node_ver.tar.gz | tar xz --strip-components=1
9090
patch -p1 -i $GITHUB_WORKSPACE/bump-v8-wasm-limits.diff
9191
patch -p1 -i $GITHUB_WORKSPACE/lto.diff
9292
93-
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"
93+
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"
9494
9595
mkdir $GITHUB_WORKSPACE/dist
9696
mv node-$node_ver-*.tar.xz $GITHUB_WORKSPACE/dist

‎build-alpine.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -eu
44

5-
node_ver=v23.6.0
5+
node_ver=v23.6.1
66

77
apk add \
88
clang \
@@ -22,7 +22,8 @@ make -j"$(nproc)" binary \
2222
AR=llvm-ar \
2323
CC=clang \
2424
CXX=clang++ \
25-
CONFIG_FLAGS="--enable-lto --fully-static --openssl-use-def-ca-store --v8-disable-maglev" \
25+
CONFIG_FLAGS="--enable-lto --fully-static --openssl-use-def-ca-store" \
26+
LDFLAGS=-Wl,-z,stack-size=8388608 \
2627
VARIATION="static"
2728

2829
mkdir /workspace/dist

‎lto.diff

Lines changed: 217 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/common.gypi b/common.gypi
2-
index 23196aae..4a3d643b 100644
2+
index a6a79adc..160b6eb6 100644
33
--- a/common.gypi
44
+++ b/common.gypi
55
@@ -185,9 +185,9 @@
@@ -15,10 +15,10 @@ index 23196aae..4a3d643b 100644
1515
],
1616
},
1717
diff --git a/deps/cares/configure b/deps/cares/configure
18-
index 76b0ddf3..08b743b3 100755
18+
index d02f117d..468461f7 100755
1919
--- a/deps/cares/configure
2020
+++ b/deps/cares/configure
21-
@@ -16126,11 +16126,6 @@ _LT_EOF
21+
@@ -16139,11 +16139,6 @@ _LT_EOF
2222

2323

2424
_lt_libdeps_save_CFLAGS=$CFLAGS
@@ -68,8 +68,101 @@ index 5f2c097f..42dad126 100644
6868
and self._Test(
6969
"DEBUG_INFORMATION_FORMAT", "dwarf-with-dsym", default="dwarf"
7070
)
71+
diff --git a/deps/openssl/openssl-cli.gypi b/deps/openssl/openssl-cli.gypi
72+
index b4c278b4..79cafd6b 100644
73+
--- a/deps/openssl/openssl-cli.gypi
74+
+++ b/deps/openssl/openssl-cli.gypi
75+
@@ -23,7 +23,7 @@
76+
}],
77+
# Avoid excessive LTO
78+
['enable_lto=="true"', {
79+
- 'ldflags': [ '-fno-lto' ],
80+
+ 'ldflags': [],
81+
}],
82+
],
83+
}
84+
diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp
85+
index ea3a2dc0..ea3780f7 100644
86+
--- a/deps/openssl/openssl.gyp
87+
+++ b/deps/openssl/openssl.gyp
88+
@@ -75,7 +75,7 @@
89+
}],
90+
# Avoid excessive LTO
91+
['enable_lto=="true"', {
92+
- 'ldflags': [ '-fno-lto' ],
93+
+ 'ldflags': [],
94+
}],
95+
]
96+
}, {
97+
diff --git a/node.gyp b/node.gyp
98+
index a3688b8e..d320299f 100644
99+
--- a/node.gyp
100+
+++ b/node.gyp
101+
@@ -1069,7 +1069,7 @@
102+
}],
103+
# Avoid excessive LTO
104+
['enable_lto=="true"', {
105+
- 'ldflags': [ '-fno-lto' ],
106+
+ 'ldflags': [],
107+
}],
108+
],
109+
}, # fuzz_env
110+
@@ -1112,7 +1112,7 @@
111+
}],
112+
# Avoid excessive LTO
113+
['enable_lto=="true"', {
114+
- 'ldflags': [ '-fno-lto' ],
115+
+ 'ldflags': [],
116+
}],
117+
],
118+
}, # fuzz_ClientHelloParser.cc
119+
@@ -1157,7 +1157,7 @@
120+
}],
121+
# Avoid excessive LTO
122+
['enable_lto=="true"', {
123+
- 'ldflags': [ '-fno-lto' ],
124+
+ 'ldflags': [],
125+
}],
126+
],
127+
}, # fuzz_strings
128+
@@ -1235,7 +1235,7 @@
129+
}],
130+
# Avoid excessive LTO
131+
['enable_lto=="true"', {
132+
- 'ldflags': [ '-fno-lto' ],
133+
+ 'ldflags': [],
134+
}],
135+
],
136+
}, # cctest
137+
@@ -1291,7 +1291,7 @@
138+
}],
139+
# Avoid excessive LTO
140+
['enable_lto=="true"', {
141+
- 'ldflags': [ '-fno-lto' ],
142+
+ 'ldflags': [],
143+
}],
144+
],
145+
}, # embedtest
146+
@@ -1333,7 +1333,7 @@
147+
}],
148+
# Avoid excessive LTO
149+
['enable_lto=="true"', {
150+
- 'ldflags': [ '-fno-lto' ],
151+
+ 'ldflags': [],
152+
}],
153+
]
154+
}, # overlapped-checker
155+
@@ -1439,7 +1439,7 @@
156+
}],
157+
# Avoid excessive LTO
158+
['enable_lto=="true"', {
159+
- 'ldflags': [ '-fno-lto' ],
160+
+ 'ldflags': [],
161+
}],
162+
],
163+
}, # node_mksnapshot
71164
diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
72-
index f567542b..604f6895 100644
165+
index aee1a542..162881d1 100644
73166
--- a/tools/gyp/pylib/gyp/xcode_emulation.py
74167
+++ b/tools/gyp/pylib/gyp/xcode_emulation.py
75168
@@ -638,7 +638,7 @@ class XcodeSettings:
@@ -90,3 +183,123 @@ index f567542b..604f6895 100644
90183
and self._Test(
91184
"DEBUG_INFORMATION_FORMAT", "dwarf-with-dsym", default="dwarf"
92185
)
186+
diff --git a/tools/icu/icu-generic.gyp b/tools/icu/icu-generic.gyp
187+
index f007c652..ac69a873 100644
188+
--- a/tools/icu/icu-generic.gyp
189+
+++ b/tools/icu/icu-generic.gyp
190+
@@ -454,7 +454,7 @@
191+
'conditions': [
192+
# Avoid excessive LTO
193+
['enable_lto=="true"', {
194+
- 'ldflags': [ '-fno-lto' ],
195+
+ 'ldflags': [],
196+
}],
197+
],
198+
},
199+
@@ -471,7 +471,7 @@
200+
'conditions': [
201+
# Avoid excessive LTO
202+
['enable_lto=="true"', {
203+
- 'ldflags': [ '-fno-lto' ],
204+
+ 'ldflags': [],
205+
}],
206+
],
207+
},
208+
@@ -489,7 +489,7 @@
209+
'conditions': [
210+
# Avoid excessive LTO
211+
['enable_lto=="true"', {
212+
- 'ldflags': [ '-fno-lto' ],
213+
+ 'ldflags': [],
214+
}],
215+
],
216+
},
217+
@@ -506,7 +506,7 @@
218+
'conditions': [
219+
# Avoid excessive LTO
220+
['enable_lto=="true"', {
221+
- 'ldflags': [ '-fno-lto' ],
222+
+ 'ldflags': [],
223+
}],
224+
],
225+
},
226+
diff --git a/tools/v8_gypfiles/d8.gyp b/tools/v8_gypfiles/d8.gyp
227+
index 4dd98972..27165061 100644
228+
--- a/tools/v8_gypfiles/d8.gyp
229+
+++ b/tools/v8_gypfiles/d8.gyp
230+
@@ -65,7 +65,7 @@
231+
}],
232+
# Avoid excessive LTO
233+
['enable_lto=="true"', {
234+
- 'ldflags': [ '-fno-lto' ],
235+
+ 'ldflags': [],
236+
}],
237+
],
238+
},
239+
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
240+
index 88c1297b..a640a7ff 100644
241+
--- a/tools/v8_gypfiles/v8.gyp
242+
+++ b/tools/v8_gypfiles/v8.gyp
243+
@@ -1690,7 +1690,7 @@
244+
}],
245+
# Avoid excessive LTO
246+
['enable_lto=="true"', {
247+
- 'ldflags': [ '-fno-lto' ],
248+
+ 'ldflags': [],
249+
}],
250+
],
251+
'defines!': [
252+
@@ -1752,7 +1752,7 @@
253+
}],
254+
# Avoid excessive LTO
255+
['enable_lto=="true"', {
256+
- 'ldflags': [ '-fno-lto' ],
257+
+ 'ldflags': [],
258+
}],
259+
],
260+
}, # mksnapshot
261+
@@ -1769,7 +1769,7 @@
262+
}],
263+
# Avoid excessive LTO
264+
['enable_lto=="true"', {
265+
- 'ldflags': [ '-fno-lto' ],
266+
+ 'ldflags': [],
267+
}],
268+
],
269+
'defines!': [
270+
@@ -1807,7 +1807,7 @@
271+
}],
272+
# Avoid excessive LTO
273+
['enable_lto=="true"', {
274+
- 'ldflags': [ '-fno-lto' ],
275+
+ 'ldflags': [],
276+
}],
277+
],
278+
'dependencies': [
279+
@@ -1843,7 +1843,7 @@
280+
}],
281+
# Avoid excessive LTO
282+
['enable_lto=="true"', {
283+
- 'ldflags': [ '-fno-lto' ],
284+
+ 'ldflags': [],
285+
}],
286+
],
287+
'sources': [
288+
@@ -1863,7 +1863,7 @@
289+
}],
290+
# Avoid excessive LTO
291+
['enable_lto=="true"', {
292+
- 'ldflags': [ '-fno-lto' ],
293+
+ 'ldflags': [],
294+
}],
295+
],
296+
'actions': [
297+
@@ -1931,7 +1931,7 @@
298+
],
299+
'conditions': [
300+
['enable_lto=="true"', {
301+
- 'cflags_cc': [ '-fno-lto' ],
302+
+ 'cflags_cc': [],
303+
}],
304+
# Changes in push_registers_asm.cc in V8 v12.8 requires using
305+
# push_registers_masm on Windows even with ClangCL on x64

0 commit comments

Comments
 (0)