aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2003-04-02 20:03:30 +0000
committerRoland McGrath <roland@gnu.org>2003-04-02 20:03:30 +0000
commit426074293fbc1c90585b2864416ff506cdf7eda5 (patch)
tree9d6f8f58e86ab971f0c50d237fb436c6f50e3461
parentfabb2e1c04a9ec95ddeb4a506e5f3deda01202fe (diff)
downloadglibc-426074293fbc1c90585b2864416ff506cdf7eda5.tar
glibc-426074293fbc1c90585b2864416ff506cdf7eda5.tar.gz
glibc-426074293fbc1c90585b2864416ff506cdf7eda5.tar.bz2
glibc-426074293fbc1c90585b2864416ff506cdf7eda5.zip
* configure.in: Check for __register_frame_info in both
-lgcc and -lgcc_eh. * configure: Regenerated.
-rw-r--r--ChangeLog6
-rwxr-xr-xconfigure27
-rw-r--r--configure.in18
3 files changed, 23 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog
index 7983796b50..275bcbc878 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-02 Daniel Jacobowitz <drow@mvista.com>
+
+ * configure.in: Check for __register_frame_info in both
+ -lgcc and -lgcc_eh.
+ * configure: Regenerated.
+
2003-04-01 Roland McGrath <roland@redhat.com>
* scripts/abilist.awk: Allow dots in soname suffix.
diff --git a/configure b/configure
index e5d3205af8..31a2a6e0ef 100755
--- a/configure
+++ b/configure
@@ -5548,28 +5548,23 @@ abort () {}
__bzero () {}
dl_iterate_phdr () {}
EOF
-if { ac_try='${CC-cc} $CFLAGS -DCHECK__register_frame_info
- -nostdlib -nostartfiles
- -o conftest conftest.c -lgcc >&5'
+libc_unwind_check="${CC-cc} $CFLAGS -DCHECK__register_frame_info \
+ -nostdlib -nostartfiles -o conftest conftest.c \
+ -lgcc"
+# Some platforms' specs put -lgcc first. The second one doesn't hurt.
+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
- libc_cv_gcc_dwarf2_unwind_info=static
-else
- libc_cv_gcc_dwarf2_unwind_info=no
-fi
-# 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'
+ (exit $ac_status); }; } ||
+ { ac_try='$libc_unwind_check -lgcc_eh -lgcc >&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
+ (exit $ac_status); }; }
+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
@@ -5622,7 +5617,7 @@ if test "${libc_cv_gcc_builtin_expect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat > conftest.c <<EOF
-#line 5625 "configure"
+#line 5620 "configure"
int foo (int a)
{
a = __builtin_expect (a, 10);
@@ -5690,7 +5685,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 5693 "configure"
+#line 5688 "configure"
int foo (int a)
{
static const int ar[] = { &&l1 - &&l1, &&l2 - &&l1 };
diff --git a/configure.in b/configure.in
index 083929cc38..f71f984439 100644
--- a/configure.in
+++ b/configure.in
@@ -1604,19 +1604,13 @@ abort () {}
__bzero () {}
dl_iterate_phdr () {}
EOF
-dnl No \ in command here because it ends up inside ''.
-if AC_TRY_COMMAND([${CC-cc} $CFLAGS -DCHECK__register_frame_info
- -nostdlib -nostartfiles
- -o conftest conftest.c -lgcc >&AS_MESSAGE_LOG_FD]); then
- libc_cv_gcc_dwarf2_unwind_info=static
-else
- libc_cv_gcc_dwarf2_unwind_info=no
-fi
-# 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
+ -nostdlib -nostartfiles -o conftest conftest.c \
+ -lgcc"
+# Some platforms' specs put -lgcc first. The second one doesn't hurt.
+if AC_TRY_COMMAND([$libc_unwind_check >&AS_MESSAGE_LOG_FD]) ||
+ AC_TRY_COMMAND([$libc_unwind_check -lgcc_eh -lgcc >&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