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

BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # 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/dcheck_always_on.gni")
 import("//build/config/mips.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 
@@ skipping 154 matching lines @@
   }
 }
 
 config("toolchain") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
 
   defines = []
   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" ]
     }
     if (arm_fpu == "vfpv3-d16") {
       defines += [ "CAN_USE_VFP3_INSTRUCTIONS" ]
     } else if (arm_fpu == "vfpv3") {
       defines += [
         "CAN_USE_VFP3_INSTRUCTIONS",
         "CAN_USE_VFP32DREGS",
@@ skipping 10 matching lines @@
 
     if (current_cpu != "arm") {
       # These defines ares used for the ARM simulator.
       if (arm_float_abi == "hard") {
         defines += [ "USE_EABI_HARDFLOAT=1" ]
       } else if (arm_float_abi == "softfp") {
         defines += [ "USE_EABI_HARDFLOAT=0" ]
       }
     }
   }
-  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" ]
     }
     if (v8_use_mips_abi_hardfloat) {
       defines += [
         "__mips_hard_float=1",
         "CAN_USE_FPU_INSTRUCTIONS",
       ]
     } else {
@@ skipping 14 matching lines @@
         defines += [ "FPU_MODE_FP32" ]
       }
     } else if (mips_arch_variant == "r1") {
       defines += [ "FPU_MODE_FP32" ]
     }
 
     # TODO(jochen): Add support for mips_arch_variant rx and loongson.
   }
 
   # 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" ]
     }
 
     # TODO(jochen): Add support for big endian host byteorder.
     defines += [ "V8_TARGET_ARCH_MIPS64_LE" ]
     if (v8_use_mips_abi_hardfloat) {
       defines += [
         "__mips_hard_float=1",
         "CAN_USE_FPU_INSTRUCTIONS",
       ]
     } else {
       defines += [ "__mips_soft_float=1" ]
     }
     if (mips_arch_variant == "r6") {
       defines += [ "_MIPS_ARCH_MIPS64R6" ]
     } else if (mips_arch_variant == "r2") {
       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
       # applies only to executables and shared libraries produced by V8 since
       # ldflags are not pushed to dependants.
       ldflags += [ "/STACK:2097152" ]
     }
   }
 
   # TODO(jochen): Support v8_enable_prof on Windows.
@@ skipping 1260 matching lines @@
     "src/wasm/wasm-opcodes.cc",
     "src/wasm/wasm-opcodes.h",
     "src/wasm/wasm-result.cc",
     "src/wasm/wasm-result.h",
     "src/zone-allocator.h",
     "src/zone-containers.h",
     "src/zone.cc",
     "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",
       "src/compiler/ia32/instruction-scheduler-ia32.cc",
       "src/compiler/ia32/instruction-selector-ia32.cc",
       "src/crankshaft/ia32/lithium-codegen-ia32.cc",
       "src/crankshaft/ia32/lithium-codegen-ia32.h",
       "src/crankshaft/ia32/lithium-gap-resolver-ia32.cc",
       "src/crankshaft/ia32/lithium-gap-resolver-ia32.h",
       "src/crankshaft/ia32/lithium-ia32.cc",
@@ skipping 17 matching lines @@
       "src/ia32/macro-assembler-ia32.cc",
       "src/ia32/macro-assembler-ia32.h",
       "src/ic/ia32/access-compiler-ia32.cc",
       "src/ic/ia32/handler-compiler-ia32.cc",
       "src/ic/ia32/ic-compiler-ia32.cc",
       "src/ic/ia32/ic-ia32.cc",
       "src/ic/ia32/stub-cache-ia32.cc",
       "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",
       "src/compiler/x64/instruction-scheduler-x64.cc",
       "src/compiler/x64/instruction-selector-x64.cc",
       "src/crankshaft/x64/lithium-codegen-x64.cc",
       "src/crankshaft/x64/lithium-codegen-x64.h",
       "src/crankshaft/x64/lithium-gap-resolver-x64.cc",
       "src/crankshaft/x64/lithium-gap-resolver-x64.h",
       "src/crankshaft/x64/lithium-x64.cc",
@@ skipping 17 matching lines @@
       "src/x64/codegen-x64.h",
       "src/x64/cpu-x64.cc",
       "src/x64/deoptimizer-x64.cc",
       "src/x64/disasm-x64.cc",
       "src/x64/frames-x64.cc",
       "src/x64/frames-x64.h",
       "src/x64/interface-descriptors-x64.cc",
       "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",
       "src/arm/assembler-arm.h",
       "src/arm/builtins-arm.cc",
       "src/arm/code-stubs-arm.cc",
       "src/arm/code-stubs-arm.h",
       "src/arm/codegen-arm.cc",
       "src/arm/codegen-arm.h",
       "src/arm/constants-arm.cc",
