|
 |
bcc1c6d |
--- binutils/configure.jj 2007-06-18 13:29:28.000000000 -0400
|
|
|
e989e15 |
+++ binutils/configure 2007-06-27 13:55:07.000000000 -0400
|
|
|
e989e15 |
@@ -8990,10 +8990,34 @@ rm -f conftest.err conftest.$ac_objext \
|
|
|
bcc1c6d |
# before this can be enabled.
|
|
|
bcc1c6d |
hardcode_into_libs=yes
|
|
|
bcc1c6d |
|
|
|
bcc1c6d |
+ # find out which ABI we are using
|
|
|
bcc1c6d |
+ libsuff=
|
|
|
bcc1c6d |
+ case "$host_cpu" in
|
|
|
bcc1c6d |
+ x86_64*|s390*|powerpc*|ppc*|sparc*)
|
|
|
e989e15 |
+ echo 'int i;' > conftest.$ac_ext
|
|
|
e989e15 |
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
e989e15 |
+ (eval $ac_compile) 2>&5
|
|
|
e989e15 |
+ ac_status=$?
|
|
|
e989e15 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
e989e15 |
+ (exit $ac_status); }; then
|
|
|
bcc1c6d |
+ case `/usr/bin/file conftest.$ac_objext` in
|
|
|
bcc1c6d |
+ *64-bit*)
|
|
|
bcc1c6d |
+ libsuff=64
|
|
|
bcc1c6d |
+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
|
|
|
bcc1c6d |
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
|
|
|
bcc1c6d |
+ ;;
|
|
|
bcc1c6d |
+ esac
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ rm -rf conftest*
|
|
|
bcc1c6d |
+ ;;
|
|
|
bcc1c6d |
+ esac
|
|
|
bcc1c6d |
+
|
|
|
bcc1c6d |
# Append ld.so.conf contents to the search path
|
|
|
bcc1c6d |
if test -f /etc/ld.so.conf; then
|
|
|
bcc1c6d |
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' ' '`
|
|
|
bcc1c6d |
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
|
|
bcc1c6d |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
|
|
|
bcc1c6d |
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
|
|
bcc1c6d |
--- binutils/aclocal.m4.jj 2007-06-18 13:29:28.000000000 -0400
|
|
|
e989e15 |
+++ binutils/aclocal.m4 2007-06-27 13:55:07.000000000 -0400
|
|
|
bcc1c6d |
@@ -1206,16 +1206,49 @@ version_type=none
|
|
|
bcc1c6d |
dynamic_linker="$host_os ld.so"
|
|
|
bcc1c6d |
sys_lib_dlsearch_path_spec="/lib /usr/lib"
|
|
|
bcc1c6d |
if test "$GCC" = yes; then
|
|
|
bcc1c6d |
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
|
|
bcc1c6d |
- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
|
|
|
bcc1c6d |
+ lt_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
|
|
bcc1c6d |
+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
|
|
|
bcc1c6d |
# if the path contains ";" then we assume it to be the separator
|
|
|
bcc1c6d |
# otherwise default to the standard path separator (i.e. ":") - it is
|
|
|
bcc1c6d |
# assumed that no part of a normal pathname contains ";" but that should
|
|
|
bcc1c6d |
# okay in the real world where ";" in dirpaths is itself problematic.
|
|
|
bcc1c6d |
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
|
|
|
bcc1c6d |
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
|
|
|
bcc1c6d |
else
|
|
|
bcc1c6d |
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
bcc1c6d |
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
+ # Ok, now we have the path, separated by spaces, we can step through it
|
|
|
bcc1c6d |
+ # and add multilib dir if necessary.
|
|
|
bcc1c6d |
+ lt_tmp_lt_search_path_spec=
|
|
|
bcc1c6d |
+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
|
|
|
bcc1c6d |
+ for lt_sys_path in $lt_search_path_spec; do
|
|
|
bcc1c6d |
+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
|
|
|
bcc1c6d |
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
|
|
|
bcc1c6d |
+ else
|
|
|
bcc1c6d |
+ test -d "$lt_sys_path" && \
|
|
|
bcc1c6d |
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ done
|
|
|
bcc1c6d |
+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
|
|
|
bcc1c6d |
+BEGIN {RS=" "; FS="/|\n";} {
|
|
|
bcc1c6d |
+ lt_foo="";
|
|
|
bcc1c6d |
+ lt_count=0;
|
|
|
bcc1c6d |
+ for (lt_i = NF; lt_i > 0; lt_i--) {
|
|
|
bcc1c6d |
+ if ($lt_i != "" && $lt_i != ".") {
|
|
|
bcc1c6d |
+ if ($lt_i == "..") {
|
|
|
bcc1c6d |
+ lt_count++;
|
|
|
bcc1c6d |
+ } else {
|
|
|
bcc1c6d |
+ if (lt_count == 0) {
|
|
|
bcc1c6d |
+ lt_foo="/" $lt_i lt_foo;
|
|
|
bcc1c6d |
+ } else {
|
|
|
bcc1c6d |
+ lt_count--;
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
|
|
|
bcc1c6d |
+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
|
|
|
bcc1c6d |
+}'`
|
|
|
bcc1c6d |
+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
|
|
|
bcc1c6d |
else
|
|
|
bcc1c6d |
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
@@ -1581,13 +1614,16 @@ linux*)
|
|
|
bcc1c6d |
# find out which ABI we are using
|
|
|
bcc1c6d |
libsuff=
|
|
|
bcc1c6d |
case "$host_cpu" in
|
|
|
bcc1c6d |
- x86_64*|s390x*|powerpc64*)
|
|
|
bcc1c6d |
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
|
|
|
bcc1c6d |
+ x86_64*|s390*|powerpc64*|ppc*|sparc*)
|
|
|
e989e15 |
+ echo 'int i;' > conftest.$ac_ext
|
|
|
bcc1c6d |
if AC_TRY_EVAL(ac_compile); then
|
|
|
bcc1c6d |
case `/usr/bin/file conftest.$ac_objext` in
|
|
|
bcc1c6d |
*64-bit*)
|
|
|
bcc1c6d |
libsuff=64
|
|
|
bcc1c6d |
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
|
bcc1c6d |
+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
|
|
|
bcc1c6d |
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
|
|
|
bcc1c6d |
;;
|
|
|
bcc1c6d |
esac
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
--- opcodes/configure.jj 2007-06-18 13:29:29.000000000 -0400
|
|
|
e989e15 |
+++ opcodes/configure 2007-06-27 13:55:08.000000000 -0400
|
|
|
e989e15 |
@@ -8420,10 +8420,34 @@ rm -f conftest.err conftest.$ac_objext \
|
|
|
bcc1c6d |
# before this can be enabled.
|
|
|
bcc1c6d |
hardcode_into_libs=yes
|
|
|
bcc1c6d |
|
|
|
bcc1c6d |
+ # find out which ABI we are using
|
|
|
bcc1c6d |
+ libsuff=
|
|
|
bcc1c6d |
+ case "$host_cpu" in
|
|
|
bcc1c6d |
+ x86_64*|s390*|powerpc*|ppc*|sparc*)
|
|
|
e989e15 |
+ echo 'int i;' > conftest.$ac_ext
|
|
|
e989e15 |
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
e989e15 |
+ (eval $ac_compile) 2>&5
|
|
|
e989e15 |
+ ac_status=$?
|
|
|
e989e15 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
e989e15 |
+ (exit $ac_status); }; then
|
|
|
bcc1c6d |
+ case `/usr/bin/file conftest.$ac_objext` in
|
|
|
bcc1c6d |
+ *64-bit*)
|
|
|
bcc1c6d |
+ libsuff=64
|
|
|
bcc1c6d |
+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
|
|
|
bcc1c6d |
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
|
|
|
bcc1c6d |
+ ;;
|
|
|
bcc1c6d |
+ esac
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ rm -rf conftest*
|
|
|
bcc1c6d |
+ ;;
|
|
|
bcc1c6d |
+ esac
|
|
|
bcc1c6d |
+
|
|
|
bcc1c6d |
# Append ld.so.conf contents to the search path
|
|
|
bcc1c6d |
if test -f /etc/ld.so.conf; then
|
|
|
bcc1c6d |
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' ' '`
|
|
|
bcc1c6d |
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
|
|
bcc1c6d |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
|
|
|
bcc1c6d |
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
|
|
bcc1c6d |
--- opcodes/aclocal.m4.jj 2007-06-18 13:29:29.000000000 -0400
|
|
|
e989e15 |
+++ opcodes/aclocal.m4 2007-06-27 13:55:08.000000000 -0400
|
|
|
bcc1c6d |
@@ -1206,16 +1206,49 @@ version_type=none
|
|
|
bcc1c6d |
dynamic_linker="$host_os ld.so"
|
|
|
bcc1c6d |
sys_lib_dlsearch_path_spec="/lib /usr/lib"
|
|
|
bcc1c6d |
if test "$GCC" = yes; then
|
|
|
bcc1c6d |
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
|
|
bcc1c6d |
- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
|
|
|
bcc1c6d |
+ lt_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
|
|
bcc1c6d |
+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
|
|
|
bcc1c6d |
# if the path contains ";" then we assume it to be the separator
|
|
|
bcc1c6d |
# otherwise default to the standard path separator (i.e. ":") - it is
|
|
|
bcc1c6d |
# assumed that no part of a normal pathname contains ";" but that should
|
|
|
bcc1c6d |
# okay in the real world where ";" in dirpaths is itself problematic.
|
|
|
bcc1c6d |
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
|
|
|
bcc1c6d |
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
|
|
|
bcc1c6d |
else
|
|
|
bcc1c6d |
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
bcc1c6d |
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
+ # Ok, now we have the path, separated by spaces, we can step through it
|
|
|
bcc1c6d |
+ # and add multilib dir if necessary.
|
|
|
bcc1c6d |
+ lt_tmp_lt_search_path_spec=
|
|
|
bcc1c6d |
+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
|
|
|
bcc1c6d |
+ for lt_sys_path in $lt_search_path_spec; do
|
|
|
bcc1c6d |
+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
|
|
|
bcc1c6d |
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
|
|
|
bcc1c6d |
+ else
|
|
|
bcc1c6d |
+ test -d "$lt_sys_path" && \
|
|
|
bcc1c6d |
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ done
|
|
|
bcc1c6d |
+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
|
|
|
bcc1c6d |
+BEGIN {RS=" "; FS="/|\n";} {
|
|
|
bcc1c6d |
+ lt_foo="";
|
|
|
bcc1c6d |
+ lt_count=0;
|
|
|
bcc1c6d |
+ for (lt_i = NF; lt_i > 0; lt_i--) {
|
|
|
bcc1c6d |
+ if ($lt_i != "" && $lt_i != ".") {
|
|
|
bcc1c6d |
+ if ($lt_i == "..") {
|
|
|
bcc1c6d |
+ lt_count++;
|
|
|
bcc1c6d |
+ } else {
|
|
|
bcc1c6d |
+ if (lt_count == 0) {
|
|
|
bcc1c6d |
+ lt_foo="/" $lt_i lt_foo;
|
|
|
bcc1c6d |
+ } else {
|
|
|
bcc1c6d |
+ lt_count--;
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
|
|
|
bcc1c6d |
+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
|
|
|
bcc1c6d |
+}'`
|
|
|
bcc1c6d |
+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
|
|
|
bcc1c6d |
else
|
|
|
bcc1c6d |
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
@@ -1581,13 +1614,16 @@ linux*)
|
|
|
bcc1c6d |
# find out which ABI we are using
|
|
|
bcc1c6d |
libsuff=
|
|
|
bcc1c6d |
case "$host_cpu" in
|
|
|
bcc1c6d |
- x86_64*|s390x*|powerpc64*)
|
|
|
bcc1c6d |
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
|
|
|
bcc1c6d |
+ x86_64*|s390*|powerpc64*|ppc*|sparc*)
|
|
|
e989e15 |
+ echo 'int i;' > conftest.$ac_ext
|
|
|
bcc1c6d |
if AC_TRY_EVAL(ac_compile); then
|
|
|
bcc1c6d |
case `/usr/bin/file conftest.$ac_objext` in
|
|
|
bcc1c6d |
*64-bit*)
|
|
|
bcc1c6d |
libsuff=64
|
|
|
bcc1c6d |
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
|
bcc1c6d |
+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
|
|
|
bcc1c6d |
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
|
|
|
bcc1c6d |
;;
|
|
|
bcc1c6d |
esac
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
--- gprof/configure.jj 2007-06-18 13:29:29.000000000 -0400
|
|
|
e989e15 |
+++ gprof/configure 2007-06-27 13:55:08.000000000 -0400
|
|
|
e989e15 |
@@ -8250,10 +8250,34 @@ rm -f conftest.err conftest.$ac_objext \
|
|
|
bcc1c6d |
# before this can be enabled.
|
|
|
bcc1c6d |
hardcode_into_libs=yes
|
|
|
bcc1c6d |
|
|
|
bcc1c6d |
+ # find out which ABI we are using
|
|
|
bcc1c6d |
+ libsuff=
|
|
|
bcc1c6d |
+ case "$host_cpu" in
|
|
|
bcc1c6d |
+ x86_64*|s390*|powerpc*|ppc*|sparc*)
|
|
|
e989e15 |
+ echo 'int i;' > conftest.$ac_ext
|
|
|
e989e15 |
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
e989e15 |
+ (eval $ac_compile) 2>&5
|
|
|
e989e15 |
+ ac_status=$?
|
|
|
e989e15 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
e989e15 |
+ (exit $ac_status); }; then
|
|
|
bcc1c6d |
+ case `/usr/bin/file conftest.$ac_objext` in
|
|
|
bcc1c6d |
+ *64-bit*)
|
|
|
bcc1c6d |
+ libsuff=64
|
|
|
bcc1c6d |
+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
|
|
|
bcc1c6d |
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
|
|
|
bcc1c6d |
+ ;;
|
|
|
bcc1c6d |
+ esac
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ rm -rf conftest*
|
|
|
bcc1c6d |
+ ;;
|
|
|
bcc1c6d |
+ esac
|
|
|
bcc1c6d |
+
|
|
|
bcc1c6d |
# Append ld.so.conf contents to the search path
|
|
|
bcc1c6d |
if test -f /etc/ld.so.conf; then
|
|
|
bcc1c6d |
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' ' '`
|
|
|
bcc1c6d |
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
|
|
bcc1c6d |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
|
|
|
bcc1c6d |
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
|
|
bcc1c6d |
--- gprof/aclocal.m4.jj 2007-06-18 13:29:29.000000000 -0400
|
|
|
e989e15 |
+++ gprof/aclocal.m4 2007-06-27 13:55:08.000000000 -0400
|
|
|
bcc1c6d |
@@ -1206,16 +1206,49 @@ version_type=none
|
|
|
bcc1c6d |
dynamic_linker="$host_os ld.so"
|
|
|
bcc1c6d |
sys_lib_dlsearch_path_spec="/lib /usr/lib"
|
|
|
bcc1c6d |
if test "$GCC" = yes; then
|
|
|
bcc1c6d |
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
|
|
bcc1c6d |
- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
|
|
|
bcc1c6d |
+ lt_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
|
|
bcc1c6d |
+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
|
|
|
bcc1c6d |
# if the path contains ";" then we assume it to be the separator
|
|
|
bcc1c6d |
# otherwise default to the standard path separator (i.e. ":") - it is
|
|
|
bcc1c6d |
# assumed that no part of a normal pathname contains ";" but that should
|
|
|
bcc1c6d |
# okay in the real world where ";" in dirpaths is itself problematic.
|
|
|
bcc1c6d |
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
|
|
|
bcc1c6d |
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
|
|
|
bcc1c6d |
else
|
|
|
bcc1c6d |
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
bcc1c6d |
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
+ # Ok, now we have the path, separated by spaces, we can step through it
|
|
|
bcc1c6d |
+ # and add multilib dir if necessary.
|
|
|
bcc1c6d |
+ lt_tmp_lt_search_path_spec=
|
|
|
bcc1c6d |
+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
|
|
|
bcc1c6d |
+ for lt_sys_path in $lt_search_path_spec; do
|
|
|
bcc1c6d |
+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
|
|
|
bcc1c6d |
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
|
|
|
bcc1c6d |
+ else
|
|
|
bcc1c6d |
+ test -d "$lt_sys_path" && \
|
|
|
bcc1c6d |
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ done
|
|
|
bcc1c6d |
+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
|
|
|
bcc1c6d |
+BEGIN {RS=" "; FS="/|\n";} {
|
|
|
bcc1c6d |
+ lt_foo="";
|
|
|
bcc1c6d |
+ lt_count=0;
|
|
|
bcc1c6d |
+ for (lt_i = NF; lt_i > 0; lt_i--) {
|
|
|
bcc1c6d |
+ if ($lt_i != "" && $lt_i != ".") {
|
|
|
bcc1c6d |
+ if ($lt_i == "..") {
|
|
|
bcc1c6d |
+ lt_count++;
|
|
|
bcc1c6d |
+ } else {
|
|
|
bcc1c6d |
+ if (lt_count == 0) {
|
|
|
bcc1c6d |
+ lt_foo="/" $lt_i lt_foo;
|
|
|
bcc1c6d |
+ } else {
|
|
|
bcc1c6d |
+ lt_count--;
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
|
|
|
bcc1c6d |
+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
|
|
|
bcc1c6d |
+}'`
|
|
|
bcc1c6d |
+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
|
|
|
bcc1c6d |
else
|
|
|
bcc1c6d |
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
@@ -1581,13 +1614,16 @@ linux*)
|
|
|
bcc1c6d |
# find out which ABI we are using
|
|
|
bcc1c6d |
libsuff=
|
|
|
bcc1c6d |
case "$host_cpu" in
|
|
|
bcc1c6d |
- x86_64*|s390x*|powerpc64*)
|
|
|
bcc1c6d |
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
|
|
|
bcc1c6d |
+ x86_64*|s390*|powerpc64*|ppc*|sparc*)
|
|
|
e989e15 |
+ echo 'int i;' > conftest.$ac_ext
|
|
|
bcc1c6d |
if AC_TRY_EVAL(ac_compile); then
|
|
|
bcc1c6d |
case `/usr/bin/file conftest.$ac_objext` in
|
|
|
bcc1c6d |
*64-bit*)
|
|
|
bcc1c6d |
libsuff=64
|
|
|
bcc1c6d |
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
|
bcc1c6d |
+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
|
|
|
bcc1c6d |
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
|
|
|
bcc1c6d |
;;
|
|
|
bcc1c6d |
esac
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
--- ld/configure.jj 2007-06-18 13:29:29.000000000 -0400
|
|
|
e989e15 |
+++ ld/configure 2007-06-27 13:55:08.000000000 -0400
|
|
|
e989e15 |
@@ -8253,10 +8253,34 @@ rm -f conftest.err conftest.$ac_objext \
|
|
|
bcc1c6d |
# before this can be enabled.
|
|
|
bcc1c6d |
hardcode_into_libs=yes
|
|
|
bcc1c6d |
|
|
|
bcc1c6d |
+ # find out which ABI we are using
|
|
|
bcc1c6d |
+ libsuff=
|
|
|
bcc1c6d |
+ case "$host_cpu" in
|
|
|
bcc1c6d |
+ x86_64*|s390*|powerpc*|ppc*|sparc*)
|
|
|
e989e15 |
+ echo 'int i;' > conftest.$ac_ext
|
|
|
e989e15 |
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
e989e15 |
+ (eval $ac_compile) 2>&5
|
|
|
e989e15 |
+ ac_status=$?
|
|
|
e989e15 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
e989e15 |
+ (exit $ac_status); }; then
|
|
|
bcc1c6d |
+ case `/usr/bin/file conftest.$ac_objext` in
|
|
|
bcc1c6d |
+ *64-bit*)
|
|
|
bcc1c6d |
+ libsuff=64
|
|
|
bcc1c6d |
+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
|
|
|
bcc1c6d |
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
|
|
|
bcc1c6d |
+ ;;
|
|
|
bcc1c6d |
+ esac
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ rm -rf conftest*
|
|
|
bcc1c6d |
+ ;;
|
|
|
bcc1c6d |
+ esac
|
|
|
bcc1c6d |
+
|
|
|
bcc1c6d |
# Append ld.so.conf contents to the search path
|
|
|
bcc1c6d |
if test -f /etc/ld.so.conf; then
|
|
|
bcc1c6d |
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' ' '`
|
|
|
bcc1c6d |
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
|
|
bcc1c6d |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
|
|
|
bcc1c6d |
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
|
|
bcc1c6d |
--- ld/aclocal.m4.jj 2007-06-18 13:29:29.000000000 -0400
|
|
|
e989e15 |
+++ ld/aclocal.m4 2007-06-27 13:55:08.000000000 -0400
|
|
|
bcc1c6d |
@@ -1206,16 +1206,49 @@ version_type=none
|
|
|
bcc1c6d |
dynamic_linker="$host_os ld.so"
|
|
|
bcc1c6d |
sys_lib_dlsearch_path_spec="/lib /usr/lib"
|
|
|
bcc1c6d |
if test "$GCC" = yes; then
|
|
|
bcc1c6d |
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
|
|
bcc1c6d |
- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
|
|
|
bcc1c6d |
+ lt_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
|
|
bcc1c6d |
+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
|
|
|
bcc1c6d |
# if the path contains ";" then we assume it to be the separator
|
|
|
bcc1c6d |
# otherwise default to the standard path separator (i.e. ":") - it is
|
|
|
bcc1c6d |
# assumed that no part of a normal pathname contains ";" but that should
|
|
|
bcc1c6d |
# okay in the real world where ";" in dirpaths is itself problematic.
|
|
|
bcc1c6d |
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
|
|
|
bcc1c6d |
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
|
|
|
bcc1c6d |
else
|
|
|
bcc1c6d |
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
bcc1c6d |
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
+ # Ok, now we have the path, separated by spaces, we can step through it
|
|
|
bcc1c6d |
+ # and add multilib dir if necessary.
|
|
|
bcc1c6d |
+ lt_tmp_lt_search_path_spec=
|
|
|
bcc1c6d |
+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
|
|
|
bcc1c6d |
+ for lt_sys_path in $lt_search_path_spec; do
|
|
|
bcc1c6d |
+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
|
|
|
bcc1c6d |
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
|
|
|
bcc1c6d |
+ else
|
|
|
bcc1c6d |
+ test -d "$lt_sys_path" && \
|
|
|
bcc1c6d |
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ done
|
|
|
bcc1c6d |
+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
|
|
|
bcc1c6d |
+BEGIN {RS=" "; FS="/|\n";} {
|
|
|
bcc1c6d |
+ lt_foo="";
|
|
|
bcc1c6d |
+ lt_count=0;
|
|
|
bcc1c6d |
+ for (lt_i = NF; lt_i > 0; lt_i--) {
|
|
|
bcc1c6d |
+ if ($lt_i != "" && $lt_i != ".") {
|
|
|
bcc1c6d |
+ if ($lt_i == "..") {
|
|
|
bcc1c6d |
+ lt_count++;
|
|
|
bcc1c6d |
+ } else {
|
|
|
bcc1c6d |
+ if (lt_count == 0) {
|
|
|
bcc1c6d |
+ lt_foo="/" $lt_i lt_foo;
|
|
|
bcc1c6d |
+ } else {
|
|
|
bcc1c6d |
+ lt_count--;
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
|
|
|
bcc1c6d |
+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
|
|
|
bcc1c6d |
+}'`
|
|
|
bcc1c6d |
+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
|
|
|
bcc1c6d |
else
|
|
|
bcc1c6d |
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
@@ -1581,13 +1614,16 @@ linux*)
|
|
|
bcc1c6d |
# find out which ABI we are using
|
|
|
bcc1c6d |
libsuff=
|
|
|
bcc1c6d |
case "$host_cpu" in
|
|
|
bcc1c6d |
- x86_64*|s390x*|powerpc64*)
|
|
|
bcc1c6d |
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
|
|
|
bcc1c6d |
+ x86_64*|s390*|powerpc64*|ppc*|sparc*)
|
|
|
e989e15 |
+ echo 'int i;' > conftest.$ac_ext
|
|
|
bcc1c6d |
if AC_TRY_EVAL(ac_compile); then
|
|
|
bcc1c6d |
case `/usr/bin/file conftest.$ac_objext` in
|
|
|
bcc1c6d |
*64-bit*)
|
|
|
bcc1c6d |
libsuff=64
|
|
|
bcc1c6d |
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
|
bcc1c6d |
+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
|
|
|
bcc1c6d |
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
|
|
|
bcc1c6d |
;;
|
|
|
bcc1c6d |
esac
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
--- gas/configure.jj 2007-06-18 13:29:28.000000000 -0400
|
|
|
e989e15 |
+++ gas/configure 2007-06-27 13:55:08.000000000 -0400
|
|
|
e989e15 |
@@ -8252,10 +8252,34 @@ rm -f conftest.err conftest.$ac_objext \
|
|
|
bcc1c6d |
# before this can be enabled.
|
|
|
bcc1c6d |
hardcode_into_libs=yes
|
|
|
bcc1c6d |
|
|
|
bcc1c6d |
+ # find out which ABI we are using
|
|
|
bcc1c6d |
+ libsuff=
|
|
|
bcc1c6d |
+ case "$host_cpu" in
|
|
|
bcc1c6d |
+ x86_64*|s390*|powerpc*|ppc*|sparc*)
|
|
|
e989e15 |
+ echo 'int i;' > conftest.$ac_ext
|
|
|
e989e15 |
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
e989e15 |
+ (eval $ac_compile) 2>&5
|
|
|
e989e15 |
+ ac_status=$?
|
|
|
e989e15 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
e989e15 |
+ (exit $ac_status); }; then
|
|
|
bcc1c6d |
+ case `/usr/bin/file conftest.$ac_objext` in
|
|
|
bcc1c6d |
+ *64-bit*)
|
|
|
bcc1c6d |
+ libsuff=64
|
|
|
bcc1c6d |
+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
|
|
|
bcc1c6d |
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
|
|
|
bcc1c6d |
+ ;;
|
|
|
bcc1c6d |
+ esac
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ rm -rf conftest*
|
|
|
bcc1c6d |
+ ;;
|
|
|
bcc1c6d |
+ esac
|
|
|
bcc1c6d |
+
|
|
|
bcc1c6d |
# Append ld.so.conf contents to the search path
|
|
|
bcc1c6d |
if test -f /etc/ld.so.conf; then
|
|
|
bcc1c6d |
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' ' '`
|
|
|
bcc1c6d |
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
|
|
bcc1c6d |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
|
|
|
bcc1c6d |
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
|
|
bcc1c6d |
--- gas/aclocal.m4.jj 2007-06-18 13:29:28.000000000 -0400
|
|
|
e989e15 |
+++ gas/aclocal.m4 2007-06-27 13:55:08.000000000 -0400
|
|
|
bcc1c6d |
@@ -1206,16 +1206,49 @@ version_type=none
|
|
|
bcc1c6d |
dynamic_linker="$host_os ld.so"
|
|
|
bcc1c6d |
sys_lib_dlsearch_path_spec="/lib /usr/lib"
|
|
|
bcc1c6d |
if test "$GCC" = yes; then
|
|
|
bcc1c6d |
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
|
|
bcc1c6d |
- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
|
|
|
bcc1c6d |
+ lt_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
|
|
bcc1c6d |
+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
|
|
|
bcc1c6d |
# if the path contains ";" then we assume it to be the separator
|
|
|
bcc1c6d |
# otherwise default to the standard path separator (i.e. ":") - it is
|
|
|
bcc1c6d |
# assumed that no part of a normal pathname contains ";" but that should
|
|
|
bcc1c6d |
# okay in the real world where ";" in dirpaths is itself problematic.
|
|
|
bcc1c6d |
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
|
|
|
bcc1c6d |
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
|
|
|
bcc1c6d |
else
|
|
|
bcc1c6d |
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
bcc1c6d |
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
+ # Ok, now we have the path, separated by spaces, we can step through it
|
|
|
bcc1c6d |
+ # and add multilib dir if necessary.
|
|
|
bcc1c6d |
+ lt_tmp_lt_search_path_spec=
|
|
|
bcc1c6d |
+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
|
|
|
bcc1c6d |
+ for lt_sys_path in $lt_search_path_spec; do
|
|
|
bcc1c6d |
+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
|
|
|
bcc1c6d |
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
|
|
|
bcc1c6d |
+ else
|
|
|
bcc1c6d |
+ test -d "$lt_sys_path" && \
|
|
|
bcc1c6d |
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ done
|
|
|
bcc1c6d |
+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
|
|
|
bcc1c6d |
+BEGIN {RS=" "; FS="/|\n";} {
|
|
|
bcc1c6d |
+ lt_foo="";
|
|
|
bcc1c6d |
+ lt_count=0;
|
|
|
bcc1c6d |
+ for (lt_i = NF; lt_i > 0; lt_i--) {
|
|
|
bcc1c6d |
+ if ($lt_i != "" && $lt_i != ".") {
|
|
|
bcc1c6d |
+ if ($lt_i == "..") {
|
|
|
bcc1c6d |
+ lt_count++;
|
|
|
bcc1c6d |
+ } else {
|
|
|
bcc1c6d |
+ if (lt_count == 0) {
|
|
|
bcc1c6d |
+ lt_foo="/" $lt_i lt_foo;
|
|
|
bcc1c6d |
+ } else {
|
|
|
bcc1c6d |
+ lt_count--;
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
|
|
|
bcc1c6d |
+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
|
|
|
bcc1c6d |
+}'`
|
|
|
bcc1c6d |
+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
|
|
|
bcc1c6d |
else
|
|
|
bcc1c6d |
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
@@ -1581,13 +1614,16 @@ linux*)
|
|
|
bcc1c6d |
# find out which ABI we are using
|
|
|
bcc1c6d |
libsuff=
|
|
|
bcc1c6d |
case "$host_cpu" in
|
|
|
bcc1c6d |
- x86_64*|s390x*|powerpc64*)
|
|
|
bcc1c6d |
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
|
|
|
bcc1c6d |
+ x86_64*|s390*|powerpc64*|ppc*|sparc*)
|
|
|
e989e15 |
+ echo 'int i;' > conftest.$ac_ext
|
|
|
bcc1c6d |
if AC_TRY_EVAL(ac_compile); then
|
|
|
bcc1c6d |
case `/usr/bin/file conftest.$ac_objext` in
|
|
|
bcc1c6d |
*64-bit*)
|
|
|
bcc1c6d |
libsuff=64
|
|
|
bcc1c6d |
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
|
bcc1c6d |
+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
|
|
|
bcc1c6d |
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
|
|
|
bcc1c6d |
;;
|
|
|
bcc1c6d |
esac
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
--- bfd/configure.jj 2007-06-18 13:29:28.000000000 -0400
|
|
|
e989e15 |
+++ bfd/configure 2007-06-27 13:55:08.000000000 -0400
|
|
|
e989e15 |
@@ -9156,10 +9156,34 @@ rm -f conftest.err conftest.$ac_objext \
|
|
|
bcc1c6d |
# before this can be enabled.
|
|
|
bcc1c6d |
hardcode_into_libs=yes
|
|
|
bcc1c6d |
|
|
|
bcc1c6d |
+ # find out which ABI we are using
|
|
|
bcc1c6d |
+ libsuff=
|
|
|
bcc1c6d |
+ case "$host_cpu" in
|
|
|
bcc1c6d |
+ x86_64*|s390*|powerpc*|ppc*|sparc*)
|
|
|
e989e15 |
+ echo 'int i;' > conftest.$ac_ext
|
|
|
e989e15 |
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
|
|
e989e15 |
+ (eval $ac_compile) 2>&5
|
|
|
e989e15 |
+ ac_status=$?
|
|
|
e989e15 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
e989e15 |
+ (exit $ac_status); }; then
|
|
|
bcc1c6d |
+ case `/usr/bin/file conftest.$ac_objext` in
|
|
|
bcc1c6d |
+ *64-bit*)
|
|
|
bcc1c6d |
+ libsuff=64
|
|
|
bcc1c6d |
+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
|
|
|
bcc1c6d |
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
|
|
|
bcc1c6d |
+ ;;
|
|
|
bcc1c6d |
+ esac
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ rm -rf conftest*
|
|
|
bcc1c6d |
+ ;;
|
|
|
bcc1c6d |
+ esac
|
|
|
bcc1c6d |
+
|
|
|
bcc1c6d |
# Append ld.so.conf contents to the search path
|
|
|
bcc1c6d |
if test -f /etc/ld.so.conf; then
|
|
|
bcc1c6d |
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' ' '`
|
|
|
bcc1c6d |
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
|
|
bcc1c6d |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
|
|
|
bcc1c6d |
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
|
|
bcc1c6d |
--- bfd/aclocal.m4.jj 2007-06-18 13:29:28.000000000 -0400
|
|
|
e989e15 |
+++ bfd/aclocal.m4 2007-06-27 13:55:08.000000000 -0400
|
|
|
bcc1c6d |
@@ -1206,16 +1206,49 @@ version_type=none
|
|
|
bcc1c6d |
dynamic_linker="$host_os ld.so"
|
|
|
bcc1c6d |
sys_lib_dlsearch_path_spec="/lib /usr/lib"
|
|
|
bcc1c6d |
if test "$GCC" = yes; then
|
|
|
bcc1c6d |
- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
|
|
bcc1c6d |
- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
|
|
|
bcc1c6d |
+ lt_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
|
|
|
bcc1c6d |
+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
|
|
|
bcc1c6d |
# if the path contains ";" then we assume it to be the separator
|
|
|
bcc1c6d |
# otherwise default to the standard path separator (i.e. ":") - it is
|
|
|
bcc1c6d |
# assumed that no part of a normal pathname contains ";" but that should
|
|
|
bcc1c6d |
# okay in the real world where ";" in dirpaths is itself problematic.
|
|
|
bcc1c6d |
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
|
|
|
bcc1c6d |
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
|
|
|
bcc1c6d |
else
|
|
|
bcc1c6d |
- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
bcc1c6d |
+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
+ # Ok, now we have the path, separated by spaces, we can step through it
|
|
|
bcc1c6d |
+ # and add multilib dir if necessary.
|
|
|
bcc1c6d |
+ lt_tmp_lt_search_path_spec=
|
|
|
bcc1c6d |
+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
|
|
|
bcc1c6d |
+ for lt_sys_path in $lt_search_path_spec; do
|
|
|
bcc1c6d |
+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
|
|
|
bcc1c6d |
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
|
|
|
bcc1c6d |
+ else
|
|
|
bcc1c6d |
+ test -d "$lt_sys_path" && \
|
|
|
bcc1c6d |
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ done
|
|
|
bcc1c6d |
+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
|
|
|
bcc1c6d |
+BEGIN {RS=" "; FS="/|\n";} {
|
|
|
bcc1c6d |
+ lt_foo="";
|
|
|
bcc1c6d |
+ lt_count=0;
|
|
|
bcc1c6d |
+ for (lt_i = NF; lt_i > 0; lt_i--) {
|
|
|
bcc1c6d |
+ if ($lt_i != "" && $lt_i != ".") {
|
|
|
bcc1c6d |
+ if ($lt_i == "..") {
|
|
|
bcc1c6d |
+ lt_count++;
|
|
|
bcc1c6d |
+ } else {
|
|
|
bcc1c6d |
+ if (lt_count == 0) {
|
|
|
bcc1c6d |
+ lt_foo="/" $lt_i lt_foo;
|
|
|
bcc1c6d |
+ } else {
|
|
|
bcc1c6d |
+ lt_count--;
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ }
|
|
|
bcc1c6d |
+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
|
|
|
bcc1c6d |
+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
|
|
|
bcc1c6d |
+}'`
|
|
|
bcc1c6d |
+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
|
|
|
bcc1c6d |
else
|
|
|
bcc1c6d |
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
|
|
|
bcc1c6d |
fi
|
|
|
bcc1c6d |
@@ -1581,13 +1614,16 @@ linux*)
|
|
|
bcc1c6d |
# find out which ABI we are using
|
|
|
bcc1c6d |
libsuff=
|
|
|
bcc1c6d |
case "$host_cpu" in
|
|
|
bcc1c6d |
- x86_64*|s390x*|powerpc64*)
|
|
|
bcc1c6d |
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
|
|
|
bcc1c6d |
+ x86_64*|s390*|powerpc64*|ppc*|sparc*)
|
|
|
e989e15 |
+ echo 'int i;' > conftest.$ac_ext
|
|
|
bcc1c6d |
if AC_TRY_EVAL(ac_compile); then
|
|
|
bcc1c6d |
case `/usr/bin/file conftest.$ac_objext` in
|
|
|
bcc1c6d |
*64-bit*)
|
|
|
bcc1c6d |
libsuff=64
|
|
|
bcc1c6d |
- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
|
bcc1c6d |
+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
|
|
|
bcc1c6d |
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
|
bcc1c6d |
+ fi
|
|
|
bcc1c6d |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
|
|
|
bcc1c6d |
;;
|
|
|
bcc1c6d |
esac
|
|
|
bcc1c6d |
fi
|
|
|
e989e15 |
--- libtool.m4.jj 2007-06-18 13:29:28.000000000 -0400
|
|
|
e989e15 |
+++ libtool.m4 2007-06-27 13:55:08.000000000 -0400
|
|
|
e989e15 |
@@ -2337,10 +2337,30 @@ linux* | k*bsd*-gnu)
|
|
|
e989e15 |
# before this can be enabled.
|
|
|
e989e15 |
hardcode_into_libs=yes
|
|
|
e989e15 |
|
|
|
e989e15 |
+ # find out which ABI we are using
|
|
|
e989e15 |
+ libsuff=
|
|
|
e989e15 |
+ case "$host_cpu" in
|
|
|
e989e15 |
+ x86_64*|s390*|powerpc*|ppc*|sparc*)
|
|
|
e989e15 |
+ echo 'int i;' > conftest.$ac_ext
|
|
|
e989e15 |
+ if AC_TRY_EVAL(ac_compile); then
|
|
|
e989e15 |
+ case `/usr/bin/file conftest.$ac_objext` in
|
|
|
e989e15 |
+ *64-bit*)
|
|
|
e989e15 |
+ libsuff=64
|
|
|
e989e15 |
+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then
|
|
|
e989e15 |
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
|
|
|
e989e15 |
+ fi
|
|
|
e989e15 |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
|
|
|
e989e15 |
+ ;;
|
|
|
e989e15 |
+ esac
|
|
|
e989e15 |
+ fi
|
|
|
e989e15 |
+ rm -rf conftest*
|
|
|
e989e15 |
+ ;;
|
|
|
e989e15 |
+ esac
|
|
|
e989e15 |
+
|
|
|
e989e15 |
# Append ld.so.conf contents to the search path
|
|
|
e989e15 |
if test -f /etc/ld.so.conf; then
|
|
|
e989e15 |
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' ' '`
|
|
|
e989e15 |
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
|
|
e989e15 |
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
|
|
|
e989e15 |
fi
|
|
|
e989e15 |
|
|
|
e989e15 |
# We used to test for /lib/ld.so.1 and disable shared libraries on
|