diff options
| author | Ying Wang <wangying@android.com> | 2013-08-13 15:03:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-13 15:03:24 -0700 |
| commit | 6d98d3b9426241983df9ee50fe62dcde8463a010 (patch) | |
| tree | d74c83203877c2eb488feed75f8fe2fd39a47bc4 /core/combo | |
| parent | 25d64bea75f898551a1e5c8ac65a8dae497fdf28 (diff) | |
| parent | a4ad06ac1db1dfc041fe386b76b22233fdc54341 (diff) | |
| download | build-6d98d3b9426241983df9ee50fe62dcde8463a010.zip build-6d98d3b9426241983df9ee50fe62dcde8463a010.tar.gz build-6d98d3b9426241983df9ee50fe62dcde8463a010.tar.bz2 | |
am a4ad06ac: am 750e0c08: Merge "Prepare upcoming GCC 4.8 release."
* commit 'a4ad06ac1db1dfc041fe386b76b22233fdc54341':
Prepare upcoming GCC 4.8 release.
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 5319868..c31fe59 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -113,9 +113,10 @@ TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS) # We cannot turn it off blindly since the option is not available # in gcc-4.4.x. We also want to disable sincos optimization globally # by turning off the builtin sin function. -ifneq ($(filter 4.6 4.6.% 4.7 4.7.%, $(TARGET_GCC_VERSION)),) +ifneq ($(filter 4.6 4.6.% 4.7 4.7.% 4.8, $(TARGET_GCC_VERSION)),) TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable -fno-builtin-sin \ - -fno-strict-volatile-bitfields + -fno-strict-volatile-bitfields \ + -Wno-unused-parameter -Wno-unused-but-set-parameter endif # This is to avoid the dreaded warning compiler message: |