From cd92532749dafc2e3694264131245ab354de4546 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Tue, 19 Nov 2002 22:14:48 +0000
Subject: [PATCH] 2002-11-19  Roland McGrath  <roland@redhat.com>

	* configure.in (libc_cv_gcc_dwarf2_unwind_info check): Use libraries
	`-lgcc -lgcc_eh -lgcc', not just `-lgcc -lgcc_eh' in link commands for
	test leading to libc_cv_gcc_dwarf2_unwind_info=no_registry_needed.
	* configure: Regenerated.
---
 configure    | 15 ++++++++-------
 configure.in | 11 ++++++-----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index 33737d603c..0176878bfe 100755
--- a/configure
+++ b/configure
@@ -5301,16 +5301,17 @@ if { ac_try='${CC-cc} $CFLAGS -DCHECK__register_frame_info
 else
   libc_cv_gcc_dwarf2_unwind_info=no
 fi
-if { ac_try='${CC-cc} $CFLAGS -DCHECK__register_frame_info
-                            -nostdlib -nostartfiles
-                            -o conftest conftest.c -lgcc -lgcc_eh >&5'
+# Some platforms' specs put -lgcc first.  The second one doesn't hurt.
+libc_unwind_check="${CC-cc} $CFLAGS -DCHECK__register_frame_info \
+                            -nostdlib -nostartfiles -o conftest conftest.c \
+			    -lgcc -lgcc_eh -lgcc"
+if { ac_try='$libc_unwind_check >&5'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  if ${CC-cc} $CFLAGS -DCHECK__register_frame_info -nostdlib -nostartfiles \
-     -o conftest conftest.c -lgcc -lgcc_eh -v 2>&1 >/dev/null \
+  if $libc_unwind_check -v 2>&1 >/dev/null \
      | grep -q -- --eh-frame-hdr; then
     libc_cv_gcc_dwarf2_unwind_info=no_registry_needed
   else
@@ -5362,7 +5363,7 @@ if test "${libc_cv_gcc_builtin_expect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat > conftest.c <<EOF
-#line 5365 "configure"
+#line 5366 "configure"
 int foo (int a)
 {
   a = __builtin_expect (a, 10);
@@ -5430,7 +5431,7 @@ if test "${libc_cv_gcc_subtract_local_labels+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat > conftest.c <<EOF
-#line 5433 "configure"
+#line 5434 "configure"
 int foo (int a)
 {
   static const int ar[] = { &&l1 - &&l1, &&l2 - &&l1 };
diff --git a/configure.in b/configure.in
index 9dc94f50e6..2804c3f8b1 100644
--- a/configure.in
+++ b/configure.in
@@ -1544,11 +1544,12 @@ if AC_TRY_COMMAND([${CC-cc} $CFLAGS -DCHECK__register_frame_info
 else
   libc_cv_gcc_dwarf2_unwind_info=no
 fi
-if AC_TRY_COMMAND([${CC-cc} $CFLAGS -DCHECK__register_frame_info
-                            -nostdlib -nostartfiles
-                            -o conftest conftest.c -lgcc -lgcc_eh >&AS_MESSAGE_LOG_FD]); then
-  if ${CC-cc} $CFLAGS -DCHECK__register_frame_info -nostdlib -nostartfiles \
-     -o conftest conftest.c -lgcc -lgcc_eh -v 2>&1 >/dev/null \
+# Some platforms' specs put -lgcc first.  The second one doesn't hurt.
+libc_unwind_check="${CC-cc} $CFLAGS -DCHECK__register_frame_info \
+                            -nostdlib -nostartfiles -o conftest conftest.c \
+			    -lgcc -lgcc_eh -lgcc"
+if AC_TRY_COMMAND([$libc_unwind_check >&AS_MESSAGE_LOG_FD]); then
+  if $libc_unwind_check -v 2>&1 >/dev/null \
      | grep -q -- --eh-frame-hdr; then
     libc_cv_gcc_dwarf2_unwind_info=no_registry_needed
   else
-- 
2.43.5