Update bmake bits to build GCC 3.3.1-prerelease.

2 files changed, 43 insertions, 31 deletions

diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index e885364..620228e 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -22,14 +22,21 @@ LDADD+=		-lm
 DPADD+=		${LIBM}
 
 # libstdc++ sources (libstdc++/src/Makefile.in, do not reorder)
-SRCS+=	globals.cc limits.cc basic_file_stdio.cc complex_io.cc ios.cc \
-	strstream-fixed.cc bitset.cc functexcept.cc stdexcept.cc \
-	vterminate.cc ctype.cc c_locale.cc locale.cc localename.cc codecvt.cc \
-	codecvt_members.cc collate_members.cc ctype_members.cc messages_members.cc \
-	monetary_members.cc numeric_members.cc time_members.cc concept-inst.cc \
-	locale-inst.cc misc-inst.cc stl-inst.cc string-inst.cc wstring-inst.cc \
-	valarray-inst.cc ext-inst.cc fstream.cc fstream-inst.cc io-inst.cc \
-	istream-inst.cc ostream-inst.cc streambuf-inst.cc sstream-inst.cc
+SRCS+= bitset.cc codecvt.cc complex_io.cc concept-inst.cc ctype.cc \
+	ext-inst.cc fstream.cc fstream-inst.cc functexcept.cc \
+	globals.cc io-inst.cc ios.cc istream-inst.cc limits.cc \
+	locale.cc locale-inst.cc localename.cc misc-inst.cc \
+	ostream-inst.cc  sstream-inst.cc stdexcept.cc stl-inst.cc \
+	streambuf-inst.cc string-inst.cc strstream-fixed.cc \
+	valarray-inst.cc vterminate.cc wstring-inst.cc
+
+# target sources
+SRCS+=  codecvt_members.cc collate_members.cc ctype_members.cc \
+	messages_members.cc monetary_members.cc numeric_members.cc \
+	time_members.cc
+
+# target sources extra
+SRCS+=  basic_file_stdio.cc c_locale.cc
 
 # C parts of math
 SRCS+=	nan.c signbit.c signbitf.c signbitl.c stubs.c
@@ -38,7 +45,7 @@ SRCS+=	nan.c signbit.c signbitf.c signbitl.c stubs.c
 SRCS+=	del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc \
 	eh_alloc.cc eh_aux_runtime.cc eh_catch.cc eh_exception.cc \
 	eh_globals.cc eh_personality.cc eh_terminate.cc eh_throw.cc eh_type.cc \
-	new_handler.cc new_op.cc new_opnt.cc new_opv.cc new_opvnt.cc \
+	guard.cc new_handler.cc new_op.cc new_opnt.cc new_opv.cc new_opvnt.cc \
 	pure.cc tinfo.cc tinfo2.cc vec.cc
 
 # from libiberty:
@@ -55,9 +62,10 @@ INCSGROUPS=	BITSHDRS BKWHDRS EXTHDRS BASEHDRS BASEXHDRS STDHDRS \
 
 BITSHDRS=	basic_ios.h basic_ios.tcc basic_string.h basic_string.tcc \
 		boost_concept_check.h char_traits.h codecvt.h concept_check.h \
-		cpp_type_traits.h fpos.h fstream.tcc functexcept.h \
+		cpp_type_traits.h deque.tcc fpos.h fstream.tcc functexcept.h \
 		generic_shadow.h gslice.h gslice_array.h indirect_array.h \
-		ios_base.h istream.tcc locale_facets.h locale_facets.tcc \
+		ios_base.h istream.tcc list.tcc \
+		locale_classes.h locale_facets.h locale_facets.tcc \
 		localefwd.h mask_array.h ostream.tcc pthread_allocimpl.h \
 		slice.h slice_array.h sstream.tcc stl_algo.h stl_algobase.h \
 		stl_alloc.h stl_bvector.h stl_construct.h stl_deque.h \
