diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-03 07:43:46 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-04-03 07:43:46 -0700 |
| commit | 3101e61f5e7e0025d997d218e975b9c715b37648 (patch) | |
| tree | beaccd379606dd4f09c95621d2ad5b78a3809313 /core/clang/config.mk | |
| parent | 16109f6c3886567e21c3aa5f600d219b22107a0e (diff) | |
| parent | e04e91b1fb23218aa5945136a1244ca4b043d57a (diff) | |
| download | build-3101e61f5e7e0025d997d218e975b9c715b37648.zip build-3101e61f5e7e0025d997d218e975b9c715b37648.tar.gz build-3101e61f5e7e0025d997d218e975b9c715b37648.tar.bz2 | |
resolved conflicts for merge of e04e91b1 to master
Change-Id: I537065b0810ea8525401778824c4810c5e7ef433
Diffstat (limited to 'core/clang/config.mk')
| -rw-r--r-- | core/clang/config.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/clang/config.mk b/core/clang/config.mk index 7f3d337..e0d9b2c 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -66,20 +66,22 @@ CLANG_CONFIG_UNKNOWN_CFLAGS := \ -fno-tree-sra \ -fprefetch-loop-arrays \ -funswitch-loops \ - -Werror=unused-but-set-variable \ -Werror=unused-but-set-parameter \ + -Werror=unused-but-set-variable \ -Wmaybe-uninitialized \ -Wno-error=maybe-uninitialized \ - -Wno-error=unused-but-set-variable \ -Wno-error=unused-but-set-parameter \ + -Wno-error=unused-but-set-variable \ -Wno-free-nonheap-object \ -Wno-literal-suffix \ -Wno-maybe-uninitialized \ -Wno-old-style-declaration \ -Wno-psabi \ - -Wno-unused-but-set-variable \ -Wno-unused-but-set-parameter \ - -Wno-unused-local-typedefs + -Wno-unused-but-set-variable \ + -Wno-unused-local-typedefs \ + -Wunused-but-set-parameter \ + -Wunused-but-set-variable # Clang flags for all host rules CLANG_CONFIG_HOST_EXTRA_ASFLAGS := |