mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

build: add apple silicon support (#24545)

Browse source 
* chore: add patches to prevent installation of non-arm pip packages

* chore: add patches for apple-silicon

* build: add apple silicon build

* ci: add testing of new arm binary

* chore: remove / update for upstreamed patches

* Skip content tracing on macos on arm

* build: ensure that spec native modules are rebuilt for arm64 on apple-silicon

* chore: fix patches

* chore: fix broken patch

* chore: fix arm64 DCHECK

* build: add MAS arm64 build

* build: disable arm2 tests

* chore: update patches

* build: actually build MAS version of apple silicon app

Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
This commit is contained in:
Samuel Attard 2020-07-17 09:08:44 -07:00 • committed by GitHub
parent 6f53457a17
commit f146a164af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 767 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

5
patches/chromium/.patches
View file

@ -97,3 +97,8 @@ feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
use_electron_resources_in_icon_reader_service.patch
fix_patch_out_profile_refs_in_accessibility_ui.patch
fix_accessibility_label_id_mismatch.patch
remove_some_deps_that_do_not_work_on_arm64.patch
chore_add_allocator_patches_for_apple_silicon.patch
chore_disable_failing_blink_font_dcheck_on_big_sur.patch
fix_check_issecureeventinputenabled_in_constructor_before_setting.patch
fix_compare_page_size_to_ulong_not_int.patch

24
patches/chromium/chore_add_allocator_patches_for_apple_silicon.patch Normal file
View file

@ -0,0 +1,24 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Samuel Attard <marshallofsound@electronjs.org>
Date: Mon, 6 Jul 2020 20:49:19 -0700
Subject: chore: add allocator patches for apple silicon
Once these are available upstream we can remove this patch.
diff --git a/base/mac/mac_util.h b/base/mac/mac_util.h
index e24439cee6c81afc74bfcb557cbdab6785a32794..f84128e76f380a86b74d354787c741c2217b6b69 100644
--- a/base/mac/mac_util.h
+++ b/base/mac/mac_util.h
@@ -132,6 +132,12 @@ DEFINE_IS_OS_FUNCS(15, TEST_DEPLOYMENT_TARGET)
DEFINE_IS_OS_FUNCS(15, IGNORE_DEPLOYMENT_TARGET)
#endif
+#ifdef MAC_OS_X_VERSION_10_16
+DEFINE_IS_OS_FUNCS(16, TEST_DEPLOYMENT_TARGET)
+#else
+DEFINE_IS_OS_FUNCS(16, IGNORE_DEPLOYMENT_TARGET)
+#endif
+
#undef IGNORE_DEPLOYMENT_TARGET
#undef TEST_DEPLOYMENT_TARGET
#undef DEFINE_IS_OS_FUNCS_CR_MIN_REQUIRED

26
patches/chromium/chore_disable_failing_blink_font_dcheck_on_big_sur.patch Normal file
View file

@ -0,0 +1,26 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Samuel Attard <marshallofsound@electronjs.org>
Date: Mon, 6 Jul 2020 20:52:09 -0700
Subject: chore: disable failing blink font DCHECK on Big Sur
Once these are available upstream we can remove this patch.
diff --git a/third_party/blink/renderer/platform/fonts/mac/font_platform_data_mac.mm b/third_party/blink/renderer/platform/fonts/mac/font_platform_data_mac.mm
index d6abddab51bc95768467b3d84a55e07dec262f26..0678c9d30e162beb9fec6f98ae82e31b042723cf 100644
--- a/third_party/blink/renderer/platform/fonts/mac/font_platform_data_mac.mm
+++ b/third_party/blink/renderer/platform/fonts/mac/font_platform_data_mac.mm
@@ -59,10 +59,10 @@ bool VariableAxisChangeEffective(SkTypeface* typeface,
return false;
SkFontParameters::Variation::Axis axes_parameters[num_axes];
- int returned_axes =
- typeface->getVariationDesignParameters(axes_parameters, num_axes);
- DCHECK_EQ(num_axes, returned_axes);
- DCHECK_GE(num_axes, 0);
+ // int returned_axes =
+ // typeface->getVariationDesignParameters(axes_parameters, num_axes);
+ // DCHECK_EQ(num_axes, returned_axes);
+ // DCHECK_GE(num_axes, 0);
float clamped_new_value = new_value;
for (auto& axis_parameters : axes_parameters) {

21
patches/chromium/fix_check_issecureeventinputenabled_in_constructor_before_setting.patch Normal file
View file

@ -0,0 +1,21 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@github.com>
Date: Thu, 9 Jul 2020 11:16:30 -0400
Subject: fix: check IsSecureEventInputEnabled in constructor before setting
SetPasswordInputEnabled to true
It appears that macOS 12 has IsSecureEventInputEnabled set to true initially.
diff --git a/ui/base/cocoa/secure_password_input.mm b/ui/base/cocoa/secure_password_input.mm
index c9d003216ec51407d80b2c3ed0a77e747d203069..f10829d7fe369d2419bb1f0828d6d1ec7c8f57e1 100644
--- a/ui/base/cocoa/secure_password_input.mm
+++ b/ui/base/cocoa/secure_password_input.mm
@@ -41,7 +41,7 @@ void SetPasswordInputEnabled(bool enabled) {
namespace ui {
ScopedPasswordInputEnabler::ScopedPasswordInputEnabler() {
- if (!g_password_input_counter) {
+ if (!g_password_input_counter && !IsSecureEventInputEnabled()) {
SetPasswordInputEnabled(true);
}
++g_password_input_counter;

20
patches/chromium/fix_compare_page_size_to_ulong_not_int.patch Normal file
View file

@ -0,0 +1,20 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Samuel Attard <marshallofsound@electronjs.org>
Date: Tue, 14 Jul 2020 14:51:31 -0700
Subject: fix: compare page size to ulong not int
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2298340
diff --git a/base/process/process_metrics_mac.cc b/base/process/process_metrics_mac.cc
index 6d05c82369f792f5f396dfc4f2c61f49b6585390..8f80975763e8a2e04dbe5864d7d4eaf7460cd119 100644
--- a/base/process/process_metrics_mac.cc
+++ b/base/process/process_metrics_mac.cc
@@ -298,7 +298,7 @@ bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo) {
#if defined(ARCH_CPU_ARM64)
// PAGE_SIZE is vm_page_size on arm, which isn't constexpr.
- DCHECK_EQ(PAGE_SIZE % 1024, 0) << "Invalid page size";
+ DCHECK_EQ(PAGE_SIZE % 1024, static_cast<uint64_t>(0)) << "Invalid page size";
#else
static_assert(PAGE_SIZE % 1024 == 0, "Invalid page size");
#endif

168
patches/chromium/remove_some_deps_that_do_not_work_on_arm64.patch Normal file
View file

@ -0,0 +1,168 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Samuel Attard <marshallofsound@electronjs.org>
Date: Mon, 6 Jul 2020 16:59:17 -0700
Subject: remove some deps that do not work on arm64
Once these deps have been fixed upstream we can remove this patch.
diff --git a/.vpython b/.vpython
index 0a28e76064296edea609eb52e57555689c23c0a3..bea6a9b7ee4b64dcc44b6f345a83e28d1d22649c 100644
--- a/.vpython
+++ b/.vpython
@@ -53,10 +53,10 @@ wheel: <
#
# This version must be compatible with the version range specified by
# //third_party/catapult/telemetry/telemetry/internal/util/external_modules.py
-wheel: <
- name: "infra/python/wheels/psutil/${vpython_platform}"
- version: "version:5.2.2"
->
+#wheel: <
+# name: "infra/python/wheels/psutil/${vpython_platform}"
+# version: "version:5.2.2"
+#>
# Used by:
# third_party/catapult
@@ -67,37 +67,37 @@ wheel: <
# This version must also be compatible with the "numpy" version, as "cv2"
# depends on "numpy". In this case, OpenCV@2.4.13.2 has been built against
# numpy@1.11.3.
-wheel: <
- name: "infra/python/wheels/opencv_python/${vpython_platform}"
- version: "version:2.4.13.2"
- match_tag: <
- platform: "win32"
- >
- match_tag: <
- platform: "win_amd64"
- >
- match_tag: <
- abi: "cp27mu"
- platform: "manylinux1_i686"
- >
- match_tag: <
- abi: "cp27mu"
- platform: "manylinux1_x86_64"
- >
- match_tag: <
- platform: "macosx_10_6_intel"
- >
->
+#wheel: <
+# name: "infra/python/wheels/opencv_python/${vpython_platform}"
+# version: "version:2.4.13.2"
+# match_tag: <
+# platform: "win32"
+# >
+# match_tag: <
+# platform: "win_amd64"
+# >
+# match_tag: <
+# abi: "cp27mu"
+# platform: "manylinux1_i686"
+# >
+# match_tag: <
+# abi: "cp27mu"
+# platform: "manylinux1_x86_64"
+# >
+# match_tag: <
+# platform: "macosx_10_6_intel"
+# >
+#>
# Used by:
# third_party/catapult
#
# This version must be compatible with the version range specified by
# //third_party/catapult/telemetry/telemetry/internal/util/external_modules.py
-wheel: <
- name: "infra/python/wheels/numpy/${vpython_platform}"
- version: "version:1.11.3"
->
+#wheel: <
+# name: "infra/python/wheels/numpy/${vpython_platform}"
+# version: "version:1.11.3"
+#>
# Used by:
# third_party/catapult
@@ -132,10 +132,10 @@ wheel: <
# Used by:
# testing/buildbot/generate_buildbot_json_coveragetest.py
-wheel: <
- name: "infra/python/wheels/coverage/${vpython_platform}"
- version: "version:4.3.4"
->
+#wheel: <
+# name: "infra/python/wheels/coverage/${vpython_platform}"
+# version: "version:4.3.4"
+#>
# Used by:
# build/android/pylib/local/emulator/avd.py
@@ -166,27 +166,27 @@ wheel: <
# Used by:
# tools/perf/flakiness_cli
-wheel: <
- name: "infra/python/wheels/pandas/${vpython_platform}"
- version: "version:0.23.4"
- match_tag: <
- platform: "win32"
- >
- match_tag: <
- platform: "win_amd64"
- >
- match_tag: <
- abi: "cp27mu"
- platform: "manylinux1_i686"
- >
- match_tag: <
- abi: "cp27mu"
- platform: "manylinux1_x86_64"
- >
- match_tag: <
- platform: "macosx_10_6_intel"
- >
->
+#wheel: <
+# name: "infra/python/wheels/pandas/${vpython_platform}"
+# version: "version:0.23.4"
+# match_tag: <
+# platform: "win32"
+# >
+# match_tag: <
+# platform: "win_amd64"
+# >
+# match_tag: <
+# abi: "cp27mu"
+# platform: "manylinux1_i686"
+# >
+# match_tag: <
+# abi: "cp27mu"
+# platform: "manylinux1_x86_64"
+# >
+# match_tag: <
+# platform: "macosx_10_6_intel"
+# >
+#>
wheel: <
name: "infra/python/wheels/pytz-py2_py3"
version: "version:2018.4"
@@ -268,10 +268,10 @@ wheel <
name: "infra/python/wheels/funcsigs-py2_py3"
version: "version:1.0.2"
>
-wheel: <
- name: "infra/python/wheels/psutil/${vpython_platform}"
- version: "version:5.2.2"
->
+#wheel: <
+# name: "infra/python/wheels/psutil/${vpython_platform}"
+# version: "version:5.2.2"
+#>
# Used by:
# tools/infra

4
patches/config.json
View file

@ -9,5 +9,7 @@
"src/electron/patches/squirrel.mac": "src/third_party/squirrel.mac",
"src/electron/patches/ReactiveObjC": "src/third_party/squirrel.mac/vendor/ReactiveObjC"
"src/electron/patches/ReactiveObjC": "src/third_party/squirrel.mac/vendor/ReactiveObjC",
"src/electron/patches/depot_tools": "src/third_party/depot_tools"
}

1
patches/depot_tools/.patches Normal file
View file

@ -0,0 +1 @@
remove_some_deps_that_do_not_work_on_arm64.patch

54
patches/depot_tools/remove_some_deps_that_do_not_work_on_arm64.patch Normal file
View file

@ -0,0 +1,54 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel@Samuels-Mac.local>
Date: Mon, 6 Jul 2020 14:47:55 -0700
Subject: remove some deps that do not work on arm64
Once these deps have newly built arm64 versions we can remove this patch.
diff --git a/gsutil.vpython b/gsutil.vpython
index 8a2a38aac8e154199a1431a95b1d620052c8d770..0d9d92cd5f93c1f771253a4542c0548e7f002c10 100644
--- a/gsutil.vpython
+++ b/gsutil.vpython
@@ -25,19 +25,19 @@ wheel <
# "gsutil" on non-GCE can require PyOpenSSL, which, in turn, requires
# "cryptography".
-wheel: <
- name: "infra/python/wheels/pyopenssl-py2_py3"
- version: "version:17.2.0"
->
+#wheel: <
+# name: "infra/python/wheels/pyopenssl-py2_py3"
+# version: "version:17.2.0"
+#>
##
# BEGIN "cryptography" dependencies.
##
-wheel: <
- name: "infra/python/wheels/cryptography/${platform}_${py_python}_${py_abi}"
- version: "version:2.0.3"
->
+#wheel: <
+# name: "infra/python/wheels/cryptography/${platform}_${py_python}_${py_abi}"
+# version: "version:2.0.3"
+#>
wheel: <
name: "infra/python/wheels/appdirs-py2_py3"
@@ -54,10 +54,10 @@ wheel: <
version: "version:1.1.6"
>
-wheel: <
- name: "infra/python/wheels/cffi/${platform}_${py_python}_${py_abi}"
- version: "version:1.10.0"
->
+#wheel: <
+# name: "infra/python/wheels/cffi/${platform}_${py_python}_${py_abi}"
+# version: "version:1.10.0"
+#>
wheel: <
name: "infra/python/wheels/idna-py2_py3"

2
patches/v8/.patches
View file

@ -7,3 +7,5 @@ workaround_an_undefined_symbol_error.patch
do_not_export_private_v8_symbols_on_windows.patch
revert_cleanup_switch_offset_of_to_offsetof_where_possible.patch
fix_build_deprecated_attirbute_for_older_msvc_versions.patch
chore_add_v8_apple_silicon_patches.patch
fix_use_proper_page_size_for_mac_arm64.patch

134
patches/v8/chore_add_v8_apple_silicon_patches.patch Normal file
View file

@ -0,0 +1,134 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Samuel Attard <marshallofsound@electronjs.org>
Date: Mon, 6 Jul 2020 20:47:43 -0700
Subject: chore: add v8 apple silicon patches
Once these are available upstream we can remove this patch.
diff --git a/src/codegen/arm64/macro-assembler-arm64.cc b/src/codegen/arm64/macro-assembler-arm64.cc
index 2d3e27e5302f40466917ca5ce28bd787d14d8fe9..d0d55a25a62c255096cfb0348beaae02e5549e87 100644
--- a/src/codegen/arm64/macro-assembler-arm64.cc
+++ b/src/codegen/arm64/macro-assembler-arm64.cc
@@ -2973,6 +2973,35 @@ void TurboAssembler::PrintfNoPreserve(const char* format,
int arg_count = kPrintfMaxArgCount;
+#if V8_OS_MACOSX && !USE_SIMULATOR
+ CPURegList tmp_list = kCallerSaved;
+ tmp_list.Remove(x0); // Used to pass the format string.
+ tmp_list.Remove(arg0, arg1, arg2, arg3);
+
+ // Override the MacroAssembler's scratch register list. The lists will be
+ // reset automatically at the end of the UseScratchRegisterScope.
+ UseScratchRegisterScope temps(this);
+ TmpList()->set_list(tmp_list.list());
+
+ VRegister temp_D = temps.AcquireD();
+
+ // https://developer.apple.com/library/archive/documentation/Xcode/Conceptual/iPhoneOSABIReference/Articles/ARM64FunctionCallingConventions.html#//apple_ref/doc/uid/TP40013702-SW1
+ Claim(kPrintfMaxArgCount, 8);
+ int64_t offset = 0;
+ for (unsigned i = 0; i < kPrintfMaxArgCount; i++) {
+ CPURegister arg = args[i];
+ if (arg.IsNone()) {
+ break;
+ }
+ if (arg.IsS()) {
+ fcvt(temp_D, arg.S());
+ arg = temp_D;
+ }
+ // FIXME: Use stp.
+ str(arg, MemOperand(sp, offset, Offset));
+ offset += 8;
+ }
+#else
// The PCS varargs registers for printf. Note that x0 is used for the printf
// format string.
static const CPURegList kPCSVarargs =
@@ -3083,7 +3112,7 @@ void TurboAssembler::PrintfNoPreserve(const char* format,
}
#endif
}
-
+#endif
// Load the format string into x0, as per the procedure-call standard.
//
// To make the code as portable as possible, the format string is encoded
@@ -3105,6 +3134,10 @@ void TurboAssembler::PrintfNoPreserve(const char* format,
}
CallPrintf(arg_count, pcs);
+
+#if V8_OS_MACOSX && !USE_SIMULATOR
+ Drop(kPrintfMaxArgCount, 8);
+#endif
}
void TurboAssembler::CallPrintf(int arg_count, const CPURegister* args) {
diff --git a/src/compiler/backend/arm64/instruction-selector-arm64.cc b/src/compiler/backend/arm64/instruction-selector-arm64.cc
index 1737c7f8e121c967de6da8bfd17dcebd121d9dd5..58ec3108a8ea5888ba31f4b5c7c4939e1c1718ea 100644
--- a/src/compiler/backend/arm64/instruction-selector-arm64.cc
+++ b/src/compiler/backend/arm64/instruction-selector-arm64.cc
@@ -1864,6 +1864,7 @@ void InstructionSelector::EmitPrepareArguments(
// Poke the arguments into the stack.
while (slot >= 0) {
+ // FIXME: In the Apple ARM64 ABI parameters should be packed on the stack.
PushParameter input0 = (*arguments)[slot];
PushParameter input1 = slot > 0 ? (*arguments)[slot - 1] : PushParameter();
// Emit a poke-pair if consecutive parameters have the same type.
diff --git a/src/flags/flag-definitions.h b/src/flags/flag-definitions.h
index d4a1ad0920a45e0d704e4ed8a01fdad59fcde6e1..32c25712c6490984bd59cf4125feec98050cc61d 100644
--- a/src/flags/flag-definitions.h
+++ b/src/flags/flag-definitions.h
@@ -710,7 +710,12 @@ DEFINE_INT(wasm_num_compilation_tasks, 128,
"maximum number of parallel compilation tasks for wasm")
DEFINE_DEBUG_BOOL(trace_wasm_native_heap, false,
"trace wasm native heap events")
-DEFINE_BOOL(wasm_write_protect_code_memory, false,
+#if V8_OS_MACOSX && V8_TARGET_ARCH_ARM64
+#define V8_DEFAULT_WASM_WRITE_PROTECT_CODE_MEMORY true
+#else
+#define V8_DEFAULT_WASM_WRITE_PROTECT_CODE_MEMORY false
+#endif
+DEFINE_BOOL(wasm_write_protect_code_memory, V8_DEFAULT_WASM_WRITE_PROTECT_CODE_MEMORY,
"write protect code memory on the wasm native heap")
DEFINE_DEBUG_BOOL(trace_wasm_serialization, false,
"trace serialization/deserialization")
diff --git a/src/wasm/function-compiler.cc b/src/wasm/function-compiler.cc
index e268667d2870a0f8fc370e14d3a846b623dae197..95d4318cf9baf895bea58991d4c2f58e4f07e23d 100644
--- a/src/wasm/function-compiler.cc
+++ b/src/wasm/function-compiler.cc
@@ -260,6 +260,7 @@ void WasmCompilationUnit::CompileWasmFunction(Isolate* isolate,
isolate->counters(), detected);
if (result.succeeded()) {
WasmCodeRefScope code_ref_scope;
+ NativeModuleModificationScope native_module_modification_scope(native_module);
native_module->PublishCode(
native_module->AddCompiledCode(std::move(result)));
} else {
diff --git a/src/wasm/wasm-code-manager.h b/src/wasm/wasm-code-manager.h
index d76adccad7667665da2723dac1b30e4956dfd98a..1b802d7e4382f61c8a622234c6d1314e8fcbac96 100644
--- a/src/wasm/wasm-code-manager.h
+++ b/src/wasm/wasm-code-manager.h
@@ -851,7 +851,7 @@ class V8_EXPORT_PRIVATE WasmCodeManager final {
// and even if we did, the resulting set of pages may be fragmented.
// Currently, we try and keep the number of syscalls low.
// - similar argument for debug time.
-class NativeModuleModificationScope final {
+class V8_EXPORT_PRIVATE NativeModuleModificationScope final {
public:
explicit NativeModuleModificationScope(NativeModule* native_module);
~NativeModuleModificationScope();
diff --git a/src/wasm/wasm-objects.cc b/src/wasm/wasm-objects.cc
index 1d85bb3ff79557442dc416587769b5f8fcfa77fb..bdd7ef4c45a3908ff234ecf136e153c31dbc2ba9 100644
--- a/src/wasm/wasm-objects.cc
+++ b/src/wasm/wasm-objects.cc
@@ -1447,6 +1447,7 @@ void WasmInstanceObject::ImportWasmJSFunctionIntoTable(
wasm::CompilationEnv env = native_module->CreateCompilationEnv();
wasm::WasmCompilationResult result = compiler::CompileWasmImportCallWrapper(
isolate->wasm_engine(), &env, kind, sig, false);
+ wasm::NativeModuleModificationScope native_module_modification_scope(native_module);
std::unique_ptr<wasm::WasmCode> wasm_code = native_module->AddCode(
result.func_index, result.code_desc, result.frame_slot_count,
result.tagged_parameter_slots,

65
patches/v8/fix_use_proper_page_size_for_mac_arm64.patch Normal file
View file

@ -0,0 +1,65 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@github.com>
Date: Wed, 8 Jul 2020 10:46:13 -0400
Subject: fix: use proper page size for mac arm64
This fix temporarily sets page size to 16k for mac arm64 so that mksnapshot can run on x64
and generate a mac arm64 snapshot
diff --git a/src/base/platform/platform-posix.cc b/src/base/platform/platform-posix.cc
index 238750bab16b619d017bddce584b1c8257e5a6dc..89716d0ac4d354615411374dcef5b2d381804e50 100644
--- a/src/base/platform/platform-posix.cc
+++ b/src/base/platform/platform-posix.cc
@@ -147,9 +147,19 @@ int GetFlagsForMemoryPermission(OS::MemoryPermission access) {
void* Allocate(void* hint, size_t size, OS::MemoryPermission access) {
int prot = GetProtectionFromMemoryPermission(access);
int flags = GetFlagsForMemoryPermission(access);
+#if defined(__APPLE__) && V8_TARGET_ARCH_ARM64 && defined(__x86_64__)
+ // XXX: This logic is simple and leaky as it is only used for mksnapshot.
+ size_t alignment = 16384;
+ void* result = mmap(hint, size + alignment, prot, flags, kMmapFd,
+ kMmapFdOffset);
+ if (result == MAP_FAILED) return nullptr;
+ return reinterpret_cast<void*>(
+ RoundUp(reinterpret_cast<uintptr_t>(result), alignment));
+#else
void* result = mmap(hint, size, prot, flags, kMmapFd, kMmapFdOffset);
if (result == MAP_FAILED) return nullptr;
return result;
+#endif
}
#endif // !V8_OS_FUCHSIA
@@ -206,7 +216,9 @@ void OS::Initialize(bool hard_abort, const char* const gc_fake_mmap) {
}
int OS::ActivationFrameAlignment() {
-#if V8_TARGET_ARCH_ARM
+#if defined(__APPLE__) && V8_TARGET_ARCH_ARM
+ return 4;
+#elif V8_TARGET_ARCH_ARM
// On EABI ARM targets this is required for fp correctness in the
// runtime system.
return 8;
@@ -226,13 +238,21 @@ int OS::ActivationFrameAlignment() {
// static
size_t OS::AllocatePageSize() {
+#if defined(__APPLE__) && V8_TARGET_ARCH_ARM64 && defined(__x86_64__)
+ return 16384;
+#else
return static_cast<size_t>(sysconf(_SC_PAGESIZE));
+#endif
}
// static
size_t OS::CommitPageSize() {
+#if defined(__APPLE__) && V8_TARGET_ARCH_ARM64 && defined(__x86_64__)
+ return 16384;
+#else
static size_t page_size = getpagesize();
return page_size;
+#endif
}
// static