diff options
| author | Ying Wang <wangying@android.com> | 2013-12-11 10:11:21 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-11 10:11:21 -0800 |
| commit | 0e2779bdbb80b6f94534af0b9128ced4b6caa418 (patch) | |
| tree | dd2347b09c5e94362f3532c185fbb8b48d46d9e8 | |
| parent | f2fbb21de204519877eaf58e2163d9b0da97e0e9 (diff) | |
| parent | 8a373fd5aef4eafbd716abe517a99ef0b3d69094 (diff) | |
| download | build-0e2779bdbb80b6f94534af0b9128ced4b6caa418.zip build-0e2779bdbb80b6f94534af0b9128ced4b6caa418.tar.gz build-0e2779bdbb80b6f94534af0b9128ced4b6caa418.tar.bz2 | |
am 8a373fd5: Merge "Added TARGET_IS_64_BIT flag for x86_64 and aarch64"
* commit '8a373fd5aef4eafbd716abe517a99ef0b3d69094':
Added TARGET_IS_64_BIT flag for x86_64 and aarch64
| -rw-r--r-- | core/combo/TARGET_linux-aarch64.mk | 2 | ||||
| -rwxr-xr-x | core/combo/TARGET_linux-x86_64.mk | 2 |
2 files changed, 4 insertions, 0 deletions
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 @@ else 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)) 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 @@ else 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 |