summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2014-12-18 19:25:50 -0800
committerChih-Hung Hsieh <chh@google.com>2015-01-07 19:05:08 -0800
commit86bb22e188f587ba64a0e62ae5f44363d573345d (patch)
treeac7459c119d2c0667bfa62d32f86411724287e06
parent4270e74152d8a7cd979ab5a92fe2a8f84adb8a42 (diff)
downloadart-86bb22e188f587ba64a0e62ae5f44363d573345d.zip
art-86bb22e188f587ba64a0e62ae5f44363d573345d.tar.gz
art-86bb22e188f587ba64a0e62ae5f44363d573345d.tar.bz2
Do not use clang for mips target.
Clang assembler cannot compile some inlined assembly code in valgrind_malloc_space-inl.h:192:5: error: used $at without ".set noat" However, clang generated assembly code for runtime/mirror/array.cc cannot be compiled by gas. BUG: 18789639 BUG: 18807290 Change-Id: Ifdeb3c50f11cefc7f0d62c1d36fdd1f8b9344fb4
-rw-r--r--build/Android.common_build.mk11
-rw-r--r--sigchainlib/Android.mk2
2 files changed, 12 insertions, 1 deletions
diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk
index 0d3b4c9..1e07430 100644
--- a/build/Android.common_build.mk
+++ b/build/Android.common_build.mk
@@ -83,9 +83,18 @@ ART_TARGET_CLANG := $(USE_CLANG_PLATFORM_BUILD)
else
ART_TARGET_CLANG := false
endif
+
+ifeq ($(TARGET_ARCH),mips)
+ # b/18807290, Clang generated mips assembly code for array.cc
+ # cannot be compiled by gas.
+ # b/18789639, Clang assembler cannot compile inlined assembly code in
+ # valgrind_malloc_space-inl.h:192:5: error: used $at without ".set noat"
+ $(warning Clang is disabled for the mips target)
+endif
ART_TARGET_CLANG_arm :=
ART_TARGET_CLANG_arm64 :=
-ART_TARGET_CLANG_mips :=
+# TODO: Enable clang mips when b/18807290 and b/18789639 are fixed.
+ART_TARGET_CLANG_mips := false
ART_TARGET_CLANG_x86 :=
ART_TARGET_CLANG_x86_64 :=
diff --git a/sigchainlib/Android.mk b/sigchainlib/Android.mk
index b7ff360..35dec4b 100644
--- a/sigchainlib/Android.mk
+++ b/sigchainlib/Android.mk
@@ -28,6 +28,7 @@ LOCAL_MODULE:= libsigchain
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.common_build.mk
+$(eval $(call set-target-local-clang-vars))
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
@@ -40,6 +41,7 @@ LOCAL_MODULE:= libsigchain
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.common_build.mk
+$(eval $(call set-target-local-clang-vars))
include $(BUILD_STATIC_LIBRARY)
# Build host library.