900278a
--- binutils/configure.jj	2007-06-18 13:29:28.000000000 -0400
900278a
+++ binutils/configure	2007-06-27 13:55:07.000000000 -0400
900278a
@@ -8990,10 +8990,34 @@ rm -f conftest.err conftest.$ac_objext \
900278a
   # before this can be enabled.
900278a
   hardcode_into_libs=yes
900278a
 
900278a
+  # find out which ABI we are using
900278a
+  libsuff=
900278a
+  case "$host_cpu" in
900278a
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
900278a
+    echo 'int i;' > conftest.$ac_ext
900278a
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
900278a
+  (eval $ac_compile) 2>&5
900278a
+  ac_status=$?
900278a
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
900278a
+  (exit $ac_status); }; then
900278a
+      case `/usr/bin/file conftest.$ac_objext` in
900278a
+      *64-bit*)
900278a
+        libsuff=64
900278a
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
900278a
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
900278a
+        fi
900278a
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
900278a
+        ;;
900278a
+      esac
900278a
+    fi
900278a
+    rm -rf conftest*
900278a
+    ;;
900278a
+  esac
900278a
+
900278a
   # Append ld.so.conf contents to the search path
900278a
   if test -f /etc/ld.so.conf; then
900278a
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
900278a
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
900278a
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
900278a
   fi
900278a
 
900278a
   # We used to test for /lib/ld.so.1 and disable shared libraries on
900278a
--- opcodes/configure.jj	2007-06-18 13:29:29.000000000 -0400
900278a
+++ opcodes/configure	2007-06-27 13:55:08.000000000 -0400
900278a
@@ -8420,10 +8420,34 @@ rm -f conftest.err conftest.$ac_objext \
900278a
   # before this can be enabled.
900278a
   hardcode_into_libs=yes
900278a
 
900278a
+  # find out which ABI we are using
900278a
+  libsuff=
900278a
+  case "$host_cpu" in
900278a
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
900278a
+    echo 'int i;' > conftest.$ac_ext
900278a
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
900278a
+  (eval $ac_compile) 2>&5
900278a
+  ac_status=$?
900278a
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
900278a
+  (exit $ac_status); }; then
900278a
+      case `/usr/bin/file conftest.$ac_objext` in
900278a
+      *64-bit*)
900278a
+        libsuff=64
900278a
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
900278a
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
900278a
+        fi
900278a
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
900278a
+        ;;
900278a
+      esac
900278a
+    fi
900278a
+    rm -rf conftest*
900278a
+    ;;
900278a
+  esac
900278a
+
900278a
   # Append ld.so.conf contents to the search path
900278a
   if test -f /etc/ld.so.conf; then
900278a
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
900278a
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
900278a
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
900278a
   fi
900278a
 
900278a
   # We used to test for /lib/ld.so.1 and disable shared libraries on
900278a
--- gprof/configure.jj	2007-06-18 13:29:29.000000000 -0400
900278a
+++ gprof/configure	2007-06-27 13:55:08.000000000 -0400
900278a
@@ -8250,10 +8250,34 @@ rm -f conftest.err conftest.$ac_objext \
900278a
   # before this can be enabled.
900278a
   hardcode_into_libs=yes
900278a
 
900278a
+  # find out which ABI we are using
900278a
+  libsuff=
900278a
+  case "$host_cpu" in
900278a
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
900278a
+    echo 'int i;' > conftest.$ac_ext
900278a
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
900278a
+  (eval $ac_compile) 2>&5
900278a
+  ac_status=$?
900278a
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
900278a
+  (exit $ac_status); }; then
900278a
+      case `/usr/bin/file conftest.$ac_objext` in
900278a
+      *64-bit*)
900278a
+        libsuff=64
900278a
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
900278a
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
900278a
+        fi
900278a
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
900278a
+        ;;
900278a
+      esac
900278a
+    fi
900278a
+    rm -rf conftest*
900278a
+    ;;
900278a
+  esac
900278a
+
900278a
   # Append ld.so.conf contents to the search path
900278a
   if test -f /etc/ld.so.conf; then
900278a
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
900278a
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
900278a
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
900278a
   fi
900278a
 
900278a
   # We used to test for /lib/ld.so.1 and disable shared libraries on
900278a
--- ld/configure.jj	2007-06-18 13:29:29.000000000 -0400
900278a
+++ ld/configure	2007-06-27 13:55:08.000000000 -0400
900278a
@@ -8253,10 +8253,34 @@ rm -f conftest.err conftest.$ac_objext \
900278a
   # before this can be enabled.
900278a
   hardcode_into_libs=yes
900278a
 
