172ecb8
diff -rcp ../binutils-2.20.51.0.7.original/bfd/configure ./bfd/configure
8000c8f
--- a/bfd/configure	2010-04-08 14:53:48.000000000 +0100
8000c8f
+++ b/bfd/configure	2010-04-08 14:56:50.000000000 +0100
8000c8f
@@ -10762,10 +10762,34 @@
8000c8f
   # before this can be enabled.
8000c8f
   hardcode_into_libs=yes
8000c8f
 
8000c8f
+  # find out which ABI we are using
8000c8f
+  libsuff=
8000c8f
+  case "$host_cpu" in
8000c8f
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
8000c8f
+    echo 'int i;' > conftest.$ac_ext
8000c8f
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8000c8f
+  (eval $ac_compile) 2>&5
8000c8f
+  ac_status=$?
8000c8f
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8000c8f
+  (exit $ac_status); }; then
8000c8f
+      case `/usr/bin/file conftest.$ac_objext` in
8000c8f
+      *64-bit*)
8000c8f
+        libsuff=64
8000c8f
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
8000c8f
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
8000c8f
+        fi
8000c8f
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
8000c8f
+        ;;
8000c8f
+      esac
8000c8f
+    fi
8000c8f
+    rm -rf conftest*
8000c8f
+    ;;
8000c8f
+  esac
8000c8f
+
8000c8f
   # Append ld.so.conf contents to the search path
8000c8f
   if test -f /etc/ld.so.conf; then
8000c8f
     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/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
8000c8f
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
8000c8f
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
8000c8f
   fi
8000c8f
 
8000c8f
   # We used to test for /lib/ld.so.1 and disable shared libraries on
172ecb8
diff -rcp ../binutils-2.20.51.0.7.original/binutils/configure ./binutils/configure
8000c8f
--- a/binutils/configure	2010-04-08 14:53:45.000000000 +0100
8000c8f
+++ b/binutils/configure	2010-04-08 14:56:21.000000000 +0100
8000c8f
@@ -10560,10 +10560,34 @@
8000c8f
   # before this can be enabled.
8000c8f
   hardcode_into_libs=yes
8000c8f
 
8000c8f
+  # find out which ABI we are using
8000c8f
+  libsuff=
8000c8f
+  case "$host_cpu" in
8000c8f
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
8000c8f
+    echo 'int i;' > conftest.$ac_ext
8000c8f
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8000c8f
+  (eval $ac_compile) 2>&5
8000c8f
+  ac_status=$?
8000c8f
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8000c8f
+  (exit $ac_status); }; then
8000c8f
+      case `/usr/bin/file conftest.$ac_objext` in
8000c8f
+      *64-bit*)
8000c8f
+        libsuff=64
8000c8f
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
8000c8f
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
8000c8f
+        fi
8000c8f
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
8000c8f
+        ;;
8000c8f
+      esac
8000c8f
+    fi
8000c8f
+    rm -rf conftest*
8000c8f
+    ;;
8000c8f
+  esac
8000c8f
+
8000c8f
   # Append ld.so.conf contents to the search path
8000c8f
   if test -f /etc/ld.so.conf; then
8000c8f
     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/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
8000c8f
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
8000c8f
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
8000c8f
   fi
8000c8f
 
8000c8f
   # We used to test for /lib/ld.so.1 and disable shared libraries on
172ecb8
diff -rcp ../binutils-2.20.51.0.7.original/gas/configure ./gas/configure
8000c8f
--- a/gas/configure	2010-04-08 14:53:47.000000000 +0100
8000c8f
+++ b/gas/configure	2010-04-08 14:57:24.000000000 +0100
8000c8f
@@ -10547,10 +10547,34 @@
8000c8f
   # before this can be enabled.
8000c8f
   hardcode_into_libs=yes
8000c8f
 
8000c8f
+  # find out which ABI we are using
8000c8f
+  libsuff=
8000c8f
+  case "$host_cpu" in
8000c8f
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
8000c8f
+    echo 'int i;' > conftest.$ac_ext
8000c8f
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8000c8f
+  (eval $ac_compile) 2>&5
8000c8f
+  ac_status=$?
8000c8f
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8000c8f
+  (exit $ac_status); }; then
8000c8f
+      case `/usr/bin/file conftest.$ac_objext` in
8000c8f
+      *64-bit*)
8000c8f
+        libsuff=64
8000c8f
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
8000c8f
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
8000c8f
+        fi
8000c8f
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
8000c8f
+        ;;
8000c8f
+      esac
8000c8f
+    fi
8000c8f
+    rm -rf conftest*
8000c8f
+    ;;
8000c8f
+  esac
8000c8f
+
8000c8f
   # Append ld.so.conf contents to the search path
8000c8f
   if test -f /etc/ld.so.conf; then
8000c8f
     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/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
8000c8f
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
8000c8f
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
8000c8f
   fi
8000c8f
 
8000c8f
   # We used to test for /lib/ld.so.1 and disable shared libraries on
