Reviewers: Yang,
Description:
Version 4.3.34.1 (cherry-pick)
Merged 6b8428748ebcb13c262e40f53d5b77cdc9f7f516
Use target_cpu instead of cpu_arch in BUILD.gn
BUG=v8:3841
LOG=N
[email protected]
Please review this at https://codereview.chromium.org/1007733002/
Base URL: https://chromium.googlesource.com/v8/[email protected]
Affected files (+35, -28 lines):
M BUILD.gn
M include/v8-version.h
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index
98a8b382cd805804ccba471efb06c6c3aeecd847..827cd2c366bbdf2a7c4d3cf8792a78b102b7ee2c
100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -2,6 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/android/config.gni")
+import("//build/config/arm.gni")
+import("//build/config/mips.gni")
+
# Because standalone V8 builds are not supported, assume this is part of a
# Chromium build.
import("//build/module_args/v8.gni")
@@ -18,23 +22,19 @@ v8_interpreted_regexp = false
v8_object_print = false
v8_postmortem_support = false
v8_use_snapshot = true
-
-# TODO(GYP): We should be just target_cpu and not need v8_target_arch.
-v8_target_arch = current_cpu
-
+v8_target_arch = target_cpu
v8_random_seed = "314159265"
v8_toolset_for_d8 = "host"
# The snapshot needs to be compiled for the host, but compiled with
# a toolchain that matches the bit-width of the target.
#
-# TODO(GYP): For now we only support 32-bit little-endian target builds
from
-# an x86/x64 Linux host. Eventually we need to support all of the
-# host/target configurations v8 runs on.
-if (target_os == "android" || target_os == "chromeos") {
- assert(host_os == "linux" &&
- (host_cpu == "x86" || host_cpu == "x64") &&
- (target_cpu == "arm" || target_cpu == "mipsel" || target_cpu
== "x86"))
+# TODO(GYP): For now we only support 32-bit little-endian target builds
from an
+# x64 Linux host. Eventually we need to support all of the host/target
+# configurations v8 runs on.
+if (host_cpu == "x64" &&
+ (target_cpu == "arm" || target_cpu == "mipsel" || target_cpu
== "x86")) {
+ assert(host_os == "linux")
snapshot_toolchain = "//build/toolchain/linux:clang_x86"
} else {
snapshot_toolchain = default_toolchain
@@ -118,29 +118,36 @@ config("toolchain") {
if (v8_target_arch == "arm") {
defines += [ "V8_TARGET_ARCH_ARM" ]
- if (arm_version == 7) {
- defines += [ "CAN_USE_ARMV7_INSTRUCTIONS" ]
- }
- if (arm_fpu == "vfpv3-d16") {
- defines += [ "CAN_USE_VFP3_INSTRUCTIONS" ]
- }
- if (arm_fpu == "vfpv3") {
- defines += [
- "CAN_USE_VFP3_INSTRUCTIONS",
- "CAN_USE_VFP32DREGS",
- ]
- }
- if (arm_fpu == "neon") {
+ if (current_cpu == "arm") {
+ if (arm_version == 7) {
+ defines += [ "CAN_USE_ARMV7_INSTRUCTIONS" ]
+ }
+ if (arm_fpu == "vfpv3-d16") {
+ defines += [ "CAN_USE_VFP3_INSTRUCTIONS" ]
+ }
+ if (arm_fpu == "vfpv3") {
+ defines += [
+ "CAN_USE_VFP3_INSTRUCTIONS",
+ "CAN_USE_VFP32DREGS",
+ ]
+ }
+ if (arm_fpu == "neon") {
+ defines += [
+ "CAN_USE_VFP3_INSTRUCTIONS",
+ "CAN_USE_VFP32DREGS",
+ "CAN_USE_NEON",
+ ]
+ }
+ } else {
defines += [
+ "CAN_USE_ARMV7_INSTRUCTIONS",
"CAN_USE_VFP3_INSTRUCTIONS",
"CAN_USE_VFP32DREGS",
- "CAN_USE_NEON",
+ "USE_EABI_HARDFLOAT=0",
]
}
# TODO(jochen): Add support for arm_test_noprobe.
-
- # TODO(jochen): Add support for cpu_arch != v8_target_arch/
}
if (v8_target_arch == "arm64") {
defines += [ "V8_TARGET_ARCH_ARM64" ]
Index: include/v8-version.h
diff --git a/include/v8-version.h b/include/v8-version.h
index
5b1cd1068d3d803f85112b4edc20108fce75be4a..9b790791a02b4248e59bf3d60480c554b113418b
100644
--- a/include/v8-version.h
+++ b/include/v8-version.h
@@ -11,7 +11,7 @@
#define V8_MAJOR_VERSION 4
#define V8_MINOR_VERSION 3
#define V8_BUILD_NUMBER 34
-#define V8_PATCH_LEVEL 0
+#define V8_PATCH_LEVEL 1
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
