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>

diff --git a/shared_llvm.mk b/shared_llvm.mk
index 2ca7616..1b9b49d 100644 (file)
--- 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 (file)
--- 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)")