Revision: 18957
Author:   [email protected]
Date:     Thu Jan 30 17:42:04 2014 UTC
Log:      A64: Add Android_a64 build target

[email protected]

Review URL: https://codereview.chromium.org/137243006
http://code.google.com/p/v8/source/detail?r=18957

Modified:
 /branches/experimental/a64/Makefile
 /branches/experimental/a64/Makefile.android
 /branches/experimental/a64/build/toolchain.gypi

=======================================
--- /branches/experimental/a64/Makefile Thu Jan 30 12:09:30 2014 UTC
+++ /branches/experimental/a64/Makefile Thu Jan 30 17:42:04 2014 UTC
@@ -211,7 +211,7 @@
 ARCHES = ia32 x64 arm a64 mipsel
 DEFAULT_ARCHES = ia32 x64 arm
 MODES = release debug
-ANDROID_ARCHES = android_ia32 android_arm android_mipsel
+ANDROID_ARCHES = android_ia32 android_arm android_a64 android_mipsel
 NACL_ARCHES = nacl_ia32 nacl_x64

 # List of files that trigger Makefile regeneration:
=======================================
--- /branches/experimental/a64/Makefile.android Thu Jan 30 12:09:30 2014 UTC
+++ /branches/experimental/a64/Makefile.android Thu Jan 30 17:42:04 2014 UTC
@@ -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_mipsel
+ANDROID_ARCHES = android_ia32 android_arm android_a64 android_mipsel
 MODES = release debug

 # Generates all combinations of ANDROID ARCHES and MODES,
@@ -51,16 +51,21 @@
   DEFINES += arm_neon=0 armv7=1
   TOOLCHAIN_ARCH = arm-linux-androideabi-4.6
 else
-  ifeq ($(ARCH), android_mipsel)
- DEFINES = target_arch=mipsel v8_target_arch=mipsel android_target_arch=mips
-    DEFINES += mips_arch_variant=mips32r2
-    TOOLCHAIN_ARCH = mipsel-linux-android-4.6
+  ifeq ($(ARCH), android_a64)
+ DEFINES = target_arch=a64 v8_target_arch=a64 android_target_arch=aarch64
+    TOOLCHAIN_ARCH = aarch64-linux-android-4.8
   else
-    ifeq ($(ARCH), android_ia32)
- DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86
-      TOOLCHAIN_ARCH = x86-4.6
+    ifeq ($(ARCH), android_mipsel)
+      DEFINES  = target_arch=mipsel v8_target_arch=mipsel
+      DEFINES += android_target_arch=mips mips_arch_variant=mips32r2
+      TOOLCHAIN_ARCH = mipsel-linux-android-4.6
     else
-      $(error Target architecture "${ARCH}" is not supported)
+      ifeq ($(ARCH), android_ia32)
+ DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86
+        TOOLCHAIN_ARCH = x86-4.6
+      else
+        $(error Target architecture "${ARCH}" is not supported)
+      endif
     endif
   endif
 endif
=======================================
--- /branches/experimental/a64/build/toolchain.gypi Tue Jan 28 15:50:06 2014 UTC +++ /branches/experimental/a64/build/toolchain.gypi Thu Jan 30 17:42:04 2014 UTC
@@ -410,7 +410,8 @@
           }],
         ],
       }],
-      ['(OS=="linux") and (v8_target_arch=="x64")', {
+      ['(OS=="linux" or OS=="android") and \
+        (v8_target_arch=="x64" or v8_target_arch=="a64")', {
         # Check whether the host compiler and target compiler support the
         # '-m64' option and set it if so.
         'target_conditions': [

--
--
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/groups/opt_out.

Reply via email to