aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuane Sand <duane.sand@imgtec.com>2014-06-03 16:05:59 -0700
committerDuane Sand <duane.sand@imgtec.com>2014-07-23 14:10:39 -0700
commit41ca4446370ba90e472e45a8897868855185a6c7 (patch)
tree450b7eb3cbabc88a1d5272a1829b651d5c20ecc2
parent1029013a0db29b926da93d2400b181d1c3b495fe (diff)
downloadbuild-41ca4446370ba90e472e45a8897868855185a6c7.tar.gz
[MIPS64] Enable mips64 clang
Change-Id: I737f40ff1d4c71c21bea5159d1b0acee89fe32a2
-rw-r--r--core/clang/TARGET_mips.mk2
-rw-r--r--core/combo/TARGET_linux-mips64.mk3
-rw-r--r--target/board/generic_mips64/BoardConfig.mk2
3 files changed, 2 insertions, 5 deletions
diff --git a/core/clang/TARGET_mips.mk b/core/clang/TARGET_mips.mk
index e70e25422f..de615b01dc 100644
--- a/core/clang/TARGET_mips.mk
+++ b/core/clang/TARGET_mips.mk
@@ -43,7 +43,7 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_CFLAGS := \
$(CLANG_CONFIG_mips_TARGET_EXTRA_CFLAGS)
$(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_CPPFLAGS := \
- $(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$(clang_2nd_arch_prefix)$(TARGET_GLOBAL_CPPFLAGS)) \
+ $(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_CPPFLAGS)) \
$(CLANG_CONFIG_mips_TARGET_EXTRA_CPPFLAGS)
$(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \
diff --git a/core/combo/TARGET_linux-mips64.mk b/core/combo/TARGET_linux-mips64.mk
index aa456efaec..1b07847157 100644
--- a/core/combo/TARGET_linux-mips64.mk
+++ b/core/combo/TARGET_linux-mips64.mk
@@ -48,9 +48,6 @@ ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),)
$(error Unknown MIPS architecture variant: $(TARGET_ARCH_VARIANT))
endif
-# TODO: Enable Clang when its mips64 prebuilt is added
-WITHOUT_TARGET_CLANG := true
-
include $(TARGET_ARCH_SPECIFIC_MAKEFILE)
# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else
diff --git a/target/board/generic_mips64/BoardConfig.mk b/target/board/generic_mips64/BoardConfig.mk
index 7452978650..88a24a3ef9 100644
--- a/target/board/generic_mips64/BoardConfig.mk
+++ b/target/board/generic_mips64/BoardConfig.mk
@@ -32,7 +32,7 @@ TARGET_2ND_ARCH := mips
ifeq (,$(TARGET_2ND_ARCH_VARIANT))
TARGET_2ND_ARCH_VARIANT := mips32r2-fp
endif
-TARGET_CPU_ABI := mips
+TARGET_2ND_CPU_ABI := mips
# The emulator (qemu) uses the Goldfish devices
HAVE_HTC_AUDIO_DRIVER := true