summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-04-20 08:30:20 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-04-20 08:30:21 -0700
commitd0427e493edf2e4de2bd60fd1cc8253e9de233fd (patch)
tree9c855fed4feee2e46e75651cf087821c7d7f5432
parent810b0d8bb4a458c5a92c0bed48b75cbf27f1410d (diff)
parentc856e31523b2a01efc39a97207d3ce11f1db1ca5 (diff)
downloadbuild-d0427e493edf2e4de2bd60fd1cc8253e9de233fd.zip
build-d0427e493edf2e4de2bd60fd1cc8253e9de233fd.tar.gz
build-d0427e493edf2e4de2bd60fd1cc8253e9de233fd.tar.bz2
Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
-rw-r--r--core/combo/TARGET_linux-arm.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk
index 784010c..4db9bac 100644
--- a/core/combo/TARGET_linux-arm.mk
+++ b/core/combo/TARGET_linux-arm.mk
@@ -119,7 +119,8 @@ TARGET_GLOBAL_CFLAGS += \
# in gcc-4.4.x. We also want to disable sincos optimization globally
# by turning off the builtin sin function.
ifneq ($(filter 4.6.%, $(shell $(TARGET_CC) --version)),)
-TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable -fno-builtin-sin
+TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable -fno-builtin-sin \
+ -fno-strict-volatile-bitfields
endif
# This is to avoid the dreaded warning compiler message: