summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-04-20 16:43:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-04-20 16:43:25 -0700
commit9987dbbbb43ca3279ec615299fbab8a9101aa51c (patch)
tree1ecebc4791fa6028bc0338e64e4af29a5d3ea2fd
parentc4aa4ff3551873c2e87a8679994d1f41f9909b0b (diff)
parentd0427e493edf2e4de2bd60fd1cc8253e9de233fd (diff)
downloadbuild-9987dbbbb43ca3279ec615299fbab8a9101aa51c.zip
build-9987dbbbb43ca3279ec615299fbab8a9101aa51c.tar.gz
build-9987dbbbb43ca3279ec615299fbab8a9101aa51c.tar.bz2
am d0427e49: Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
* commit 'd0427e493edf2e4de2bd60fd1cc8253e9de233fd': 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: