resolved conflicts for merge of e04e91b1 to master
Change-Id: I537065b0810ea8525401778824c4810c5e7ef433
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 @@
-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 :=