diff options
| author | Stephen Hines <srhines@google.com> | 2014-05-07 01:00:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-07 01:00:06 +0000 |
| commit | 49dd77d69cff662dd36bad2866bf1b325fdddb30 (patch) | |
| tree | c65722e89f1b979189babb97df5577f740d05ea1 | |
| parent | 6cd27afdaa4d88b685f67fd1740656d1c8b35b0c (diff) | |
| parent | 220b921aed042f9e520c26cffd8282a94c66c3d5 (diff) | |
| download | llvm-49dd77d69cff662dd36bad2866bf1b325fdddb30.tar.gz | |
am 220b921a: Merge "We need to build the ARM components for AArch64 as well."
* commit '220b921aed042f9e520c26cffd8282a94c66c3d5':
We need to build the ARM components for AArch64 as well.
| -rw-r--r-- | device/include/llvm/Config/AsmParsers.def | 1 | ||||
| -rw-r--r-- | device/include/llvm/Config/AsmPrinters.def | 1 | ||||
| -rw-r--r-- | device/include/llvm/Config/Disassemblers.def | 1 | ||||
| -rw-r--r-- | device/include/llvm/Config/Targets.def | 1 | ||||
| -rw-r--r-- | shared_llvm.mk | 1 | ||||
| -rw-r--r-- | tools/llc/Android.mk | 11 |
6 files changed, 11 insertions, 5 deletions
diff --git a/device/include/llvm/Config/AsmParsers.def b/device/include/llvm/Config/AsmParsers.def index ca3af2c393c4..b2cfbe2b4c0c 100644 --- 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 3a396c20ff5a..96e2f56d95dc 100644 --- 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 aba88f883d12..0761902802ad 100644 --- 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 f30c81fc182b..014ef146ab7d 100644 --- 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 8948c39f41dd..caefb6435f63 100644 --- 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 2167fe3e0098..391ba3937e89 100644 --- 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) |