Virgin import of GCC 2.95.1's libstdc++

16 files changed, 41 insertions, 11 deletions

diff --git a/contrib/libstdc++/config/aix.ml b/contrib/libstdc++/config/aix.ml
index cd96870..dec7a90 100644
--- a/contrib/libstdc++/config/aix.ml
+++ b/contrib/libstdc++/config/aix.ml
@@ -1,8 +1,9 @@
 # AIX has wierd shared/non-shared libraries.
 
-ARLIB	 = libstdc++-ar.a 
+ARLIB	 = libstdc++-ar.a.$(VERSION)
+ARLINK	 = libstdc++-ar.a
 SHLINK   = libstdc++.a
-LIBS     = $(ARLIB) $(SHLIB) $(SHLINK)
+LIBS     = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK)
 DEPLIBS  = ../$(SHLIB)
 SHDEPS   = -lm
 SHFLAGS  = -Wl,-unix
diff --git a/contrib/libstdc++/config/dec-osf.ml b/contrib/libstdc++/config/dec-osf.ml
index 618c6c8..a11f373 100644
--- a/contrib/libstdc++/config/dec-osf.ml
+++ b/contrib/libstdc++/config/dec-osf.ml
@@ -1,6 +1,6 @@
 # We don't need -fpic on the alpha, so let's install both the shared and
 # non-shared versions.
 
-LIBS     = $(ARLIB) $(SHLIB) $(SHLINK)
+LIBS     = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK)
 DEPLIBS  = ../$(SHLIB)
 SHDEPS   = -lm
diff --git a/contrib/libstdc++/config/elf.ml b/contrib/libstdc++/config/elf.ml
index 2a5f336..bd711de 100644
--- a/contrib/libstdc++/config/elf.ml
+++ b/contrib/libstdc++/config/elf.ml
@@ -1,7 +1,7 @@
 # Elf without shared libm -- we have to link with the archive library, even
 # for programs that don't use complex.
 
-LIBS    = $(ARLIB) $(SHLIB) $(SHLINK)
+LIBS    = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK)
 SHFLAGS = -h $(SHLIB)
 DEPLIBS = ../$(SHLIB)
 LDLIBS  = -L.. -lstdc++ -lm
diff --git a/contrib/libstdc++/config/elfshlibm.ml b/contrib/libstdc++/config/elfshlibm.ml
index fe2bf3f..826f0bc 100644
--- a/contrib/libstdc++/config/elfshlibm.ml
+++ b/contrib/libstdc++/config/elfshlibm.ml
@@ -1,6 +1,6 @@
 # Elf with shared libm, so we can link it into the shared libstdc++.
 
-LIBS    = $(ARLIB) $(SHLIB) $(SHLINK)
+LIBS    = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK)
 SHFLAGS = -h $(SHLIB)
 SHDEPS  = -lm
 DEPLIBS = ../$(SHLIB)
diff --git a/contrib/libstdc++/config/freebsd.ml b/contrib/libstdc++/config/freebsd.ml
new file mode 100644
index 0000000..3ee6826
--- /dev/null
+++ b/contrib/libstdc++/config/freebsd.ml
@@ -0,0 +1,6 @@
+# Elf with shared libm, so we can link it into the shared libstdc++.
+
+LIBS    = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK) mshlink
+SHFLAGS = -Wl,-soname,$(MSHLINK)
+SHDEPS  = -lm
+DEPLIBS = ../$(SHLIB)
diff --git a/contrib/libstdc++/config/gnu.ml b/contrib/libstdc++/config/gnu.ml
new file mode 100644
index 0000000..2a03803
--- /dev/null
+++ b/contrib/libstdc++/config/gnu.ml
@@ -0,0 +1,6 @@
+# Elf with shared libm, so we can link it into the shared libstdc++.
+
+LIBS    = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK)
+SHFLAGS = -Wl,-soname,$(SHLIB)
+SHDEPS  = -lm
+DEPLIBS = ../$(SHLIB)
diff --git a/contrib/libstdc++/config/hpux.ml b/contrib/libstdc++/config/hpux.ml
index 1531fe8..a39602a 100644
--- a/contrib/libstdc++/config/hpux.ml
+++ b/contrib/libstdc++/config/hpux.ml
@@ -1,6 +1,6 @@
 # HPUX uses the .sl suffix for shared libraries.
 
 SHLIB   = libstdc++.sl
-LIBS    = $(ARLIB) $(SHLIB)
+LIBS    = $(ARLIB) $(ARLINK) $(SHLIB)
 DEPLIBS = ../$(SHLIB)
 SHFLAGS = $(PICFLAG)
diff --git a/contrib/libstdc++/config/irix5.ml b/contrib/libstdc++/config/irix5.ml
index 6b33445..055c832 100644
--- a/contrib/libstdc++/config/irix5.ml
+++ b/contrib/libstdc++/config/irix5.ml
@@ -1,6 +1,6 @@
 # We don't need -fpic on IRIX, so let's install both the shared and
 # non-shared versions.
 
-LIBS     = $(ARLIB) $(SHLIB) $(SHLINK)
+LIBS     = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK)
 DEPLIBS  = ../$(SHLIB)
 SHDEPS   = -lm
