diff options
| author | Jing Yu <jingyu@google.com> | 2011-10-27 10:47:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-27 10:47:40 -0700 |
| commit | 6af4bb07e3122c12f4391e8a0a51e09dbf69593d (patch) | |
| tree | 0ea7591281f45874365ddd40a8a696bc6ee1d964 /core | |
| parent | 5071047d7e01186e4d027a2180416ab48415cc36 (diff) | |
| parent | 2b407577256e97f35d1fb25f6ec95415cde8ffdf (diff) | |
| download | build-6af4bb07e3122c12f4391e8a0a51e09dbf69593d.zip build-6af4bb07e3122c12f4391e8a0a51e09dbf69593d.tar.gz build-6af4bb07e3122c12f4391e8a0a51e09dbf69593d.tar.bz2 | |
Merge "Fix build problems with gcc-4.6.x."
Diffstat (limited to 'core')
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 09b2619..2339d25 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -114,11 +114,12 @@ TARGET_GLOBAL_CFLAGS += \ -include $(android_config_h) \ -I $(arch_include_dir) -# This warning causes dalvik not to build with gcc 4.6 and -Werror. +# This warning causes dalvik not to build with gcc 4.6.x and -Werror. # We cannot turn it off blindly since the option is not available -# in gcc-4.4.x -ifneq ($(filter 4.6.0%, $(shell $(TARGET_CC) --version)),) -TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable +# 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 endif # This is to avoid the dreaded warning compiler message: |