diff options
| author | Duane Sand <duane.sand@imgtec.com> | 2014-06-03 16:05:59 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-08-05 12:38:31 -0700 |
| commit | 1d04a53ba31488f7e60f34620e569ce1716792e6 (patch) | |
| tree | ed3b0da32db78a633d6ffd09ecb651456832c559 | |
| parent | 3c4fcd84515ff6edcbeae7a0ceaacb1eecae437e (diff) | |
| download | build-1d04a53ba31488f7e60f34620e569ce1716792e6.zip build-1d04a53ba31488f7e60f34620e569ce1716792e6.tar.gz build-1d04a53ba31488f7e60f34620e569ce1716792e6.tar.bz2 | |
[MIPS64] Enable mips64 clang
(cherry picked from commit 41ca4446370ba90e472e45a8897868855185a6c7)
Change-Id: I0b141c58c88fe86e3a59844f53acc9a0e0a5271c
| -rw-r--r-- | core/clang/TARGET_mips.mk | 2 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-mips64.mk | 3 | ||||
| -rw-r--r-- | target/board/generic_mips64/BoardConfig.mk | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/core/clang/TARGET_mips.mk b/core/clang/TARGET_mips.mk index 6f4c197..0107519 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 dfd19ef..e23978f 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) include $(BUILD_SYSTEM)/combo/fdo.mk diff --git a/target/board/generic_mips64/BoardConfig.mk b/target/board/generic_mips64/BoardConfig.mk index 7452978..88a24a3 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 |