commit 8aa5ce8cbaa58d14493eb694f06c8a0fde23c509
author Tim Murray <timmurray@google.com> Fri Mar 07 13:15:57 2014 -0800
committer Tim Murray <timmurray@google.com> Fri Mar 14 17:13:27 2014 -0700
tree 343d7ce8767a0a37430083e6b4a567ebb30c19f4
parent 130045bafb1899ab3ba3a4eab679a7df08321796

Make LLVM build on AArch64.

bug 13343378

Change-Id: I4152d2437a144645fa0b5a425b7bfdcb3a2a5594

shared_llvm.mk

diff --git a/shared_llvm.mk b/shared_llvm.mk
index 3f9e104..b0299e8 100644
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -35,6 +35,15 @@
   libLLVMMipsAsmPrinter \
   libLLVMMipsDisassembler
 
+llvm_arm64_static_libraries := \
+  libLLVMARM64CodeGen \
+  libLLVMARM64Info \
+  libLLVMARM64Desc \
+  libLLVMARM64AsmParser \
+  libLLVMARM64AsmPrinter \
+  libLLVMARM64Utils \
+  libLLVMARM64Disassembler
+
 llvm_post_static_libraries := \
   libLLVMAsmPrinter \
   libLLVMSelectionDAG \
@@ -78,6 +87,7 @@
   $(llvm_arm_static_libraries) \
   $(llvm_x86_static_libraries) \
   $(llvm_mips_static_libraries) \
+  $(llvm_arm64_static_libraries) \
   $(llvm_host_static_libraries) \
   $(llvm_post_static_libraries)
 
@@ -110,6 +120,7 @@
 LOCAL_WHOLE_STATIC_LIBRARIES_x86 += $(llvm_x86_static_libraries)
 LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_x86_static_libraries)
 LOCAL_WHOLE_STATIC_LIBRARIES_mips += $(llvm_mips_static_libraries)
+LOCAL_WHOLE_STATIC_LIBRARIES_arm64 += $(llvm_arm64_static_libraries)
 
 LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_post_static_libraries)