diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3b24c239e50..f394db268d1 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-09  Andrew Paprocki  <andrew@ishiboo.com>
+
+	* warning.m4: Adjust egrep pattern for non-GNU compilers.
+	* configure: Regenerate.
+
 2019-01-08  Alan Modra  <amodra@gmail.com>
 
 	PR 23699
diff --git a/bfd/configure b/bfd/configure
index dae6e1f0c52..17960684f88 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -12583,7 +12583,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wshadow"
@@ -12597,7 +12597,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-4]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wstack-usage=262144"
@@ -12612,7 +12612,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   WARN_WRITE_STRINGS="-Wwrite-strings"
@@ -12628,7 +12628,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow"
@@ -12642,7 +12642,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-4]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144"
diff --git a/bfd/warning.m4 b/bfd/warning.m4
index 50f400bdf97..8b0a3427bc7 100644
--- a/bfd/warning.m4
+++ b/bfd/warning.m4
@@ -47,22 +47,22 @@ GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 GCC_WARN_CFLAGS_FOR_BUILD="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 
 # Add -Wshadow if the compiler is a sufficiently recent version of GCC.
-AC_EGREP_CPP([^[0-3]$],[__GNUC__],,GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wshadow")
+AC_EGREP_CPP([(^[0-3]$|^__GNUC__$)],[__GNUC__],,GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wshadow")
 
 # Add -Wstack-usage if the compiler is a sufficiently recent version of GCC.
-AC_EGREP_CPP([^[0-4]$],[__GNUC__],,GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wstack-usage=262144")
+AC_EGREP_CPP([(^[0-4]$|^__GNUC__$)],[__GNUC__],,GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wstack-usage=262144")
 
 # Set WARN_WRITE_STRINGS if the compiler supports -Wwrite-strings.
 WARN_WRITE_STRINGS=""
-AC_EGREP_CPP([^[0-3]$],[__GNUC__],,WARN_WRITE_STRINGS="-Wwrite-strings")
+AC_EGREP_CPP([(^[0-3]$|^__GNUC__$)],[__GNUC__],,WARN_WRITE_STRINGS="-Wwrite-strings")
 
 # Verify CC_FOR_BUILD to be compatible with warning flags
 
 # Add -Wshadow if the compiler is a sufficiently recent version of GCC.
-AC_EGREP_CPP_FOR_BUILD([^[0-3]$],[__GNUC__],,GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow")
+AC_EGREP_CPP_FOR_BUILD([(^[0-3]$|^__GNUC__$)],[__GNUC__],,GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow")
 
 # Add -Wstack-usage if the compiler is a sufficiently recent version of GCC.
-AC_EGREP_CPP_FOR_BUILD([^[0-4]$],[__GNUC__],,GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144")
+AC_EGREP_CPP_FOR_BUILD([(^[0-4]$|^__GNUC__$)],[__GNUC__],,GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144")
 
 AC_ARG_ENABLE(werror,
   [  --enable-werror         treat compile warnings as errors],
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 6007c33b836..a0fadddfad0 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2019-01-09  Andrew Paprocki  <andrew@ishiboo.com>
+
+	* configure: Regenerate.
+
 2019-01-09  Alan Modra  <amodra@gmail.com>
 
 	* testsuite/binutils-all/cxxfilt.exp: Pass --no-strip-underscores
diff --git a/binutils/configure b/binutils/configure
index a2282b23576..38128e146df 100755
--- a/binutils/configure
+++ b/binutils/configure
@@ -12258,7 +12258,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wshadow"
@@ -12272,7 +12272,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-4]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wstack-usage=262144"
@@ -12287,7 +12287,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   WARN_WRITE_STRINGS="-Wwrite-strings"
@@ -12303,7 +12303,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow"
@@ -12317,7 +12317,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-4]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144"
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 35efcbed861..99672d62f54 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2019-01-09  Andrew Paprocki  <andrew@ishiboo.com>
+
+	* configure: Regenerate.
+
 2019-01-08  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
 	* config/tc-aarch64.c (aarch64_cpus): Add ares.
diff --git a/gas/configure b/gas/configure
index 27b6e8e8c6a..ea85e1b43a3 100755
--- a/gas/configure
+++ b/gas/configure
@@ -12145,7 +12145,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wshadow"
@@ -12159,7 +12159,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-4]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wstack-usage=262144"
@@ -12174,7 +12174,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   WARN_WRITE_STRINGS="-Wwrite-strings"
@@ -12190,7 +12190,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow"
@@ -12204,7 +12204,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-4]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144"
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 3fc4606d0a6..d3138f6b273 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,7 @@
+2019-01-09  Andrew Paprocki  <andrew@ishiboo.com>
+
+	* configure: Regenerate.
+
 2019-01-01  Alan Modra  <amodra@gmail.com>
 
 	Update year range in copyright notice of all files.
diff --git a/gold/configure b/gold/configure
index 216af10f3e0..474c69a1258 100755
--- a/gold/configure
+++ b/gold/configure
@@ -7795,7 +7795,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wshadow"
@@ -7809,7 +7809,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-4]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wstack-usage=262144"
@@ -7824,7 +7824,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   WARN_WRITE_STRINGS="-Wwrite-strings"
@@ -7840,7 +7840,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow"
@@ -7854,7 +7854,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-4]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144"
diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 3fc4606d0a6..d3138f6b273 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,7 @@
+2019-01-09  Andrew Paprocki  <andrew@ishiboo.com>
+
+	* configure: Regenerate.
+
 2019-01-01  Alan Modra  <amodra@gmail.com>
 
 	Update year range in copyright notice of all files.
diff --git a/gprof/configure b/gprof/configure
index 447cea78841..f84efaba20c 100755
--- a/gprof/configure
+++ b/gprof/configure
@@ -12405,7 +12405,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wshadow"
@@ -12419,7 +12419,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-4]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wstack-usage=262144"
@@ -12434,7 +12434,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   WARN_WRITE_STRINGS="-Wwrite-strings"
@@ -12450,7 +12450,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow"
@@ -12464,7 +12464,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-4]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144"
diff --git a/ld/ChangeLog b/ld/ChangeLog
index fa35cbfb529..b2f183920ac 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2019-01-09  Andrew Paprocki  <andrew@ishiboo.com>
+
+	* configure: Regenerate.
+
 2019-01-08  Alan Modra  <amodra@gmail.com>
 
 	* testsuite/ld-elf/sec64k.exp: Use . rather than $objdir in
diff --git a/ld/configure b/ld/configure
index 5c536e4e3c2..bc09e7ef811 100755
--- a/ld/configure
+++ b/ld/configure
@@ -15926,7 +15926,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wshadow"
@@ -15940,7 +15940,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-4]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wstack-usage=262144"
@@ -15955,7 +15955,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   WARN_WRITE_STRINGS="-Wwrite-strings"
@@ -15971,7 +15971,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow"
@@ -15985,7 +15985,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-4]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144"
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 278a6165860..437590e8056 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2019-01-09  Andrew Paprocki  <andrew@ishiboo.com>
+
+	* configure: Regenerate.
+
 2019-01-07  Alan Modra  <amodra@gmail.com>
 
 	* configure: Regenerate.
diff --git a/opcodes/configure b/opcodes/configure
index c5923394c12..853849ee587 100755
--- a/opcodes/configure
+++ b/opcodes/configure
@@ -11810,7 +11810,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wshadow"
@@ -11824,7 +11824,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-4]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wstack-usage=262144"
@@ -11839,7 +11839,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   WARN_WRITE_STRINGS="-Wwrite-strings"
@@ -11855,7 +11855,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-3]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow"
@@ -11869,7 +11869,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 __GNUC__
 _ACEOF
 if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
+  $EGREP "(^[0-4]$|^__GNUC__$)" >/dev/null 2>&1; then :
 
 else
   GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144"