--- binutils/configure.jj	2007-06-18 13:29:28.000000000 -0400

+++ binutils/configure	2007-06-27 13:55:07.000000000 -0400

@@ -8990,10 +8990,34 @@ rm -f conftest.err conftest.$ac_objext \

   # before this can be enabled.

   hardcode_into_libs=yes

+  # find out which ABI we are using

+  libsuff=

+  case "$host_cpu" in

+  x86_64*|s390*|powerpc*|ppc*|sparc*)

+    echo 'int i;' > conftest.$ac_ext

+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

+  (eval $ac_compile) 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); }; then

+      case `/usr/bin/file conftest.$ac_objext` in

+      *64-bit*)

+        libsuff=64

+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then

+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

+        fi

+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"

+        ;;

+      esac

+    fi

+    rm -rf conftest*

+    ;;

+  esac

+

   # Append ld.so.conf contents to the search path

   if test -f /etc/ld.so.conf; then

     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' ' '`

-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"

   fi

   # We used to test for /lib/ld.so.1 and disable shared libraries on

--- binutils/aclocal.m4.jj	2007-06-18 13:29:28.000000000 -0400

+++ binutils/aclocal.m4	2007-06-27 13:55:07.000000000 -0400

@@ -1206,16 +1206,49 @@ version_type=none

 dynamic_linker="$host_os ld.so"

 sys_lib_dlsearch_path_spec="/lib /usr/lib"

 if test "$GCC" = yes; then

-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then

+  lt_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then

     # if the path contains ";" then we assume it to be the separator

     # otherwise default to the standard path separator (i.e. ":") - it is

     # assumed that no part of a normal pathname contains ";" but that should

     # okay in the real world where ";" in dirpaths is itself problematic.

-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`

   else

-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`

+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`

   fi

+  # Ok, now we have the path, separated by spaces, we can step through it

+  # and add multilib dir if necessary.

+  lt_tmp_lt_search_path_spec=

+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`

+  for lt_sys_path in $lt_search_path_spec; do

+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then

+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"

+    else

+      test -d "$lt_sys_path" && \

+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"

+    fi

+  done

+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '

+BEGIN {RS=" "; FS="/|\n";} {

+  lt_foo="";

+  lt_count=0;

+  for (lt_i = NF; lt_i > 0; lt_i--) {

+    if ($lt_i != "" && $lt_i != ".") {

+      if ($lt_i == "..") {

+        lt_count++;

+      } else {

+        if (lt_count == 0) {

+          lt_foo="/" $lt_i lt_foo;

+        } else {

+          lt_count--;

+        }

+      }

+    }

+  }

+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }

+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }

+}'`

+  sys_lib_search_path_spec=`echo $lt_search_path_spec`

 else

   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"

 fi

@@ -1581,13 +1614,16 @@ linux*)

   # find out which ABI we are using

   libsuff=

   case "$host_cpu" in

-  x86_64*|s390x*|powerpc64*)

-    echo '[#]line __oline__ "configure"' > conftest.$ac_ext

+  x86_64*|s390*|powerpc64*|ppc*|sparc*)

+    echo 'int i;' > conftest.$ac_ext

     if AC_TRY_EVAL(ac_compile); then

       case `/usr/bin/file conftest.$ac_objext` in

       *64-bit*)

         libsuff=64

-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then

+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

+        fi

+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"

         ;;

       esac

     fi

--- opcodes/configure.jj	2007-06-18 13:29:29.000000000 -0400

+++ opcodes/configure	2007-06-27 13:55:08.000000000 -0400

@@ -8420,10 +8420,34 @@ rm -f conftest.err conftest.$ac_objext \

   # before this can be enabled.

   hardcode_into_libs=yes

+  # find out which ABI we are using

+  libsuff=

+  case "$host_cpu" in

+  x86_64*|s390*|powerpc*|ppc*|sparc*)

+    echo 'int i;' > conftest.$ac_ext

+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

+  (eval $ac_compile) 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); }; then

+      case `/usr/bin/file conftest.$ac_objext` in

+      *64-bit*)

+        libsuff=64

+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then

+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

+        fi

+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"

+        ;;

+      esac

+    fi

+    rm -rf conftest*

+    ;;

+  esac

