Reviewers: danno, Jakob, Toon Verwaest, Yang,
Message:
PTAL
Description:
introduce android_x64 build target
BUG=
Please review this at https://codereview.chromium.org/966773005/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+18, -4 lines):
M Makefile
M Makefile.android
M build/android.gypi
M tools/run-tests.py
M tools/run_perf.py
M tools/testrunner/local/statusfile.py
Index: Makefile
diff --git a/Makefile b/Makefile
index
5468d913341e31c34b214079c3e72187d0bec6ae..28b484d4e14a907c3ce88242b01268885f012640
100644
--- a/Makefile
+++ b/Makefile
@@ -234,7 +234,7 @@ ARCHES = ia32 x64 x32 arm arm64 mips mipsel mips64el
x87 ppc ppc64
DEFAULT_ARCHES = ia32 x64 arm
MODES = release debug optdebug
DEFAULT_MODES = release debug
-ANDROID_ARCHES = android_ia32 android_arm android_arm64 android_mipsel
android_x87
+ANDROID_ARCHES = android_ia32 android_x64 android_arm android_arm64
android_mipsel android_x87
NACL_ARCHES = nacl_ia32 nacl_x64
# List of files that trigger Makefile regeneration:
Index: Makefile.android
diff --git a/Makefile.android b/Makefile.android
index
2a3640382b4f5f4535604c6c72783d87e8879239..35bcdb97376bb0b85eafd3e76e27f27b9a12ca7c
100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -26,7 +26,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Those definitions should be consistent with the main Makefile
-ANDROID_ARCHES = android_ia32 android_arm android_arm64 android_mipsel
android_x87
+ANDROID_ARCHES = android_ia32 android_x64 android_arm android_arm64
android_mipsel android_x87
MODES = release debug
# Generates all combinations of ANDROID ARCHES and MODES,
@@ -66,6 +66,11 @@ else ifeq ($(ARCH), android_ia32)
TOOLCHAIN_ARCH = x86
TOOLCHAIN_PREFIX = i686-linux-android
TOOLCHAIN_VER = 4.8
+else ifeq ($(ARCH), android_x64)
+ DEFINES = target_arch=x64 v8_target_arch=x64 android_target_arch=x86_64
android_target_platform=21
+ TOOLCHAIN_ARCH = x86_64
+ TOOLCHAIN_PREFIX = x86_64-linux-android
+ TOOLCHAIN_VER = 4.9
else ifeq ($(ARCH), android_x87)
DEFINES = target_arch=x87 v8_target_arch=x87 android_target_arch=x86
android_target_platform=14
TOOLCHAIN_ARCH = x86
Index: build/android.gypi
diff --git a/build/android.gypi b/build/android.gypi
index
5d3b25a74636ca4b8bf430b94a7835673dd49dc4..98dc7950c459e485ed77a2384e36d6cb8cd68359
100644
--- a/build/android.gypi
+++ b/build/android.gypi
@@ -52,7 +52,13 @@
'android_stlport': '<(android_ndk_root)/sources/cxx-stl/stlport/',
},
'android_include': '<(android_sysroot)/usr/include',
- 'android_lib': '<(android_sysroot)/usr/lib',
+ 'conditions': [
+ ['target_arch=="x64"', {
+ 'android_lib': '<(android_sysroot)/usr/lib64',
+ }, {
+ 'android_lib': '<(android_sysroot)/usr/lib',
+ }],
+ ],
'android_stlport_include': '<(android_stlport)/stlport',
'android_stlport_libs': '<(android_stlport)/libs',
}],
Index: tools/run-tests.py
diff --git a/tools/run-tests.py b/tools/run-tests.py
index
8627319359418391efbbeb9e044365e7b2731d81..f7e77ca1543a1ab67c15c4fe4b90d58cf5737a57
100755
--- a/tools/run-tests.py
+++ b/tools/run-tests.py
@@ -130,6 +130,7 @@ GC_STRESS_FLAGS =
["--gc-interval=500", "--stress-compaction",
SUPPORTED_ARCHS = ["android_arm",
"android_arm64",
"android_ia32",
+ "android_x64",
"arm",
"ia32",
"x87",
@@ -147,6 +148,7 @@ SUPPORTED_ARCHS = ["android_arm",
SLOW_ARCHS = ["android_arm",
"android_arm64",
"android_ia32",
+ "android_x64",
"arm",
"mips",
"mipsel",
Index: tools/run_perf.py
diff --git a/tools/run_perf.py b/tools/run_perf.py
index
2b2c455bab9c0c3da7a18ed6a34dcd73b6dfa1ba..f7710796bc3e7c651e4effcae031e1fd95eec129
100755
--- a/tools/run_perf.py
+++ b/tools/run_perf.py
@@ -111,6 +111,7 @@ ARCH_GUESS = utils.DefaultArch()
SUPPORTED_ARCHS = ["android_arm",
"android_arm64",
"android_ia32",
+ "android_x64",
"arm",
"ia32",
"mips",
Index: tools/testrunner/local/statusfile.py
diff --git a/tools/testrunner/local/statusfile.py
b/tools/testrunner/local/statusfile.py
index
a52fa566b85b1213051efc913cc89030b6fc8c9f..bae1f2162b5b25317ef28402684fbdb018cb9500
100644
--- a/tools/testrunner/local/statusfile.py
+++ b/tools/testrunner/local/statusfile.py
@@ -54,7 +54,7 @@ DEFS = {FAIL_OK: [FAIL, OKAY],
# Support arches, modes to be written as keywords instead of strings.
VARIABLES = {ALWAYS: True}
for var in ["debug", "release", "big", "little",
- "android_arm", "android_arm64", "android_ia32", "android_x87",
+ "android_arm", "android_arm64", "android_ia32", "android_x87",
"android_x64",
"arm", "arm64", "ia32", "mips", "mipsel", "mips64el", "x64", "x87",
"nacl_ia32",
"nacl_x64", "ppc", "ppc64", "macos", "windows", "linux", "aix"]:
VARIABLES[var] = var
--
--
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.
