aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2015-04-25 03:58:57 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-25 03:58:57 +0000
commit1d7bc86f20dff90559ac0f5ff30099577db2cd28 (patch)
tree3876933557dc347b950103af1cd5ee04d08170a3
parentdc995261b1e56b80990965f4556311e50deae97e (diff)
parent7b4cd9c62b527e0759ab76e4938a98415d5bc1ce (diff)
downloadexternal_llvm-1d7bc86f20dff90559ac0f5ff30099577db2cd28.zip
external_llvm-1d7bc86f20dff90559ac0f5ff30099577db2cd28.tar.gz
external_llvm-1d7bc86f20dff90559ac0f5ff30099577db2cd28.tar.bz2
am 7b4cd9c6: Merge "Fix mips vs. mips64 build issues."
* commit '7b4cd9c62b527e0759ab76e4938a98415d5bc1ce': Fix mips vs. mips64 build issues.
-rw-r--r--tools/llc/Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/llc/Android.mk b/tools/llc/Android.mk
index a98cd8b..9d32738 100644
--- a/tools/llc/Android.mk
+++ b/tools/llc/Android.mk
@@ -119,6 +119,7 @@ LOCAL_C_INCLUDES += external/llvm/include
LOCAL_STATIC_LIBRARIES_arm += $(llvm_llc_arm_STATIC_LIBRARIES)
LOCAL_STATIC_LIBRARIES_mips += $(llvm_llc_mips_STATIC_LIBRARIES)
+LOCAL_STATIC_LIBRARIES_mips64 += $(llvm_llc_mips_STATIC_LIBRARIES)
LOCAL_STATIC_LIBRARIES_x86 += $(llvm_llc_x86_STATIC_LIBRARIES)
LOCAL_STATIC_LIBRARIES_x86_64 += $(llvm_llc_x86_STATIC_LIBRARIES)
LOCAL_STATIC_LIBRARIES_arm64 += $(llvm_llc_aarch64_STATIC_LIBRARIES)