172ecb8
diff -rcp ../binutils-2.20.51.0.7.original/gprof/configure ./gprof/configure
8000c8f
--- a/gprof/configure	2010-04-08 14:53:45.000000000 +0100
8000c8f
+++ b/gprof/configure	2010-04-08 14:57:50.000000000 +0100
8000c8f
@@ -10485,10 +10485,34 @@
8000c8f
   # before this can be enabled.
8000c8f
   hardcode_into_libs=yes
8000c8f
 
8000c8f
+  # find out which ABI we are using
8000c8f
+  libsuff=
8000c8f
+  case "$host_cpu" in
8000c8f
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
8000c8f
+    echo 'int i;' > conftest.$ac_ext
8000c8f
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8000c8f
+  (eval $ac_compile) 2>&5
8000c8f
+  ac_status=$?
8000c8f
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8000c8f
+  (exit $ac_status); }; then
8000c8f
+      case `/usr/bin/file conftest.$ac_objext` in
8000c8f
+      *64-bit*)
8000c8f
+        libsuff=64
8000c8f
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
8000c8f
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
8000c8f
+        fi
8000c8f
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
8000c8f
+        ;;
8000c8f
+      esac
8000c8f
+    fi
8000c8f
+    rm -rf conftest*
8000c8f
+    ;;
8000c8f
+  esac
8000c8f
+
8000c8f
   # Append ld.so.conf contents to the search path
8000c8f
   if test -f /etc/ld.so.conf; then
8000c8f
     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/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
8000c8f
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
8000c8f
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
8000c8f
   fi
8000c8f
 
8000c8f
   # We used to test for /lib/ld.so.1 and disable shared libraries on
172ecb8
diff -rcp ../binutils-2.20.51.0.7.original/ld/configure ./ld/configure
8000c8f
--- a/ld/configure	2010-04-08 14:53:44.000000000 +0100
8000c8f
+++ b/ld/configure	2010-04-08 14:58:21.000000000 +0100
8000c8f
@@ -10966,10 +10966,34 @@
8000c8f
   # before this can be enabled.
8000c8f
   hardcode_into_libs=yes
8000c8f
 
8000c8f
+  # find out which ABI we are using
8000c8f
+  libsuff=
8000c8f
+  case "$host_cpu" in
8000c8f
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
8000c8f
+    echo 'int i;' > conftest.$ac_ext
8000c8f
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8000c8f
+  (eval $ac_compile) 2>&5
8000c8f
+  ac_status=$?
8000c8f
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8000c8f
+  (exit $ac_status); }; then
8000c8f
+      case `/usr/bin/file conftest.$ac_objext` in
8000c8f
+      *64-bit*)
8000c8f
+        libsuff=64
8000c8f
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
8000c8f
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
8000c8f
+        fi
8000c8f
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
8000c8f
+        ;;
8000c8f
+      esac
8000c8f
+    fi
8000c8f
+    rm -rf conftest*
8000c8f
+    ;;
8000c8f
+  esac
8000c8f
+
8000c8f
   # Append ld.so.conf contents to the search path
8000c8f
   if test -f /etc/ld.so.conf; then
8000c8f
     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/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
8000c8f
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
8000c8f
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
8000c8f
   fi
8000c8f
 
8000c8f
   # We used to test for /lib/ld.so.1 and disable shared libraries on
172ecb8
Only in .: .#libtool.m4
172ecb8
Only in .: #libtool.m4#
172ecb8
diff -rcp ../binutils-2.20.51.0.7.original/opcodes/configure ./opcodes/configure
8000c8f
--- a/opcodes/configure	2010-04-08 14:53:45.000000000 +0100
8000c8f
+++ b/opcodes/configure	2010-04-08 14:59:10.000000000 +0100
8000c8f
@@ -10496,10 +10496,34 @@
8000c8f
   # before this can be enabled.
8000c8f
   hardcode_into_libs=yes
8000c8f
 
8000c8f
+  # find out which ABI we are using
8000c8f
+  libsuff=
8000c8f
+  case "$host_cpu" in
8000c8f
+  x86_64*|s390*|powerpc*|ppc*|sparc*)
8000c8f
+    echo 'int i;' > conftest.$ac_ext
8000c8f
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8000c8f
+  (eval $ac_compile) 2>&5
8000c8f
+  ac_status=$?
8000c8f
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
8000c8f
+  (exit $ac_status); }; then
8000c8f
+      case `/usr/bin/file conftest.$ac_objext` in
8000c8f
+      *64-bit*)
8000c8f
+        libsuff=64
8000c8f
+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
8000c8f
+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
8000c8f
+        fi
8000c8f
+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
8000c8f
+        ;;
8000c8f
+      esac
8000c8f
+    fi
8000c8f
+    rm -rf conftest*
8000c8f
+    ;;
8000c8f
+  esac
8000c8f
+
8000c8f
   # Append ld.so.conf contents to the search path
8000c8f
   if test -f /etc/ld.so.conf; then
8000c8f
     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/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
8000c8f
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
8000c8f
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
8000c8f
   fi
8000c8f
 
8000c8f
   # We used to test for /lib/ld.so.1 and disable shared libraries on