[src/trunk]: src/gnu/lib/libgcc4 For new libgcc rules; include generated make...

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

details:   https://anonhg.NetBSD.org/src/rev/a9384e0e5f8f
branches:  trunk
changeset: 750131:a9384e0e5f8f
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Fri Dec 18 13:57:10 2009 +0000

description:
For new libgcc rules; include generated makefiles first, then register ${LIB}
and on-the-fly source rules.

No changes against existing libgcc rules.

diffstat:

 gnu/lib/libgcc4/Makefile.inc       |  12 +-----------
 gnu/lib/libgcc4/Makefile.srcs      |  13 +++++++++++++
 gnu/lib/libgcc4/Makefile.wrapper   |  12 +++++++-----
 gnu/lib/libgcc4/libgcc/Makefile    |   6 +++++-
 gnu/lib/libgcc4/libgcc_eh/Makefile |   6 +++++-
 gnu/lib/libgcc4/libgcc_s/Makefile  |   6 +++++-
 gnu/lib/libgcc4/libgcov/Makefile   |   6 +++++-
 7 files changed, 41 insertions(+), 20 deletions(-)

diffs (198 lines):

diff -r 6d81e46609e9 -r a9384e0e5f8f gnu/lib/libgcc4/Makefile.inc
--- a/gnu/lib/libgcc4/Makefile.inc      Fri Dec 18 13:01:44 2009 +0000
+++ b/gnu/lib/libgcc4/Makefile.inc      Fri Dec 18 13:57:10 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.18 2009/12/09 06:20:13 uebayasi Exp $
+#      $NetBSD: Makefile.inc,v 1.19 2009/12/18 13:57:10 uebayasi Exp $
 
 .if ${MKGCC} != "no"
 .if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk)
@@ -123,16 +123,6 @@
 # New style libgcc build procedure.
 #
 
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/srcs.tmplsrcs.mk"
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/srcs.cppflags.mk"
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/srcs.copts.mk"
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk"
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplsrcs.mk"
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplfpsrcs.mk"
-.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplasmsrcs.mk"
-
-.include "${.CURDIR}/../Makefile.wrapper"
-
 .endif # defined(MKNATIVE_LIBGCC_NEW)
 
 #
diff -r 6d81e46609e9 -r a9384e0e5f8f gnu/lib/libgcc4/Makefile.srcs
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/gnu/lib/libgcc4/Makefile.srcs     Fri Dec 18 13:57:10 2009 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile.srcs,v 1.1 2009/12/18 13:57:10 uebayasi Exp $
+
+#
+# Generated makefiles.
+#
+
+.include "${.CURDIR}/../arch/${MACHINE_ARCH}/srcs.tmplsrcs.mk"
+.include "${.CURDIR}/../arch/${MACHINE_ARCH}/srcs.cppflags.mk"
+.include "${.CURDIR}/../arch/${MACHINE_ARCH}/srcs.copts.mk"
+.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.srcs.mk"
+.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplsrcs.mk"
+.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplfpsrcs.mk"
+.include "${.CURDIR}/../arch/${MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplasmsrcs.mk"
diff -r 6d81e46609e9 -r a9384e0e5f8f gnu/lib/libgcc4/Makefile.wrapper
--- a/gnu/lib/libgcc4/Makefile.wrapper  Fri Dec 18 13:01:44 2009 +0000
+++ b/gnu/lib/libgcc4/Makefile.wrapper  Fri Dec 18 13:57:10 2009 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.wrapper,v 1.1 2009/11/30 11:47:06 uebayasi Exp $
+# $NetBSD: Makefile.wrapper,v 1.2 2009/12/18 13:57:10 uebayasi Exp $
 
 #
 # libgcc function wrapper
 #
 
