commit 8a373fd5aef4eafbd716abe517a99ef0b3d69094
author Ying Wang <wangying@android.com> Wed Dec 11 17:52:26 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 11 17:52:26 2013 +0000
tree a6846ad89bf3da817012bfaeb699f60ec891094e
parent c2f639a179b3085c7f61a8d71d2ee7b3ff6c9266
parent a1779eb11b3f175286b27fa7fe165f228de825ea

Merge "Added TARGET_IS_64_BIT flag for x86_64 and aarch64"

core/combo/TARGET_linux-aarch64.mk

diff --git a/core/combo/TARGET_linux-aarch64.mk b/core/combo/TARGET_linux-aarch64.mk
index 49cf9c0..bdb3017 100644
--- a/core/combo/TARGET_linux-aarch64.mk
+++ b/core/combo/TARGET_linux-aarch64.mk
@@ -40,6 +40,8 @@
 TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
 endif
 
+TARGET_IS_64_BIT := true
+
 TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk
 ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),)
 $(error Unknown ARM architecture version: $(TARGET_ARCH_VARIANT))

core/combo/TARGET_linux-x86_64.mk

diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk
index 9bb5724..1ad48c8 100755
--- a/core/combo/TARGET_linux-x86_64.mk
+++ b/core/combo/TARGET_linux-x86_64.mk
@@ -28,6 +28,8 @@
 TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
 endif
 
+TARGET_IS_64_BIT := true
+
 # Include the arch-variant-specific configuration file.
 # Its role is to define various ARCH_X86_HAVE_XXX feature macros,
 # plus initial values for TARGET_GLOBAL_CFLAGS