@@ -69,9 +77,10 @@ BITSHDRS=	basic_ios.h basic_ios.tcc basic_string.h basic_string.tcc \
 		stl_tempbuf.h stl_threads.h stl_tree.h stl_uninitialized.h \
 		stl_vector.h stream_iterator.h streambuf.tcc \
 		streambuf_iterator.h stringfwd.h type_traits.h \
-		valarray_array.h valarray_array.tcc valarray_meta.h
+		valarray_array.h valarray_array.tcc valarray_meta.h \
+		vector.tcc
 BITSHDRS:=	${BITSHDRS:S;^;${SRCDIR}/include/bits/;}
-BITSHDRSDIR=	${INCLUDEDIR}/g++/bits
+BITSHDRSDIR=	${INCLUDEDIR}/c++/3.3/bits
 
 BKWHDRS=	algo.h algobase.h alloc.h backward_warning.h bvector.h \
 		complex.h defalloc.h deque.h fstream.h function.h \
@@ -81,13 +90,13 @@ BKWHDRS=	algo.h algobase.h alloc.h backward_warning.h bvector.h \
 		slist.h stack.h stream.h streambuf.h strstream strstream.h \
 		tempbuf.h tree.h vector.h
 BKWHDRS:=	${BKWHDRS:S;^;${SRCDIR}/include/backward/;}
-BKWHDRSDIR=	${INCLUDEDIR}/g++/backward
+BKWHDRSDIR=	${INCLUDEDIR}/c++/3.3/backward
 
 EXTHDRS=	algorithm enc_filebuf.h functional hash_map hash_set \
 		iterator memory numeric rb_tree rope ropeimpl.h slist \
 		stdio_filebuf.h stl_hash_fun.h stl_hashtable.h stl_rope.h
 EXTHDRS:=	${EXTHDRS:S;^;${SRCDIR}/include/ext/;}
-EXTHDRSDIR=	${INCLUDEDIR}/g++/ext
+EXTHDRSDIR=	${INCLUDEDIR}/c++/3.3/ext
 
 # This is the common subset of files that all three "C" header models use.
 BASEHDRS=	std_cassert.h std_cctype.h std_cerrno.h std_cfloat.h \
@@ -99,11 +108,11 @@ BASEHDRS=	std_cassert.h std_cctype.h std_cerrno.h std_cfloat.h \
 BASEHDRSNAME_$h=${h:R:S;^std_;;}
 .endfor
 BASEHDRS:=	${BASEHDRS:S;^;${SRCDIR}/include/c_std/;}
-BASEHDRSDIR=	${INCLUDEDIR}/g++
+BASEHDRSDIR=	${INCLUDEDIR}/c++/3.3
 
 # Some of the different "C" header models need extra files.
 BASEXHDRS=	${SRCDIR}/include/c_std/cmath.tcc
-BASEXHDRSDIR=	${INCLUDEDIR}/g++/bits
+BASEXHDRSDIR=	${INCLUDEDIR}/c++/3.3/bits
 
 STDHDRS=	std_algorithm.h std_bitset.h std_complex.h std_deque.h \
 		std_fstream.h std_functional.h std_iomanip.h std_ios.h \
@@ -116,7 +125,7 @@ STDHDRS=	std_algorithm.h std_bitset.h std_complex.h std_deque.h \
 STDHDRSNAME_$h=${h:R:S;^std_;;}
 .endfor
 STDHDRS:=	${STDHDRS:S;^;${SRCDIR}/include/std/;}
-STDHDRSDIR=	${INCLUDEDIR}/g++
+STDHDRSDIR=	${INCLUDEDIR}/c++/3.3
 
 TARGETHDRS=	io/basic_file_stdio.h io/c_io_stdio.h \
 		locale/generic/c_locale.h \
@@ -124,33 +133,36 @@ TARGETHDRS=	io/basic_file_stdio.h io/c_io_stdio.h \
 		locale/generic/codecvt_specializations.h \
 		locale/generic/messages_members.h \
 		locale/generic/time_members.h \
