merge from gcc

libiberty/ChangeLog

@@ -1,3 +1,12 @@
+2004-12-27  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* Makefile.in: Undo to 2004-12-17.
+	* aclocal.m4: Likewise.
+	* config.table: Likewise.
+	* configure.ac: Likewise.
+	* maint-tool: Likewise.
+	* configure: Likewise.
+
 2004-12-19  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR bootstrap/19072

libiberty/aclocal.m4

@@ -1,7 +1,6 @@
 sinclude(../config/accross.m4)
 sinclude(../config/acx.m4)
 sinclude(../config/no-executables.m4)
-sinclude(../libtool.m4)
 
 dnl See whether strncmp reads past the end of its string parameters.
 dnl On some versions of SunOS4 at least, strncmp reads a word at a time

libiberty/config.table

@@ -20,6 +20,33 @@ else
   frags=
 fi
 
+# If they didn't specify --enable-shared, don't generate shared libs.
+case "${enable_shared}" in
+  yes) shared=yes ;;
+  no) shared=no ;;
+  "") shared=no ;;
+  *) shared=yes ;;
+esac
+if [ "${shared}" = "yes" ]; then
+  frag=
+  case "${host}" in
+    *-*-cygwin*)	;;
+    alpha*-*-linux*)	frag=mh-elfalphapic ;;
+    arm*-*-*)		frag=mh-armpic ;;
+    hppa*-*-*)		frag=mh-papic ;;
+    i[34567]86-*-* | x86_64-*-*)
+			frag=mh-x86pic ;;
+    powerpc*-*-aix*)	;;
+    powerpc*-*-*)	frag=mh-ppcpic ;;
+    sparc*-*-*)		frag=mh-sparcpic ;;
+    s390*-*-*)		frag=mh-s390pic ;;
+    *)			frag=mh-${host_cpu}pic ;;
+  esac
+  if [ -n "${frag}" ]; then
+    frags="${frags} ${libiberty_topdir}/config/${frag}"
+  fi
+fi
+
 echo "# Warning: this fragment is automatically generated" > temp-frag
 
 for frag in ${frags}; do
@@ -30,5 +57,12 @@ for frag in ${frags}; do
   fi
 done
 
+# record if we want to build shared libs.
+if [ "${shared}" = "yes" ]; then
+  echo enable_shared = yes >> temp-frag
+else
+  echo enable_shared = no >> temp-frag
+fi
+
 frag=xhost-mkfrag
 ${CONFIG_SHELL-/bin/sh} ${libiberty_topdir}/move-if-change temp-frag xhost-mkfrag

libiberty/configure.ac

@@ -4,9 +4,6 @@ AC_PREREQ(2.59)
 AC_INIT
 AC_CONFIG_SRCDIR([xmalloc.c])
 
-# FIXME: libiberty doesn't support --disable-static
-enable_static=yes
-
 # This works around the fact that libtool configuration may change LD
 # for this particular configuration, but some shells, instead of
 # keeping the changes in LD private, export them just because LD is
@@ -121,15 +118,27 @@ if test x$GCC = xyes; then
 fi
 AC_SUBST(ac_libiberty_warn_cflags)
 
+AC_PROG_CC_C_O
+# autoconf is lame and doesn't give us any substitution variable for this.
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = no"; then
+  NO_MINUS_C_MINUS_O=yes
+else
+  OUTPUT_OPTION='-o $@'
+fi
+AC_SUBST(NO_MINUS_C_MINUS_O)
+AC_SUBST(OUTPUT_OPTION)
+
 AC_C_CONST
 AC_C_INLINE
 AC_C_BIGENDIAN_CROSS
 
+dnl When we start using libtool:
 dnl Default to a non shared library.  This may be overridden by the
 dnl configure option --enable-shared.
-AM_DISABLE_SHARED
+dnl AM_DISABLE_SHARED
 
-AM_PROG_LIBTOOL
+dnl When we start using libtool:
+dnl AM_PROG_LIBTOOL
 
 dnl When we start using automake:
 dnl AM_CONFIG_HEADER(config.h:config.in)
@@ -506,16 +515,13 @@ fi
 
 # Figure out which version of pexecute to use.
 case "${host}" in
-     *-*-mingw* | *-*-winnt*)	pex=./pex-win32  ;;
-     *-*-msdosdjgpp*)		pex=./pex-djgpp  ;;
-     *-*-msdos*)		pex=./pex-msdos  ;;
-     *-*-os2-emx*)		pex=./pex-os2    ;;
-     *)				pex=./pex-unix   ;;
+     *-*-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
-pexecute=${pex}.o
-ltpexecute=${pex}.lo
 AC_SUBST(pexecute)
-AC_SUBST(ltpexecute)
 
 libiberty_AC_FUNC_STRNCMP
 
@@ -528,7 +534,6 @@ else
 fi
 AC_SUBST(INSTALL_DEST)
 
-# Add `./' to avoid VPATH.
 m4_pattern_allow(LIBOBJS)
 L=""
 for l in x $LIBOBJS; do
@@ -539,19 +544,6 @@ for l in x $LIBOBJS; do
 done
 LIBOBJS="$L"
 
-m4_pattern_allow(LTLIBOBJS)
-L=""
-for l in x $LTLIBOBJS; do
-  case $l in
-    x) ;;
-    *) L="$L ./$l" ;;
-  esac
-done
-LTLIBOBJS="$L"
-
-dnl Delete it when we start creating shared library with libtool.
-AC_SUBST(enable_shared)
-
 # We need multilib support, but only if configuring for the target.
 AC_CONFIG_FILES([Makefile testsuite/Makefile])
 AC_CONFIG_COMMANDS([default],

libiberty/maint-tool

@@ -76,7 +76,7 @@ sub missing {
     for $f (sort keys %listed) {
 	if ($f =~ /(.*)\.c$/) {
 	    $base = $1;
-	    if (! $listed{"$base.lo"}) {
+	    if (! $listed{"$base.o"}) {
 		print "O $f\n";
 	    }
 	}
@@ -213,7 +213,10 @@ sub locals_first {
 
 sub deps {
 
-    $crule .= "\t\$(LTCOMPILE) -c -o \$@ \$<\n";
+    $crule  = "\tif [ x\"\$(PICFLAG)\" != x ]; then \\\n";
+    $crule .= "\t  \$(COMPILE.c) \$(PICFLAG) \$< -o pic/\$@; \\\n";
+    $crule .= "\telse true; fi\n";
+    $crule .= "\t\$(COMPILE.c) \$< \$(OUTPUT_OPTION)\n";
     $crule .= "\n";
 
     $incdir = shift @ARGV;
@@ -262,7 +265,7 @@ sub deps {
 	    }
 	    @deps = sort { &locals_first($a,$b) } keys %scanned;
 	    $obj = $f;
-	    $obj =~ s/\.c$/.lo/;
+	    $obj =~ s/\.c$/.o/;
 	    $obj = "./$obj:";
 	    if ($#deps >= 0) {
 		print OUT "$obj \$(srcdir)/$f";