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