Add additional flags to make ART_TARGET_CLANG function with 3.5.
Change-Id: I5fbf29e5d08d905f7585fb6d0de9472e3f3ed218
diff --git a/build/Android.common.mk b/build/Android.common.mk
index aaa1490..1977682 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -193,7 +193,10 @@
-Wno-sign-promo \
-Wno-unused-parameter \
-Wstrict-aliasing \
- -fstrict-aliasing
+ -fstrict-aliasing \
+ -Wno-implicit-exception-spec-mismatch \
+ -DNVALGRIND \
+ -Wno-unused-value
ifeq ($(ART_SMALL_MODE),true)
art_cflags += -DART_SMALL_MODE=1
@@ -209,7 +212,13 @@
endif
art_non_debug_cflags := \
- -O3
+ -O3
+
+# FIXME: upstream LLVM has a vectorizer bug that needs to be fixed
+ifeq ($(ART_TARGET_CLANG),true)
+art_non_debug_cflags += \
+ -fno-vectorize
+endif
art_debug_cflags := \
-O1 \
@@ -238,8 +247,9 @@
ifneq ($(filter 4.6 4.6.%, $(TARGET_GCC_VERSION)),)
ART_TARGET_CFLAGS += -Wthread-safety
else
+ # FIXME: add -Wthread-safety when the problem is fixed
ifeq ($(ART_TARGET_CLANG),true)
- ART_TARGET_CFLAGS += -Wthread-safety
+ ART_TARGET_CFLAGS +=
else
# Warn if -Wthread-safety is not suport and not doing a top-level or 'mma' build.
ifneq ($(ONE_SHOT_MAKEFILE),)
@@ -304,7 +314,7 @@
# Has one argument, the suffix
define call-art-multi-target
$(call $(1),$(ART_PHONY_TEST_TARGET_SUFFIX))
-
+
ifdef TARGET_2ND_ARCH
$(call $(1),$(2ND_ART_PHONY_TEST_TARGET_SUFFIX))
endif
@@ -329,10 +339,10 @@
# Has one argument, the suffix
define call-art-multi-target-var
$(call $(1),$(ART_PHONY_TEST_TARGET_SUFFIX))
-
+
ifdef TARGET_2ND_ARCH
$(call $(1),$(2ND_ART_PHONY_TEST_TARGET_SUFFIX))
-
+
# Link both together, if it makes sense
ifneq ($(ART_PHONY_TEST_TARGET_SUFFIX),)
ifneq ($(2ND_ART_PHONY_TEST_TARGET_SUFFIX),)
@@ -351,10 +361,10 @@
# We assume we can link the names together easily...
define call-art-multi-target-rule
$(call $(1),$(ART_PHONY_TEST_TARGET_SUFFIX))
-
+
ifdef TARGET_2ND_ARCH
$(call $(1),$(2ND_ART_PHONY_TEST_TARGET_SUFFIX))
-
+
# Link both together, if it makes sense
ifneq ($(ART_PHONY_TEST_TARGET_SUFFIX),)
ifneq ($(2ND_ART_PHONY_TEST_TARGET_SUFFIX),)