diff options
| -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)") |