Commit 9fccfc37 authored by jochen@chromium.org's avatar jochen@chromium.org

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
parent bd2f8139
......@@ -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")', {
......
......@@ -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': [
......
......@@ -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',
......
......@@ -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',
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment