diff options
| author | Kelley Cook <kcook@gcc.gnu.org> | 2004-11-25 13:43:43 +0000 |
|---|---|---|
| committer | R. Kelley Cook <kcook@gcc.gnu.org> | 2004-11-25 13:43:43 +0000 |
| commit | 767f726e10c6ce110d6983002c5b96ad65afe677 (patch) | |
| tree | 8b914557e6af6d411adee53b28a5e2b77632a6ae /libjava | |
| parent | b269c22bbbaa940fa62cf38afa1d2fcb521c6c72 (diff) | |
| download | gcc-767f726e10c6ce110d6983002c5b96ad65afe677.zip gcc-767f726e10c6ce110d6983002c5b96ad65afe677.tar.gz gcc-767f726e10c6ce110d6983002c5b96ad65afe677.tar.bz2 | |
libtool.m4 (AC_DEPLIBS_CHECK_METHOD): Revert previous change.
2004-11-24 Kelley Cook <kcook@gcc.gnu.org>
* 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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rwxr-xr-x | libjava/configure | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f762e85..1de7a72 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2004-11-25 Kelley Cook <kcook@gcc.gnu.org> + + * configure: Regenerate for libtool reversion. + 2004-11-25 Michael Koch <konqueror@gmx.de> * Makefile.am: Added most of javax.print again. diff --git a/libjava/configure b/libjava/configure index cf52939..bfaf3c8 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() |