summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher R. Palmer <crpalmer@gmail.com>2015-09-20 05:51:18 -0400
committerChristopher R. Palmer <crpalmer@gmail.com>2015-09-22 05:12:13 -0400
commit37f0acca160bac88356c98427eda7d962907c07e (patch)
treecb9f1b047202ca2e5dc765ca26b19e8353ed55ae
parent624f867bc1424d20afa67eafc003d172db2b09fc (diff)
downloadandroid_art-cm-12.1.tar.gz
android_art-cm-12.1.tar.bz2
android_art-cm-12.1.zip
art: Increase the frame-size warning to make gcc 4.9 + intel happycm-12.1
Without this change, the build fails for x86 based builds using GCC 4.9. Change-Id: I88653b1d9b403d9051590a3e72028d683af259ec
-rw-r--r--build/Android.common_build.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk
index 6ce38777f5..d82aab5d40 100644
--- a/build/Android.common_build.mk
+++ b/build/Android.common_build.mk
@@ -201,7 +201,11 @@ art_target_non_debug_cflags := \
ifeq ($(HOST_OS),linux)
# Larger frame-size for host clang builds today
art_host_non_debug_cflags += -Wframe-larger-than=3000
- art_target_non_debug_cflags += -Wframe-larger-than=1728
+ ifeq ($(TARGET_ARCH),x86)
+ art_target_non_debug_cflags += -Wframe-larger-than=3000
+ else
+ art_target_non_debug_cflags += -Wframe-larger-than=1728
+ endif
endif
# FIXME: upstream LLVM has a vectorizer bug that needs to be fixed