2055b15
diff -rup ../binutils-2.20.51.0.2.orig/bfd/configure ./bfd/configure
2055b15
--- ../binutils-2.20.51.0.2.orig/bfd/configure	2009-10-12 11:28:45.000000000 +0100
2055b15
+++ ./bfd/configure	2009-10-12 11:31:43.000000000 +0100
2055b15
@@ -10670,10 +10670,34 @@ fi
900278a
   # before this can be enabled.
900278a
   hardcode_into_libs=yes
900278a
 
fe03d62
+   # find out which ABI we are using
fe03d62
+   libsuff=
fe03d62
+   case "$host_cpu" in
fe03d62
+   x86_64*|s390*|powerpc*|ppc*|sparc*)
fe03d62
+     echo 'int i;' > conftest.$ac_ext
fe03d62
+     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
fe03d62
+   (eval $ac_compile) 2>&5
fe03d62
+   ac_status=$?
fe03d62
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
fe03d62
+   (exit $ac_status); }; then
fe03d62
+       case `/usr/bin/file conftest.$ac_objext` in
fe03d62
+       *64-bit*)
fe03d62
+         libsuff=64
fe03d62
+         if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
fe03d62
+           sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
fe03d62
+         fi
fe03d62
+         sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
fe03d62
+         ;;
fe03d62
+       esac
fe03d62
+     fi
fe03d62
+     rm -rf conftest*
fe03d62
+     ;;
fe03d62
+   esac
fe03d62
+ 
900278a
   # Append ld.so.conf contents to the search path
900278a
   if test -f /etc/ld.so.conf; then
fe03d62
     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;/^$/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
11c397e
Only in ./bfd: configure.orig
2055b15
diff -rup ../binutils-2.20.51.0.2.orig/binutils/configure ./binutils/configure
2055b15
--- ../binutils-2.20.51.0.2.orig/binutils/configure	2009-10-12 11:28:44.000000000 +0100
2055b15
+++ ./binutils/configure	2009-10-12 11:31:43.000000000 +0100
2055b15
@@ -10461,10 +10461,34 @@ fi
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
fe03d62
     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;/^$/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
11c397e
Only in ./binutils: configure.orig
2055b15
diff -rup ../binutils-2.20.51.0.2.orig/gas/configure ./gas/configure
2055b15
--- ../binutils-2.20.51.0.2.orig/gas/configure	2009-10-12 11:28:45.000000000 +0100
2055b15
+++ ./gas/configure	2009-10-12 11:31:43.000000000 +0100
2055b15
@@ -10418,10 +10418,34 @@ fi
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
fe03d62
     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;/^$/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
11c397e
Only in ./gas: configure.orig
2055b15
diff -rup ../binutils-2.20.51.0.2.orig/gprof/configure ./gprof/configure
2055b15
--- ../binutils-2.20.51.0.2.orig/gprof/configure	2009-10-12 11:28:44.000000000 +0100
2055b15
+++ ./gprof/configure	2009-10-12 11:31:43.000000000 +0100
2055b15
@@ -10356,10 +10356,34 @@ fi
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
fe03d62
     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;/^$/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
11c397e
Only in ./gprof: configure.orig
2055b15
diff -rup ../binutils-2.20.51.0.2.orig/ld/configure ./ld/configure
2055b15
--- ../binutils-2.20.51.0.2.orig/ld/configure	2009-10-12 11:28:44.000000000 +0100
2055b15
+++ ./ld/configure	2009-10-12 11:31:43.000000000 +0100
2055b15
@@ -10806,10 +10806,34 @@ fi
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
fe03d62
     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;/^$/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
11c397e
Only in ./ld: configure.orig
2055b15
diff -rup ../binutils-2.20.51.0.2.orig/libtool.m4 ./libtool.m4
2055b15
--- ../binutils-2.20.51.0.2.orig/libtool.m4	2009-10-12 11:28:44.000000000 +0100
2055b15
+++ ./libtool.m4	2009-10-12 11:31:43.000000000 +0100
11c397e
@@ -2475,10 +2475,30 @@ linux* | k*bsd*-gnu | kopensolaris*-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
fe03d62
+    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
fe03d62
     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;/^$/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
2055b15
diff -rup ../binutils-2.20.51.0.2.orig/opcodes/configure ./opcodes/configure
2055b15
--- ../binutils-2.20.51.0.2.orig/opcodes/configure	2009-10-12 11:28:44.000000000 +0100
2055b15
+++ ./opcodes/configure	2009-10-12 11:31:43.000000000 +0100
2055b15
@@ -10406,10 +10406,34 @@ fi
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
fe03d62
+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
fe03d62
+  (eval $ac_compile) 2>&5
fe03d62
+  ac_status=$?
fe03d62
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
fe03d62
+  (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
fe03d62
     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;/^$/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
11c397e
Only in ./opcodes: configure.orig