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

test/cctest/BUILD.gn

Index: test/cctest/BUILD.gn
diff --git a/test/cctest/BUILD.gn b/test/cctest/BUILD.gn
index 233ce6e0eb9a47609efd9793b966683ea27fdc38..71e9eb0d2c0296a68f3a22a1b416efea04cb9f18 100644
--- a/test/cctest/BUILD.gn
+++ b/test/cctest/BUILD.gn
@@ -18,27 +18,27 @@ v8_executable("cctest") {
     "$target_gen_dir/resources.cc",
   ] + gypi_values.cctest_sources
 
-  if (v8_target_cpu == "arm") {
+  if (v8_current_cpu == "arm") {
     sources += gypi_values.cctest_sources_arm
-  } else if (v8_target_cpu == "arm64") {
+  } else if (v8_current_cpu == "arm64") {
     sources += gypi_values.cctest_sources_arm64
-  } else if (v8_target_cpu == "x86") {
+  } else if (v8_current_cpu == "x86") {
     sources += gypi_values.cctest_sources_ia32
-  } else if (v8_target_cpu == "mips") {
+  } else if (v8_current_cpu == "mips") {
     sources += gypi_values.cctest_sources_mips
-  } else if (v8_target_cpu == "mipsel") {
+  } else if (v8_current_cpu == "mipsel") {
     sources += gypi_values.cctest_sources_mipsel
-  } else if (v8_target_cpu == "mips64") {
+  } else if (v8_current_cpu == "mips64") {
     sources += gypi_values.cctest_sources_mips64
-  } else if (v8_target_cpu == "mips64el") {
+  } else if (v8_current_cpu == "mips64el") {
     sources += gypi_values.cctest_sources_mips64el
-  } else if (v8_target_cpu == "x64") {
+  } else if (v8_current_cpu == "x64") {
     sources += gypi_values.cctest_sources_x64
-  } else if (v8_target_cpu == "x87") {
+  } else if (v8_current_cpu == "x87") {
     sources += gypi_values.cctest_sources_x87
-  } else if (v8_target_cpu == "ppc" || v8_target_cpu == "ppc64") {
+  } else if (v8_current_cpu == "ppc" || v8_current_cpu == "ppc64") {
     sources += gypi_values.cctest_sources_ppc
-  } else if (v8_target_cpu == "s390" || v8_target_cpu == "s390x") {
+  } else if (v8_current_cpu == "s390" || v8_current_cpu == "s390x") {
     sources += gypi_values.cctest_sources_s390
   }
 
@@ -62,9 +62,9 @@ v8_executable("cctest") {
   ]
 
   # TODO(machenbach): Translate from gyp.
-  #['v8_target_cpu=="ppc" or v8_target_cpu=="ppc64" \
-  #  or v8_target_cpu=="arm" or v8_target_cpu=="arm64" \
-  #  or v8_target_cpu=="s390" or v8_target_cpu=="s390x"', {
+  #['v8_current_cpu=="ppc" or v8_current_cpu=="ppc64" \
+  #  or v8_current_cpu=="arm" or v8_current_cpu=="arm64" \
+  #  or v8_current_cpu=="s390" or v8_current_cpu=="s390x"', {
   #  # disable fmadd/fmsub so that expected results match generated code in
   #  # RunFloat64MulAndFloat64Add1 and friends.
   #  'cflags': ['-ffp-contract=off'],