Module Name: src
Committed By: mrg
Date: Wed Jun 29 02:01:38 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile
src/external/gpl3/gcc/usr.bin/backend: Makefile
src/external/gpl3/gcc/usr.bin/libcpp: Makefile
Log Message:
minor fixes for libstdc++-v3 build.
fix the gengtype call.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/libcpp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.3 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.4
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.3 Tue Jun 28 04:08:57 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Wed Jun 29 02:01:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/06/28 04:08:57 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2011/06/29 02:01:37 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -17,13 +17,10 @@
.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
SHLIB_MAJOR= 7
-SHLIB_MINOR= 0
+SHLIB_MINOR= 1
SUBDIR= include
-INCS= c++config.h
-INCSDIR= /usr/include/g++
-
.include "${.CURDIR}/../libsupc++/Makefile.common"
SRCS= ${LIBSUPCXXSRCS} ${LIBSTDCXXSRCS}
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile:1.3 src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile:1.4
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile:1.3 Tue Jun 28 04:07:36 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile Wed Jun 29 02:01:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/06/28 04:07:36 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2011/06/29 02:01:37 mrg Exp $
SUBDIR= backward ext bits debug tr1
#SUBDIR+= pb_assoc
@@ -12,7 +12,12 @@
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
GNUHOSTDIST= ${DIST}
-INCS= exception new typeinfo cxxabi.h exception_defines.h
+# libsupc++
+INCS= exception new typeinfo cxxabi.h cxxabi-forced.h
+INCS+= exception_defines.h initializer_list exception_ptr.h
+INCS+= nested_exception.h
+
+# others
INCS+= cerrno
INCS+= ${G_std_headers} ${G_c_base_headers}
INCS+= ${G_c_compatibility_headers_extra}
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.3 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.4
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.3 Tue Jun 28 04:07:36 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile Wed Jun 29 02:01:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/06/28 04:07:36 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2011/06/29 02:01:37 mrg Exp $
.include <bsd.own.mk>
@@ -10,6 +10,7 @@
CONF= ${DIST}/libstdc++-v3/config
INCS= ${G_bits_headers} ${G_c_base_headers_extra} ${G_thread_host_headers} ${G_host_headers_extra} ${G_host_headers}
+INCS+= c++config.h
INCSDIR= /usr/include/g++/bits
CLEANFILES+= basic_file.h c++io.h c++locale.h
Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.4 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.5
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.4 Tue Jun 28 10:11:04 2011
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Wed Jun 29 02:01:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/06/28 10:11:04 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/06/29 02:01:37 mrg Exp $
LIBISPRIVATE= yes
@@ -100,14 +100,18 @@
.endif
gtyp-input.list.tmp: ${GCCARCH}/gtyp-input.list
- sed s#SRCDIR#${DIST}/# < ${.ALLSRC} > ${.TARGET}
+ sed s#SRCDIR#${DIST}# < ${.ALLSRC} > ${.TARGET}
+CLEANFILES+= gtyp-input.list.tmp
+
+# XXX
+CLEANFILES+= gtype-lto.h gtype-objcp.h tm-constrs.h
gtype-desc.c: gtype-desc.h
gtype-desc.h: gengtype gtyp-input.list.tmp
${_MKTARGET_CREATE}
rm -f auto-host.h
ln -s ${.CURDIR}/../gcc/arch/${MACHINE_ARCH}/auto-host.h .
- ./gengtype ${DIST} gtyp-input.list.tmp
+ ./gengtype ${DIST}/gcc gtyp-input.list.tmp
# gengtype is the real need for options.h
gengtype.lo gengtype-lex.lo gengtype-parse.lo: ${HH} gtyp-gen.h config.h options.h
gengtype: gengtype.lo gengtype-lex.lo gengtype-parse.lo build-errors.lo
@@ -321,6 +325,7 @@
gcov-io.h: gcov-iov.h
alias.d alias.o: insn-constants.h tm_p.h tm-preds.h
cgraphunit.d cgraphunit.o: gcov-io.h
+vec.lo: gtype-desc.h
# XXX
i386.d i386.o: tm-constrs.h
Index: src/external/gpl3/gcc/usr.bin/libcpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.2 src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.3
--- src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.2 Tue Jun 28 09:31:55 2011
+++ src/external/gpl3/gcc/usr.bin/libcpp/Makefile Wed Jun 29 02:01:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/06/28 09:31:55 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/06/29 02:01:37 mrg Exp $
LIBISPRIVATE= yes
@@ -22,4 +22,4 @@
localedir.h:
echo '#define LOCALEDIR "/usr/share/locale"' > ${.TARGET}
-init.o: localedir.h
+init.d init.o: localedir.h
