diff options
| author | Stephen Hines <srhines@google.com> | 2013-09-23 17:53:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-23 17:53:17 -0700 |
| commit | 1255ecdd03f25d397c6871c18a6be6ba8f1142e7 (patch) | |
| tree | 9e338200eab1df21c0dd8a09e581fd895f56ead9 | |
| parent | c0c7ba114994c207930632a1d9f3dae92054ade2 (diff) | |
| parent | a91a22bcbadfb1aa06aec5077e8f5ce9d40a8410 (diff) | |
| download | external_llvm-1255ecdd03f25d397c6871c18a6be6ba8f1142e7.zip external_llvm-1255ecdd03f25d397c6871c18a6be6ba8f1142e7.tar.gz external_llvm-1255ecdd03f25d397c6871c18a6be6ba8f1142e7.tar.bz2 | |
am a91a22bc: am 8e708faf: am 5edef2e8: Merge "x86_64/x32: Avoid early fail on x32 or x86_64 build"
* commit 'a91a22bcbadfb1aa06aec5077e8f5ce9d40a8410':
x86_64/x32: Avoid early fail on x32 or x86_64 build
| -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 3fe43fe..3945dd7 100644 --- a/shared_llvm.mk +++ b/shared_llvm.mk @@ -98,7 +98,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 a61c1f3..bc19e9b 100644 --- a/tools/llc/Android.mk +++ b/tools/llc/Android.mk @@ -106,7 +106,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)") |