-.if !empty(SRCS:M*)
+.if !empty(SRCS:M*.*)
 ${SRCS}: ${.CURDIR}/Makefile
        ${_MKTARGET_CREATE}
        {       for i in ${_CPPFLAGS.${.TARGET}:C|-D||}; do \
@@ -15,13 +15,15 @@
 
 DPSRCS+=       ${SRCS}
 CLEANFILES+=   ${SRCS}
+.else
+.undef LIB
 .endif
 
 #
 # libgcc functions that are built in a single file
 #
 
-.if !empty(TMPLSRCS:M*.c)
+.if !empty(TMPLSRCS:M*)
 ${TMPLSRCS:C|^|tmplsrc_|}: ${.CURDIR}/Makefile
        ${_MKTARGET_CREATE}
        printf '#include <${.TARGET:C|^tmplsrc_||}>\n' >${.TARGET}
@@ -35,7 +37,7 @@
 # soft float functions
 #
 
-.if !empty(TMPLFPSRCS)
+.if !empty(TMPLFPSRCS:M*)
 ${TMPLFPSRCS:C|^|tmplsrc_|}: ${.CURDIR}/Makefile
        ${_MKTARGET_CREATE}
        printf '#include "${GCCARCHLIBGCC}/${.TARGET:C|^tmplsrc_||}"\n' >${.TARGET}
@@ -49,7 +51,7 @@
 # functions written in an asm file
 #
 
-.if !empty(TMPLASMSRCS)
+.if !empty(TMPLASMSRCS:M*.*)
 ${TMPLASMSRCS:C|^|tmplsrc_|:C|/|_|g}: ${.CURDIR}/Makefile
        ${_MKTARGET_CREATE}
        printf '#include <${G_LIB1ASMSRC}>\n' >${.TARGET}
diff -r 6d81e46609e9 -r a9384e0e5f8f gnu/lib/libgcc4/libgcc/Makefile
--- a/gnu/lib/libgcc4/libgcc/Makefile   Fri Dec 18 13:01:44 2009 +0000
+++ b/gnu/lib/libgcc4/libgcc/Makefile   Fri Dec 18 13:57:10 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2009/12/09 06:20:13 uebayasi Exp $
+#      $NetBSD: Makefile,v 1.10 2009/12/18 13:57:10 uebayasi Exp $
 
 REQUIRETOOLS=  yes
 NOLINT=                # defined
@@ -21,12 +21,16 @@
 
 .else  # defined(MKNATIVE_LIBGCC_NEW)
 
+.include "../Makefile.srcs"
+
 # New style.
 TMPLSRCS=      ${TMPLSRCS.libgcc.a}
 TMPLFPSRCS=    ${TMPLFPSRCS.libgcc.a}
 TMPLASMSRCS=   ${TMPLASMSRCS.libgcc.a}
 SRCS=          ${SRCS.libgcc.a}
 
+.include "../Makefile.wrapper"
+
 .endif # defined(MKNATIVE_LIBGCC_NEW)
 
 .include <bsd.lib.mk>
diff -r 6d81e46609e9 -r a9384e0e5f8f gnu/lib/libgcc4/libgcc_eh/Makefile
--- a/gnu/lib/libgcc4/libgcc_eh/Makefile        Fri Dec 18 13:01:44 2009 +0000
+++ b/gnu/lib/libgcc4/libgcc_eh/Makefile        Fri Dec 18 13:57:10 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2009/12/09 06:20:14 uebayasi Exp $
+#      $NetBSD: Makefile,v 1.8 2009/12/18 13:57:10 uebayasi Exp $
 
 REQUIRETOOLS=  yes
 NOLINT=                # defined
@@ -18,12 +18,16 @@
 
 .else  # defined(MKNATIVE_LIBGCC_NEW)
 
+.include "../Makefile.srcs"
+
 # New style.
 TMPLSRCS=      ${TMPLSRCS.libgcc_eh.a}
 TMPLFPSRCS=    ${TMPLFPSRCS.libgcc_eh.a}
 TMPLASMSRCS=   ${TMPLASMSRCS.libgcc_eh.a}
 SRCS=          ${SRCS.libgcc_eh.a}
 
+.include "../Makefile.wrapper"
+
 .endif # defined(MKNATIVE_LIBGCC_NEW)
 
 .include <bsd.lib.mk>
diff -r 6d81e46609e9 -r a9384e0e5f8f gnu/lib/libgcc4/libgcc_s/Makefile
--- a/gnu/lib/libgcc4/libgcc_s/Makefile Fri Dec 18 13:01:44 2009 +0000
+++ b/gnu/lib/libgcc4/libgcc_s/Makefile Fri Dec 18 13:57:10 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2009/12/09 06:20:14 uebayasi Exp $
+#      $NetBSD: Makefile,v 1.11 2009/12/18 13:57:10 uebayasi Exp $
 
 USE_SHLIBDIR=  yes
 REQUIRETOOLS=  yes
@@ -28,12 +28,16 @@
 
 .else  # defined(MKNATIVE_LIBGCC_NEW)
 
+.include "../Makefile.srcs"
+
 # New style.
 TMPLSRCS=      ${TMPLSRCS.libgcc_s.so}
 TMPLFPSRCS=    ${TMPLFPSRCS.libgcc_s.so}
 TMPLASMSRCS=   ${TMPLASMSRCS.libgcc_s.so}
 SRCS=          ${SRCS.libgcc_s.so}
 
+.include "../Makefile.wrapper"
+
 .endif # defined(MKNATIVE_LIBGCC_NEW)
 
 COPTS.unwind-dw2.c = -Wno-stack-protector
diff -r 6d81e46609e9 -r a9384e0e5f8f gnu/lib/libgcc4/libgcov/Makefile
--- a/gnu/lib/libgcc4/libgcov/Makefile  Fri Dec 18 13:01:44 2009 +0000
+++ b/gnu/lib/libgcc4/libgcov/Makefile  Fri Dec 18 13:57:10 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2009/12/18 12:48:16 uebayasi Exp $
+#      $NetBSD: Makefile,v 1.9 2009/12/18 13:57:10 uebayasi Exp $
 
 REQUIRETOOLS=  yes
 NOPIC=         # defined
@@ -25,12 +25,16 @@
 
 .else  # defined(MKNATIVE_LIBGCC_NEW)
 
+.include "../Makefile.srcs"
+
 # New style.
 SRCS=          ${SRCS.libgcov.a}
 TMPLSRCS=      ${TMPLSRCS.libgcov.a}
 TMPLFPSRCS=    ${TMPLFPSRCS.libgcov.a}
 TMPLASMSRCS=   ${TMPLASMSRCS.libgcov.a}
 
+.include "../Makefile.wrapper"
+
 .endif # defined(MKNATIVE_LIBGCC_NEW)
 
 .if !defined(MKNATIVE_LIBGCC_NEW)