build: remove native mksnapshot for arm/arm64 (#17561)
* build: remove native mksnapshot for arm/arm64
This commit is contained in:
parent
8cf15cc931
commit
7eaa57b116
8 changed files with 65 additions and 184 deletions
|
@ -2,7 +2,5 @@ deps_backport_detailed_line_info_for_cpu_profiler.patch
|
|||
add_realloc.patch
|
||||
build_gn.patch
|
||||
expose_mksnapshot.patch
|
||||
build-torque-with-x64-toolchain-on-arm.patch
|
||||
do_not_run_arm_arm64_mksnapshot_binaries.patch
|
||||
deps_provide_more_v8_backwards_compatibility.patch
|
||||
dcheck.patch
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: deepak1556 <hop2deep@gmail.com>
|
||||
Date: Thu, 21 Feb 2019 00:06:32 +0530
|
||||
Subject: build-torque-with-x64-toolchain-on-arm.patch
|
||||
|
||||
torque binary has to be run during the build.
|
||||
|
||||
diff --git a/BUILD.gn b/BUILD.gn
|
||||
index d3dbe37d0a145921dddaea72e394c87826d6d5fe..61f952f1a577b17c6063996fd1e17a195714bf5a 100644
|
||||
--- a/BUILD.gn
|
||||
+++ b/BUILD.gn
|
||||
@@ -178,7 +178,9 @@ declare_args() {
|
||||
# the snapshot toolchain is the target toolchain and, hence, can't be used.
|
||||
v8_generator_toolchain = v8_snapshot_toolchain
|
||||
if (host_cpu == "x64" &&
|
||||
- (v8_current_cpu == "mips" || v8_current_cpu == "mips64")) {
|
||||
+ (v8_current_cpu == "mips" || v8_current_cpu == "mips64" ||
|
||||
+ v8_snapshot_toolchain == "//build/toolchain/linux:clang_arm" ||
|
||||
+ v8_snapshot_toolchain == "//build/toolchain/linux:clang_arm64")) {
|
||||
v8_generator_toolchain = "//build/toolchain/linux:clang_x64"
|
||||
}
|
||||
|
||||
@@ -3545,7 +3547,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
|
||||
}
|
||||
}
|
||||
|
||||
-if (current_toolchain == v8_snapshot_toolchain) {
|
||||
+if (current_toolchain == v8_generator_toolchain) {
|
||||
v8_executable("torque") {
|
||||
visibility = [ ":*" ] # Only targets in this file can depend on this.
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: John Kleinschmidt <jkleinsc@github.com>
|
||||
Date: Mon, 19 Nov 2018 18:33:56 -0500
|
||||
Subject: Do not run arm/arm64 mksnapshot binaries
|
||||
|
||||
For arm and arm64 target_arches, Chromium builds mksnapshot as an x64 binary and
|
||||
as part of that build mksnapshot is executed to produce snapshot_blob.bin.
|
||||
Chromium does not build native arm and arm64 binaries of mksnapshot, but
|
||||
Electron does, so this patch makes sure that the build doesn't try to run
|
||||
the mksnapshot binary if it was built for arm or arm64.
|
||||
|
||||
diff --git a/BUILD.gn b/BUILD.gn
|
||||
index 61f952f1a577b17c6063996fd1e17a195714bf5a..2a1c7d0348ace504c9b26850de7340d981cbb440 100644
|
||||
--- a/BUILD.gn
|
||||
+++ b/BUILD.gn
|
||||
@@ -1322,9 +1322,19 @@ if (v8_use_snapshot && v8_use_external_startup_data) {
|
||||
]
|
||||
public_deps = [
|
||||
":natives_blob",
|
||||
- ":run_mksnapshot_default",
|
||||
]
|
||||
|
||||
+ if (v8_snapshot_toolchain == "//build/toolchain/linux:clang_arm" ||
|
||||
+ v8_snapshot_toolchain == "//build/toolchain/linux:clang_arm64") {
|
||||
+ public_deps += [
|
||||
+ ":mksnapshot($v8_snapshot_toolchain)",
|
||||
+ ]
|
||||
+ } else {
|
||||
+ public_deps += [
|
||||
+ ":run_mksnapshot_default",
|
||||
+ ]
|
||||
+ }
|
||||
+
|
||||
if (v8_use_multi_snapshots) {
|
||||
public_deps += [ ":run_mksnapshot_trusted" ]
|
||||
}
|
|
@ -3,7 +3,7 @@ From: Shelley Vohr <shelley.vohr@gmail.com>
|
|||
Date: Mon, 22 Oct 2018 10:47:13 -0700
|
||||
Subject: expose_mksnapshot.patch
|
||||
|
||||
Needed in order to build mksnapshot on arm.
|
||||
Needed in order to target mksnapshot for mksnapshot zip.
|
||||
|
||||
diff --git a/BUILD.gn b/BUILD.gn
|
||||
index d8a2b8e11a3e0e9820dca061a00dbf1a6859bcf4..d3dbe37d0a145921dddaea72e394c87826d6d5fe 100644
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue