Virgin import of GCC 2.95.1's libstdc++

1 files changed, 79 insertions, 17 deletions

diff --git a/contrib/libstdc++/Makefile.in b/contrib/libstdc++/Makefile.in
index 77e2ec9..eb9ec77 100644
--- a/contrib/libstdc++/Makefile.in
+++ b/contrib/libstdc++/Makefile.in
@@ -14,9 +14,12 @@
 # along with this library; see the file COPYING.  If not, write to the Free
 # Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-VERSION = 2.9.0
+VERSION = 2.10.0
+INTERFACE = 3
 
-OBJS  = cstringi.o stdexcepti.o cstdlibi.o cmathi.o stlinst.o
+gxx_include_dir=${includedir}/g++
+
+OBJS  = cstringi.o stdexcepti.o cstdlibi.o cmathi.o stlinst.o valarray.o
 SUBLIBS = $(STAMP)-string $(STAMP)-complx
 
 # C++ headers with no extension
@@ -25,19 +28,21 @@ HEADERS= cassert cctype cerrno cfloat ciso646 climits clocale cmath complex \
 	 cwchar cwctype string stdexcept \
 	 algorithm deque functional hash_map hash_set iterator list map \
 	 memory numeric pthread_alloc queue rope set slist stack utility \
-	 vector fstream iomanip iostream strstream iosfwd
+	 vector fstream iomanip iostream strstream iosfwd bitset valarray
 
-ARLIB   = libstdc++.a
+ARLIB   = libstdc++.a.$(VERSION)
+ARLINK  = libstdc++.a
+MARLINK = libstdc++.a.`echo $(VERSION) | sed 's/\([0-9]*[.][0-9]*\).*/\1/'`
 SHLIB   = libstdc++.so.$(VERSION)
 SHARLIB = libstdc++-sh.a
 SHLINK  = libstdc++.so
-MSHLINK = libstdc++.so.`echo $(VERSION) | sed 's/\([0-9][.][0-9]\).*/\1/'`
-SHFLAGS = 
+MSHLINK = libstdc++.so.`echo $(VERSION) | sed 's/\([0-9]*[.][0-9]*\).*/\1/'`
+SHFLAGS =
 SHDEPS  =
 
 STAMP   = bigstmp
 
-LIBS    = $(ARLIB)
+LIBS    = $(ARLIB) $(ARLINK)
 
 #### package, host, target, and site dependent Makefile fragments come in here.
 ##
@@ -85,6 +90,13 @@ $(ARLIB): stdlist
 	mv t$(ARLIB) $(ARLIB)
 	$(RANLIB) $(ARLIB)
 
+$(ARLINK):
+	-rm -f $(ARLINK)
+	$(LN_S) $(ARLIB) $(ARLINK) || cp $(ARLIB) $(ARLINK)
+
+marlink:
+	@$(MAKE) $(MARLINK) "ARLINK=$(MARLINK)"
+
 $(SHLIB): piclist
 	$(CC) $(LIBCXXFLAGS) $(SHFLAGS) -shared -o $(SHLIB) `cat piclist` $(SHDEPS)
 
@@ -95,7 +107,8 @@ $(SHARLIB): $(SHLIB)
 	$(RANLIB) $(SHARLIB)
 
 $(SHLINK):
-	ln -f -s $(SHLIB) $(SHLINK)
+	-rm -f $(SHLINK)
+	$(LN_S) $(SHLIB) $(SHLINK) || cp $(ARLIB) $(ARLINK)
 
 mshlink:
 	@$(MAKE) $(MSHLINK) "SHLINK=$(MSHLINK)"
@@ -117,6 +130,7 @@ cstdlibi.o: cstdlibi.cc
 cmathi.o: cmathi.cc
 stdexcepti.o: stdexcepti.cc
 stlinst.o: stlinst.cc
+valarray.o: valarray.cc
 
 # Later do wide strings, too.
 stmp-string: ${srcdir}/sinst.cc ${srcdir}/std/bastring.h \
@@ -256,7 +270,7 @@ install:
 	    fi ; \
 	    chmod a-x $(gxx_include_dir)/$$FILE ; \
 	  done ; \
-	  for FILE in *.h std/*.*; do \
+	  for FILE in *.h std/*.h std/*.cc std/*.tcc; do \
 	    rm -f $(gxx_include_dir)/$$FILE ; \
 	    $(INSTALL_DATA) $$FILE $(gxx_include_dir)/$$FILE ; \
 	    chmod a-x $(gxx_include_dir)/$$FILE ; \
@@ -270,20 +284,68 @@ install:
 	else true ; \
 	fi
 	rootme=`pwd`/ ; export rootme ; \
-	if [ x$(libsubdir) = x ] || [ x$(enable_version_specific_runtime_libs) != xyes ]; then \
+	if [ x$(enable_version_specific_runtime_libs) != xyes ]; then \
 	  INSTALLDIR=$(libdir); \
 	else \
 	  INSTALLDIR=$(libsubdir); \
 	fi; \
-	rm -f $${INSTALLDIR}$(MULTISUBDIR)/$(SHLINK) ; \
+	INSTALLLINKDIR=$(libsubdir); \
+	if [ $${INSTALLLINKDIR}$(MULTISUBDIR) = $${INSTALLDIR}$(MULTISUBDIR) ]; then \
+	  RELINSTALLDIR=; \
+	elif [ x$(MULTISUBDIR) = x ]; then \
+	  if [ $(build_alias) = $(target_alias) ]; then \
+	    RELINSTALLDIR=../../../; \
+	  else \
+	    RELINSTALLDIR=../../../../$(target_alias)/lib/; \
+	  fi; \
+	else \
+	  if [ $(build_alias) = $(target_alias) ]; then \
+	    RELINSTALLDIR=../../..`echo $(MULTISUBDIR) | sed -e 's,/[^/]*,/..,g'`$(MULTISUBDIR)/; \
+	  else \
+	    RELINSTALLDIR=../../../..`echo $(MULTISUBDIR) | sed -e 's,/[^/]*,/..,g'`/$(target_alias)/lib$(MULTISUBDIR)/; \
+	  fi; \
+	fi; \
+	if [ $(build_alias) != $(target_alias) ]; then \
+	  case $$RELINSTALLDIR in \
+	  ../../../|../../../../) \
+	    RELINSTALLDIR=../$${RELINSTALLDIR}$(target_alias)/lib/;; \
+	  esac; \
+	fi; \
+	rm -f $${INSTALLLINKDIR}$(MULTISUBDIR)/$(SHLINK) ; \
+	rm -f $${INSTALLLINKDIR}$(MULTISUBDIR)/$(ARLINK) ; \
 	for FILE in $(LIBS) ; do \
 	  rm -f $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
 	  if [ $$FILE = $(SHLINK) ] ; then \
-	    ln -f -s $(SHLIB) $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
+	    if [ -f $${INSTALLDIR}/$(MSHLINK) ]; then \
+	      rm -f $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
+	      $(LN_S) $${RELINSTALLDIR}$(MSHLINK) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE \
+		|| cp $${RELINSTALLDIR}$(MSHLINK) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
+	    else \
+	      rm -f $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
+	      $(LN_S) $${RELINSTALLDIR}$(SHLIB) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE \
+		|| cp $${RELINSTALLDIR}$(SHLIB) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
+	    fi; \
+	  elif [ $$FILE = $(ARLINK) ] ; then \
+	    if [ -f $${INSTALLDIR}/$(MARLINK) ]; then \
+	      rm -f $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
+	      $(LN_S) $${RELINSTALLDIR}$(MARLINK) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE \
+		|| cp $${RELINSTALLDIR}$(MARLINK) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
+	    else \
+	      rm -f $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
+	      $(LN_S) $${RELINSTALLDIR}$(ARLIB) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE \
+		|| cp $${RELINSTALLDIR}$(ARLIB) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
+	    fi; \
 	  elif [ $$FILE = mshlink ]; then \
 	    for FILE in $(MSHLINK) ; do \
 	      rm -f $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
-	      ln -f -s $(SHLIB) $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
+	      $(LN_S) $(SHLIB) $${INSTALLDIR}$(MULTISUBDIR)/$$FILE \
+		|| cp $(SHLIB) $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
+	    done; \
+	  elif [ $$FILE = marlink ]; then \
+	    for FILE in $(MARLINK) ; do \
+	      rm -f $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
+	      $(LN_S) $(ARLIB) $${INSTALLDIR}$(MULTISUBDIR)/$$FILE \
+		|| cp $(ARLIB) $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
 	    done; \
 	  elif [ $$FILE = $(SHLIB) ]; then \
 	    $(INSTALL_PROGRAM) $$FILE $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
@@ -301,8 +363,7 @@ install:
 .PHONY: force
 force:
 
-# Remove these for public releases.
-MYCXXFLAGS = -g -O2 -Wpointer-arith -Wnested-externs -Woverloaded-virtual -Wbad-function-cast -Winline -Wwrite-strings
+MYCXXFLAGS = -g -O2 -Wpointer-arith -Wnested-externs -Woverloaded-virtual -Wbad-function-cast -Winline -Wwrite-strings -pedantic -Wno-long-long
 MYCFLAGS = -g -O2 -Wpointer-arith -Wnested-externs
 
 .PHONY: stuff
@@ -316,7 +377,8 @@ stuff1:
 	touch ../../gcc/libgcc2.ready
 
 stuff2:
-	-$(MAKE) -C ../../gcc/ libgcc.a
-	-$(MAKE) check CXXFLAGS="$(MYCXXFLAGS)" CFLAGS="$(MYCFLAGS)"
+	$(MAKE) -C ../../gcc/ libgcc.a
+	$(MAKE) CXXFLAGS="$(MYCXXFLAGS)" CFLAGS="$(MYCFLAGS)"
+	-$(MAKE) check
 	-$(MAKE) -C ../libio check
 	-$(MAKE) -C ../../gcc check-g++