diff options
| author | 2015-09-14 16:50:58 +0000 | |
|---|---|---|
| committer | 2015-09-14 16:50:58 +0000 | |
| commit | 329d1b5a5afd1f1520c3fd2e723f1245d953074d (patch) | |
| tree | 2f6c04f3931fe0815664ead321c3f520ed6e516e | |
| parent | 6dc8bc81a3611c44b082f7d7e4bdc73f7c7ebe01 (diff) | |
| parent | 4a37953377092ade93c15c72ad49cde4adaabd94 (diff) | |
Merge "Revert "Re-enable Clang's -Wpessimizing-move""
| -rw-r--r-- | build/Android.common_build.mk | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk index a4434872da..acce68bcc6 100644 --- a/build/Android.common_build.mk +++ b/build/Android.common_build.mk @@ -348,6 +348,16 @@ ART_HOST_CFLAGS += $(art_cflags) -DART_BASE_ADDRESS=$(LIBART_IMG_HOST_BASE_ADDRE ART_HOST_CFLAGS += -DART_DEFAULT_INSTRUCTION_SET_FEATURES=default $(art_host_cflags) ART_HOST_ASFLAGS += $(art_asflags) +# Disable -Wpessimizing-move: triggered for art/runtime/base/variant_map.h:261 +# Adding this flag to art_clang_cflags doesn't work because -Wall gets added to +# ART_HOST_CFLAGS (as a part of art_cflags) after +# -Wno-pessimizing-move. Instead, add the flag here to both +# ART_TARGET_CLANG_CFLAGS and ART_HOST_CFLAGS +ifeq ($(ART_HOST_CLANG),true) +ART_HOST_CFLAGS += -Wno-pessimizing-move +endif +ART_TARGET_CLANG_CFLAGS += -Wno-pessimizing-move + # The latest clang update trips over many of the files in art and never finishes # compiling for aarch64 with -O3 (or -O2). Drop back to -O1 while we investigate # to stop punishing the build server. |