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

snapshot_toolchain.gni

 # Copyright 2015 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 18 matching lines @@
   # The snapshot needs to be compiled for the host, but compiled with
   # a toolchain that matches the bit-width of the target.
   v8_snapshot_toolchain = ""
 }
 
 # 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 (v8_snapshot_toolchain == "") {
   if (host_cpu == "x64" && host_os == "linux") {
-    if (target_cpu == "arm" || target_cpu == "mipsel" || target_cpu == "x86") {
-      if (target_os == "android" || is_clang) {
-        v8_snapshot_toolchain = "//build/toolchain/linux:clang_x86"
-      } else if (target_os == "chromeos") {
-        # TODO(dpranke): crbug.com/608596: Remove this clause once the
-        # CrOS ebuilds are setting v8_snapshot_toolchain directly and
-        # we've cleaned up the sysroot settings in //build.
-        v8_snapshot_toolchain = "//build/toolchain/linux:clang_x86"
-      } else {
-        v8_snapshot_toolchain = "//build/toolchain/linux:x86"
-      }
+    if (current_cpu == "arm" || current_cpu == "mipsel" ||
+        current_cpu == "x86") {
+      _snapshot_cpu = "x86"
+    } else {
+      assert(current_cpu == "arm64" || current_cpu == "x64" ||
+                 current_cpu == "mipsel64",
+             "Need environment for this arch: $current_cpu")
+      _snapshot_cpu = "x64"
+    }
 
-    } else if (target_cpu == "x64" || target_cpu == "arm64" ||
-               target_cpu == "mips64el") {
-      if (target_os == "android" || is_clang) {
-        v8_snapshot_toolchain = "//build/toolchain/linux:clang_x64"
-      } else if (target_os == "chromeos") {
-        # TODO(dpranke): crbug.com/608596: Remove this clause once the
-        # CrOS ebuilds are setting v8_snapshot_toolchain directly and
-        # we've cleaned up the sysroot settings in //build.
-        v8_snapshot_toolchain = "//build/toolchain/linux:clang_x64"
-      } else {
-        v8_snapshot_toolchain = "//build/toolchain/linux:x64"
-      }
+    if (v8_current_cpu != _snapshot_cpu) {
+      _cpus = "${_snapshot_cpu}_v8_${v8_current_cpu}"
     } else {
-      assert(false, "Need environment for this arch: $target_cpu")
+      _cpus = _snapshot_cpu
     }
-  } else if (host_os == "mac" && target_os == "win") {
-    v8_snapshot_toolchain = "//build/toolchain/mac:clang_$target_cpu"
+
+    if ((host_os == "linux" && current_os == "android") || is_clang) {

[Michael Achenbach, 2016/07/07 07:40:23]

Why did target_os change to current_os? Where's the difference?

[Dirk Pranke, 2016/07/07 17:19:16]

Theoretically, if this file got loaded from some target being parsed in the
host_toolchain,
it might still pick up the as if this was for android, and not linux.

In practice, this is almost certainly not an issue one way or another.

I just changed it to try and reduce uses of target_*, as it seems to be turning
out that
most such cases are wrong.

+      v8_snapshot_toolchain = "//build/toolchain/linux:clang_${_cpus}"
+    } else {
+      v8_snapshot_toolchain = "//build/toolchain/linux:${_cpus}"
+    }
+  } else if (host_os == "mac" && current_os == "win") {

[Michael Achenbach, 2016/07/07 07:40:23]

Do we really use this build configuration? Compiling for windows on mac?

[Dirk Pranke, 2016/07/07 17:19:16]

thakis@ has been working off-and-on on this w/ clang.

[Nico, 2016/07/07 17:28:06]

Yes, see https://codereview.chromium.org/1183633003/ It's in (slow) bring-up.
The idea isn't "on mac" but "on non-windows" in general.

+    assert(v8_current_cpu == current_cpu,
+           "v8 target must match the regular target on this platform")
+    v8_snapshot_toolchain = "//build/toolchain/mac:clang_$current_cpu"
   } else {
+    assert(v8_current_cpu == current_cpu,
+           "v8 target must match the regular target on this platform")
     v8_snapshot_toolchain = default_toolchain
   }
 }
-
-# TODO(dpranke): snapshot_toolchain is provided for backwards compatibility
-# and should be removed once all callers are updated to refer to
-# v8_snapshot_toolchain directly.
-snapshot_toolchain = v8_snapshot_toolchain