Skip to content

Commit 8a1c922

Browse files
TerrorJackTerrorJack
committed
v26.1.0
1 parent 7c4e56a commit 8a1c922

3 files changed

Lines changed: 77 additions & 129 deletions

File tree

‎build-alpine.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -eu
44

5-
node_ver=v25.9.0
5+
node_ver=v26.1.0
66

77
apk add \
88
clang \

‎lto.diff‎

Lines changed: 75 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,45 @@
11
diff --git a/common.gypi b/common.gypi
2-
index bf66a942..dc1c66b7 100644
2+
index dbd6bf9d..22d76117 100644
33
--- a/common.gypi
44
+++ b/common.gypi
5-
@@ -187,9 +187,9 @@
5+
@@ -189,9 +189,9 @@
66
'MSVC_runtimeType': 2 # MultiThreadedDLL (/MD)
77
}],
88
['clang==1', {
99
- 'lto': ' -flto ', # Clang
1010
+ 'lto': ' -flto=thin ', # Clang
1111
}, {
12-
- 'lto': ' -flto=4 -fuse-linker-plugin -ffat-lto-objects ', # GCC
13-
+ 'lto': ' -flto=auto -fuse-linker-plugin -fno-fat-lto-objects ', # GCC
12+
- 'lto': ' -flto=4 -ffat-lto-objects ', # GCC
13+
+ 'lto': ' -flto=auto -fno-fat-lto-objects ', # GCC
1414
}],
1515
],
1616
},
1717
diff --git a/deps/cares/configure b/deps/cares/configure
18-
index f91e2c95..90ff1b76 100755
18+
index f91e2c95..84a09a59 100755
1919
--- a/deps/cares/configure
2020
+++ b/deps/cares/configure
21-
@@ -17165,11 +17165,6 @@ _LT_EOF
22-
21+
@@ -17166,7 +17166,6 @@ _LT_EOF
2322

2423
_lt_libdeps_save_CFLAGS=$CFLAGS
25-
-case "$CC $CFLAGS " in #(
24+
case "$CC $CFLAGS " in #(
2625
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
27-
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
28-
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
29-
-esac
30-
31-
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
32-
(eval $ac_compile) 2>&5
26+
*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
27+
*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
28+
esac
3329
diff --git a/deps/cares/m4/libtool.m4 b/deps/cares/m4/libtool.m4
34-
index e7b68334..13ec17a6 100755
30+
index e7b68334..27a30926 100755
3531
--- a/deps/cares/m4/libtool.m4
3632
+++ b/deps/cares/m4/libtool.m4
37-
@@ -7562,11 +7562,6 @@ _LT_EOF
38-
])
33+
@@ -7563,7 +7563,6 @@ _LT_EOF
3934

