diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-31 02:10:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-31 02:10:56 +0000 |
| commit | 7fa7d04d3035e8c0cbd2e0a6ee23f0fc0c8b06d6 (patch) | |
| tree | 4ae7d91fcad5df229551880c40aaec11f2967ab1 | |
| parent | d691c358885cc0f598b1f96f96828b996eef562c (diff) | |
| parent | fd12fddfa04c19dc654eb47f375f0e217df47b1e (diff) | |
| download | llvm-7fa7d04d3035e8c0cbd2e0a6ee23f0fc0c8b06d6.tar.gz | |
Merge "Enable 64bit codegen on ARM" am: 2eb9175e4d am: fd12fddfa0
Change-Id: I91e18c7eb1433a201e31602df17dbbcf7a130764
| -rw-r--r-- | Android.bp | 3 | ||||
| -rwxr-xr-x | device/include/llvm/Config/AsmParsers.def | 1 | ||||
| -rwxr-xr-x | device/include/llvm/Config/AsmPrinters.def | 1 | ||||
| -rwxr-xr-x | device/include/llvm/Config/Disassemblers.def | 1 | ||||
| -rwxr-xr-x | device/include/llvm/Config/Targets.def | 1 |
5 files changed, 6 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index c5740d201a92..b1ee9cc62069 100644 --- a/Android.bp +++ b/Android.bp @@ -276,7 +276,8 @@ cc_library { 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 93d1be497cd2..845cb51a1b9d 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 f367c1037c7b..001c795d9ca2 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 a1ae8111a93d..6393b42a831f 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 82acbf8af2ad..fe326530cfc0 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__) |