commit 8e708fafb747b3f1e536d87016bb67c118fb5b0d
author Stephen Hines <srhines@google.com> Mon Sep 23 17:49:05 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 23 17:49:05 2013 -0700
tree ecfe54c877885401b89885f827621e2c343b7403
parent 3acb57db7bc4e1379acf668329a98acaccc2ba71
parent 5edef2e84e3c0d7df5e16904111061016a02c95f

am 5edef2e8: Merge "x86_64/x32: Avoid early fail on x32 or x86_64 build"

* commit '5edef2e84e3c0d7df5e16904111061016a02c95f':
  x86_64/x32: Avoid early fail on x32 or x86_64 build

shared_llvm.mk

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 @@
 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)

tools/llc/Android.mk

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 @@
   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)")