From cbf0ee7967dfcaf5876437ef1a5bad2ccf85f0dc Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Mon, 26 Jan 2004 12:52:10 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 5 +++++ libiberty/configure | 20 +++++++++++++++----- libiberty/configure.ac | 1 + 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 4f5d000..10c7f46 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2004-01-25 Ian Lance Taylor + + * configure.ac: Add m4_pattern_allow(LIBOBJS). + * configure: Regenerate. + 2004-01-22 DJ Delorie * Makefile.in: Convert to ./ throughout. Rebuild dependencies diff --git a/libiberty/configure b/libiberty/configure index 71f14e8..2f65976 100755 --- 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 3e379cc..e8907e7 100644 --- 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 -- 2.7.4