diff --git a/ChangeLog b/ChangeLog
index 1231d5614f7e0ff0b346563eccd89fdb9e321a9f..abcd029d7f9b83ad3c3731deb98b64e427ff49c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-24  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* libtool.m4 (AC_DEPLIBS_CHECK_METHOD): Revert previous change.
+
 2004-11-24  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* libtool.m4 (AC_DEPLIBS_CHECK_METHOD): Import linux-gnu case
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index b9ecc61ba455e0c44ab6117e4085867fdbeffbe5..8baf7f7caa58df1dc70061049eb4f3a7cd599c75 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-25  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* configure: Regenerate for libtool reversion.
+
 2004-11-24  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* configure: Regenerate for libtool change.
diff --git a/boehm-gc/configure b/boehm-gc/configure
index 0f659721a8789fd9d17e0c4281dc9345f798c7d1..b950a0706c4fd345584dc9c93fd880ad85623baa 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 550763066ecef1e010538579fbe7460c7ac5984e..38489a1b6b3d553db9d97a1f21cb30b5df3b123d 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-25  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* configure: Regenerate for libtool reversion.
+
 2004-11-24  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* configure: Regenerate for libtool change.
diff --git a/libffi/configure b/libffi/configure
index 13231dfd9f9014671645930bf6fe67ed2d6cef73..f8c08d140fdb4574fb10394572ca72c646a54db9 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 b87f96e431e2fd3837888d3b94b9ad2bb5b8dd34..f4019cfe740aac4e70dae714110da54e0ca8ab2b 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-25  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* configure: Regenerate for libtool reversion.
+
 2004-11-24  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* configure: Regenerate for libtool change.
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f762e8567bf60b19d2058ad70b023d9178e6025b..1de7a726d17b03bf160ae05cfc99e44dd4fd3fdd 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 cf52939df11e2d8159b18cac50d35ac6c86c629c..bfaf3c8d4852f02341a0c5d109fe696b286168a9 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 263d78837e0fe6918dc2fb2c03947773f00db1ae..40c5b293265ebfce3901d01e04fdfd44ce6bfbb0 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-25  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* configure: Regenerate for libtool reversion.
+
 2004-11-24  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* configure: Regenerate for libtool change.
diff --git a/libobjc/configure b/libobjc/configure
index cd384a5be7a04c1b8115a31ff778fa2dbca94b03..a3588e8a587f5d4e2cdb93ecae0cc7d7b1cc96bd 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 8d15e66b0dc78848eec37a234548bb01bcb66adb..e4622993e7a54a88d5a0b73f858e92578d1cb297 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-25  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* configure: Regenerate for libtool reversion.
+
 2004-11-24  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* configure: Regenerate for libtool change.
diff --git a/libtool.m4 b/libtool.m4
index 60121579faf990e3a0720139bba043f9547a60e6..dec9f01f3faceb60417eb5d4b009ba7db7fffa93 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 36a9a169b193c17cbf213da8a8c20926d648a3ee..fc80dbac39476a6e9470ff849958eca439bf9303 100644
--- a/zlib/ChangeLog.gcj
+++ b/zlib/ChangeLog.gcj
@@ -1,3 +1,7 @@
+2004-11-25  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* configure: Regenerate for libtool reversion.
+
 2004-11-24  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* configure: Regenerate for libtool change.