From efe6badb42adc9c315b9b9e4b7cf99cb84b897ee Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 4 Jun 2014 18:30:13 -0700 Subject: llvm: fix build The previous patch renamed some variables used by the build system from arm64 to aarch64. Rename them back so that LLVM can be built for arm64 again. Change-Id: I760aff378411b46841819b30723eb1fa9e166519 --- llvm.mk | 2 +- shared_llvm.mk | 4 ++-- tools/llc/Android.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/llvm.mk b/llvm.mk index 954308b..c9d0e19 100644 --- a/llvm.mk +++ b/llvm.mk @@ -8,4 +8,4 @@ LLVM_DEVICE_BUILD_MK := $(LLVM_ROOT_PATH)/llvm-device-build.mk LLVM_GEN_INTRINSICS_MK := $(LLVM_ROOT_PATH)/llvm-gen-intrinsics.mk LLVM_TBLGEN_RULES_MK := $(LLVM_ROOT_PATH)/llvm-tblgen-rules.mk -LLVM_SUPPORTED_ARCH := arm aarch64 mips mips64 x86 x86_64 +LLVM_SUPPORTED_ARCH := arm arm64 mips mips64 x86 x86_64 diff --git a/shared_llvm.mk b/shared_llvm.mk index 5ca48ae..0b7dd78 100644 --- a/shared_llvm.mk +++ b/shared_llvm.mk @@ -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_aarch64 += $(llvm_aarch64_static_libraries) -LOCAL_WHOLE_STATIC_LIBRARIES_aarch64 += $(llvm_arm_static_libraries) +LOCAL_WHOLE_STATIC_LIBRARIES_arm64 += $(llvm_aarch64_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 66ecb54..4497bf3 100644 --- a/tools/llc/Android.mk +++ b/tools/llc/Android.mk @@ -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_aarch64 += $(llvm_llc_aarch64_STATIC_LIBRARIES) -LOCAL_STATIC_LIBRARIES_aarch64 += $(llvm_llc_arm_STATIC_LIBRARIES) +LOCAL_STATIC_LIBRARIES_arm64 += $(llvm_llc_aarch64_STATIC_LIBRARIES) +LOCAL_STATIC_LIBRARIES_arm64 += $(llvm_llc_arm_STATIC_LIBRARIES) LOCAL_STATIC_LIBRARIES += $(llvm_llc_STATIC_LIBRARIES) -- cgit v1.1