diff --git a/www/node18/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi b/www/node18/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi index f637cc2e3ee9..9a24f1397df0 100644 --- a/www/node18/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi +++ b/www/node18/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi @@ -1,11 +1,11 @@ ---- deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi.orig 2021-10-19 00:48:28 UTC +--- deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi.orig 2023-04-12 04:09:13 UTC +++ deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi @@ -13,7 +13,7 @@ '-Wall -O3 -fomit-frame-pointer', ], 'openssl_ex_libs_linux-elf': [ - '-ldl -pthread', + '-pthread', ], 'openssl_cli_srcs_linux-elf': [ 'openssl/apps/lib/cmp_mock_srv.c', diff --git a/www/node18/files/patch-deps_openssl_openssl-cl__no__asm.gypi b/www/node18/files/patch-deps_openssl_openssl-cl__no__asm.gypi index c2508ad0064f..178d0502e808 100644 --- a/www/node18/files/patch-deps_openssl_openssl-cl__no__asm.gypi +++ b/www/node18/files/patch-deps_openssl_openssl-cl__no__asm.gypi @@ -1,17 +1,17 @@ ---- deps/openssl/openssl-cl_no_asm.gypi.orig 2022-07-26 14:30:08 UTC +--- deps/openssl/openssl-cl_no_asm.gypi.orig 2023-04-12 04:09:13 UTC +++ deps/openssl/openssl-cl_no_asm.gypi @@ -1,4 +1,5 @@ { + 'defines': ['OPENSSL_NO_ASM'], 'conditions': [ ['target_arch=="ppc64" and OS=="aix"', { 'includes': ['config/archs/aix64-gcc-as/no-asm/openssl-cl.gypi'], @@ -43,7 +44,7 @@ 'includes': ['config/archs/linux64-riscv64/no-asm/openssl-cl.gypi'], }, { # Other architectures don't use assembly - 'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'], + 'includes': ['config/archs/linux-elf/no-asm/openssl-cl.gypi'], }], ], } diff --git a/www/node18/files/patch-deps_v8_src_base_platform_platform-freebsd.cc b/www/node18/files/patch-deps_v8_src_base_platform_platform-freebsd.cc index 3e173b2811f3..1983570ba3cc 100644 --- a/www/node18/files/patch-deps_v8_src_base_platform_platform-freebsd.cc +++ b/www/node18/files/patch-deps_v8_src_base_platform_platform-freebsd.cc @@ -1,13 +1,13 @@ ---- deps/v8/src/base/platform/platform-freebsd.cc.orig 2020-06-30 17:49:16 UTC +--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2023-04-12 04:09:14 UTC +++ deps/v8/src/base/platform/platform-freebsd.cc @@ -82,8 +82,8 @@ std::vector OS::GetSharedLib lib_name = std::string(path); } result.push_back(SharedLibraryAddress( - lib_name, reinterpret_cast(map->kve_start), - reinterpret_cast(map->kve_end))); + lib_name, static_cast(map->kve_start), + static_cast(map->kve_end))); } start += ssize; diff --git a/www/node18/files/patch-deps_v8_src_codegen_arm_cpu-arm.cc b/www/node18/files/patch-deps_v8_src_codegen_arm_cpu-arm.cc index 4bbfd3df2781..4a34f1968958 100644 --- a/www/node18/files/patch-deps_v8_src_codegen_arm_cpu-arm.cc +++ b/www/node18/files/patch-deps_v8_src_codegen_arm_cpu-arm.cc @@ -1,18 +1,18 @@ ---- deps/v8/src/codegen/arm/cpu-arm.cc.orig 2022-04-19 16:03:40 UTC +--- deps/v8/src/codegen/arm/cpu-arm.cc.orig 2023-04-12 04:09:15 UTC +++ deps/v8/src/codegen/arm/cpu-arm.cc @@ -2,12 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "include/v8config.h" + // CPU specific code for arm independent of OS goes here. #ifdef __arm__ #ifdef __QNXNTO__ #include // for cache flushing. #undef MAP_TYPE #elif V8_OS_FREEBSD +#include #include // for cache flushing #include #elif V8_OS_STARBOARD diff --git a/www/node18/files/patch-deps_v8_src_codegen_ppc_constants-ppc.h b/www/node18/files/patch-deps_v8_src_codegen_ppc_constants-ppc.h index 449278ef9271..2bf7c381a87a 100644 --- a/www/node18/files/patch-deps_v8_src_codegen_ppc_constants-ppc.h +++ b/www/node18/files/patch-deps_v8_src_codegen_ppc_constants-ppc.h @@ -1,20 +1,20 @@ ---- deps/v8/src/codegen/ppc/constants-ppc.h.orig 2020-06-30 17:49:17 UTC +--- deps/v8/src/codegen/ppc/constants-ppc.h.orig 2023-04-12 04:09:15 UTC +++ deps/v8/src/codegen/ppc/constants-ppc.h @@ -36,7 +36,7 @@ #endif #if !(V8_HOST_ARCH_PPC || V8_HOST_ARCH_PPC64) || !V8_TARGET_ARCH_PPC64 || \ - V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2) + (defined(_CALL_ELF) && _CALL_ELF == 2) #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1 #else #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0 @@ -44,7 +44,7 @@ #if !(V8_HOST_ARCH_PPC || V8_HOST_ARCH_PPC64) || \ (V8_TARGET_ARCH_PPC64 && \ - (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))) + (defined(_CALL_ELF) && _CALL_ELF == 2)) #define ABI_CALL_VIA_IP 1 #else #define ABI_CALL_VIA_IP 0 diff --git a/www/node18/files/patch-deps_v8_src_libsampler_sampler.cc b/www/node18/files/patch-deps_v8_src_libsampler_sampler.cc index 4a1f24a4a3c4..73288a58ab90 100644 --- a/www/node18/files/patch-deps_v8_src_libsampler_sampler.cc +++ b/www/node18/files/patch-deps_v8_src_libsampler_sampler.cc @@ -1,13 +1,13 @@ ---- deps/v8/src/libsampler/sampler.cc.orig 2021-10-19 00:48:30 UTC +--- deps/v8/src/libsampler/sampler.cc.orig 2023-04-12 04:09:15 UTC +++ deps/v8/src/libsampler/sampler.cc @@ -497,6 +497,10 @@ void SignalHandler::FillRegisterState(void* context, R state->pc = reinterpret_cast(mcontext.__gregs[_REG_PC]); state->sp = reinterpret_cast(mcontext.__gregs[_REG_SP]); state->fp = reinterpret_cast(mcontext.__gregs[_REG_FP]); +#elif V8_TARGET_ARCH_PPC64 + state->pc = reinterpret_cast(mcontext.mc_srr0); + state->sp = reinterpret_cast(mcontext.mc_frame[1]); + state->fp = reinterpret_cast(mcontext.mc_frame[31]); #endif // V8_HOST_ARCH_* #elif V8_OS_NETBSD #if V8_HOST_ARCH_IA32 diff --git a/www/node18/files/patch-src_crypto_crypto__util.cc b/www/node18/files/patch-openssl3 similarity index 87% rename from www/node18/files/patch-src_crypto_crypto__util.cc rename to www/node18/files/patch-openssl3 index cc25a8114d05..9066f5b9df9e 100644 --- a/www/node18/files/patch-src_crypto_crypto__util.cc +++ b/www/node18/files/patch-openssl3 @@ -1,15 +1,15 @@ ---- src/crypto/crypto_util.cc.orig 2023-06-06 21:00:49 UTC +--- src/crypto/crypto_util.cc.orig 2023-04-12 04:09:19 UTC +++ src/crypto/crypto_util.cc @@ -195,10 +195,12 @@ void InitCryptoOnce() { // No-op with OPENSSL_NO_COMP builds of OpenSSL. sk_SSL_COMP_zero(SSL_COMP_get_compression_methods()); +#if OPENSSL_VERSION_MAJOR < 3 #ifndef OPENSSL_NO_ENGINE ERR_load_ENGINE_strings(); ENGINE_load_builtin_engines(); #endif // !OPENSSL_NO_ENGINE +#endif } void GetFipsCrypto(const FunctionCallbackInfo& args) { diff --git a/www/node18/files/patch-tools_v8__gypfiles_v8.gyp b/www/node18/files/patch-tools_v8__gypfiles_v8.gyp index 374f77039af4..32853c6bfc17 100644 --- a/www/node18/files/patch-tools_v8__gypfiles_v8.gyp +++ b/www/node18/files/patch-tools_v8__gypfiles_v8.gyp @@ -1,11 +1,11 @@ ---- tools/v8_gypfiles/v8.gyp.orig 2022-05-17 11:37:47 UTC +--- tools/v8_gypfiles/v8.gyp.orig 2023-04-12 04:09:21 UTC +++ tools/v8_gypfiles/v8.gyp @@ -977,7 +977,7 @@ }], # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library # to implement atomic memory access - ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "arm", "riscv64", "loong64"]', { + ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "riscv64", "loong64"]', { 'link_settings': { 'libraries': ['-latomic', ], },