diff options
Diffstat (limited to 'data/node/v8.diff')
| -rw-r--r-- | data/node/v8.diff | 62 |
1 files changed, 40 insertions, 22 deletions
diff --git a/data/node/v8.diff b/data/node/v8.diff index 7ed407a0e..aed571fa6 100644 --- a/data/node/v8.diff +++ b/data/node/v8.diff @@ -1,6 +1,30 @@ -diff -ur node-v12.2.0/tools/v8_gypfiles/toolchain.gypi node-v12.2.0+iPhone/tools/v8_gypfiles/toolchain.gypi ---- node-v12.2.0/tools/v8_gypfiles/toolchain.gypi 2019-05-07 14:52:17.000000000 +0000 -+++ node-v12.2.0+iPhone/tools/v8_gypfiles/toolchain.gypi 2019-05-23 17:52:51.039689961 +0000 +diff -ur node-v12.3.1/deps/v8/src/arm64/cpu-arm64.cc node-v12.3.1+iPhone/deps/v8/src/arm64/cpu-arm64.cc +--- node-v12.3.1/deps/v8/src/arm64/cpu-arm64.cc 2019-05-22 12:21:52.000000000 +0000 ++++ node-v12.3.1+iPhone/deps/v8/src/arm64/cpu-arm64.cc 2019-05-24 19:37:47.406732128 +0000 +@@ -15,7 +15,7 @@ + class CacheLineSizes { + public: + CacheLineSizes() { +-#if !defined(V8_HOST_ARCH_ARM64) || defined(V8_OS_WIN) ++#if !defined(V8_HOST_ARCH_ARM64) || defined(V8_OS_WIN) || defined(V8_OS_IPHONEOS) || defined(__IPHONEOS__) + cache_type_register_ = 0; + #else + // Copy the content of the cache type register to a core register. +diff -ur node-v12.3.1/deps/v8/src/base/platform/platform-posix.cc node-v12.3.1+iPhone/deps/v8/src/base/platform/platform-posix.cc +--- node-v12.3.1/deps/v8/src/base/platform/platform-posix.cc 2019-05-22 12:21:52.000000000 +0000 ++++ node-v12.3.1+iPhone/deps/v8/src/base/platform/platform-posix.cc 2019-05-24 19:40:15.582804009 +0000 +@@ -240,6 +240,8 @@ + // 42 bits of virtual addressing. Truncate to 40 bits to allow kernel chance + // to fulfill request. + raw_addr &= uint64_t{0xFFFFFF0000}; ++#elif V8_TARGET_ARCH_ARM64 ++ raw_addr = raw_addr >> 14 << 14; + #else + raw_addr &= 0x3FFFF000; + +diff -ur node-v12.3.1/tools/v8_gypfiles/toolchain.gypi node-v12.3.1+iPhone/tools/v8_gypfiles/toolchain.gypi +--- node-v12.3.1/tools/v8_gypfiles/toolchain.gypi 2019-05-22 12:21:55.000000000 +0000 ++++ node-v12.3.1+iPhone/tools/v8_gypfiles/toolchain.gypi 2019-05-24 19:35:58.206678803 +0000 @@ -84,7 +84,9 @@ # The setting is ignored if want_separate_host_toolset is 0. 'v8_toolset_for_shell%': 'target', @@ -75,28 +99,23 @@ diff -ur node-v12.2.0/tools/v8_gypfiles/toolchain.gypi node-v12.2.0+iPhone/tools 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': '3', # -O3 -diff -ur node-v12.2.0/tools/v8_gypfiles/v8.gyp node-v12.2.0+iPhone/tools/v8_gypfiles/v8.gyp ---- node-v12.2.0/tools/v8_gypfiles/v8.gyp 2019-05-07 14:52:17.000000000 +0000 -+++ node-v12.2.0+iPhone/tools/v8_gypfiles/v8.gyp 2019-05-23 17:57:07.199852911 +0000 -@@ -123,7 +123,7 @@ +diff -ur node-v12.3.1/tools/v8_gypfiles/v8.gyp node-v12.3.1+iPhone/tools/v8_gypfiles/v8.gyp +--- node-v12.3.1/tools/v8_gypfiles/v8.gyp 2019-05-22 12:21:55.000000000 +0000 ++++ node-v12.3.1+iPhone/tools/v8_gypfiles/v8.gyp 2019-05-24 19:45:01.650941667 +0000 +@@ -123,6 +123,12 @@ ], }, 'conditions': [ -- ['OS=="mac"', { -+ ['OS=="mac" or OS=="ios"', { ++ ['OS=="ios"', { ++ 'ldflags': [ ++ '-dynamiclib', ++ '-all_load' ++ ], ++ }], + ['OS=="mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': ['-dynamiclib', '-all_load'] - }, -@@ -1824,7 +1824,7 @@ - '<(V8_ROOT)/src/x64/sse-instr.h', - ], - }], -- ['v8_target_arch=="x64" and (OS=="linux" or OS=="mac")', { -+ ['v8_target_arch=="x64" and (OS=="linux" or OS=="mac" or OS=="ios")', { - 'sources': [ - '<(V8_ROOT)/src/trap-handler/handler-inside-posix.cc', - '<(V8_ROOT)/src/trap-handler/handler-inside-posix.h', -@@ -2221,7 +2221,7 @@ +@@ -2221,7 +2227,7 @@ }], ], 'conditions': [ @@ -105,7 +124,7 @@ diff -ur node-v12.2.0/tools/v8_gypfiles/v8.gyp node-v12.2.0+iPhone/tools/v8_gypf 'link_settings': { 'libraries': [ '-ldl', -@@ -2296,15 +2296,38 @@ +@@ -2296,15 +2302,37 @@ '<(V8_ROOT)/src/base/platform/platform-fuchsia.cc', ]}, ], @@ -134,7 +153,6 @@ diff -ur node-v12.2.0/tools/v8_gypfiles/v8.gyp node-v12.2.0+iPhone/tools/v8_gypf + 'link_settings': { + 'target_conditions': [ + ['_toolset=="host" and host_os!="mac"', { -+ + 'libraries': [ + '-ldl', + '-lpthread', |