4035
_lt_libdeps_save_CFLAGS=$CFLAGS
41-
-case "$CC $CFLAGS " in #(
36+
case "$CC $CFLAGS " in #(
4237
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
43-
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
44-
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
45-
-esac
46-
47-
dnl Parse the compiler output and extract the necessary
48-
dnl objects, libraries and library flags.
49-
diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
50-
index d13eaa9a..f67917c7 100644
51-
--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
52-
+++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
53-
@@ -635,7 +635,7 @@ class XcodeSettings:
54-
# if the system clang isn't used, DYLD_LIBRARY_PATH needs to contain the
55-
# path to the libLTO.dylib that matches the used clang.
56-
if self._Test("LLVM_LTO", "YES", default="NO"):
57-
- cflags.append("-flto")
58-
+ cflags.append("-flto=thin")
59-
60-
self._AppendPlatformVersionMinFlags(cflags)
61-
62-
@@ -1097,7 +1097,7 @@ class XcodeSettings:
63-
# For static libraries, no dSYMs are created.
64-
result = []
65-
if (
66-
- self._Test("GCC_GENERATE_DEBUGGING_SYMBOLS", "YES", default="YES")
67-
+ self._Test("GCC_GENERATE_DEBUGGING_SYMBOLS", "YES", default="NO")
68-
and self._Test(
69-
"DEBUG_INFORMATION_FORMAT", "dwarf-with-dsym", default="dwarf"
70-
)
38+
*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
39+
*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
40+
esac
7141
diff --git a/deps/openssl/openssl-cli.gypi b/deps/openssl/openssl-cli.gypi
72-
index ae74be9a..4e8517e5 100644
42+
index da03938f..00057f89 100644
7343
--- a/deps/openssl/openssl-cli.gypi
7444
+++ b/deps/openssl/openssl-cli.gypi
7545
@@ -23,7 +23,7 @@
@@ -79,10 +49,10 @@ index ae74be9a..4e8517e5 100644
7949
- 'ldflags': [ '-fno-lto' ],
8050
+ 'ldflags': [],
8151
}],
82-
],
83-
}
52+
['node_with_ltcg=="true" or enable_lto=="true" or enable_thin_lto=="true"', {
53+
'msvs_settings': {
8454
diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp
85-
index ea3a2dc0..ea3780f7 100644
55+
index 4d8d16f0..3a770c37 100644
8656
--- a/deps/openssl/openssl.gyp
8757
+++ b/deps/openssl/openssl.gyp
8858
@@ -75,7 +75,7 @@
@@ -92,13 +62,13 @@ index ea3a2dc0..ea3780f7 100644
9262
- 'ldflags': [ '-fno-lto' ],
9363
+ 'ldflags': [],
9464
}],
95-
]
96-
}, {
65+
['node_with_ltcg=="true" or enable_lto=="true" or enable_thin_lto=="true"', {
66+
'msvs_settings': {
9767
diff --git a/node.gyp b/node.gyp
98-
index bd77943b..71525b70 100644
68+
index b129c3db..9c685df4 100644
9969
--- a/node.gyp
10070
+++ b/node.gyp
101-
@@ -1178,7 +1178,7 @@
71+
@@ -1229,7 +1229,7 @@
10272
}],
10373
# Avoid excessive LTO
10474
['enable_lto=="true"', {
@@ -107,7 +77,7 @@ index bd77943b..71525b70 100644
10777
}],
10878
],
10979
}, # fuzz_env
110-
@@ -1227,7 +1227,7 @@
80+
@@ -1278,7 +1278,7 @@
11181
}],
11282
# Avoid excessive LTO
11383
['enable_lto=="true"', {
@@ -116,7 +86,7 @@ index bd77943b..71525b70 100644
11686
}],
11787
],
11888
}, # fuzz_ClientHelloParser.cc
119-
@@ -1286,7 +1286,7 @@
89+
@@ -1337,7 +1337,7 @@
12090
}],
12191
# Avoid excessive LTO
12292
['enable_lto=="true"', {
@@ -125,66 +95,44 @@ index bd77943b..71525b70 100644
12595
}],
12696
],
12797
}, # fuzz_strings
128-
@@ -1398,7 +1398,7 @@
98+
@@ -1449,7 +1449,7 @@
12999
}],
130100
# Avoid excessive LTO
131101
['enable_lto=="true"', {
132102
- 'ldflags': [ '-fno-lto' ],
133103
+ 'ldflags': [],
134104
}],
135-
],
136-
}, # cctest
137-
@@ -1462,7 +1462,7 @@
105+
['node_with_ltcg=="true" or enable_lto=="true" or enable_thin_lto=="true"', {
106+
'msvs_settings': {
107+
@@ -1523,7 +1523,7 @@
138108
}],
139109
# Avoid excessive LTO
140110
['enable_lto=="true"', {
141111
- 'ldflags': [ '-fno-lto' ],
142112
+ 'ldflags': [],
143113
}],
144-
],
145-
}, # embedtest
146-
@@ -1539,7 +1539,7 @@
114+
['node_with_ltcg=="true" or enable_lto=="true" or enable_thin_lto=="true"', {
115+
'msvs_settings': {
116+
@@ -1610,7 +1610,7 @@
147117
}],
148118
# Avoid excessive LTO
149119
['enable_lto=="true"', {
150120
- 'ldflags': [ '-fno-lto' ],
151121
+ 'ldflags': [],
152122
}],
153-
]
154-
}, # overlapped-checker
155-
@@ -1665,7 +1665,7 @@
123+
['node_with_ltcg=="true" or enable_lto=="true" or enable_thin_lto=="true"', {
124+
'msvs_settings': {
125+
@@ -1746,7 +1746,7 @@
156126
}],
157127
# Avoid excessive LTO
158128
['enable_lto=="true"', {
159129
- 'ldflags': [ '-fno-lto' ],
160130
+ 'ldflags': [],
161131
}],
162-
],
163-
}, # node_mksnapshot
164-
diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
165-
index d13eaa9a..f67917c7 100644
166-
--- a/tools/gyp/pylib/gyp/xcode_emulation.py
167-
+++ b/tools/gyp/pylib/gyp/xcode_emulation.py
168-
@@ -635,7 +635,7 @@ class XcodeSettings:
169-
# if the system clang isn't used, DYLD_LIBRARY_PATH needs to contain the
170-
# path to the libLTO.dylib that matches the used clang.
171-
if self._Test("LLVM_LTO", "YES", default="NO"):
172-
- cflags.append("-flto")
173-
+ cflags.append("-flto=thin")
174-
175-
self._AppendPlatformVersionMinFlags(cflags)
176-
177-
@@ -1097,7 +1097,7 @@ class XcodeSettings:
178-
# For static libraries, no dSYMs are created.
179-
result = []
180-
if (
181-
- self._Test("GCC_GENERATE_DEBUGGING_SYMBOLS", "YES", default="YES")
182-
+ self._Test("GCC_GENERATE_DEBUGGING_SYMBOLS", "YES", default="NO")
183-
and self._Test(
184-
"DEBUG_INFORMATION_FORMAT", "dwarf-with-dsym", default="dwarf"
185-
)
132+
['node_with_ltcg=="true" or enable_lto=="true" or enable_thin_lto=="true"', {
133+
'msvs_settings': {
186134
diff --git a/tools/icu/icu-generic.gyp b/tools/icu/icu-generic.gyp
187-
index f007c652..ac69a873 100644
135+
index f49b4ddb..40187c33 100644
188136
--- a/tools/icu/icu-generic.gyp
189137
+++ b/tools/icu/icu-generic.gyp
190138
@@ -454,7 +454,7 @@
@@ -194,37 +142,37 @@ index f007c652..ac69a873 100644
194142
- 'ldflags': [ '-fno-lto' ],
195143
+ 'ldflags': [],
196144
}],
197-
],
198-
},
199-
@@ -471,7 +471,7 @@
145+
['node_with_ltcg=="true" or enable_lto=="true" or enable_thin_lto=="true"', {
146+
'msvs_settings': {
147+
@@ -481,7 +481,7 @@
200148
'conditions': [
201149
# Avoid excessive LTO
202150
['enable_lto=="true"', {
203151
- 'ldflags': [ '-fno-lto' ],
204152
+ 'ldflags': [],
205153
}],
206-
],
207-
},
208-
@@ -489,7 +489,7 @@
154+
['node_with_ltcg=="true" or enable_lto=="true" or enable_thin_lto=="true"', {
155+
'msvs_settings': {
156+
@@ -509,7 +509,7 @@
209157
'conditions': [
210158
# Avoid excessive LTO
211159
['enable_lto=="true"', {
212160
- 'ldflags': [ '-fno-lto' ],
213161
+ 'ldflags': [],
214162
}],
215-
],
216-
},
217-
@@ -506,7 +506,7 @@
163+
['node_with_ltcg=="true" or enable_lto=="true" or enable_thin_lto=="true"', {
164+
'msvs_settings': {
165+
@@ -536,7 +536,7 @@
218166
'conditions': [
219167
# Avoid excessive LTO
220168
['enable_lto=="true"', {
221169
- 'ldflags': [ '-fno-lto' ],
222170
+ 'ldflags': [],
223171
}],
224-
],
225-
},
172+
['node_with_ltcg=="true" or enable_lto=="true" or enable_thin_lto=="true"', {
173+
'msvs_settings': {
226174
diff --git a/tools/v8_gypfiles/d8.gyp b/tools/v8_gypfiles/d8.gyp
227-
index f5f8a194..d2a6306e 100644
175+
index 5b47ebf1..a77f8de6 100644
228176
--- a/tools/v8_gypfiles/d8.gyp
229177
+++ b/tools/v8_gypfiles/d8.gyp
230178
@@ -65,7 +65,7 @@
@@ -234,72 +182,72 @@ index f5f8a194..d2a6306e 100644
234182
- 'ldflags': [ '-fno-lto' ],
235183
+ 'ldflags': [],
236184
}],
237-
],
238-
},
185+
['node_with_ltcg=="true" or enable_lto=="true" or enable_thin_lto=="true"', {
186+
'msvs_settings': {
239187
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
240-
index e09fcc1c..1220dd3b 100644
188+
index 945aa0aa..38054a4e 100644
241189
--- a/tools/v8_gypfiles/v8.gyp
242190
+++ b/tools/v8_gypfiles/v8.gyp
243-
@@ -1789,7 +1789,7 @@
191+
@@ -1738,7 +1738,7 @@
244192
}],
245193
# Avoid excessive LTO
246194
['enable_lto=="true"', {
247195
- 'ldflags': [ '-fno-lto' ],
248196
+ 'ldflags': [],
249197
}],
250-
],
251-
'defines!': [
252-
@@ -1852,7 +1852,7 @@
198+
['node_with_ltcg=="true" or enable_lto=="true" or enable_thin_lto=="true"', {
199+
'msvs_settings': {
200+
@@ -1810,7 +1810,7 @@
253201
}],
254202
# Avoid excessive LTO
255203
['enable_lto=="true"', {
256204
- 'ldflags': [ '-fno-lto' ],
257205
+ 'ldflags': [],
258206
}],
259-
],
260-
}, # mksnapshot
261-
@@ -1870,7 +1870,7 @@
207+
['node_with_ltcg=="true" or enable_lto=="true" or enable_thin_lto=="true"', {
208+
'msvs_settings': {
209+
@@ -1838,7 +1838,7 @@
262210
}],
263211
# Avoid excessive LTO
264212
['enable_lto=="true"', {
265213
- 'ldflags': [ '-fno-lto' ],
266214
+ 'ldflags': [],
267215
}],
268-
],
269-
'defines!': [
270-
@@ -1909,7 +1909,7 @@
216+
['node_with_ltcg=="true" or enable_lto=="true" or enable_thin_lto=="true"', {
217+
'msvs_settings': {
218+
@@ -1887,7 +1887,7 @@
271219
}],
272220
# Avoid excessive LTO
273221
['enable_lto=="true"', {
274222
- 'ldflags': [ '-fno-lto' ],
275223
+ 'ldflags': [],
276224
}],
277-
],
278-
'dependencies': [
279-
@@ -1947,7 +1947,7 @@
225+
['node_with_ltcg=="true" or enable_lto=="true" or enable_thin_lto=="true"', {
226+
'msvs_settings': {
227+
@@ -1935,7 +1935,7 @@
280228
}],
281229
# Avoid excessive LTO
282230
['enable_lto=="true"', {
283231
- 'ldflags': [ '-fno-lto' ],
284232
+ 'ldflags': [],
285233
}],
286-
],
287-
'sources': [
288-
@@ -1967,7 +1967,7 @@
234+
['node_with_ltcg=="true" or enable_lto=="true" or enable_thin_lto=="true"', {
235+
'msvs_settings': {
236+
@@ -1965,7 +1965,7 @@
289237
}],
290238
# Avoid excessive LTO
291239
['enable_lto=="true"', {
292240
- 'ldflags': [ '-fno-lto' ],
293241
+ 'ldflags': [],
294242
}],
295-
],
296-
'actions': [
297-
@@ -2035,7 +2035,7 @@
243+
['node_with_ltcg=="true" or enable_lto=="true" or enable_thin_lto=="true"', {
244+
'msvs_settings': {
245+
@@ -2043,7 +2043,7 @@
298246
],
299247
'conditions': [
300248
['enable_lto=="true"', {
301249
- 'cflags_cc': [ '-fno-lto' ],
302250
+ 'cflags_cc': [],
303251
}],
304-
# Changes in push_registers_asm.cc in V8 v12.8 requires using
305-
# push_registers_masm on Windows even with ClangCL on x64
252+
['node_with_ltcg=="true" or enable_lto=="true" or enable_thin_lto=="true"', {
253+
'msvs_settings': {

‎utils/update-diff.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ trap 'rm -rf "$workdir"' EXIT
77

88
cd "$workdir"
99

10-
git clone --depth=1 --branch=v25.9.0 https://github.com/nodejs/node.git .
10+
git clone --depth=1 --branch=v26.1.0 https://github.com/nodejs/node.git .
1111

1212
git apply "$OLDPWD/lto.diff"
1313

0 commit comments

Comments
 (0)