commit 1d04a53ba31488f7e60f34620e569ce1716792e6
author Duane Sand <duane.sand@imgtec.com> Tue Jun 03 16:05:59 2014 -0700
committer Ying Wang <wangying@google.com> Tue Aug 05 12:38:31 2014 -0700
tree ed3b0da32db78a633d6ffd09ecb651456832c559
parent 3c4fcd84515ff6edcbeae7a0ceaacb1eecae437e

[MIPS64] Enable mips64 clang

(cherry picked from commit 41ca4446370ba90e472e45a8897868855185a6c7)

Change-Id: I0b141c58c88fe86e3a59844f53acc9a0e0a5271c

core/clang/TARGET_mips.mk

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_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 := \

core/combo/TARGET_linux-mips64.mk

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 @@
 $(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