@@ skipping 22 matching lines @@
       "src/debug/arm/debug-arm.cc",
       "src/full-codegen/arm/full-codegen-arm.cc",
       "src/ic/arm/access-compiler-arm.cc",
       "src/ic/arm/handler-compiler-arm.cc",
       "src/ic/arm/ic-arm.cc",
       "src/ic/arm/ic-compiler-arm.cc",
       "src/ic/arm/stub-cache-arm.cc",
       "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",
       "src/arm64/assembler-arm64.h",
       "src/arm64/builtins-arm64.cc",
       "src/arm64/code-stubs-arm64.cc",
       "src/arm64/code-stubs-arm64.h",
       "src/arm64/codegen-arm64.cc",
       "src/arm64/codegen-arm64.h",
       "src/arm64/constants-arm64.h",
@@ skipping 35 matching lines @@
       "src/debug/arm64/debug-arm64.cc",
       "src/full-codegen/arm64/full-codegen-arm64.cc",
       "src/ic/arm64/access-compiler-arm64.cc",
       "src/ic/arm64/handler-compiler-arm64.cc",
       "src/ic/arm64/ic-arm64.cc",
       "src/ic/arm64/ic-compiler-arm64.cc",
       "src/ic/arm64/stub-cache-arm64.cc",
       "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",
       "src/compiler/mips/instruction-scheduler-mips.cc",
       "src/compiler/mips/instruction-selector-mips.cc",
       "src/crankshaft/mips/lithium-codegen-mips.cc",
       "src/crankshaft/mips/lithium-codegen-mips.h",
       "src/crankshaft/mips/lithium-gap-resolver-mips.cc",
       "src/crankshaft/mips/lithium-gap-resolver-mips.h",
       "src/crankshaft/mips/lithium-mips.cc",
@@ skipping 21 matching lines @@
       "src/mips/frames-mips.cc",
       "src/mips/frames-mips.h",
       "src/mips/interface-descriptors-mips.cc",
       "src/mips/macro-assembler-mips.cc",
       "src/mips/macro-assembler-mips.h",
       "src/mips/simulator-mips.cc",
       "src/mips/simulator-mips.h",
       "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",
       "src/compiler/mips64/instruction-scheduler-mips64.cc",
       "src/compiler/mips64/instruction-selector-mips64.cc",
       "src/crankshaft/mips64/lithium-codegen-mips64.cc",
       "src/crankshaft/mips64/lithium-codegen-mips64.h",
       "src/crankshaft/mips64/lithium-gap-resolver-mips64.cc",
       "src/crankshaft/mips64/lithium-gap-resolver-mips64.h",
       "src/crankshaft/mips64/lithium-mips64.cc",
@@ skipping 21 matching lines @@
       "src/mips64/frames-mips64.cc",
       "src/mips64/frames-mips64.h",
       "src/mips64/interface-descriptors-mips64.cc",
       "src/mips64/macro-assembler-mips64.cc",
       "src/mips64/macro-assembler-mips64.h",
       "src/mips64/simulator-mips64.cc",
       "src/mips64/simulator-mips64.h",
       "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",
       "src/compiler/s390/instruction-scheduler-s390.cc",
       "src/compiler/s390/instruction-selector-s390.cc",
       "src/crankshaft/s390/lithium-codegen-s390.cc",
       "src/crankshaft/s390/lithium-codegen-s390.h",
       "src/crankshaft/s390/lithium-gap-resolver-s390.cc",
       "src/crankshaft/s390/lithium-gap-resolver-s390.h",
       "src/crankshaft/s390/lithium-s390.cc",
@@ skipping 236 matching lines @@
 
   configs = [ ":internal_config_base" ]
 }
 
 ###############################################################################
 # Executables
 #
 
 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 = [
       "src/snapshot/mksnapshot.cc",
     ]
 
     configs = [ ":internal_config" ]
 
     deps = [
       ":v8_base",
@@ skipping 304 matching lines @@
 
   deps = [
     ":fuzzer_support",
   ]
 
   configs = [ ":internal_config" ]
 }
 
 v8_fuzzer("wasm_asmjs_fuzzer") {
 }