From: Theodore Ts'o <tytso@mit.edu>
Date: Wed, 1 Jan 2020 00:48:37 +0000 (-0500)
Subject: Drop use of -pedantic when doing gcc-wall
X-Git-Tag: v1.45.5~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84486e5432bc60d0c1db818cbba9f5befe62fd9b;p=thirdparty%2Fe2fsprogs.git

Drop use of -pedantic when doing gcc-wall

With newer versions of gcc -pedantic is *super* pedantic, and
generates way too much noise.  So we drop it, and thus we don't need
util/gcc-wall-cleanup and util/static-analysis-cleanup.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/MCONFIG.in b/MCONFIG.in
index d24f7ef2c..6151825ac 100644
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -213,8 +213,7 @@ DEP_INSTALL_SYMLINK = $(top_builddir)/util/install-symlink \
 # Run make gcc-wall to do a build with warning messages.
 #
 #
-WFLAGS=		-std=gnu99 -D_XOPEN_SOURCE=600 -D_GNU_SOURCE \
-			-pedantic $(WFLAGS_EXTRA) \
+WFLAGS=		-std=gnu99 -D_XOPEN_SOURCE=600 -D_GNU_SOURCE $(WFLAGS_EXTRA) \
 			-Wall -W -Wwrite-strings -Wpointer-arith \
 			-Wcast-qual -Wcast-align -Wno-variadic-macros \
 			-Wstrict-prototypes -Wmissing-prototypes \
@@ -224,14 +223,14 @@ WFLAGS=		-std=gnu99 -D_XOPEN_SOURCE=600 -D_GNU_SOURCE \
 			-UENABLE_NLS
 
 gcc-wall-new:
-	($(MAKE) CFLAGS_WARN="$(WFLAGS)" > /dev/null) 2>&1 | sed -f $(top_srcdir)/util/gcc-wall-cleanup
+	($(MAKE) CFLAGS_WARN="$(WFLAGS)" > /dev/null) 2>&1
 
 gcc-wall:
 	$(MAKE) clean > /dev/null
 	$(MAKE) gcc-wall-new
 
 static-check:
-	($(MAKE) C=1 V=1 CFLAGS="$(ALL_CFLAGS) $(WFLAGS)") 2>&1 | sed -f $(top_srcdir)/util/static-analysis-cleanup
+	($(MAKE) C=1 V=1 CFLAGS="$(ALL_CFLAGS) $(WFLAGS)") 2>&1
 
 static-check-all:
 	$(MAKE) clean > /dev/null
diff --git a/util/gcc-wall-cleanup b/util/gcc-wall-cleanup
deleted file mode 100644
index cef7a2dcf..000000000
--- a/util/gcc-wall-cleanup
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sed -f
-#
-# This script filters out gcc-wall crud that we're not interested in seeing.
-#
-/^cc /d
-/^kcc /d
-/^gcc /d
-/does not support `long long'/d
-/forbids long long integer constants/d
-/does not support the `ll' length modifier/d
-/does not support the `ll' printf length modifier/d
-/ANSI C forbids long long integer constants/d
-/traditional C rejects string concatenation/d
-/integer constant is unsigned in ANSI C, signed with -traditional/d
-/ISO C forbids conversion of object pointer to function pointer type/,+2d
-/ISO C does not support ‘__FUNCTION__’ predefined identifier/d
-/At top level:/d
-/In file included from/d
-/In function `.*':/d
-/zero-length format string/d
-/warning: (near initialization for/d
-/^[ 	]*from/d
-
diff --git a/util/static-analysis-cleanup b/util/static-analysis-cleanup
deleted file mode 100644
index 674925979..000000000
--- a/util/static-analysis-cleanup
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sed -f
-#
-# This script filters out gcc-wall crud that we're not interested in seeing.
-#
-/^cc /d
-/^kcc /d
-/^gcc /d
-/does not support `long long'/d
-/forbids long long integer constants/d
-/does not support the `ll' length modifier/d
-/does not support the `ll' printf length modifier/d
-/ANSI C forbids long long integer constants/d
-/traditional C rejects string concatenation/d
-/integer constant is unsigned in ANSI C, signed with -traditional/d
-/warning: missing initializer/d
-/warning: (near initialization for/d
-/^[ 	]*from/d
-/unused parameter/d
-/e2_types.h" not found.$/d
-/e2_bitops.h" not found.$/d