We need to build the ARM components for AArch64 as well.

Bug: 14474874
Change-Id: I37d5a95db83c31bb77cf2e2b5686d8aa329fd7d8

diff --git a/device/include/llvm/Config/AsmParsers.def b/device/include/llvm/Config/AsmParsers.def
index ca3af2c..b2cfbe2 100644 (file)
--- a/device/include/llvm/Config/AsmParsers.def
+++ b/device/include/llvm/Config/AsmParsers.def
@@ -31,6 +31,7 @@
 #elif defined(__i386__) || defined(__x86_64__)
   LLVM_ASM_PARSER(X86)
 #elif defined(__aarch64__)
+  LLVM_ASM_PARSER(ARM)
   LLVM_ASM_PARSER(AArch64)
 #else
 #  error Unsupported TARGET_ARCH for LLVM_ASM_PARSER

diff --git a/device/include/llvm/Config/AsmPrinters.def b/device/include/llvm/Config/AsmPrinters.def
index 3a396c2..96e2f56 100644 (file)
--- a/device/include/llvm/Config/AsmPrinters.def
+++ b/device/include/llvm/Config/AsmPrinters.def
@@ -31,6 +31,7 @@
 #elif defined(__i386__) || defined(__x86_64__)
   LLVM_ASM_PRINTER(X86)
 #elif defined(__aarch64__)
+  LLVM_ASM_PRINTER(ARM)
   LLVM_ASM_PRINTER(AArch64)
 #else
 #  error Unsupported TARGET_ARCH for LLVM_ASM_PRINTER

diff --git a/device/include/llvm/Config/Disassemblers.def b/device/include/llvm/Config/Disassemblers.def
index aba88f8..0761902 100644 (file)
--- a/device/include/llvm/Config/Disassemblers.def
+++ b/device/include/llvm/Config/Disassemblers.def
@@ -31,6 +31,7 @@
 #elif defined(__i386__) || defined(__x86_64__)
   LLVM_DISASSEMBLER(X86)
 #elif defined(__aarch64__)
+  LLVM_DISASSEMBLER(ARM)
   LLVM_DISASSEMBLER(AArch64)
 #else
 #  error Unsupported TARGET_ARCH for LLVM_DISASSEMBLER

diff --git a/device/include/llvm/Config/Targets.def b/device/include/llvm/Config/Targets.def
index f30c81f..014ef14 100644 (file)
--- a/device/include/llvm/Config/Targets.def
+++ b/device/include/llvm/Config/Targets.def
@@ -30,6 +30,7 @@
 #elif defined(__i386__) || defined(__x86_64__)
   LLVM_TARGET(X86)
 #elif defined(__aarch64__)
+  LLVM_TARGET(ARM)
   LLVM_TARGET(AArch64)
 #else
 #  error Unsupported TARGET_ARCH for LLVM_TARGET

diff --git a/shared_llvm.mk b/shared_llvm.mk
index 8948c39..caefb64 100644 (file)
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -122,6 +122,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_arm64 += $(llvm_arm_static_libraries)
 
 LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_post_static_libraries)
 

diff --git a/tools/llc/Android.mk b/tools/llc/Android.mk
index 2167fe3..391ba39 100644 (file)
--- a/tools/llc/Android.mk
+++ b/tools/llc/Android.mk
@@ -116,11 +116,12 @@ LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_SRC_FILES := $(llvm_llc_SRC_FILES)
 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_x86 := $(llvm_llc_x86_STATIC_LIBRARIES)
-LOCAL_STATIC_LIBRARIES_x86_64 := $(llvm_llc_x86_STATIC_LIBRARIES)
-LOCAL_STATIC_LIBRARIES_arm64 := $(llvm_llc_arm64_STATIC_LIBRARIES)
+LOCAL_STATIC_LIBRARIES_arm += $(llvm_llc_arm_STATIC_LIBRARIES)
+LOCAL_STATIC_LIBRARIES_mips += $(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_arm64_STATIC_LIBRARIES)
+LOCAL_STATIC_LIBRARIES_arm64 += $(llvm_llc_arm_STATIC_LIBRARIES)
 
 LOCAL_STATIC_LIBRARIES += $(llvm_llc_STATIC_LIBRARIES)