aboutsummaryrefslogtreecommitdiffstats
path: root/shared_llvm.mk
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2014-10-15 14:05:57 -0700
committerTim Murray <timmurray@google.com>2014-10-15 14:17:40 -0700
commitb86aaa733ce2042447857baf096ccc58b4ec430a (patch)
treef69cd1965db595d49911d17b81147ceb6eea12ed /shared_llvm.mk
parentf8e021ce4621688f8f57bf98302cba23f5d7e0f1 (diff)
downloadexternal_llvm-b86aaa733ce2042447857baf096ccc58b4ec430a.zip
external_llvm-b86aaa733ce2042447857baf096ccc58b4ec430a.tar.gz
external_llvm-b86aaa733ce2042447857baf096ccc58b4ec430a.tar.bz2
add ARM codegen for x86 LLVM if specified
bug 17765171 Change-Id: Id1135f5804d2738c7de5c264079e0a61d161f997
Diffstat (limited to 'shared_llvm.mk')
-rw-r--r--shared_llvm.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/shared_llvm.mk b/shared_llvm.mk
index bd886fe..d244a45 100644
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -123,6 +123,11 @@ LOCAL_WHOLE_STATIC_LIBRARIES_mips64 += $(llvm_mips_static_libraries)
LOCAL_WHOLE_STATIC_LIBRARIES_arm64 += $(llvm_aarch64_static_libraries)
LOCAL_WHOLE_STATIC_LIBRARIES_arm64 += $(llvm_arm_static_libraries)
+ifeq ($(BUILD_ARM_FOR_X86),true)
+LOCAL_WHOLE_STATIC_LIBRARIES_x86 += $(llvm_arm_static_libraries)
+LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_arm_static_libraries)
+endif
+
LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_post_static_libraries)
#LOCAL_LDLIBS := -ldl -lpthread