From: Nick Alcock <nick.alcock@oracle.com>
To: binutils@sourceware.org
Subject: [PATCH 3/4] Regenerate affected configures.
Date: Fri, 16 Dec 2022 13:25:40 +0000 [thread overview]
Message-ID: <20221216132541.45791-4-nick.alcock@oracle.com> (raw)
In-Reply-To: <20221216132541.45791-1-nick.alcock@oracle.com>
---
bfd/configure | 17 ++++++++++-------
binutils/configure | 17 ++++++++++-------
gas/configure | 17 ++++++++++-------
gprof/configure | 17 ++++++++++-------
gprofng/configure | 17 ++++++++++-------
gprofng/libcollector/configure | 17 ++++++++++-------
ld/configure | 17 ++++++++++-------
libbacktrace/configure | 17 ++++++++++-------
libctf/configure | 17 ++++++++++-------
libsframe/configure | 17 ++++++++++-------
opcodes/configure | 17 ++++++++++-------
sim/configure | 17 ++++++++++-------
zlib/configure | 12 +++++++-----
13 files changed, 127 insertions(+), 89 deletions(-)
diff --git a/bfd/configure b/bfd/configure
index b532fe7e8af..bbc0776cf0c 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -5440,15 +5440,18 @@ else
tmp_nm_to_nm="`$ECHO "$tmp_nm" | sed 's, -.*$,,'`"
if test -f "$tmp_nm_to_nm" || test -f "$tmp_nm_to_nm$ac_exeext" ; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # We discard lines that mention 'unknown', 'invalid', or 'usage', hopefully
+ # placating systems like Darwin and HP-UX, which mention the name of nm
+ # in error output.
# nm: unknown option "B" ignored
- case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
+ case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | $GREP -v 'sage: ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
+ lt_cv_path_NM="$tmp_nm -B"
break
;;
*)
- case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*)
+ case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | $GREP -v 'sage: ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
lt_cv_path_NM="$tmp_nm -p"
break
;;
@@ -11106,7 +11109,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11109 "configure"
+#line 11112 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11212,7 +11215,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11215 "configure"
+#line 11218 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/binutils/configure b/binutils/configure
index 5a3e5017b46..40a1926c81b 100755
--- a/binutils/configure
+++ b/binutils/configure
@@ -5120,15 +5120,18 @@ else
tmp_nm_to_nm="`$ECHO "$tmp_nm" | sed 's, -.*$,,'`"
if test -f "$tmp_nm_to_nm" || test -f "$tmp_nm_to_nm$ac_exeext" ; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # We discard lines that mention 'unknown', 'invalid', or 'usage', hopefully
+ # placating systems like Darwin and HP-UX, which mention the name of nm
+ # in error output.
# nm: unknown option "B" ignored
- case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
+ case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | $GREP -v 'sage: ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
+ lt_cv_path_NM="$tmp_nm -B"
break
;;
*)
- case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*)
+ case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | $GREP -v 'sage: ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
lt_cv_path_NM="$tmp_nm -p"
break
;;
@@ -10817,7 +10820,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10820 "configure"
+#line 10823 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10923,7 +10926,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10926 "configure"
+#line 10929 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/gas/configure b/gas/configure
index 1b53c03d04f..7c7dfda663b 100755
--- a/gas/configure
+++ b/gas/configure
@@ -5029,15 +5029,18 @@ else
tmp_nm_to_nm="`$ECHO "$tmp_nm" | sed 's, -.*$,,'`"
if test -f "$tmp_nm_to_nm" || test -f "$tmp_nm_to_nm$ac_exeext" ; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # We discard lines that mention 'unknown', 'invalid', or 'usage', hopefully
+ # placating systems like Darwin and HP-UX, which mention the name of nm
+ # in error output.
# nm: unknown option "B" ignored
- case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
+ case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | $GREP -v 'sage: ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
+ lt_cv_path_NM="$tmp_nm -B"
break
;;
*)
- case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*)
+ case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | $GREP -v 'sage: ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
lt_cv_path_NM="$tmp_nm -p"
break
;;
@@ -10726,7 +10729,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10729 "configure"
+#line 10732 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10832,7 +10835,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10835 "configure"
+#line 10838 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/gprof/configure b/gprof/configure
index cb150353050..d574ac46278 100755
--- a/gprof/configure
+++ b/gprof/configure
@@ -4907,15 +4907,18 @@ else
tmp_nm_to_nm="`$ECHO "$tmp_nm" | sed 's, -.*$,,'`"
if test -f "$tmp_nm_to_nm" || test -f "$tmp_nm_to_nm$ac_exeext" ; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # We discard lines that mention 'unknown' or 'invalid', hopefully
+ # placating systems like Darwin and HP-UX, which mention the name of nm
+ # in error output.
# nm: unknown option "B" ignored
- case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
+ case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
+ lt_cv_path_NM="$tmp_nm -B"
break
;;
*)
- case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*)
+ case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
lt_cv_path_NM="$tmp_nm -p"
break
;;
@@ -10604,7 +10607,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10607 "configure"
+#line 10610 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10710,7 +10713,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10713 "configure"
+#line 10716 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/gprofng/configure b/gprofng/configure
index 8ad5ebd67be..60ff32d411b 100755
--- a/gprofng/configure
+++ b/gprofng/configure
@@ -6553,15 +6553,18 @@ else
tmp_nm_to_nm="`$ECHO "$tmp_nm" | sed 's, -.*$,,'`"
if test -f "$tmp_nm_to_nm" || test -f "$tmp_nm_to_nm$ac_exeext" ; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # We discard lines that mention 'unknown' or 'invalid', hopefully
+ # placating systems like Darwin and HP-UX, which mention the name of nm
+ # in error output.
# nm: unknown option "B" ignored
- case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
+ case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
+ lt_cv_path_NM="$tmp_nm -B"
break
;;
*)
- case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*)
+ case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
lt_cv_path_NM="$tmp_nm -p"
break
;;
@@ -12221,7 +12224,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12224 "configure"
+#line 12227 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12327,7 +12330,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12330 "configure"
+#line 12333 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/gprofng/libcollector/configure b/gprofng/libcollector/configure
index bd40838425c..fa1861aa8ac 100755
--- a/gprofng/libcollector/configure
+++ b/gprofng/libcollector/configure
@@ -6366,15 +6366,18 @@ else
tmp_nm_to_nm="`$ECHO "$tmp_nm" | sed 's, -.*$,,'`"
if test -f "$tmp_nm_to_nm" || test -f "$tmp_nm_to_nm$ac_exeext" ; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # We discard lines that mention 'unknown' or 'invalid', hopefully
+ # placating systems like Darwin and HP-UX, which mention the name of nm
+ # in error output.
# nm: unknown option "B" ignored
- case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
+ case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
+ lt_cv_path_NM="$tmp_nm -B"
break
;;
*)
- case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*)
+ case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
lt_cv_path_NM="$tmp_nm -p"
break
;;
@@ -12064,7 +12067,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12067 "configure"
+#line 12070 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12170,7 +12173,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12173 "configure"
+#line 12176 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/ld/configure b/ld/configure
index a4d30abfb1c..371fc2bac7c 100755
--- a/ld/configure
+++ b/ld/configure
@@ -5927,15 +5927,18 @@ else
tmp_nm_to_nm="`$ECHO "$tmp_nm" | sed 's, -.*$,,'`"
if test -f "$tmp_nm_to_nm" || test -f "$tmp_nm_to_nm$ac_exeext" ; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # We discard lines that mention 'unknown', 'invalid', or 'usage', hopefully
+ # placating systems like Darwin and HP-UX, which mention the name of nm
+ # in error output.
# nm: unknown option "B" ignored
- case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
+ case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | $GREP -v 'sage: ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
+ lt_cv_path_NM="$tmp_nm -B"
break
;;
*)
- case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*)
+ case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | $GREP -v 'sage: ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
lt_cv_path_NM="$tmp_nm -p"
break
;;
@@ -11625,7 +11628,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11628 "configure"
+#line 11631 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11731,7 +11734,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11734 "configure"
+#line 11737 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/libbacktrace/configure b/libbacktrace/configure
index 406b67b8cbc..0bcca435c63 100755
--- a/libbacktrace/configure
+++ b/libbacktrace/configure
@@ -5843,15 +5843,18 @@ else
tmp_nm_to_nm="`$ECHO "$tmp_nm" | sed 's, -.*$,,'`"
if test -f "$tmp_nm_to_nm" || test -f "$tmp_nm_to_nm$ac_exeext" ; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # We discard lines that mention 'unknown', 'invalid', or 'usage', hopefully
+ # placating systems like Darwin and HP-UX, which mention the name of nm
+ # in error output.
# nm: unknown option "B" ignored
- case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
+ case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | $GREP -v 'sage: ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
+ lt_cv_path_NM="$tmp_nm -B"
break
;;
*)
- case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*)
+ case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | $GREP -v 'sage: ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
lt_cv_path_NM="$tmp_nm -p"
break
;;
@@ -11540,7 +11543,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11543 "configure"
+#line 11546 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11646,7 +11649,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11649 "configure"
+#line 11652 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/libctf/configure b/libctf/configure
index 17463a74cca..cf63ded9eec 100755
--- a/libctf/configure
+++ b/libctf/configure
@@ -5965,15 +5965,18 @@ else
tmp_nm_to_nm="`$ECHO "$tmp_nm" | sed 's, -.*$,,'`"
if test -f "$tmp_nm_to_nm" || test -f "$tmp_nm_to_nm$ac_exeext" ; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # We discard lines that mention 'unknown', 'invalid', or 'usage', hopefully
+ # placating systems like Darwin and HP-UX, which mention the name of nm
+ # in error output.
# nm: unknown option "B" ignored
- case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
+ case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | $GREP -v 'sage: ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
+ lt_cv_path_NM="$tmp_nm -B"
break
;;
*)
- case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*)
+ case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | $GREP -v 'sage: ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
lt_cv_path_NM="$tmp_nm -p"
break
;;
@@ -11632,7 +11635,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11635 "configure"
+#line 11638 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11738,7 +11741,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11741 "configure"
+#line 11744 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/libsframe/configure b/libsframe/configure
index 7bbed5d8ccf..12de8b35e00 100755
--- a/libsframe/configure
+++ b/libsframe/configure
@@ -5776,15 +5776,18 @@ else
tmp_nm_to_nm="`$ECHO "$tmp_nm" | sed 's, -.*$,,'`"
if test -f "$tmp_nm_to_nm" || test -f "$tmp_nm_to_nm$ac_exeext" ; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # We discard lines that mention 'unknown', 'invalid', or 'usage', hopefully
+ # placating systems like Darwin and HP-UX, which mention the name of nm
+ # in error output.
# nm: unknown option "B" ignored
- case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
+ case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | $GREP -v 'sage: ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
+ lt_cv_path_NM="$tmp_nm -B"
break
;;
*)
- case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*)
+ case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | $GREP -v 'sage: ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
lt_cv_path_NM="$tmp_nm -p"
break
;;
@@ -11443,7 +11446,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11446 "configure"
+#line 11449 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11549,7 +11552,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11552 "configure"
+#line 11555 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/opcodes/configure b/opcodes/configure
index 9dc87d6c19c..822af4377ba 100755
--- a/opcodes/configure
+++ b/opcodes/configure
@@ -5374,15 +5374,18 @@ else
tmp_nm_to_nm="`$ECHO "$tmp_nm" | sed 's, -.*$,,'`"
if test -f "$tmp_nm_to_nm" || test -f "$tmp_nm_to_nm$ac_exeext" ; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # We discard lines that mention 'unknown' or 'invalid', hopefully
+ # placating systems like Darwin and HP-UX, which mention the name of nm
+ # in error output.
# nm: unknown option "B" ignored
- case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
+ case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
+ lt_cv_path_NM="$tmp_nm -B"
break
;;
*)
- case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*)
+ case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
lt_cv_path_NM="$tmp_nm -p"
break
;;
@@ -11041,7 +11044,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11044 "configure"
+#line 11047 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11147,7 +11150,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11150 "configure"
+#line 11153 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/sim/configure b/sim/configure
index 57c4fcf6972..2ee39ad371e 100755
--- a/sim/configure
+++ b/sim/configure
@@ -6020,15 +6020,18 @@ else
tmp_nm_to_nm="`$ECHO "$tmp_nm" | sed 's, -.*$,,'`"
if test -f "$tmp_nm_to_nm" || test -f "$tmp_nm_to_nm$ac_exeext" ; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # We discard lines that mention 'unknown', 'invalid', or 'usage', hopefully
+ # placating systems like Darwin and HP-UX, which mention the name of nm
+ # in error output.
# nm: unknown option "B" ignored
- case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
+ case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | $GREP -v 'sage: ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
+ lt_cv_path_NM="$tmp_nm -B"
break
;;
*)
- case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
- *$tmp_nm*)
+ case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v 'nknown ' | $GREP -v 'nvalid ' | $GREP -v 'sage: ' | sed '1q'` in
+ *$tmp_nm*|*\ \ \ [A-Za-z]\ *|*[0-9a-f][0-9a-f][0-9a-f]\ [A-Za-z]\ *)
lt_cv_path_NM="$tmp_nm -p"
break
;;
@@ -12431,7 +12434,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12434 "configure"
+#line 12437 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12537,7 +12540,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12540 "configure"
+#line 12543 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/zlib/configure b/zlib/configure
index e65ade3badd..e549fbdafae 100755
--- a/zlib/configure
+++ b/zlib/configure
@@ -4713,14 +4713,16 @@ else
tmp_nm_to_nm="`$ECHO "$tmp_nm" | sed 's, -.*$,,'`"
if test -f "$tmp_nm_to_nm" || test -f "$tmp_nm_to_nm$ac_exeext" ; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # We discard lines that mention 'unknown' or 'invalid', hopefully
+ # placating systems like Darwin and HP-UX, which mention the name of nm
+ # in error output.
# nm: unknown option "B" ignored
- case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
+ case `"$tmp_nm" -B "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v ' unknown ' | $GREP -v 'invalid '` in
*$tmp_nm*) lt_cv_path_NM="$tmp_nm -B"
break
;;
*)
- case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | grep -v '^ *$' | sed '1q'` in
+ case `"$tmp_nm" -p "$tmp_nm_to_nm" 2>&1 | $GREP -v '^ *$' | $GREP -v ' unknown ' | $GREP -v 'invalid '` in
*$tmp_nm*)
lt_cv_path_NM="$tmp_nm -p"
break
@@ -10711,7 +10713,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10714 "configure"
+#line 10716 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10817,7 +10819,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10820 "configure"
+#line 10822 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
--
2.39.0.267.g7648178303
next prev parent reply other threads:[~2022-12-16 13:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-16 13:25 [PATCH 0/4] A few backlogged build-system problems Nick Alcock
2022-12-16 13:25 ` [PATCH 1/4] ctf: fix various dreadful typos in the ctf_archive format comments Nick Alcock
2022-12-16 13:25 ` [PATCH 2/4] libtool.m4: adjust kludge for ignoring syntax errors Nick Alcock
2022-12-16 13:54 ` Andreas Schwab
2022-12-16 15:11 ` Nick Alcock
2022-12-16 15:18 ` Andreas Schwab
2022-12-19 17:30 ` Nick Alcock
2022-12-16 13:25 ` Nick Alcock [this message]
2022-12-16 13:25 ` [PATCH 4/4] libctf: skip the testsuite from inside dejagnu Nick Alcock
2022-12-20 12:53 ` [PATCH 0/4] A few backlogged build-system problems Alan Modra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221216132541.45791-4-nick.alcock@oracle.com \
--to=nick.alcock@oracle.com \
--cc=binutils@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).