diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | configure | 27 | ||||
| -rw-r--r-- | configure.in | 18 |
3 files changed, 23 insertions, 28 deletions
@@ -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. @@ -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 |