+

   # Append ld.so.conf contents to the search path

   if test -f /etc/ld.so.conf; then

     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' ' '`

-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"

   fi

   # We used to test for /lib/ld.so.1 and disable shared libraries on

--- opcodes/aclocal.m4.jj	2007-06-18 13:29:29.000000000 -0400

+++ opcodes/aclocal.m4	2007-06-27 13:55:08.000000000 -0400

@@ -1206,16 +1206,49 @@ version_type=none

 dynamic_linker="$host_os ld.so"

 sys_lib_dlsearch_path_spec="/lib /usr/lib"

 if test "$GCC" = yes; then

-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then

+  lt_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then

     # if the path contains ";" then we assume it to be the separator

     # otherwise default to the standard path separator (i.e. ":") - it is

     # assumed that no part of a normal pathname contains ";" but that should

     # okay in the real world where ";" in dirpaths is itself problematic.

-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`

   else

-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`

+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`

   fi

+  # Ok, now we have the path, separated by spaces, we can step through it

+  # and add multilib dir if necessary.

+  lt_tmp_lt_search_path_spec=

+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`

+  for lt_sys_path in $lt_search_path_spec; do

+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then

+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"

+    else

+      test -d "$lt_sys_path" && \

+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"

+    fi

+  done

+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '

+BEGIN {RS=" "; FS="/|\n";} {

+  lt_foo="";

+  lt_count=0;

+  for (lt_i = NF; lt_i > 0; lt_i--) {

+    if ($lt_i != "" && $lt_i != ".") {

+      if ($lt_i == "..") {

+        lt_count++;

+      } else {

+        if (lt_count == 0) {

+          lt_foo="/" $lt_i lt_foo;

+        } else {

+          lt_count--;

+        }

+      }

+    }

+  }

+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }

+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }

+}'`

+  sys_lib_search_path_spec=`echo $lt_search_path_spec`

 else

   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"

 fi

@@ -1581,13 +1614,16 @@ linux*)

   # find out which ABI we are using

   libsuff=

   case "$host_cpu" in

-  x86_64*|s390x*|powerpc64*)

-    echo '[#]line __oline__ "configure"' > conftest.$ac_ext

+  x86_64*|s390*|powerpc64*|ppc*|sparc*)

+    echo 'int i;' > conftest.$ac_ext

     if AC_TRY_EVAL(ac_compile); then

       case `/usr/bin/file conftest.$ac_objext` in

       *64-bit*)

         libsuff=64

-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then

+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

+        fi

+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"

         ;;

       esac

     fi

--- gprof/configure.jj	2007-06-18 13:29:29.000000000 -0400

+++ gprof/configure	2007-06-27 13:55:08.000000000 -0400

@@ -8250,10 +8250,34 @@ rm -f conftest.err conftest.$ac_objext \

   # before this can be enabled.

   hardcode_into_libs=yes

+  # find out which ABI we are using

+  libsuff=

+  case "$host_cpu" in

+  x86_64*|s390*|powerpc*|ppc*|sparc*)

+    echo 'int i;' > conftest.$ac_ext

+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

+  (eval $ac_compile) 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); }; then

+      case `/usr/bin/file conftest.$ac_objext` in

+      *64-bit*)

+        libsuff=64

+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then

+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

+        fi

+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"

+        ;;

+      esac

+    fi

+    rm -rf conftest*

+    ;;

+  esac

+

   # Append ld.so.conf contents to the search path

   if test -f /etc/ld.so.conf; then

     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' ' '`

-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"

   fi

   # We used to test for /lib/ld.so.1 and disable shared libraries on

--- gprof/aclocal.m4.jj	2007-06-18 13:29:29.000000000 -0400

+++ gprof/aclocal.m4	2007-06-27 13:55:08.000000000 -0400

@@ -1206,16 +1206,49 @@ version_type=none

 dynamic_linker="$host_os ld.so"

 sys_lib_dlsearch_path_spec="/lib /usr/lib"

 if test "$GCC" = yes; then

-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then

+  lt_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then

     # if the path contains ";" then we assume it to be the separator

     # otherwise default to the standard path separator (i.e. ":") - it is

     # assumed that no part of a normal pathname contains ";" but that should

     # okay in the real world where ";" in dirpaths is itself problematic.

-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`

   else

-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`

+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`

   fi

+  # Ok, now we have the path, separated by spaces, we can step through it

+  # and add multilib dir if necessary.

+  lt_tmp_lt_search_path_spec=

+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`

+  for lt_sys_path in $lt_search_path_spec; do

+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then

+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"

+    else

+      test -d "$lt_sys_path" && \

+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"

+    fi

+  done

+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '

+BEGIN {RS=" "; FS="/|\n";} {

+  lt_foo="";

+  lt_count=0;

+  for (lt_i = NF; lt_i > 0; lt_i--) {

+    if ($lt_i != "" && $lt_i != ".") {

+      if ($lt_i == "..") {

+        lt_count++;

+      } else {

+        if (lt_count == 0) {

+          lt_foo="/" $lt_i lt_foo;

+        } else {

+          lt_count--;

+        }

+      }

+    }

+  }

+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }

+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }

+}'`

+  sys_lib_search_path_spec=`echo $lt_search_path_spec`

 else

   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"

 fi

@@ -1581,13 +1614,16 @@ linux*)

   # find out which ABI we are using

   libsuff=

   case "$host_cpu" in

-  x86_64*|s390x*|powerpc64*)

-    echo '[#]line __oline__ "configure"' > conftest.$ac_ext

+  x86_64*|s390*|powerpc64*|ppc*|sparc*)

+    echo 'int i;' > conftest.$ac_ext

     if AC_TRY_EVAL(ac_compile); then

       case `/usr/bin/file conftest.$ac_objext` in

       *64-bit*)

         libsuff=64

-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then

+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

+        fi

+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"

         ;;

       esac

     fi

--- ld/configure.jj	2007-06-18 13:29:29.000000000 -0400

+++ ld/configure	2007-06-27 13:55:08.000000000 -0400

@@ -8253,10 +8253,34 @@ rm -f conftest.err conftest.$ac_objext \

   # before this can be enabled.

   hardcode_into_libs=yes

+  # find out which ABI we are using

+  libsuff=

+  case "$host_cpu" in

+  x86_64*|s390*|powerpc*|ppc*|sparc*)

+    echo 'int i;' > conftest.$ac_ext

+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

+  (eval $ac_compile) 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); }; then

+      case `/usr/bin/file conftest.$ac_objext` in

+      *64-bit*)

+        libsuff=64

+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then

+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

+        fi

+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"

+        ;;

+      esac

+    fi

+    rm -rf conftest*

+    ;;

+  esac

+

   # Append ld.so.conf contents to the search path

   if test -f /etc/ld.so.conf; then

     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' ' '`

-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"

   fi

   # We used to test for /lib/ld.so.1 and disable shared libraries on

--- ld/aclocal.m4.jj	2007-06-18 13:29:29.000000000 -0400

+++ ld/aclocal.m4	2007-06-27 13:55:08.000000000 -0400

@@ -1206,16 +1206,49 @@ version_type=none

 dynamic_linker="$host_os ld.so"

 sys_lib_dlsearch_path_spec="/lib /usr/lib"

 if test "$GCC" = yes; then

-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then

+  lt_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then

     # if the path contains ";" then we assume it to be the separator

     # otherwise default to the standard path separator (i.e. ":") - it is

     # assumed that no part of a normal pathname contains ";" but that should

     # okay in the real world where ";" in dirpaths is itself problematic.

-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`

   else

-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`

+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`

   fi

+  # Ok, now we have the path, separated by spaces, we can step through it

+  # and add multilib dir if necessary.

+  lt_tmp_lt_search_path_spec=

+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`

+  for lt_sys_path in $lt_search_path_spec; do

+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then

+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"

+    else

+      test -d "$lt_sys_path" && \

+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"

+    fi

+  done

+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '

+BEGIN {RS=" "; FS="/|\n";} {

+  lt_foo="";

+  lt_count=0;

+  for (lt_i = NF; lt_i > 0; lt_i--) {

+    if ($lt_i != "" && $lt_i != ".") {

+      if ($lt_i == "..") {

+        lt_count++;

+      } else {

+        if (lt_count == 0) {

+          lt_foo="/" $lt_i lt_foo;

+        } else {

+          lt_count--;

+        }

+      }

+    }

+  }

+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }

+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }

+}'`

+  sys_lib_search_path_spec=`echo $lt_search_path_spec`

 else

   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"

 fi

@@ -1581,13 +1614,16 @@ linux*)

   # find out which ABI we are using

   libsuff=

   case "$host_cpu" in

-  x86_64*|s390x*|powerpc64*)

-    echo '[#]line __oline__ "configure"' > conftest.$ac_ext

+  x86_64*|s390*|powerpc64*|ppc*|sparc*)

+    echo 'int i;' > conftest.$ac_ext

     if AC_TRY_EVAL(ac_compile); then

       case `/usr/bin/file conftest.$ac_objext` in

       *64-bit*)

         libsuff=64

-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then

+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

+        fi

+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"

         ;;

       esac

     fi

--- gas/configure.jj	2007-06-18 13:29:28.000000000 -0400

+++ gas/configure	2007-06-27 13:55:08.000000000 -0400

@@ -8252,10 +8252,34 @@ rm -f conftest.err conftest.$ac_objext \

   # before this can be enabled.

   hardcode_into_libs=yes

+  # find out which ABI we are using

+  libsuff=

+  case "$host_cpu" in

+  x86_64*|s390*|powerpc*|ppc*|sparc*)

+    echo 'int i;' > conftest.$ac_ext

+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

+  (eval $ac_compile) 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); }; then

+      case `/usr/bin/file conftest.$ac_objext` in

+      *64-bit*)

+        libsuff=64

+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then

+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

+        fi

+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"

+        ;;

+      esac

+    fi

+    rm -rf conftest*

+    ;;

+  esac

+

   # Append ld.so.conf contents to the search path

   if test -f /etc/ld.so.conf; then

     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' ' '`

-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"

   fi

   # We used to test for /lib/ld.so.1 and disable shared libraries on

--- gas/aclocal.m4.jj	2007-06-18 13:29:28.000000000 -0400

+++ gas/aclocal.m4	2007-06-27 13:55:08.000000000 -0400

@@ -1206,16 +1206,49 @@ version_type=none

 dynamic_linker="$host_os ld.so"

 sys_lib_dlsearch_path_spec="/lib /usr/lib"

 if test "$GCC" = yes; then

-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then

+  lt_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then

     # if the path contains ";" then we assume it to be the separator

     # otherwise default to the standard path separator (i.e. ":") - it is

     # assumed that no part of a normal pathname contains ";" but that should

     # okay in the real world where ";" in dirpaths is itself problematic.

-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`

   else

-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`

+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`

   fi

+  # Ok, now we have the path, separated by spaces, we can step through it

+  # and add multilib dir if necessary.

+  lt_tmp_lt_search_path_spec=

+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`

+  for lt_sys_path in $lt_search_path_spec; do

+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then

+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"

+    else

+      test -d "$lt_sys_path" && \

+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"

+    fi

+  done

+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '

+BEGIN {RS=" "; FS="/|\n";} {

+  lt_foo="";

+  lt_count=0;

+  for (lt_i = NF; lt_i > 0; lt_i--) {

+    if ($lt_i != "" && $lt_i != ".") {

+      if ($lt_i == "..") {

+        lt_count++;

+      } else {

+        if (lt_count == 0) {

+          lt_foo="/" $lt_i lt_foo;

+        } else {

+          lt_count--;

+        }

+      }

+    }

+  }

+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }

+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }

+}'`

+  sys_lib_search_path_spec=`echo $lt_search_path_spec`

 else

   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"

 fi

@@ -1581,13 +1614,16 @@ linux*)

   # find out which ABI we are using

   libsuff=

   case "$host_cpu" in

-  x86_64*|s390x*|powerpc64*)

-    echo '[#]line __oline__ "configure"' > conftest.$ac_ext

+  x86_64*|s390*|powerpc64*|ppc*|sparc*)

+    echo 'int i;' > conftest.$ac_ext

     if AC_TRY_EVAL(ac_compile); then

       case `/usr/bin/file conftest.$ac_objext` in

       *64-bit*)

         libsuff=64

-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then

+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

+        fi

+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"

         ;;

       esac

     fi

--- bfd/configure.jj	2007-06-18 13:29:28.000000000 -0400

+++ bfd/configure	2007-06-27 13:55:08.000000000 -0400

@@ -9156,10 +9156,34 @@ rm -f conftest.err conftest.$ac_objext \

   # before this can be enabled.

   hardcode_into_libs=yes

+  # find out which ABI we are using

+  libsuff=

+  case "$host_cpu" in

+  x86_64*|s390*|powerpc*|ppc*|sparc*)

+    echo 'int i;' > conftest.$ac_ext

+    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

+  (eval $ac_compile) 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); }; then

+      case `/usr/bin/file conftest.$ac_objext` in

+      *64-bit*)

+        libsuff=64

+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then

+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

+        fi

+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"

+        ;;

+      esac

+    fi

+    rm -rf conftest*

+    ;;

+  esac

+

   # Append ld.so.conf contents to the search path

   if test -f /etc/ld.so.conf; then

     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' ' '`

-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"

   fi

   # We used to test for /lib/ld.so.1 and disable shared libraries on

--- bfd/aclocal.m4.jj	2007-06-18 13:29:28.000000000 -0400

+++ bfd/aclocal.m4	2007-06-27 13:55:08.000000000 -0400

@@ -1206,16 +1206,49 @@ version_type=none

 dynamic_linker="$host_os ld.so"

 sys_lib_dlsearch_path_spec="/lib /usr/lib"

 if test "$GCC" = yes; then

-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then

+  lt_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

+  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then

     # if the path contains ";" then we assume it to be the separator

     # otherwise default to the standard path separator (i.e. ":") - it is

     # assumed that no part of a normal pathname contains ";" but that should

     # okay in the real world where ";" in dirpaths is itself problematic.

-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`

   else

-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`

+    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`

   fi

+  # Ok, now we have the path, separated by spaces, we can step through it

+  # and add multilib dir if necessary.

+  lt_tmp_lt_search_path_spec=

+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`

+  for lt_sys_path in $lt_search_path_spec; do

+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then

+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"

+    else

+      test -d "$lt_sys_path" && \

+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"

+    fi

+  done

+  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '

+BEGIN {RS=" "; FS="/|\n";} {

+  lt_foo="";

+  lt_count=0;

+  for (lt_i = NF; lt_i > 0; lt_i--) {

+    if ($lt_i != "" && $lt_i != ".") {

+      if ($lt_i == "..") {

+        lt_count++;

+      } else {

+        if (lt_count == 0) {

+          lt_foo="/" $lt_i lt_foo;

+        } else {

+          lt_count--;

+        }

+      }

+    }

+  }

+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }

+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }

+}'`

+  sys_lib_search_path_spec=`echo $lt_search_path_spec`

 else

   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"

 fi

@@ -1581,13 +1614,16 @@ linux*)

   # find out which ABI we are using

   libsuff=

   case "$host_cpu" in

-  x86_64*|s390x*|powerpc64*)

-    echo '[#]line __oline__ "configure"' > conftest.$ac_ext

+  x86_64*|s390*|powerpc64*|ppc*|sparc*)

+    echo 'int i;' > conftest.$ac_ext

     if AC_TRY_EVAL(ac_compile); then

       case `/usr/bin/file conftest.$ac_objext` in

       *64-bit*)

         libsuff=64

-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then

+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

+        fi

+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"

         ;;

       esac

     fi

--- libtool.m4.jj	2007-06-18 13:29:28.000000000 -0400

+++ libtool.m4	2007-06-27 13:55:08.000000000 -0400

@@ -2337,10 +2337,30 @@ linux* | k*bsd*-gnu)

   # before this can be enabled.

   hardcode_into_libs=yes

+  # find out which ABI we are using

+  libsuff=

+  case "$host_cpu" in

+  x86_64*|s390*|powerpc*|ppc*|sparc*)

+    echo 'int i;' > conftest.$ac_ext

+    if AC_TRY_EVAL(ac_compile); then

+      case `/usr/bin/file conftest.$ac_objext` in

+      *64-bit*)

+        libsuff=64

+        if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then

+          sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

+        fi

+        sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"

+        ;;

+      esac

+    fi

+    rm -rf conftest*

+    ;;

+  esac

+

   # Append ld.so.conf contents to the search path

   if test -f /etc/ld.so.conf; then

     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' ' '`

-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"

   fi

   # We used to test for /lib/ld.so.1 and disable shared libraries on