aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Makeconfig2
-rw-r--r--Makefile2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d08674e478..b05d6d0e9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-10-21 Joseph Myers <joseph@codesourcery.com>
+ * Makeconfig (+gccwarn-c): Add -Wold-style-definition.
+ * Makefile ($(objpfx)c++-types-check.out): Filter out
+ $(+gccwarn-c) instead of -Wstrict-prototypes.
+
* io/fts.c (fts_open): Convert to prototype-style function
definition.
* malloc/mcheck.c (mcheck): Likewise.
diff --git a/Makeconfig b/Makeconfig
index 1dc522c7ed..f3668c616a 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -752,7 +752,7 @@ endif
ifeq ($(enable-werror),yes)
+gccwarn += -Werror
endif
-+gccwarn-c = -Wstrict-prototypes
++gccwarn-c = -Wstrict-prototypes -Wold-style-definition
# We do not depend on the address of constants in different files to be
# actually different, so allow the compiler to merge them all.
diff --git a/Makefile b/Makefile
index a2abfb9273..b2dd771a19 100644
--- a/Makefile
+++ b/Makefile
@@ -256,7 +256,7 @@ ifneq ($(CXX),no)
vpath c++-types.data $(+sysdep_dirs)
$(objpfx)c++-types-check.out: c++-types.data scripts/check-c++-types.sh
- scripts/check-c++-types.sh $< $(CXX) $(filter-out -std=gnu99 -Wstrict-prototypes,$(CFLAGS)) $(CPPFLAGS) > $@; \
+ scripts/check-c++-types.sh $< $(CXX) $(filter-out -std=gnu99 $(+gccwarn-c),$(CFLAGS)) $(CPPFLAGS) > $@; \
$(evaluate-test)
endif