Merge "Enable 64bit codegen on ARM" am: 2eb9175e4d
Change-Id: I78fe8dd36d7ba7143604c9aaa46110be9eb9c1f1
diff --git a/Android.bp b/Android.bp
index c5740d2..b1ee9cc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -276,7 +276,8 @@
export_include_dirs: ["device/include"],
},
android_arm: {
- whole_static_libs: llvm_arm_static_libraries,
+ whole_static_libs: llvm_arm_static_libraries +
+ llvm_aarch64_static_libraries,
},
android_x86: {
whole_static_libs: llvm_x86_static_libraries +
diff --git a/device/include/llvm/Config/AsmParsers.def b/device/include/llvm/Config/AsmParsers.def
index 93d1be4..845cb51 100755
--- a/device/include/llvm/Config/AsmParsers.def
+++ b/device/include/llvm/Config/AsmParsers.def
@@ -26,6 +26,7 @@
#if defined(__arm__)
LLVM_ASM_PARSER(ARM)
+ LLVM_ASM_PARSER(AArch64)
#elif defined(__mips__)
LLVM_ASM_PARSER(Mips)
#elif defined(__i386__) || defined(__x86_64__)
diff --git a/device/include/llvm/Config/AsmPrinters.def b/device/include/llvm/Config/AsmPrinters.def
index f367c10..001c795 100755
--- a/device/include/llvm/Config/AsmPrinters.def
+++ b/device/include/llvm/Config/AsmPrinters.def
@@ -26,6 +26,7 @@
#if defined(__arm__)
LLVM_ASM_PRINTER(ARM)
+ LLVM_ASM_PRINTER(AArch64)
#elif defined(__mips__)
LLVM_ASM_PRINTER(Mips)
#elif defined(__i386__) || defined(__x86_64__)
diff --git a/device/include/llvm/Config/Disassemblers.def b/device/include/llvm/Config/Disassemblers.def
index a1ae811..6393b42 100755
--- a/device/include/llvm/Config/Disassemblers.def
+++ b/device/include/llvm/Config/Disassemblers.def
@@ -26,6 +26,7 @@
#if defined(__arm__)
LLVM_DISASSEMBLER(ARM)
+ LLVM_DISASSEMBLER(AArch64)
#elif defined(__mips__)
LLVM_DISASSEMBLER(Mips)
#elif defined(__i386__) || defined(__x86_64__)
diff --git a/device/include/llvm/Config/Targets.def b/device/include/llvm/Config/Targets.def
index 82acbf8..fe32653 100755
--- a/device/include/llvm/Config/Targets.def
+++ b/device/include/llvm/Config/Targets.def
@@ -25,6 +25,7 @@
#if defined(__arm__)
LLVM_TARGET(ARM)
+ LLVM_TARGET(AArch64)
#elif defined(__mips__)
LLVM_TARGET(Mips)
#elif defined(__i386__) || defined(__x86_64__)
