🌴 Sync 2026-09-27 20:55:59

This commit is contained in:
github-actions[bot] committed 2026-09-27 20:56:00 +08:00
1 parent 5c90f0aed1
commit 13668feb29
77 files changed
+2076 -94

No files matched your search

+12
View File
@@ -0,0 +1,12 @@
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -2212,7 +2212,8 @@ Module._initPaths = function() {
path.resolve(process.execPath, '..') :
path.resolve(process.execPath, '..', '..');
- const paths = [path.resolve(prefixDir, 'lib', 'node')];
+ const paths = [path.resolve(prefixDir, 'lib', 'node'),
+ path.resolve(prefixDir, 'lib', 'node_modules')];
if (homeDir) {
ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries'));
+22
View File
@@ -0,0 +1,22 @@
--- a/deps/v8/src/base/platform/platform-posix.cc
+++ b/deps/v8/src/base/platform/platform-posix.cc
@@ -1337,7 +1337,7 @@ bool Thread::Start() {
#if V8_OS_DARWIN
// Default on Mac OS X is 512kB -- bump up to 1MB
stack_size = 1 * 1024 * 1024;
-#elif V8_OS_AIX
+#elif V8_OS_AIX || !defined(__GLIBC__)
// Default on AIX is 96kB -- bump up to 2MB
stack_size = 2 * 1024 * 1024;
#endif
--- a/deps/v8/src/codegen/external-reference-table.cc
+++ b/deps/v8/src/codegen/external-reference-table.cc
@@ -10,7 +10,7 @@
#include "src/ic/stub-cache.h"
#include "src/logging/counters.h"
-#if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
+#if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID) && defined(V8_LIBC_GLIBC)
#define SYMBOLIZE_FUNCTION
#include <execinfo.h>
@@ -0,0 +1,11 @@
--- a/tools/gyp/pylib/gyp/generator/make.py
+++ b/tools/gyp/pylib/gyp/generator/make.py
@@ -208,7 +208,7 @@ cmd_solink_module = $(LINK.$(TOOLSET)) -
LINK_COMMANDS_MAC = """\
quiet_cmd_alink = LIBTOOL-STATIC $@
-cmd_alink = rm -f $@ && %(python)s gyp-mac-tool filter-libtool libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %%.o,$^)
+cmd_alink = rm -f $@ && %(python)s gyp-mac-tool filter-libtool /usr/bin/libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %%.o,$^)
quiet_cmd_link = LINK($(TOOLSET)) $@
cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS)
@@ -0,0 +1,20 @@
--- a/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js
+++ b/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js
@@ -1384,7 +1384,7 @@ const definitions = {
},
}),
loglevel: new Definition('loglevel', {
- default: 'notice',
+ default: 'info',
type: [
'silent',
'error',
@@ -2393,7 +2393,7 @@ const definitions = {
flatten,
}),
'strict-ssl': new Definition('strict-ssl', {
- default: true,
+ default: false,
type: Boolean,
description: `
Whether or not to do SSL key validation when making requests to the
+10
View File
@@ -0,0 +1,10 @@
--- a/deps/uv/uv.gyp
+++ b/deps/uv/uv.gyp
@@ -155,6 +155,7 @@
'target_name': 'libuv',
'toolsets': ['host', 'target'],
'type': '<(uv_library)',
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'include',
'src/',
+10
View File
@@ -0,0 +1,10 @@
--- a/deps/zlib/zlib.gyp
+++ b/deps/zlib/zlib.gyp
@@ -8,6 +8,7 @@
'use_system_zlib%': 0,
'arm_fpu%': '',
},
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'conditions': [
['use_system_zlib==0', {
'targets': [
+18
View File
@@ -0,0 +1,18 @@
--- a/node.gyp
+++ b/node.gyp
@@ -1243,6 +1243,7 @@
'includes': [
'node.gypi'
],
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
'include_dirs': [
'src',
'tools/msvs/genfiles',
@@ -1635,6 +1636,7 @@
'target_name': 'node_js2c',
'type': 'executable',
'toolsets': ['host'],
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
'include_dirs': [
'tools',
'src',
@@ -0,0 +1,106 @@
--- a/tools/icu/icu-generic.gyp
+++ b/tools/icu/icu-generic.gyp
@@ -106,6 +106,7 @@
'sources': [
'<@(icu_src_i18n)'
],
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(icu_path)/source/i18n',
],
@@ -114,6 +115,7 @@
],
'dependencies': [ 'icuucx', 'icu_implementation', 'icu_uconfig', 'icu_uconfig_target' ],
'direct_dependent_settings': {
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(icu_path)/source/i18n',
],
@@ -224,6 +226,7 @@
# full data - no trim needed
'sources': [ '<(SHARED_INTERMEDIATE_DIR)/icudt<(icu_ver_major)_dat.<(icu_asm_ext)' ],
'dependencies': [ 'genccode#host', 'icupkg#host', 'icu_implementation#host', 'icu_uconfig' ],
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(icu_path)/source/common',
],
@@ -308,6 +311,7 @@
# This file contains the small ICU data
'sources': [ '<(SHARED_INTERMEDIATE_DIR)/icusmdt<(icu_ver_major)_dat.<(icu_asm_ext)' ],
# for umachine.h
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(icu_path)/source/common',
],
@@ -324,6 +328,7 @@
'sources': [
'<@(icu_src_stubdata)'
],
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(icu_path)/source/common',
],
@@ -363,6 +368,7 @@
'_XOPEN_SOURCE_EXTENDED=0',
]}],
],
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(icu_path)/source/common',
],
@@ -372,6 +378,7 @@
'cflags_c': ['-std=c99'],
'export_dependent_settings': [ 'icu_uconfig', 'icu_uconfig_target' ],
'direct_dependent_settings': {
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(icu_path)/source/common',
],
@@ -402,6 +409,7 @@
'<(icu_path)/source/tools/toolutil/dbgutil.cpp',
'<(icu_path)/source/tools/toolutil/dbgutil.h',
],
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(icu_path)/source/common',
'<(icu_path)/source/i18n',
@@ -421,6 +429,7 @@
}]
],
'direct_dependent_settings': {
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(icu_path)/source/common',
'<(icu_path)/source/i18n',
@@ -442,6 +451,7 @@
'target_name': 'genrb',
'type': 'executable',
'toolsets': [ 'host' ],
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
'dependencies': [ 'icutools', 'icu_implementation' ],
'sources': [
'<@(icu_src_genrb)'
@@ -474,6 +484,7 @@
'target_name': 'iculslocs',
'toolsets': [ 'host' ],
'type': 'executable',
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
'dependencies': [ 'icutools' ],
'sources': [
'iculslocs.cc',
@@ -502,6 +513,7 @@
'target_name': 'icupkg',
'toolsets': [ 'host' ],
'type': 'executable',
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
'dependencies': [ 'icutools' ],
'sources': [
'<@(icu_src_icupkg)',
@@ -529,6 +541,7 @@
'target_name': 'genccode',
'toolsets': [ 'host' ],
'type': 'executable',
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
'dependencies': [ 'icutools' ],
'sources': [
'<@(icu_src_genccode)',
+131
View File
@@ -0,0 +1,131 @@
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -113,6 +113,7 @@
],
'hard_dependency': 1,
'direct_dependent_settings': {
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)',
],
@@ -235,6 +236,7 @@
'<@(torque_outputs_cc)',
'<@(torque_outputs_inc)',
],
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)',
],
@@ -256,6 +258,7 @@
'sources': [
'<(generate_bytecode_builtins_list_output)',
],
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(generate_bytecode_output_root)',
'<(SHARED_INTERMEDIATE_DIR)',
@@ -315,6 +318,7 @@
'v8_shared_internal_headers',
'v8_pch',
],
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)',
'<(generate_bytecode_output_root)',
@@ -987,6 +991,7 @@
'target_name': 'v8_compiler',
'type': 'static_library',
'toolsets': ['host', 'target'],
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
'dependencies': [
'generate_bytecode_builtins_list',
'run_torque',
@@ -1122,6 +1127,7 @@
],
'includes': ['inspector.gypi'],
'direct_dependent_settings': {
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(generate_bytecode_output_root)',
'<(SHARED_INTERMEDIATE_DIR)',
@@ -1794,6 +1800,7 @@
}],
],
'direct_dependent_settings': {
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(V8_ROOT)/include',
],
@@ -1814,6 +1821,7 @@
{
'target_name': 'bytecode_builtins_list_generator',
'type': 'executable',
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
'conditions': [
['want_separate_host_toolset', {
'toolsets': ['host'],
@@ -1856,6 +1864,8 @@
{
'target_name': 'mksnapshot',
'type': 'executable',
+ 'libraries!':[ '-L<!@(echo "$STAGING_DIR"/usr/lib)', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
+ 'libraries':[ '-L../../../../staging_dir/hostpkg/share/icu/current/lib' ],
'dependencies': [
'v8_base_without_compiler',
'v8_compiler_for_mksnapshot',
@@ -1918,6 +1928,7 @@
{
'target_name': 'torque',
'type': 'executable',
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
'dependencies': [
'torque_base',
# "build/win:default_exe_manifest",
@@ -1974,6 +1985,7 @@
{
'target_name': 'torque-language-server',
'type': 'executable',
+ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
'conditions': [
['want_separate_host_toolset', {
'toolsets': ['host'],
@@ -2016,6 +2028,8 @@
{
'target_name': 'gen-regexp-special-case',
'type': 'executable',
+ 'libraries!':[ '-L<!@(echo "$STAGING_DIR"/usr/lib)', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
+ 'libraries':[ '-L../../../../staging_dir/hostpkg/share/icu/current/lib' ],
'dependencies': [
'v8_libbase',
# "build/win:default_exe_manifest",
@@ -2277,6 +2291,7 @@
}],
],
'direct_dependent_settings': {
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(V8_ROOT)/include',
],
@@ -2420,12 +2435,14 @@
}],
],
'direct_dependent_settings': {
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(V8_ROOT)/third_party/zlib',
'<(V8_ROOT)/third_party/zlib/google',
],
},
'defines': [ 'ZLIB_IMPLEMENTATION' ],
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(V8_ROOT)/third_party/zlib',
'<(V8_ROOT)/third_party/zlib/google',
@@ -2473,6 +2490,7 @@
'variables': {
'FP16_ROOT': '../../deps/v8/third_party/fp16',
},
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'all_dependent_settings': {
'include_dirs': [
'<(FP16_ROOT)/src/include',
+23
View File
@@ -0,0 +1,23 @@
--- a/tools/v8_gypfiles/abseil.gyp
+++ b/tools/v8_gypfiles/abseil.gyp
@@ -9,16 +9,20 @@
'ABSEIL_ROOT': '../../deps/v8/third_party/abseil-cpp',
},
'direct_dependent_settings': {
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(ABSEIL_ROOT)',
],
+ 'include_dirs': [ '<(ABSEIL_ROOT)', '<!@(echo "$STAGING_DIR"/usr/../usr/include)' ],
'xcode_settings': {
'OTHER_LDFLAGS': ['-framework CoreFoundation'],
},
},
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'<(ABSEIL_ROOT)',
],
+ 'include_dirs': [ '<(ABSEIL_ROOT)', '<!@(echo "$STAGING_DIR"/usr/../usr/include)' ],
'sources': [
'<(ABSEIL_ROOT)/absl/algorithm/algorithm.h',
'<(ABSEIL_ROOT)/absl/algorithm/container.h',
+18
View File
@@ -0,0 +1,18 @@
--- a/deps/LIEF/lief.gyp
+++ b/deps/LIEF/lief.gyp
@@ -419,6 +419,7 @@
'toolsets': ['host', 'target'],
'type': 'static_library',
'includes': [],
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [
'.',
#include <LIEF/third-party/internal/expected.hpp>
@@ -439,6 +440,7 @@
"include/LIEF/third-party/internal",
],
'direct_dependent_settings': {
+ 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
'include_dirs': [ 'include' ],
},
'defines': [
@@ -0,0 +1,15 @@
From: Johannes Müller <alpinelinux@jogemu.at>
Date: Wed Aug 5 17:35:19 2026 +0000
Subject: Deactivate AVX2 dispatch on x86 due to unsupported _mm_extract_epi64
--- a/deps/histogram/src/hdr_histogram.c
+++ b/deps/histogram/src/hdr_histogram.c
@@ -36,7 +36,7 @@
/* Runtime-dispatched AVX2 path: keep the rest of this TU at the project's
baseline ISA so the shipped binary does not silently require AVX2. */
-#if (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86)) \
+#if (defined(__x86_64__) || defined(_M_X64)) \
&& (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER) && !defined(_MSC_VER)
# define HDR_HAS_AVX2_DISPATCH 1
# include <immintrin.h>
@@ -0,0 +1,29 @@
Description: do not use dns.ADDRCONFIG for localhost
it fails on IPv6-only systems. Setting it with libc fails on linux.
https://github.com/nodejs/node/issues/33279
Author: Jérémy Lal <kapouer@melix.org>
Last-Update: 2020-06-11
Bug-Debian: https://bugs.debian.org/962318
Forwarded: https://github.com/nodejs/node/issues/33816
--- a/lib/net.js
+++ b/lib/net.js
@@ -1,4 +1,5 @@
// Copyright Joyent, Inc. and other Node contributors.
+
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
@@ -1744,13 +1745,6 @@ function lookupAndConnect(self, options)
hints: options.hints || 0,
};
- if (!isWindows &&
- dnsopts.family !== 4 &&
- dnsopts.family !== 6 &&
- dnsopts.hints === 0) {
- dnsopts.hints = dns.ADDRCONFIG;
- }
-
debug('connect: find host', host);
debug('connect: dns options', dnsopts);
self._host = host;
@@ -0,0 +1,10 @@
--- a/node.gyp
+++ b/node.gyp
@@ -1244,6 +1244,7 @@
'node.gypi'
],
'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
+ 'cflags!': ['-mbranch-protection=standard'],
'include_dirs': [
'src',
'tools/msvs/genfiles',
@@ -0,0 +1,26 @@
From: Johannes Müller <alpinelinux@jogemu.at>
Date: Wed May 6 19:56:53 2025 +0000
Subject: Allow less highway lanes to fix armhf build
--- a/deps/v8/src/strings/string-hasher.cc
+++ b/deps/v8/src/strings/string-hasher.cc
@@ -77,7 +77,7 @@ uint64_t HashConvertingTo8Bit(const uint
bool IsOnly8BitSIMD(const uint16_t* chars, unsigned len) {
namespace hw = hwy::HWY_NAMESPACE;
- hw::FixedTag<uint16_t, 8> tag;
+ hw::CappedTag<uint16_t, 8> tag;
const size_t stride = hw::Lanes(tag);
const auto high_byte_mask = hw::Set(tag, static_cast<uint16_t>(0xFF00));
const auto zero = hw::Zero(tag);
--- a/deps/v8/src/json/json-stringifier.cc
+++ b/deps/v8/src/json/json-stringifier.cc
@@ -3398,7 +3398,7 @@ bool FastJsonStringifier<Char>::AppendSt
size_t uncopied_src_index = 0; // Index of first char not copied yet.
const SrcChar* block = chars;
const SrcChar* end = chars + length;
- hw::FixedTag<SrcChar, 16> tag;
+ hw::CappedTag<SrcChar, 16> tag;
static const size_t stride = hw::Lanes(tag);
const auto mask_0x20 = hw::Set(tag, 0x20);
@@ -0,0 +1,24 @@
Patch source: https://github.com/felixonmars/archriscv-packages/commit/c892e1fff21f427b5753b5d9cd8defb6b14763dd
Disable v8's trap handler[1] to workaround ENOMEM on sv39 systems[2].
v8's OOB trap handler for wasm tries to allocate a 10 GB guard region[3],
but unfortunately on sv39 systems we only have 256GB virtual memory for
userspace, which is usually already exhausted by the node process and
leads to `WebAssembly.Instance(): Out of memory: Cannot allocate Wasm
memory for new instance` errors
[1]: https://chromium-review.googlesource.com/c/v8/v8/+/5227604
[2]: https://github.com/riscv-forks/electron/issues/3#issuecomment-2391689815
[3]: https://github.com/nodejs/node/blob/09a8440b45f69651ff52110cb1bc2dde9e14e2e8/deps/v8/src/objects/backing-store.cc#L38
--- a/deps/v8/src/trap-handler/trap-handler.h
+++ b/deps/v8/src/trap-handler/trap-handler.h
@@ -49,7 +49,7 @@ namespace v8::internal::trap_handler {
// RISCV64 (non-simulator) on Linux.
#elif V8_TARGET_ARCH_RISCV64 && V8_HOST_ARCH_RISCV64 && V8_OS_LINUX && \
!V8_OS_ANDROID
-#define V8_TRAP_HANDLER_SUPPORTED true
+#define V8_TRAP_HANDLER_SUPPORTED false
// RISCV64 simulator on x64 on Linux
#elif V8_TARGET_ARCH_RISCV64 && V8_HOST_ARCH_X64 && V8_OS_LINUX
#define V8_TRAP_HANDLER_VIA_SIMULATOR
@@ -0,0 +1,24 @@
From: Johannes Müller <alpinelinux@jogemu.at>
Date: Fri Jul 12 11:33:42 2026 +0000
Subject: Resolve undefined reference to FloatMinMaxHelper
--- a/deps/v8/src/maglev/riscv/maglev-ir-riscv.cc
+++ b/deps/v8/src/maglev/riscv/maglev-ir-riscv.cc
@@ -881,7 +881,7 @@ void Float64Min::GenerateCode(MaglevAsse
DoubleRegister right = ToDoubleRegister(RightInput());
DoubleRegister out = ToDoubleRegister(result());
- __ FloatMinMaxHelper<double>(out, left, right, MaxMinKind::kMin);
+ __ Float64Min(out, left, right);
}
void Float64Max::SetValueLocationConstraints() {
@@ -896,7 +896,7 @@ void Float64Max::GenerateCode(MaglevAsse
DoubleRegister right = ToDoubleRegister(RightInput());
DoubleRegister out = ToDoubleRegister(result());
- __ FloatMinMaxHelper<double>(out, left, right, MaxMinKind::kMax);
+ __ Float64Max(out, left, right);
}
int Float64Ieee754Unary::MaxCallStackArgs() const { return 0; }
@@ -0,0 +1,114 @@
From: Martijn van der Ven <martijn@vanderven.se>
Date: Thu Aug 20 09:37:04 2026 +0000
Subject: Enable Temporal with system ICU via baked zoneinfo64 data
V8 loads Temporal's timezone data through the ICU-internal udatamem.h
API, which system ICU does not provide, so configuring with
--with-intl=system-icu leaves Temporal disabled. Always use the baked
zoneinfo64 data path that V8 already uses for builds without intl
instead; the zoneinfo64.res input is vendored in the release tarball
as part of the zoneinfo64 crate.
Patch-Source: https://github.com/nodejs/node/pull/62766
--- a/deps/v8/src/objects/js-temporal-zoneinfo64.h
+++ b/deps/v8/src/objects/js-temporal-zoneinfo64.h
@@ -7,7 +7,7 @@
#include "temporal_rs/Provider.d.hpp"
-#ifdef V8_INTL_SUPPORT
+#if false
#include "unicode/udata.h"
#else
#include <vector>
@@ -37,7 +37,7 @@ class ZoneInfo64Provider {
ZoneInfo64Provider();
~ZoneInfo64Provider();
std::unique_ptr<temporal_rs::Provider> provider;
-#ifdef V8_INTL_SUPPORT
+#if false
UDataMemory* memory;
#endif
};
--- a/deps/v8/src/objects/js-temporal-zoneinfo64.cc
+++ b/deps/v8/src/objects/js-temporal-zoneinfo64.cc
@@ -10,7 +10,7 @@
#include "temporal_rs/Provider.hpp"
#include "temporal_rs/TimeZone.hpp"
-#ifdef V8_INTL_SUPPORT
+#if false
#include "udatamem.h"
#else
// Defined in builtins-temporal-zoneinfo64-data.cc, generated by
@@ -22,7 +22,7 @@ extern "C" size_t zoneinfo64_static_data
namespace v8::internal {
ZoneInfo64Provider::ZoneInfo64Provider() {
-#ifdef V8_INTL_SUPPORT
+#if false
UErrorCode status = U_ZERO_ERROR;
memory = udata_open(0, "res", "zoneinfo64", &status);
if (U_FAILURE(status)) {
@@ -74,7 +74,7 @@ ZoneInfo64Provider::~ZoneInfo64Provider(
// Then clean up memory
// This ideally is a no-op when using static data
-#ifdef V8_INTL_SUPPORT
+#if false
if (memory) {
udata_close(memory);
}
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -1159,6 +1159,9 @@
],
}],
['v8_enable_temporal_support==1', {
+ 'dependencies': [
+ 'make_temporal_zoneinfo_cpp',
+ ],
'conditions': [
['node_shared_temporal_capi=="false"', {
'dependencies': [
@@ -2063,6 +2066,40 @@
],
}, # gen-regexp-special-case
{
+ 'target_name': 'make_temporal_zoneinfo_cpp',
+ 'type': 'none',
+ 'toolsets': ['host', 'target'],
+ 'conditions': [
+ ['v8_enable_temporal_support==1', {
+ 'actions': [
+ {
+ 'action_name': 'make_temporal_zoneinfo_cpp_action',
+ 'inputs': [
+ '<(V8_ROOT)/tools/include-file-as-bytes.py',
+ '<(V8_ROOT)/../crates/vendor/zoneinfo64-v0_3/src/data/zoneinfo64.res',
+ ],
+ 'outputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/src/builtins/builtins-temporal-zoneinfo64-data.cc',
+ ],
+ 'action': [
+ '<(python)',
+ '<(V8_ROOT)/tools/include-file-as-bytes.py',
+ '<(V8_ROOT)/../crates/vendor/zoneinfo64-v0_3/src/data/zoneinfo64.res',
+ '<@(_outputs)',
+ 'zoneinfo64_static_data',
+ ],
+ 'message': 'Generating temporal zoneinfo static data',
+ },
+ ],
+ }],
+ ],
+ 'direct_dependent_settings': {
+ 'sources': [
+ '<(SHARED_INTERMEDIATE_DIR)/src/builtins/builtins-temporal-zoneinfo64-data.cc',
+ ],
+ },
+ }, # make_temporal_zoneinfo_cpp
+ {
'target_name': 'run_gen-regexp-special-case',
'type': 'none',
'toolsets': ['host', 'target'],
@@ -0,0 +1,24 @@
From: Johannes Müller <50362-jogemu@users.gitlab.alpinelinux.org>
Date: Fri Oct 31 07:00:11 2025 +0000
Subject: Fix x86 build because _mm_cvtsi128_si64 is x64 only
--- a/deps/v8/src/strings/string-hasher.cc
+++ b/deps/v8/src/strings/string-hasher.cc
@@ -24,7 +24,7 @@ struct ConvertTo8BitHashReader {
DCHECK_LE(p[5], 0xff);
DCHECK_LE(p[6], 0xff);
DCHECK_LE(p[7], 0xff);
-#ifdef __SSE2__
+#if defined(__SSE2__) && defined(__x86_64__)
__m128i x = _mm_loadu_si128(reinterpret_cast<const __m128i*>(p));
return _mm_cvtsi128_si64(_mm_packus_epi16(x, x));
#elif defined(__ARM_NEON__)
@@ -45,7 +45,7 @@ struct ConvertTo8BitHashReader {
DCHECK_LE(p[1], 0xff);
DCHECK_LE(p[2], 0xff);
DCHECK_LE(p[3], 0xff);
-#ifdef __SSE2__
+#if defined(__SSE2__) && defined(__x86_64__)
__m128i x = _mm_loadu_si64(reinterpret_cast<const __m128i*>(p));
return _mm_cvtsi128_si64(_mm_packus_epi16(x, x));
#elif defined(__ARM_NEON__)
@@ -0,0 +1,16 @@
[arm64] Use the ISB instruction instead of YIELD
https://source.chromium.org/chromium/_/chromium/v8/v8/+/2b4f16e81707a744c09417f49ad6c7cb77413da8
--- a/deps/v8/src/base/platform/yield-processor.h
+++ b/deps/v8/src/base/platform/yield-processor.h
@@ -41,8 +41,10 @@
#if defined(V8_HOST_ARCH_IA32) || defined(V8_HOST_ARCH_X64)
#define YIELD_PROCESSOR __asm__ __volatile__("pause")
#elif defined(V8_HOST_ARCH_ARM64) || \
- (defined(V8_HOST_ARCH_ARM) && __ARM_ARCH >= 6)
+ (defined(V8_HOST_ARCH_ARM) && __ARM_ARCH > 6)
#define YIELD_PROCESSOR __asm__ __volatile__("isb" ::: "memory")
+#elif defined(V8_HOST_ARCH_ARM)
+#define YIELD_PROCESSOR __asm__ __volatile__("yield")
#elif defined(V8_HOST_ARCH_MIPS64EL) && __mips_isa_rev >= 2
// Don't bother doing using .word here since r2 is the lowest supported mips64
// that Chromium supports.