diff --git a/contrib/libstdc++/config/linux.ml b/contrib/libstdc++/config/linux.ml
index 7e6eece..14dcb45 100644
--- a/contrib/libstdc++/config/linux.ml
+++ b/contrib/libstdc++/config/linux.ml
@@ -1,6 +1,11 @@
 # Elf with shared libm, so we can link it into the shared libstdc++.
 
-LIBS    = $(ARLIB) $(SHLIB) $(SHLINK) mshlink
+ARLIB   = libstdc++-$(LIBSTDCXX_INTERFACE)$(LIBC_INTERFACE)$(CXX_INTERFACE)-$(VERSION).a
+MARLINK = libstdc++$(LIBC_INTERFACE)$(CXX_INTERFACE).a.$(LIBSTDCXX_INTERFACE)
+SHLIB   = libstdc++-$(LIBSTDCXX_INTERFACE)$(LIBC_INTERFACE)$(CXX_INTERFACE)-$(VERSION).so
+MSHLINK = libstdc++$(LIBC_INTERFACE)$(CXX_INTERFACE).so.$(LIBSTDCXX_INTERFACE)
+
+LIBS    = $(ARLIB) marlink $(ARLINK) $(SHLIB) mshlink $(SHLINK)
 SHFLAGS = -Wl,-soname,$(MSHLINK)
 SHDEPS  = -lm
 DEPLIBS = ../$(SHLIB)
diff --git a/contrib/libstdc++/config/openbsd.ml b/contrib/libstdc++/config/openbsd.ml
index 0d278f6..09c4023 100644
--- a/contrib/libstdc++/config/openbsd.ml
+++ b/contrib/libstdc++/config/openbsd.ml
@@ -1,6 +1,6 @@
 # Base shared lib for OpenBSD i386
 
-LIBS    = $(ARLIB) $(SHLIB) $(SHLINK) mshlink
+LIBS    = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK) mshlink
 SHFLAGS = -nostdlib -Wl,-Bshareable,-Bforcearchive
 SHDEPS  = -lm
 DEPLIBS = ../$(SHLIB)
diff --git a/contrib/libstdc++/config/posix.mt b/contrib/libstdc++/config/posix.mt
new file mode 100644
index 0000000..6afe1e5
--- /dev/null
+++ b/contrib/libstdc++/config/posix.mt
@@ -0,0 +1 @@
+MT_CFLAGS = -D_PTHREADS
diff --git a/contrib/libstdc++/config/sol2pth.mt b/contrib/libstdc++/config/sol2pth.mt
new file mode 100644
index 0000000..6afe1e5
--- /dev/null
+++ b/contrib/libstdc++/config/sol2pth.mt
@@ -0,0 +1 @@
+MT_CFLAGS = -D_PTHREADS
diff --git a/contrib/libstdc++/config/sol2shm.ml b/contrib/libstdc++/config/sol2shm.ml
index f02650c..e87f079 100644
--- a/contrib/libstdc++/config/sol2shm.ml
+++ b/contrib/libstdc++/config/sol2shm.ml
@@ -1,6 +1,6 @@
 # Solaris2 with shared libm, so we can link it into the shared libstdc++.
 
-LIBS    = $(ARLIB) $(SHLIB) $(SHLINK)
+LIBS    = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK)
 SHFLAGS = -h $(SHLIB)
 SHDEPS  = -lm
 DEPLIBS = ../$(SHLIB)
diff --git a/contrib/libstdc++/config/sol2solth.mt b/contrib/libstdc++/config/sol2solth.mt
new file mode 100644
index 0000000..f809d0a
--- /dev/null
+++ b/contrib/libstdc++/config/sol2solth.mt
@@ -0,0 +1 @@
+MT_CFLAGS = -D_SOLTHREADS
diff --git a/contrib/libstdc++/config/sunos4.ml b/contrib/libstdc++/config/sunos4.ml
index 0abc13c..3c5de27 100644
--- a/contrib/libstdc++/config/sunos4.ml
+++ b/contrib/libstdc++/config/sunos4.ml
@@ -2,7 +2,7 @@
 # library, even for programs that don't use complex.
 # SunOS requires a version number in shared library filenames.
 
-LIBS    = $(ARLIB) $(SHLIB)
+LIBS    = $(ARLIB) $(ARLINK) $(SHLIB)
 SHFLAGS = $(PICFLAG)
 DEPLIBS = ../$(SHLIB)
 LDLIBS	= -L.. -lstdc++ -lm
diff --git a/contrib/libstdc++/config/x86-interix.ml b/contrib/libstdc++/config/x86-interix.ml
new file mode 100644
index 0000000..8b8774e
--- /dev/null
+++ b/contrib/libstdc++/config/x86-interix.ml
@@ -0,0 +1,9 @@
+# x86 Interix. SHLINK is defined to be .dummy to avoid running into 
+# the lack of symbolic links.
+
+SHLINK  = .dummy
+SHLIB   = libstdc++.so
+LIBS    = $(ARLIB) $(SHLIB)
+DEPLIBS = ../$(SHLIB)
+SHFLAGS = $(PICFLAG)
+