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 /shared_llvm.mk | |
| 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 'shared_llvm.mk')
| -rw-r--r-- | shared_llvm.mk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/shared_llvm.mk b/shared_llvm.mk index 06dd2e0..5ca48ae 100644 --- a/shared_llvm.mk +++ b/shared_llvm.mk @@ -35,14 +35,14 @@ llvm_mips_static_libraries := \ libLLVMMipsAsmPrinter \ libLLVMMipsDisassembler -llvm_arm64_static_libraries := \ - libLLVMARM64CodeGen \ - libLLVMARM64Info \ - libLLVMARM64Desc \ - libLLVMARM64AsmParser \ - libLLVMARM64AsmPrinter \ - libLLVMARM64Utils \ - libLLVMARM64Disassembler +llvm_aarch64_static_libraries := \ + libLLVMAArch64CodeGen \ + libLLVMAArch64Info \ + libLLVMAArch64Desc \ + libLLVMAArch64AsmParser \ + libLLVMAArch64AsmPrinter \ + libLLVMAArch64Utils \ + libLLVMAArch64Disassembler llvm_post_static_libraries := \ libLLVMAsmPrinter \ @@ -88,7 +88,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ $(llvm_arm_static_libraries) \ $(llvm_x86_static_libraries) \ $(llvm_mips_static_libraries) \ - $(llvm_arm64_static_libraries) \ + $(llvm_aarch64_static_libraries) \ $(llvm_host_static_libraries) \ $(llvm_post_static_libraries) @@ -123,8 +123,8 @@ 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_mips64 += $(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_aarch64 += $(llvm_aarch64_static_libraries) +LOCAL_WHOLE_STATIC_LIBRARIES_aarch64 += $(llvm_arm_static_libraries) LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_post_static_libraries) |