From 9fccfc37c8be1f5024ccca229d2b81b0bbfe4ef4 Mon Sep 17 00:00:00 2001
From: "jochen@chromium.org"
 <jochen@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Fri, 21 Mar 2014 08:47:03 +0000
Subject: [PATCH] Prepare switch from a64 to arm64

BUG=354405
R=machenbach@chromium.org
LOG=n

Review URL: https://codereview.chromium.org/207793002

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@20147 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---
 build/standalone.gypi  | 1 +
 build/toolchain.gypi   | 5 +++--
 test/cctest/cctest.gyp | 2 +-
 tools/gyp/v8.gyp       | 2 +-
 tools/run-tests.py     | 5 ++++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/build/standalone.gypi b/build/standalone.gypi
index 48f1873..8a5b7cf 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -103,6 +103,7 @@
     'conditions': [
       ['(v8_target_arch=="arm" and host_arch!="arm") or \
         (v8_target_arch=="a64" and host_arch!="a64") or \
+        (v8_target_arch=="arm64" and host_arch!="arm64") or \
         (v8_target_arch=="mipsel" and host_arch!="mipsel") or \
         (v8_target_arch=="x64" and host_arch!="x64") or \
         (OS=="android" or OS=="qnx")', {
diff --git a/build/toolchain.gypi b/build/toolchain.gypi
index c2a3300..539a4db 100644
--- a/build/toolchain.gypi
+++ b/build/toolchain.gypi
@@ -268,7 +268,7 @@
           }],  # _toolset=="target"
         ],
       }],  # v8_target_arch=="arm"
-      ['v8_target_arch=="a64"', {
+      ['v8_target_arch=="a64" or v8_target_arch=="arm64"', {
         'defines': [
           'V8_TARGET_ARCH_A64',
         ],
@@ -413,7 +413,8 @@
         ],
       }],
       ['(OS=="linux" or OS=="android") and \
-        (v8_target_arch=="x64" or v8_target_arch=="a64")', {
+        (v8_target_arch=="x64" or v8_target_arch=="a64" or \
+         v8_target_arch=="arm64")', {
         # Check whether the host compiler and target compiler support the
         # '-m64' option and set it if so.
         'target_conditions': [
diff --git a/test/cctest/cctest.gyp b/test/cctest/cctest.gyp
index 252fdf7..b1869e8 100644
--- a/test/cctest/cctest.gyp
+++ b/test/cctest/cctest.gyp
@@ -154,7 +154,7 @@
             'test-macro-assembler-arm.cc'
           ],
         }],
-        ['v8_target_arch=="a64"', {
+        ['v8_target_arch=="a64" or v8_target_arch=="arm64"', {
           'sources': [
             'test-utils-a64.cc',
             'test-assembler-a64.cc',
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index 5967bfe..9274348 100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -645,7 +645,7 @@
             '../../src/arm/stub-cache-arm.cc',
           ],
         }],
-        ['v8_target_arch=="a64"', {
+        ['v8_target_arch=="a64" or v8_target_arch=="arm64"', {
           'sources': [  ### gcmole(arch:a64) ###
             '../../src/a64/assembler-a64.cc',
             '../../src/a64/assembler-a64.h',
diff --git a/tools/run-tests.py b/tools/run-tests.py
index 46f5db0..25dfeb2 100755
--- a/tools/run-tests.py
+++ b/tools/run-tests.py
@@ -82,7 +82,8 @@ SUPPORTED_ARCHS = ["android_arm",
                    "nacl_ia32",
                    "nacl_x64",
                    "x64",
-                   "a64"]
+                   "a64",
+                   "arm64"]
 # Double the timeout for these:
 SLOW_ARCHS = ["android_arm",
               "android_ia32",
@@ -352,6 +353,8 @@ def Main():
 
   for (arch, mode) in options.arch_and_mode:
     try:
+      if arch == "arm64":
+        arch = "a64"
       code = Execute(arch, mode, args, options, suites, workspace)
     except KeyboardInterrupt:
       return 2
-- 
2.7.4