From 767f726e10c6ce110d6983002c5b96ad65afe677 Mon Sep 17 00:00:00 2001 From: Kelley Cook Date: Thu, 25 Nov 2004 13:43:43 +0000 Subject: [PATCH] libtool.m4 (AC_DEPLIBS_CHECK_METHOD): Revert previous change. 2004-11-24 Kelley Cook * libtool.m4 (AC_DEPLIBS_CHECK_METHOD): Revert previous change. * boehm-gc/configure: Regenerate. * libffi/configure: Regenerate. * libgfortran/configure: Regenerate. * libjava/configure: Regenerate. * libobjc/configure: Regenerate. * libstdc++-v3/configure: Regenerate. * zlib/configure: Regenerate. From-SVN: r91293 --- ChangeLog | 4 ++++ boehm-gc/ChangeLog | 4 ++++ boehm-gc/configure | 11 +++++++++-- libffi/ChangeLog | 4 ++++ libffi/configure | 11 +++++++++-- libgfortran/ChangeLog | 4 ++++ libjava/ChangeLog | 4 ++++ libjava/configure | 13 ++++++++++--- libobjc/ChangeLog | 4 ++++ libobjc/configure | 13 ++++++++++--- libstdc++-v3/ChangeLog | 4 ++++ libtool.m4 | 9 ++++++++- zlib/ChangeLog.gcj | 4 ++++ 13 files changed, 78 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1231d5614f7..abcd029d7f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-11-24 Kelley Cook + + * libtool.m4 (AC_DEPLIBS_CHECK_METHOD): Revert previous change. + 2004-11-24 Kelley Cook * libtool.m4 (AC_DEPLIBS_CHECK_METHOD): Import linux-gnu case diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index b9ecc61ba45..8baf7f7caa5 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,7 @@ +2004-11-25 Kelley Cook + + * configure: Regenerate for libtool reversion. + 2004-11-24 Kelley Cook * configure: Regenerate for libtool change. diff --git a/boehm-gc/configure b/boehm-gc/configure index 0f659721a87..b950a0706c4 100755 --- a/boehm-gc/configure +++ b/boehm-gc/configure @@ -4317,7 +4317,14 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) - lt_cv_deplibs_check_method=pass_all + case $host_cpu in + alpha* | mips* | hppa* | i*86 | powerpc* | sparc* | ia64* | sh* ) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; netbsd* | knetbsd*-gnu) @@ -4712,7 +4719,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4715 "configure"' > conftest.$ac_ext + echo '#line 4722 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 550763066ec..38489a1b6b3 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,7 @@ +2004-11-25 Kelley Cook + + * configure: Regenerate for libtool reversion. + 2004-11-24 Kelley Cook * configure: Regenerate for libtool change. diff --git a/libffi/configure b/libffi/configure index 13231dfd9f9..f8c08d140fd 100755 --- a/libffi/configure +++ b/libffi/configure @@ -3454,7 +3454,14 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) - lt_cv_deplibs_check_method=pass_all + case $host_cpu in + alpha* | mips* | hppa* | i*86 | powerpc* | sparc* | ia64* | sh* ) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; netbsd* | knetbsd*-gnu) @@ -3849,7 +3856,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3852 "configure"' > conftest.$ac_ext + echo '#line 3859 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index b87f96e431e..f4019cfe740 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,7 @@ +2004-11-25 Kelley Cook + + * configure: Regenerate for libtool reversion. + 2004-11-24 Kelley Cook * configure: Regenerate for libtool change. diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f762e8567bf..1de7a726d17 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2004-11-25 Kelley Cook + + * configure: Regenerate for libtool reversion. + 2004-11-25 Michael Koch * Makefile.am: Added most of javax.print again. diff --git a/libjava/configure b/libjava/configure index cf52939df11..bfaf3c8d485 100755 --- a/libjava/configure +++ b/libjava/configure @@ -4349,7 +4349,14 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) - lt_cv_deplibs_check_method=pass_all + case $host_cpu in + alpha* | mips* | hppa* | i*86 | powerpc* | sparc* | ia64* | sh* ) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; netbsd* | knetbsd*-gnu) @@ -4743,7 +4750,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4746 "configure"' > conftest.$ac_ext + echo '#line 4753 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5774,7 +5781,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : else cat > conftest.$ac_ext << EOF -#line 5777 "configure" +#line 5784 "configure" struct S { ~S(); }; void bar(); void foo() diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 263d78837e0..40c5b293265 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,7 @@ +2004-11-25 Kelley Cook + + * configure: Regenerate for libtool reversion. + 2004-11-24 Kelley Cook * configure: Regenerate for libtool change. diff --git a/libobjc/configure b/libobjc/configure index cd384a5be7a..a3588e8a587 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -3269,7 +3269,14 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) - lt_cv_deplibs_check_method=pass_all + case $host_cpu in + alpha* | mips* | hppa* | i*86 | powerpc* | sparc* | ia64* | sh* ) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; netbsd* | knetbsd*-gnu) @@ -3664,7 +3671,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3667 "configure"' > conftest.$ac_ext + echo '#line 3674 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5099,7 +5106,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : else cat > conftest.$ac_ext << EOF -#line 5102 "configure" +#line 5109 "configure" @interface Frob @end @implementation Frob diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8d15e66b0dc..e4622993e7a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2004-11-25 Kelley Cook + + * configure: Regenerate for libtool reversion. + 2004-11-24 Kelley Cook * configure: Regenerate for libtool change. diff --git a/libtool.m4 b/libtool.m4 index 60121579faf..dec9f01f3fa 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -679,7 +679,14 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) - lt_cv_deplibs_check_method=pass_all + case $host_cpu in + alpha* | mips* | hppa* | i*86 | powerpc* | sparc* | ia64* | sh* ) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM + lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; netbsd* | knetbsd*-gnu) diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj index 36a9a169b19..fc80dbac394 100644 --- a/zlib/ChangeLog.gcj +++ b/zlib/ChangeLog.gcj @@ -1,3 +1,7 @@ +2004-11-25 Kelley Cook + + * configure: Regenerate for libtool reversion. + 2004-11-24 Kelley Cook * configure: Regenerate for libtool change.