diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2015-05-01 14:53:59 -0700 |
|---|---|---|
| committer | Chih-hung Hsieh <chh@google.com> | 2015-05-06 00:24:18 +0000 |
| commit | 0ba68bafa3b465110d10da1a57a1843ff91b2f3a (patch) | |
| tree | 5b15e52aa9d1bca6543893d58e0c691c84299bf7 /core/clang | |
| parent | 4f5d0e60b441f009f78ef6595172ffa11dd69a2d (diff) | |
| download | build-0ba68bafa3b465110d10da1a57a1843ff91b2f3a.zip build-0ba68bafa3b465110d10da1a57a1843ff91b2f3a.tar.gz build-0ba68bafa3b465110d10da1a57a1843ff91b2f3a.tar.bz2 | |
Upgrade x86 gcc to 4.9 and disable devirtualization.
Also filter out gcc-only flags -Wno-clobbered and -fno-devirtualize
when compiled with clang/llvm.
BUG: 19872411
Change-Id: I6de57583be04da607f569df65e93531787dbb789
(cherry picked from AOSP commit 90036610ddfe0455553a1b46bb8adbeafde0cac1)
Diffstat (limited to 'core/clang')
| -rw-r--r-- | core/clang/config.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/clang/config.mk b/core/clang/config.mk index 505d441..6da90ec 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -68,12 +68,15 @@ CLANG_CONFIG_UNKNOWN_CFLAGS := \ -finline-functions \ -finline-limit=64 \ -fno-canonical-system-headers \ + -Wno-clobbered \ + -fno-devirtualize \ -fno-tree-sra \ -fprefetch-loop-arrays \ -funswitch-loops \ -Werror=unused-but-set-parameter \ -Werror=unused-but-set-variable \ -Wmaybe-uninitialized \ + -Wno-error=clobbered \ -Wno-error=maybe-uninitialized \ -Wno-error=unused-but-set-parameter \ -Wno-error=unused-but-set-variable \ |