summaryrefslogtreecommitdiff
path: root/gnu/lib/libstdc++
diff options
context:
space:
mode:
authortv <tv@NetBSD.org>1998-08-28 15:31:29 +0000
committertv <tv@NetBSD.org>1998-08-28 15:31:29 +0000
commitaa06e255fae77f106a773e5867848bd2ab1f4cb6 (patch)
tree2d89ac092b7e9f0b1f9df3cf16fb2b96c1b2418f /gnu/lib/libstdc++
parent81c6c6b8c6920d112daf2ce7df932fe4d874c64e (diff)
Update to egcs 1.1-snap's libstdc++. Now shlib version 2.0. Now requires
"make includes" before "make" like other libraries.
Diffstat (limited to 'gnu/lib/libstdc++')
-rw-r--r--gnu/lib/libstdc++/Makefile157
-rw-r--r--gnu/lib/libstdc++/_G_config.h5
-rw-r--r--gnu/lib/libstdc++/config/Makefile21
-rw-r--r--gnu/lib/libstdc++/io/Makefile4
-rw-r--r--gnu/lib/libstdc++/shlib_version2
-rw-r--r--gnu/lib/libstdc++/std/Makefile7
-rw-r--r--gnu/lib/libstdc++/stl/Makefile13
7 files changed, 90 insertions, 119 deletions
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index a70daf320b9..02729eb984b 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.6 1998/05/06 11:59:09 mycroft Exp $
+# $NetBSD: Makefile,v 1.7 1998/08/28 15:31:29 tv Exp $
HAVE_GCC28!= ${CXX} --version | egrep "^(2\.8|egcs)" ; echo
.if (${HAVE_GCC28} != "")
-INCS= cassert cctype cerrno cfloat ciso646 climits clocale cmath complex \
- csetjmp csignal cstdarg cstddef cstdio cstdlib cstring ctime cwchar \
- cwctype fstream iomanip iosfwd iostream stdexcept string strstream
-INCS+= complex.h stl.h _G_config.h
-INCSDIR=/usr/include/g++
-SUBDIR=std stl io
+LIB= stdc++
-LIB= stdc++
+INCS= cassert cctype cerrno cfloat ciso646 climits clocale cmath \
+ complex csetjmp csignal cstdarg cstddef cstdio cstdlib \
+ cstring ctime cwchar cwctype fstream iomanip iosfwd iostream \
+ stdexcept string strstream complex.h stl.h _G_config.h
+INCSDIR= /usr/include/g++
-SRCS= _G_config.h \
- PlotFile.cc SFile.cc builtinbuf.cc editbuf.cc filebuf.cc fstream.cc \
+SUBDIR= config std stl io
+
+SRCS= PlotFile.cc SFile.cc builtinbuf.cc editbuf.cc filebuf.cc fstream.cc \
indstream.cc ioassign.cc ioextend.cc iomanip.cc iostream.cc \
isgetline.cc isgetsb.cc isscan.cc osform.cc parsestream.cc \
pfstream.cc procbuf.cc sbform.cc sbgetline.cc sbscan.cc \
@@ -29,111 +29,56 @@ SRCS= _G_config.h \
iosetbuffer.c iosetvbuf.c iosprintf.c iosscanf.c iostrerror.c \
ioungetc.c iovfprintf.c iovfscanf.c iovsprintf.c iovsscanf.c \
outfloat.c peekc.c strops.c \
- cmathi.cc cstdlibi.cc cstringi.cc stdexcepti.cc stlinst.cc \
- cstrmain.cc cstrio.cc fcomplex.cc fcomio.cc dcomplex.cc dcomio.cc \
- ldcomplex.cc ldcomio.cc
-
-DIST= $(.CURDIR)/../../dist
-CXXFLAGS+= -nostdinc++
-CPPFLAGS+= -I. -I$(DIST)/libstdc++ -I$(DIST)/libio \
- -I$(DIST)/libstdc++/stl -I$(DIST)/gcc/cp/inc
-NOMAN= noman
-NOLINT= nolint (c++)
+ cmathi.cc cstdlibi.cc cstringi.cc stdexcepti.cc stlinst.cc
-.PATH: $(DIST)/libstdc++ $(DIST)/libstdc++/stl $(DIST)/libio
+DIST= ${.CURDIR}/../../dist
+CPPFLAGS+= -I${DESTDIR}/usr/include/g++ -I${DIST}/libstdc++
-.if (${MACHINE} != "alpha")
-LDADD= ${DESTDIR}/usr/lib/c++rt0.o
-DPADD= ${DESTDIR}/usr/lib/c++rt0.o
-.endif
+NOMAN=
+NOLINT= nolint (c++)
+
+.PATH: ${DIST}/libstdc++ ${DIST}/libstdc++/stl ${DIST}/libio
+
+# W not yet supported
+.for _TYPE_ in C
+SRCS+= ${_TYPE_}inst.cc
+CLEANFILES+= ${_TYPE_}inst.cc
+${_TYPE_}inst.cc: sinst.cc
+ echo '#define ${_TYPE_}' >$@
+ @for func in \
+ REP MAIN TRAITS ADDSS ADDPS ADDCS ADDSP ADDSC EQSS EQPS EQSP \
+ NESS NEPS NESP LTSS LTPS LTSP GTSS GTPS GTSP LESS LEPS LESP \
+ GESS GEPS GESP EXTRACT INSERT GETLINE; do \
+ echo "#define $$func" >>$@; \
+ done
+ cat $> >>$@
+.endfor
+
+.for _TYPE_ in F D LD
+SRCS+= ${_TYPE_}inst.cc
+CLEANFILES+= ${_TYPE_}inst.cc
+${_TYPE_}inst.cc: cinst.cc
+ echo '#define ${_TYPE_}' >$@
+ @for func in \
+ MAIN ADDCC ADDCF ADDFC SUBCC SUBCF SUBFC MULCC MULCF MULFC \
+ DIVCC DIVCF DIVFC PLUS MINUS EQCC EQCF EQFC NECC NECF NEFC \
+ ABS ARG POLAR CONJ NORM COS COSH EXP LOG POWCC POWCF POWCI \
+ POWFC SIN SINH SQRT EXTRACT INSERT; do \
+ echo "#define $$func" >>$@; \
+ done
+ cat $> >>$@
+.endfor
-# XXX Workaround the .cc -> (NULL) extension rule
.cc:
@true
.include <bsd.lib.mk>
.include <bsd.subdir.mk>
-SINSTCC= $(DIST)/libstdc++/sinst.cc
-CINSTCC= $(DIST)/libstdc++/cinst.cc
-
-_G_config.h: Makefile
- rootme=${.OBJDIR} CC="${CC}" CXX="${CXX}" CONFIG_NM="${NM}" \
- /bin/sh ${DIST}/libio/gen-params LIB_VERSION=2.8.0 >tmp-params.h
- mv -f tmp-params.h _G_config.h
-CLEANFILES+=dummy.h tmp-params.h _G_config.h
-
-cstrmain.cc: Makefile
- @echo Creating cstrmain.cc
- @(for i in REP MAIN TRAITS ADDSS ADDPS ADDCS ADDSP ADDSC EQSS EQPS EQSP NESS NEPS NESP LTSS LTPS LTSP GTSS GTPS GTSP LESS LEPS LESP GESS GEPS GESP ; do \
- echo "#define $$i"; \
- done;\
- echo '#define C';\
- cat $(SINSTCC)) > $(.TARGET)
-CLEANFILES+=cstrmain.cc
-
-cstrio.cc: Makefile
- @echo Creating cstrio.cc
- @(for i in EXTRACT INSERT GETLINE ; do \
- echo "#define $$i"; \
- done;\
- echo '#define C';\
- cat $(SINSTCC)) > $(.TARGET)
-CLEANFILES+=cstrio.cc
-
-fcomplex.cc: Makefile
- @echo Creating fcomplex.cc
- @(for i in MAIN ADDCC ADDCF ADDFC SUBCC SUBCF SUBFC MULCC MULCF MULFC DIVCC DIVCF DIVFC PLUS MINUS EQCC EQCF EQFC NECC NECF NEFC ABS ARG POLAR CONJ NORM COS COSH EXP LOG POWCC POWCF POWCI POWFC SIN SINH SQRT ; do \
- echo "#define $$i"; \
- done;\
- echo '#define F';\
- cat $(CINSTCC)) > $(.TARGET)
-CLEANFILES+=fcomplex.cc
-
-fcomio.cc: Makefile
- @echo Creating fcomio.cc
- @(for i in EXTRACT INSERT ; do \
- echo "#define $$i"; \
- done;\
- echo '#define F';\
- cat $(CINSTCC)) > $(.TARGET)
-CLEANFILES+=fcomio.cc
-
-dcomplex.cc: Makefile
- @echo Creating dcomplex.cc
- @(for i in MAIN ADDCC ADDCF ADDFC SUBCC SUBCF SUBFC MULCC MULCF MULFC DIVCC DIVCF DIVFC PLUS MINUS EQCC EQCF EQFC NECC NECF NEFC ABS ARG POLAR CONJ NORM COS COSH EXP LOG POWCC POWCF POWCI POWFC SIN SINH SQRT ; do \
- echo "#define $$i"; \
- done;\
- echo '#define D';\
- cat $(CINSTCC)) > $(.TARGET)
-CLEANFILES+=dcomplex.cc
-
-dcomio.cc: Makefile
- @echo Creating dcomio.cc
- @(for i in EXTRACT INSERT ; do \
- echo "#define $$i"; \
- done;\
- echo '#define D';\
- cat $(CINSTCC)) > $(.TARGET)
-CLEANFILES+=dcomio.cc
-
-ldcomplex.cc: Makefile
- @echo Creating ldcomplex.cc
- @(for i in MAIN ADDCC ADDCF ADDFC SUBCC SUBCF SUBFC MULCC MULCF MULFC DIVCC DIVCF DIVFC PLUS MINUS EQCC EQCF EQFC NECC NECF NEFC ABS ARG POLAR CONJ NORM COS COSH EXP LOG POWCC POWCF POWCI POWFC SIN SINH SQRT ; do \
- echo "#define $$i"; \
- done;\
- echo '#define LD';\
- cat $(CINSTCC)) > $(.TARGET)
-CLEANFILES+=ldcomplex.cc
-
-ldcomio.cc: Makefile
- @echo Creating ldcomio.cc
- @(for i in EXTRACT INSERT ; do \
- echo "#define $$i"; \
- done;\
- echo '#define LD';\
- cat $(CINSTCC)) > $(.TARGET)
-CLEANFILES+=ldcomio.cc
+.if (${OBJECT_FMT} == "a.out")
+LDADD= ${DESTDIR}/usr/lib/c++rt0.o
+DPADD= ${DESTDIR}/usr/lib/c++rt0.o
+.endif
.else
diff --git a/gnu/lib/libstdc++/_G_config.h b/gnu/lib/libstdc++/_G_config.h
new file mode 100644
index 00000000000..77f82082ac5
--- /dev/null
+++ b/gnu/lib/libstdc++/_G_config.h
@@ -0,0 +1,5 @@
+/* $NetBSD: _G_config.h,v 1.3 1998/08/28 15:31:29 tv Exp $ */
+
+/* These definitions are machine-dependent, so pick up the proper MD file. */
+
+#include <machine/_G_config.h>
diff --git a/gnu/lib/libstdc++/config/Makefile b/gnu/lib/libstdc++/config/Makefile
new file mode 100644
index 00000000000..dee9ebe4b13
--- /dev/null
+++ b/gnu/lib/libstdc++/config/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 1998/08/28 15:31:29 tv Exp $
+
+# Makefile for _G_config.h, a machine-dependent automatically generated
+# configuration file.
+
+NOPROG=
+DPSRCS= _G_config.h
+INCS= _G_config.h
+INCSDIR= /usr/include/${MACHINE}
+CLEANFILES= dummy.c dummy.h dummy.C _G_config.h
+DIST= ${.CURDIR}/../../../dist
+
+_G_config.h: Makefile ${DIST}/libio/gen-params
+ rootme=${.OBJDIR} CC="${CC}" CXX="${CXX}" CONFIG_NM="${NM}" \
+ /bin/sh ${DIST}/libio/gen-params LIB_VERSION=2.9.0 >$@
+
+all: ${DPSRCS}
+
+.include <bsd.prog.mk>
+
+incinstall:: linksinstall
diff --git a/gnu/lib/libstdc++/io/Makefile b/gnu/lib/libstdc++/io/Makefile
index 1d6a097fd0f..6ae8f7f91b9 100644
--- a/gnu/lib/libstdc++/io/Makefile
+++ b/gnu/lib/libstdc++/io/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/03/29 11:40:13 mrg Exp $
+# $NetBSD: Makefile,v 1.2 1998/08/28 15:31:30 tv Exp $
NOPROG= yes
@@ -8,6 +8,6 @@ INCS= PlotFile.h SFile.h builtinbuf.h editbuf.h floatio.h fstream.h \
procbuf.h stdiostream.h stream.h streambuf.h strfile.h strstream.h
INCSDIR=/usr/include/g++
-.PATH: $(.CURDIR)/../../../dist/libio
+.PATH: ${.CURDIR}/../../../dist/libio
.include <bsd.prog.mk>
diff --git a/gnu/lib/libstdc++/shlib_version b/gnu/lib/libstdc++/shlib_version
index 1edea46de91..b52599a164f 100644
--- a/gnu/lib/libstdc++/shlib_version
+++ b/gnu/lib/libstdc++/shlib_version
@@ -1,2 +1,2 @@
-major=1
+major=2
minor=0
diff --git a/gnu/lib/libstdc++/std/Makefile b/gnu/lib/libstdc++/std/Makefile
index a5553201378..b811c7eb95f 100644
--- a/gnu/lib/libstdc++/std/Makefile
+++ b/gnu/lib/libstdc++/std/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/03/29 11:40:13 mrg Exp $
+# $NetBSD: Makefile,v 1.2 1998/08/28 15:31:30 tv Exp $
NOPROG= yes
-INCS= bastring.h complext.h dcomplex.h fcomplex.h ldcomplex.h straits.h
+INCS= bastring.cc bastring.h complext.cc complext.h dcomplex.h fcomplex.h \
+ ldcomplex.h straits.h
INCSDIR=/usr/include/g++/std
-.PATH: $(.CURDIR)/../../../dist/libstdc++/std
+.PATH: ${.CURDIR}/../../../dist/libstdc++/std
.include <bsd.prog.mk>
diff --git a/gnu/lib/libstdc++/stl/Makefile b/gnu/lib/libstdc++/stl/Makefile
index 450cd1efa09..2fafba39f2e 100644
--- a/gnu/lib/libstdc++/stl/Makefile
+++ b/gnu/lib/libstdc++/stl/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.3 1998/04/12 14:18:42 tv Exp $
+# $NetBSD: Makefile,v 1.4 1998/08/28 15:31:30 tv Exp $
NOPROG= yes
+
INCS= algorithm deque functional hash_map hash_set iterator list map \
memory numeric pthread_alloc queue rope set slist stack utility \
- vector
-INCS+= algo.h algobase.h alloc.h bvector.h defalloc.h deque.h function.h \
+ vector \
+ algo.h algobase.h alloc.h bvector.h defalloc.h deque.h function.h \
hash_map.h hash_set.h hashtable.h heap.h iterator.h list.h map.h \
multimap.h multiset.h pair.h pthread_alloc.h rope.h ropeimpl.h set.h \
slist.h stack.h stl_algo.h stl_algobase.h stl_alloc.h stl_bvector.h \
@@ -17,10 +18,8 @@ INCS+= algo.h algobase.h alloc.h bvector.h defalloc.h deque.h function.h \
tempbuf.h tree.h type_traits.h vector.h
INCSDIR=/usr/include/g++
-.PATH: $(.CURDIR)/../../../dist/libstdc++/stl
+.PATH: ${.CURDIR}/../../../dist/libstdc++/stl
-# XXX Workaround the .cc -> (NULL) extension rule
-.cc:
- @true
+.SUFFIXES:
.include <bsd.prog.mk>