From 137e5b22fe6672134dd2c7bb11b2ab26aff4724a Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Thu, 17 Jul 2014 01:49:18 -0700 Subject: [PATCH] Update frame-larger-than limit to 2440 for new clang. Bug: 16362912 The latest version of clang is generating larger frames on elf_writer_quick.cc and dex2oat.cc than we had previously encountered. This change unblocks the LLVM rebase temporarily. Change-Id: I20d9f88959b91e0509e58f01c22532720225f44d --- build/Android.common_build.mk | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk index c39bc5dd6..dad61068f 100644 --- a/build/Android.common_build.mk +++ b/build/Android.common_build.mk @@ -183,8 +183,16 @@ endif art_non_debug_cflags := \ -O3 +art_host_non_debug_cflags := \ + $(art_non_debug_cflags) + +art_target_non_debug_cflags := \ + $(art_non_debug_cflags) + ifeq ($(HOST_OS),linux) - art_non_debug_cflags += -Wframe-larger-than=1728 + # Larger frame-size for host clang builds today + art_host_non_debug_cflags += -Wframe-larger-than=2440 + art_target_non_debug_cflags += -Wframe-larger-than=1728 endif # FIXME: upstream LLVM has a vectorizer bug that needs to be fixed @@ -266,8 +274,8 @@ ifeq ($(TARGET_ARCH),arm) endif endif -ART_HOST_NON_DEBUG_CFLAGS := $(art_non_debug_cflags) -ART_TARGET_NON_DEBUG_CFLAGS := $(art_non_debug_cflags) +ART_HOST_NON_DEBUG_CFLAGS := $(art_host_non_debug_cflags) +ART_TARGET_NON_DEBUG_CFLAGS := $(art_target_non_debug_cflags) # TODO: move -fkeep-inline-functions to art_debug_cflags when target gcc > 4.4 (and -lsupc++) ART_HOST_DEBUG_CFLAGS := $(art_debug_cflags) -fkeep-inline-functions @@ -329,5 +337,8 @@ endif ART_DEFAULT_GC_TYPE := ART_DEFAULT_GC_TYPE_CFLAGS := art_cflags := +art_target_non_debug_cflags := +art_host_non_debug_cflags := +art_non_debug_cflags := endif # ANDROID_COMMON_BUILD_MK -- 2.11.0