diff options
author | Pavel Chupin <pavel.v.chupin@intel.com> | 2013-07-26 13:54:32 +0400 |
---|---|---|
committer | Pavel Chupin <pavel.v.chupin@intel.com> | 2013-09-20 21:37:12 +0400 |
commit | 1a020e0b1024d083a82c726c78ee785bc30f4732 (patch) | |
tree | 836078b84b858fa5b2fd82c85663ab0bf7a3789c | |
parent | f31eb8ab038dabe0f70710696e0091b85f3a84e7 (diff) | |
download | external_llvm-1a020e0b1024d083a82c726c78ee785bc30f4732.zip external_llvm-1a020e0b1024d083a82c726c78ee785bc30f4732.tar.gz external_llvm-1a020e0b1024d083a82c726c78ee785bc30f4732.tar.bz2 |
x86_64/x32: Avoid early fail on x32 or x86_64 build
Change-Id: I30186cfb74467004400a10e79e0fcbf72f876098
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
-rw-r--r-- | shared_llvm.mk | 2 | ||||
-rw-r--r-- | tools/llc/Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/shared_llvm.mk b/shared_llvm.mk index 2ca7616..1b9b49d 100644 --- a/shared_llvm.mk +++ b/shared_llvm.mk @@ -95,7 +95,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ ifeq ($(TARGET_ARCH),arm) LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_arm_static_libraries) else - ifeq ($(TARGET_ARCH),x86) + ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64 x32)) LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_x86_static_libraries) else ifeq ($(TARGET_ARCH),mips) diff --git a/tools/llc/Android.mk b/tools/llc/Android.mk index f74e9a7..c141f8a 100644 --- a/tools/llc/Android.mk +++ b/tools/llc/Android.mk @@ -104,7 +104,7 @@ else ifeq ($(TARGET_ARCH),mips) LOCAL_STATIC_LIBRARIES := $(llvm_llc_mips_STATIC_LIBRARIES) else - ifeq ($(TARGET_ARCH),x86) + ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64 x32)) LOCAL_STATIC_LIBRARIES := $(llvm_llc_x86_STATIC_LIBRARIES) else $(error "Unsupport llc target $(TARGET_ARCH)") |