Reviewers: Michael Achenbach,

Description:
Prepare switch from a64 to arm64

BUG=354405
[email protected]
LOG=n

Please review this at https://codereview.chromium.org/207793002/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files (+10, -5 lines):
  M build/standalone.gypi
  M build/toolchain.gypi
  M test/cctest/cctest.gyp
  M tools/gyp/v8.gyp
  M tools/run-tests.py


Index: build/standalone.gypi
diff --git a/build/standalone.gypi b/build/standalone.gypi
index 48f187376da297f837549235a0e84888c8fb32f4..8a5b7cf2f4b859ce8210e87afe76baf26e38defd 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")', {
Index: build/toolchain.gypi
diff --git a/build/toolchain.gypi b/build/toolchain.gypi
index c2a33007334a829ccab0d3bb9992628f40e091dc..539a4db4d4b4e477e1e6ae3b6ec38be0f549a12d 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': [
Index: test/cctest/cctest.gyp
diff --git a/test/cctest/cctest.gyp b/test/cctest/cctest.gyp
index 252fdf7489d6cd3865bef1c3d6f0120f3a935233..b1869e8ac1c82d28e17230788baa596e446c12e8 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',
Index: tools/gyp/v8.gyp
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index 5967bfef880ac5d1244bb547d67cdf5b07edac21..927434825a86a7e57cd5752e81213294a578bdfb 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',
Index: tools/run-tests.py
diff --git a/tools/run-tests.py b/tools/run-tests.py
index 46f5db0f4817654b953c1d284feffd23f16fa0c5..25dfeb281e5682f35029f36ee32dbe5aaa4117c3 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


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to