diff options
| author | Stephen Hines <srhines@google.com> | 2014-06-04 22:35:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-04 22:35:28 +0000 |
| commit | f58eae99c3b2b1f047233392524713f8b08a6095 (patch) | |
| tree | 913476acb4cff19a0e80154c264d00260c62089e /tools | |
| parent | 806b35f1b384b253e41d7f56d43aef8ce3c14219 (diff) | |
| parent | 7cfe7b81886cb23fc41ff32b5f2bc5941dc3f682 (diff) | |
| download | external_llvm-f58eae99c3b2b1f047233392524713f8b08a6095.zip external_llvm-f58eae99c3b2b1f047233392524713f8b08a6095.tar.gz external_llvm-f58eae99c3b2b1f047233392524713f8b08a6095.tar.bz2 | |
Merge "Updated the makefiles to use AArch64 name."
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/llc/Android.mk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/llc/Android.mk b/tools/llc/Android.mk index f9c87fe..66ecb54 100644 --- a/tools/llc/Android.mk +++ b/tools/llc/Android.mk @@ -59,14 +59,14 @@ llvm_llc_STATIC_LIBRARIES := \ libLLVMSupport \ libLLVMObject -llvm_llc_arm64_STATIC_LIBRARIES := \ - libLLVMARM64Info \ - libLLVMARM64AsmParser \ - libLLVMARM64CodeGen \ - libLLVMARM64Disassembler \ - libLLVMARM64Desc \ - libLLVMARM64AsmPrinter \ - libLLVMARM64Utils +llvm_llc_aarch64_STATIC_LIBRARIES := \ + libLLVMAArch64Info \ + libLLVMAArch64AsmParser \ + libLLVMAArch64CodeGen \ + libLLVMAArch64Disassembler \ + libLLVMAArch64Desc \ + libLLVMAArch64AsmPrinter \ + libLLVMAArch64Utils @@ -87,7 +87,7 @@ LOCAL_STATIC_LIBRARIES := \ $(llvm_llc_arm_STATIC_LIBRARIES) \ $(llvm_llc_mips_STATIC_LIBRARIES) \ $(llvm_llc_x86_STATIC_LIBRARIES) \ - $(llvm_llc_arm64_STATIC_LIBRARIES) \ + $(llvm_llc_aarch64_STATIC_LIBRARIES) \ $(llvm_llc_STATIC_LIBRARIES) LOCAL_LDLIBS += -lpthread -lm -ldl @@ -121,8 +121,8 @@ 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_aarch64 += $(llvm_llc_aarch64_STATIC_LIBRARIES) +LOCAL_STATIC_LIBRARIES_aarch64 += $(llvm_llc_arm_STATIC_LIBRARIES) LOCAL_STATIC_LIBRARIES += $(llvm_llc_STATIC_LIBRARIES) |