aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog5
-rwxr-xr-xbfd/configure10
-rw-r--r--bfd/warning.m410
3 files changed, 15 insertions, 10 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3b24c23..f394db2 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 dae6e1f..1796068 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 50f400b..8b0a342 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],