diff options
| -rw-r--r-- | device/include/llvm/Config/AsmParsers.def | 5 | ||||
| -rw-r--r-- | device/include/llvm/Config/AsmPrinters.def | 5 | ||||
| -rw-r--r-- | device/include/llvm/Config/Disassemblers.def | 5 | ||||
| -rw-r--r-- | device/include/llvm/Config/Targets.def | 5 | ||||
| -rw-r--r-- | shared_llvm.mk | 5 |
5 files changed, 25 insertions, 0 deletions
diff --git a/device/include/llvm/Config/AsmParsers.def b/device/include/llvm/Config/AsmParsers.def index b2cfbe2..a0cdc19 100644 --- a/device/include/llvm/Config/AsmParsers.def +++ b/device/include/llvm/Config/AsmParsers.def @@ -30,6 +30,11 @@ LLVM_ASM_PARSER(Mips) #elif defined(__i386__) || defined(__x86_64__) LLVM_ASM_PARSER(X86) + +#if defined(FORCE_BUILD_ARM) + LLVM_ASM_PARSER(ARM) +#endif + #elif defined(__aarch64__) LLVM_ASM_PARSER(ARM) LLVM_ASM_PARSER(AArch64) diff --git a/device/include/llvm/Config/AsmPrinters.def b/device/include/llvm/Config/AsmPrinters.def index 96e2f56..103c2a5 100644 --- a/device/include/llvm/Config/AsmPrinters.def +++ b/device/include/llvm/Config/AsmPrinters.def @@ -30,6 +30,11 @@ LLVM_ASM_PRINTER(Mips) #elif defined(__i386__) || defined(__x86_64__) LLVM_ASM_PRINTER(X86) + +#if defined(FORCE_BUILD_ARM) + LLVM_ASM_PRINTER(ARM) +#endif + #elif defined(__aarch64__) LLVM_ASM_PRINTER(ARM) LLVM_ASM_PRINTER(AArch64) diff --git a/device/include/llvm/Config/Disassemblers.def b/device/include/llvm/Config/Disassemblers.def index 0761902..2ec382e 100644 --- a/device/include/llvm/Config/Disassemblers.def +++ b/device/include/llvm/Config/Disassemblers.def @@ -30,6 +30,11 @@ LLVM_DISASSEMBLER(Mips) #elif defined(__i386__) || defined(__x86_64__) LLVM_DISASSEMBLER(X86) + +#if defined(FORCE_BUILD_ARM) + LLVM_DISASSEMBLER(ARM) +#endif + #elif defined(__aarch64__) LLVM_DISASSEMBLER(ARM) LLVM_DISASSEMBLER(AArch64) diff --git a/device/include/llvm/Config/Targets.def b/device/include/llvm/Config/Targets.def index 014ef14..1b67f95 100644 --- a/device/include/llvm/Config/Targets.def +++ b/device/include/llvm/Config/Targets.def @@ -29,6 +29,11 @@ LLVM_TARGET(Mips) #elif defined(__i386__) || defined(__x86_64__) LLVM_TARGET(X86) + +#if defined(FORCE_BUILD_ARM) + LLVM_TARGET(ARM) +#endif + #elif defined(__aarch64__) LLVM_TARGET(ARM) LLVM_TARGET(AArch64) diff --git a/shared_llvm.mk b/shared_llvm.mk index bd886fe..d244a45 100644 --- a/shared_llvm.mk +++ b/shared_llvm.mk @@ -123,6 +123,11 @@ LOCAL_WHOLE_STATIC_LIBRARIES_mips64 += $(llvm_mips_static_libraries) LOCAL_WHOLE_STATIC_LIBRARIES_arm64 += $(llvm_aarch64_static_libraries) LOCAL_WHOLE_STATIC_LIBRARIES_arm64 += $(llvm_arm_static_libraries) +ifeq ($(BUILD_ARM_FOR_X86),true) +LOCAL_WHOLE_STATIC_LIBRARIES_x86 += $(llvm_arm_static_libraries) +LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 += $(llvm_arm_static_libraries) +endif + LOCAL_WHOLE_STATIC_LIBRARIES += $(llvm_post_static_libraries) #LOCAL_LDLIBS := -ldl -lpthread |