Commit dfc21ed6 authored by Michael Achenbach's avatar Michael Achenbach Committed by Commit Bot

[build] Fix multi-arch build for pointer-compression - part 2

Bug: v8:9899
Change-Id: Ia67d19e4b213db44a62c559a24a29ee6dd687810
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1876056Reviewed-by: 's avatarSantiago Aboy Solanes <solanes@chromium.org>
Reviewed-by: 's avatarLeszek Swirski <leszeks@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#64517}
parent 8938dff2
...@@ -225,9 +225,6 @@ if (v8_enable_pointer_compression == "") { ...@@ -225,9 +225,6 @@ if (v8_enable_pointer_compression == "") {
# TODO(v8:v7703): temporarily enable pointer compression on arm64 # TODO(v8:v7703): temporarily enable pointer compression on arm64
v8_enable_pointer_compression = v8_current_cpu == "arm64" v8_enable_pointer_compression = v8_current_cpu == "arm64"
} }
if (v8_enable_shared_ro_heap == "") {
v8_enable_shared_ro_heap = !v8_enable_pointer_compression
}
if (v8_enable_fast_torque == "") { if (v8_enable_fast_torque == "") {
v8_enable_fast_torque = v8_enable_fast_mksnapshot v8_enable_fast_torque = v8_enable_fast_mksnapshot
} }
...@@ -244,6 +241,9 @@ if (v8_multi_arch_build && ...@@ -244,6 +241,9 @@ if (v8_multi_arch_build &&
"clang_x64_pointer_compression") { "clang_x64_pointer_compression") {
v8_enable_pointer_compression = !v8_enable_pointer_compression v8_enable_pointer_compression = !v8_enable_pointer_compression
} }
if (v8_enable_shared_ro_heap == "") {
v8_enable_shared_ro_heap = !v8_enable_pointer_compression
}
assert(!v8_disable_write_barriers || v8_enable_single_generation, assert(!v8_disable_write_barriers || v8_enable_single_generation,
"Disabling write barriers works only with single generation") "Disabling write barriers works only with single generation")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment