merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 4f5d000e110f759f16916146ba15fe7bbba35cc6..10c7f4690e6dbb217e6ad4ee5d38711ffc998af1 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-25  Ian Lance Taylor  <ian@wasabisystems.com>
+
+       * configure.ac: Add m4_pattern_allow(LIBOBJS).
+       * configure: Regenerate.
+
 2004-01-22  DJ Delorie  <dj@redhat.com>
 
        * Makefile.in: Convert to ./ throughout.  Rebuild dependencies

diff --git a/libiberty/configure b/libiberty/configure
index 71f14e8a93cfb425089df6e141491dd07a1e6f90..2f65976692d459ebf268d79040454e1d13c0c9b7 100755 (executable)
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -5679,11 +5679,11 @@ fi
 
 # Figure out which version of pexecute to use.
 case "${host}" in
-     *-*-mingw* | *-*-winnt*)  pexecute=pex-win32.o  ;;
-     *-*-msdosdjgpp*)          pexecute=pex-djgpp.o  ;;
-     *-*-msdos*)               pexecute=pex-msdos.o  ;;
-     *-*-os2-emx*)             pexecute=pex-os2.o    ;;
-     *)                                pexecute=pex-unix.o   ;;
+     *-*-mingw* | *-*-winnt*)  pexecute=./pex-win32.o  ;;
+     *-*-msdosdjgpp*)          pexecute=./pex-djgpp.o  ;;
+     *-*-msdos*)               pexecute=./pex-msdos.o  ;;
+     *-*-os2-emx*)             pexecute=./pex-os2.o    ;;
+     *)                                pexecute=./pex-unix.o   ;;
 esac
 
 
@@ -6134,6 +6134,16 @@ else
 fi
 
 
+
+L=""
+for l in x $LIBOBJS; do
+  case $l in
+    x) ;;
+    *) L="$L ./$l" ;;
+  esac
+done
+LIBOBJS="$L"
+
 # We need multilib support, but only if configuring for the target.
                     ac_config_files="$ac_config_files Makefile testsuite/Makefile"
           ac_config_commands="$ac_config_commands default"

diff --git a/libiberty/configure.ac b/libiberty/configure.ac
index 3e379cc85a5ba3c5b9309f56a03fcc4f59cae30b..e8907e708c887554e86c07f56115713e02aa52ba 100644 (file)
--- a/libiberty/configure.ac
+++ b/libiberty/configure.ac
@@ -496,6 +496,7 @@ else
 fi
 AC_SUBST(INSTALL_DEST)
 
+m4_pattern_allow(LIBOBJS)
 L=""
 for l in x $LIBOBJS; do
   case $l in