[src/trunk]: src/external/gpl3/gcc minor fixes for libstdc++-v3 build.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a395423665c3
branches:  trunk
changeset: 766614:a395423665c3
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jun 29 02:01:37 2011 +0000

description:
minor fixes for libstdc++-v3 build.
fix the gengtype call.

diffstat:

 external/gpl3/gcc/lib/libstdc++-v3/Makefile              |   7 ++-----
 external/gpl3/gcc/lib/libstdc++-v3/include/Makefile      |   9 +++++++--
 external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile |   3 ++-
 external/gpl3/gcc/usr.bin/backend/Makefile               |  11 ++++++++---
 external/gpl3/gcc/usr.bin/libcpp/Makefile                |   4 ++--
 5 files changed, 21 insertions(+), 13 deletions(-)

diffs (117 lines):

diff -r 034ad0ae3277 -r a395423665c3 external/gpl3/gcc/lib/libstdc++-v3/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/Makefile       Wed Jun 29 02:00:09 2011 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/Makefile       Wed Jun 29 02:01:37 2011 +0000
@@ -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}
diff -r 034ad0ae3277 -r a395423665c3 external/gpl3/gcc/lib/libstdc++-v3/include/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile       Wed Jun 29 02:00:09 2011 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile       Wed Jun 29 02:01:37 2011 +0000
@@ -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}
diff -r 034ad0ae3277 -r a395423665c3 external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile  Wed Jun 29 02:00:09 2011 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile  Wed Jun 29 02:01:37 2011 +0000
@@ -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
diff -r 034ad0ae3277 -r a395423665c3 external/gpl3/gcc/usr.bin/backend/Makefile
--- a/external/gpl3/gcc/usr.bin/backend/Makefile        Wed Jun 29 02:00:09 2011 +0000
+++ b/external/gpl3/gcc/usr.bin/backend/Makefile        Wed Jun 29 02:01:37 2011 +0000
@@ -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
 
diff -r 034ad0ae3277 -r a395423665c3 external/gpl3/gcc/usr.bin/libcpp/Makefile
--- a/external/gpl3/gcc/usr.bin/libcpp/Makefile Wed Jun 29 02:00:09 2011 +0000
+++ b/external/gpl3/gcc/usr.bin/libcpp/Makefile Wed Jun 29 02:01:37 2011 +0000
@@ -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