-		os/bsd/freebsd/bits/ctype_base.h \
-		os/bsd/freebsd/bits/ctype_inline.h \
-		os/bsd/freebsd/bits/ctype_noninline.h \
-		os/bsd/freebsd/bits/os_defines.h
+		os/bsd/freebsd/ctype_base.h \
+		os/bsd/freebsd/ctype_inline.h \
+		os/bsd/freebsd/ctype_noninline.h \
+		os/bsd/freebsd/os_defines.h
 TARGETHDRS:=	${TARGETHDRS:S;^;${SRCDIR}/config/;}
 TARGETHDRS+=	${.CURDIR}/c++config.h
 TARGETHDRSNAME_basic_file_stdio.h= basic_file.h
 TARGETHDRSNAME_c_io_stdio.h= c++io.h
 TARGETHDRSNAME_c_locale.h= c++locale.h
-TARGETHDRSDIR=	${INCLUDEDIR}/g++/bits
+TARGETHDRSDIR=	${INCLUDEDIR}/c++/3.3/bits
 
-MARCHHDRS=	atomicity.h cpu_limits.h
+MARCHHDRS=	atomicity.h
 .if ${MACHINE_ARCH} == "sparc64"
-MARCHDIR=	${SRCDIR}/config/cpu/sparc/${MACHINE_ARCH}/bits
+MARCHDIR=	sparc
+.elif ${MACHINE_ARCH} == "i386" && ${MACHINE_CPU} != 'i386'
+MARCHDIR=	i486
 .else
-MARCHDIR=	${SRCDIR}/config/cpu/${MACHINE_ARCH}/bits
+MARCHDIR=	${MACHINE_ARCH}
 .endif
+
 .for h in ${MARCHHDRS}
-.if exists(${MARCHDIR}/${h})
-TARGETHDRS+=	${MARCHDIR}/${h}
+.if exists(${SRCDIR}/config/cpu/${MARCHDIR}/${h})
+TARGETHDRS+=	${SRCDIR}/config/cpu/${MARCHDIR}/${h}
 .else
 TARGETHDRS+=	${SRCDIR}/config/cpu/generic/bits/${h}
 .endif
 .endfor
 
 THRHDRS=	gthr.h gthr-single.h gthr-posix.h gthr-default.h
-THRHDRSDIR=	${INCLUDEDIR}/g++/bits
+THRHDRSDIR=	${INCLUDEDIR}/c++/3.3/bits
 
 gthr.h: ${GCCDIR}/gthr.h
 	sed -e '/^#/s/\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][ABCDEFGHIJKLMNOPQRSTUVWXYZ_]*\)/_GLIBCPP_\1/g' \
diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile
index 681b1d8..cb41af2 100644
--- a/gnu/lib/libsupc++/Makefile
+++ b/gnu/lib/libsupc++/Makefile
@@ -10,7 +10,7 @@ LIB=	supc++
 SRCS=	del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc \
 	eh_alloc.cc eh_aux_runtime.cc eh_catch.cc eh_exception.cc \
 	eh_globals.cc eh_personality.cc eh_terminate.cc eh_throw.cc eh_type.cc \
-	new_handler.cc new_op.cc new_opnt.cc new_opv.cc new_opvnt.cc \
+	guard.cc new_handler.cc new_op.cc new_opnt.cc new_opv.cc new_opvnt.cc \
 	pure.cc tinfo.cc tinfo2.cc vec.cc
 
 # from libiberty:
@@ -22,6 +22,6 @@ CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections
 
 HDRS=	exception new typeinfo cxxabi.h exception_defines.h
 INCS=	${HDRS:S;^;${SRCDIR}/;}
-INCSDIR=${INCLUDEDIR}/g++
+INCSDIR=${INCLUDEDIR}/c++/3.3
 
 .include <bsd.lib.mk>