Land v8-side changes to switch to v8_current_cpu in the GN build.

BUILD.gn

Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index a11b1467e286fdc799183bca0d3c358bc29fcb31..32374f60f52968500acf30fc5eb41aabba89c30a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -172,7 +172,7 @@ config("toolchain") {
   cflags = []
   ldflags = []
 
-  if (v8_target_cpu == "arm") {
+  if (v8_current_cpu == "arm") {
     defines += [ "V8_TARGET_ARCH_ARM" ]
     if (arm_version == 7) {
       defines += [ "CAN_USE_ARMV7_INSTRUCTIONS" ]
@@ -203,12 +203,12 @@ config("toolchain") {
       }
     }
   }
-  if (v8_target_cpu == "arm64") {
+  if (v8_current_cpu == "arm64") {
     defines += [ "V8_TARGET_ARCH_ARM64" ]
   }
 
   # TODO(jochen): Add support for mips.
-  if (v8_target_cpu == "mipsel") {
+  if (v8_current_cpu == "mipsel") {
     defines += [ "V8_TARGET_ARCH_MIPS" ]
     if (v8_can_use_fpu_instructions) {
       defines += [ "CAN_USE_FPU_INSTRUCTIONS" ]
@@ -243,7 +243,7 @@ config("toolchain") {
   }
 
   # TODO(jochen): Add support for mips64.
-  if (v8_target_cpu == "mips64el") {
+  if (v8_current_cpu == "mips64el") {
     defines += [ "V8_TARGET_ARCH_MIPS64" ]
     if (v8_can_use_fpu_instructions) {
       defines += [ "CAN_USE_FPU_INSTRUCTIONS" ]
@@ -265,23 +265,23 @@ config("toolchain") {
       defines += [ "_MIPS_ARCH_MIPS64R2" ]
     }
   }
-  if (v8_target_cpu == "s390" || v8_target_cpu == "s390x") {
+  if (v8_current_cpu == "s390" || v8_current_cpu == "s390x") {
     defines += [ "V8_TARGET_ARCH_S390" ]
-    if (v8_target_cpu == "s390x") {
+    if (v8_current_cpu == "s390x") {
       defines += [ "V8_TARGET_ARCH_S390X" ]
     }
     if (host_cpu == "x64" || host_cpu == "x86") {
       defines += [ "V8_TARGET_ARCH_S390_LE_SIM" ]
     }
   }
-  if (v8_target_cpu == "x86") {
+  if (v8_current_cpu == "x86") {
     defines += [ "V8_TARGET_ARCH_IA32" ]
     if (is_win) {
       # Ensure no surprising artifacts from 80bit double math with x86.
       cflags += [ "/arch:SSE2" ]
     }
   }
-  if (v8_target_cpu == "x64") {
+  if (v8_current_cpu == "x64") {
     defines += [ "V8_TARGET_ARCH_X64" ]
     if (is_win) {
       # Increase the initial stack size. The default is 1MB, this is 2MB. This
@@ -1562,7 +1562,7 @@ v8_source_set("v8_base") {
     "src/zone.h",
   ]
 
-  if (v8_target_cpu == "x86") {
+  if (v8_current_cpu == "x86") {
     sources += [
       "src/compiler/ia32/code-generator-ia32.cc",
       "src/compiler/ia32/instruction-codes-ia32.h",
@@ -1600,7 +1600,7 @@ v8_source_set("v8_base") {
       "src/regexp/ia32/regexp-macro-assembler-ia32.cc",
       "src/regexp/ia32/regexp-macro-assembler-ia32.h",
     ]
-  } else if (v8_target_cpu == "x64") {
+  } else if (v8_current_cpu == "x64") {
     sources += [
       "src/compiler/x64/code-generator-x64.cc",
       "src/compiler/x64/instruction-codes-x64.h",
@@ -1638,7 +1638,7 @@ v8_source_set("v8_base") {
       "src/x64/macro-assembler-x64.cc",
       "src/x64/macro-assembler-x64.h",
     ]
-  } else if (v8_target_cpu == "arm") {
+  } else if (v8_current_cpu == "arm") {
     sources += [
       "src/arm/assembler-arm-inl.h",
       "src/arm/assembler-arm.cc",
@@ -1681,7 +1681,7 @@ v8_source_set("v8_base") {
       "src/regexp/arm/regexp-macro-assembler-arm.cc",
       "src/regexp/arm/regexp-macro-assembler-arm.h",
     ]
-  } else if (v8_target_cpu == "arm64") {
+  } else if (v8_current_cpu == "arm64") {
     sources += [
       "src/arm64/assembler-arm64-inl.h",
       "src/arm64/assembler-arm64.cc",
@@ -1737,7 +1737,7 @@ v8_source_set("v8_base") {
       "src/regexp/arm64/regexp-macro-assembler-arm64.cc",
       "src/regexp/arm64/regexp-macro-assembler-arm64.h",
     ]
-  } else if (v8_target_cpu == "mipsel") {
+  } else if (v8_current_cpu == "mipsel") {
     sources += [
       "src/compiler/mips/code-generator-mips.cc",
       "src/compiler/mips/instruction-codes-mips.h",
@@ -1779,7 +1779,7 @@ v8_source_set("v8_base") {
       "src/regexp/mips/regexp-macro-assembler-mips.cc",
       "src/regexp/mips/regexp-macro-assembler-mips.h",
     ]
-  } else if (v8_target_cpu == "mips64el") {
+  } else if (v8_current_cpu == "mips64el") {
     sources += [
       "src/compiler/mips64/code-generator-mips64.cc",
       "src/compiler/mips64/instruction-codes-mips64.h",
@@ -1821,7 +1821,7 @@ v8_source_set("v8_base") {
       "src/regexp/mips64/regexp-macro-assembler-mips64.cc",
       "src/regexp/mips64/regexp-macro-assembler-mips64.h",
     ]
-  } else if (v8_target_cpu == "s390" || v8_target_cpu == "s390x") {
+  } else if (v8_current_cpu == "s390" || v8_current_cpu == "s390x") {
     sources += [
       "src/compiler/s390/code-generator-s390.cc",
       "src/compiler/s390/instruction-codes-s390.h",
@@ -2078,6 +2078,8 @@ v8_source_set("simple_fuzzer") {
 
 if (current_toolchain == v8_snapshot_toolchain) {
   v8_executable("mksnapshot") {
+    print(v8_current_cpu)
+    print(current_toolchain)

[michaelbai, 2016/07/12 01:23:58]

Remove them?

[Dirk Pranke, 2016/07/12 01:39:35]

Whoops, yes, will do.

     visibility = [ ":*" ]  # Only targets in this file can depend on this.
 
     sources = [