900278a
+  # find out which ABI we are using
900278a
+  libsuff=
900278a
+  case "$host_cpu" in
900278a
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
900278a
+    echo 'int i;' > conftest.$ac_ext
900278a
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
900278a
+  (eval $ac_compile) 2>&5
900278a
+  ac_status=$?
900278a
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
900278a
+  (exit $ac_status); }; then
900278a
+      case `/usr/bin/file conftest.$ac_objext` in
900278a
+      *64-bit*)
900278a
+        libsuff=64
900278a
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
900278a
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
900278a
+        fi
900278a
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
900278a
+        ;;
900278a
+      esac
900278a
+    fi
900278a
+    rm -rf conftest*
900278a
+    ;;
900278a
+  esac
900278a
+
900278a
   # Append ld.so.conf contents to the search path
900278a
   if test -f /etc/ld.so.conf; then
900278a
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
900278a
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
900278a
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
900278a
   fi
900278a
 
900278a
   # We used to test for /lib/ld.so.1 and disable shared libraries on
900278a
--- gas/configure.jj	2007-06-18 13:29:28.000000000 -0400
900278a
+++ gas/configure	2007-06-27 13:55:08.000000000 -0400
900278a
@@ -8252,10 +8252,34 @@ rm -f conftest.err conftest.$ac_objext \
900278a
   # before this can be enabled.
900278a
   hardcode_into_libs=yes
900278a
 
900278a
+  # find out which ABI we are using
900278a
+  libsuff=
900278a
+  case "$host_cpu" in
900278a
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
900278a
+    echo 'int i;' > conftest.$ac_ext
900278a
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
900278a
+  (eval $ac_compile) 2>&5
900278a
+  ac_status=$?
900278a
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
900278a
+  (exit $ac_status); }; then
900278a
+      case `/usr/bin/file conftest.$ac_objext` in
900278a
+      *64-bit*)
900278a
+        libsuff=64
900278a
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
900278a
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
900278a
+        fi
900278a
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
900278a
+        ;;
900278a
+      esac
900278a
+    fi
900278a
+    rm -rf conftest*
900278a
+    ;;
900278a
+  esac
900278a
+
900278a
   # Append ld.so.conf contents to the search path
900278a
   if test -f /etc/ld.so.conf; then
900278a
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
900278a
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
900278a
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
900278a
   fi
900278a
 
900278a
   # We used to test for /lib/ld.so.1 and disable shared libraries on
900278a
--- bfd/configure.jj	2007-06-18 13:29:28.000000000 -0400
900278a
+++ bfd/configure	2007-06-27 13:55:08.000000000 -0400
900278a
@@ -9156,10 +9156,34 @@ rm -f conftest.err conftest.$ac_objext \
900278a
   # before this can be enabled.
900278a
   hardcode_into_libs=yes
900278a
 
900278a
+  # find out which ABI we are using
900278a
+  libsuff=
900278a
+  case "$host_cpu" in
900278a
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
900278a
+    echo 'int i;' > conftest.$ac_ext
900278a
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
900278a
+  (eval $ac_compile) 2>&5
900278a
+  ac_status=$?
900278a
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
900278a
+  (exit $ac_status); }; then
900278a
+      case `/usr/bin/file conftest.$ac_objext` in
900278a
+      *64-bit*)
900278a
+        libsuff=64
900278a
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
900278a
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
900278a
+        fi
900278a
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
900278a
+        ;;
900278a
+      esac
900278a
+    fi
900278a
+    rm -rf conftest*
900278a
+    ;;
900278a
+  esac
900278a
+
900278a
   # Append ld.so.conf contents to the search path
900278a
   if test -f /etc/ld.so.conf; then
900278a
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
900278a
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
900278a
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
900278a
   fi
900278a
 
900278a
   # We used to test for /lib/ld.so.1 and disable shared libraries on
900278a
--- libtool.m4.jj	2007-06-18 13:29:28.000000000 -0400
900278a
+++ libtool.m4	2007-06-27 13:55:08.000000000 -0400
900278a
@@ -2337,10 +2337,30 @@ linux* | k*bsd*-gnu)
900278a
   # before this can be enabled.
900278a
   hardcode_into_libs=yes
900278a
 
900278a
+  # find out which ABI we are using
900278a
+  libsuff=
900278a
+  case "$host_cpu" in
900278a
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
900278a
+    echo 'int i;' > conftest.$ac_ext
900278a
+    if AC_TRY_EVAL(ac_compile); then
900278a
+      case `/usr/bin/file conftest.$ac_objext` in
900278a
+      *64-bit*)
900278a
+        libsuff=64
900278a
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
900278a
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
900278a
+        fi
900278a
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
900278a
+        ;;
900278a
+      esac
900278a
+    fi
900278a
+    rm -rf conftest*
900278a
+    ;;
900278a
+  esac
900278a
+
900278a
   # Append ld.so.conf contents to the search path
900278a
   if test -f /etc/ld.so.conf; then
900278a
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
900278a
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
900278a
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
900278a
   fi
900278a
 
900278a
   # We used to test for /lib/ld.so.1 and disable shared libraries on