[src/trunk]: src Introduce GENASSYM_CPPFLAGS for options during genassym proc...

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

details:   https://anonhg.NetBSD.org/src/rev/73beff24318d
branches:  trunk
changeset: 327312:73beff24318d
user:      joerg <joerg%NetBSD.org@localhost>
date:      Tue Mar 04 14:58:14 2014 +0000

description:
Introduce GENASSYM_CPPFLAGS for options during genassym processing.
Consistently drop assembler flags.

diffstat:

 lib/libc/Makefile               |  6 +++---
 lib/libpthread_dbg/Makefile     |  6 +++---
 sys/arch/i386/bioscall/Makefile |  6 +++---
 sys/conf/Makefile.kern.inc      |  6 +++---
 sys/dev/arcbios/Makefile.inc    |  4 ++--
 sys/modules/Makefile.assym      |  5 +++--
 6 files changed, 17 insertions(+), 16 deletions(-)

diffs (123 lines):

diff -r ce9874e562e2 -r 73beff24318d lib/libc/Makefile
--- a/lib/libc/Makefile Tue Mar 04 13:47:32 2014 +0000
+++ b/lib/libc/Makefile Tue Mar 04 14:58:14 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.164 2014/01/29 23:37:18 joerg Exp $
+#      $NetBSD: Makefile,v 1.165 2014/03/04 14:58:14 joerg Exp $
 #      @(#)Makefile    8.2 (Berkeley) 2/3/94
 #
 # All library objects contain sccsid strings by default; they may be
@@ -37,9 +37,9 @@
 
 assym.h: ${ARCHDIR}/genassym.cf
        ${_MKTARGET_CREATE}
-       ${TOOL_GENASSYM} -- ${CC} ${CFLAGS:N-Wa,--fatal-warnings} \
+       ${TOOL_GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} \
                ${CPPFLAGS} ${CPPFLAGS.assym.h} ${PROF} \
-               < ${ARCHDIR}/genassym.cf > assym.h.tmp && \
+               ${GENASSYM_CPPFLAGS} < ${ARCHDIR}/genassym.cf > assym.h.tmp && \
        mv -f assym.h.tmp assym.h
 .endif
 
diff -r ce9874e562e2 -r 73beff24318d lib/libpthread_dbg/Makefile
--- a/lib/libpthread_dbg/Makefile       Tue Mar 04 13:47:32 2014 +0000
+++ b/lib/libpthread_dbg/Makefile       Tue Mar 04 14:58:14 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2012/07/19 06:33:48 joerg Exp $
+#      $NetBSD: Makefile,v 1.11 2014/03/04 14:58:14 joerg Exp $
 #
 
 WARNS?=                5
@@ -29,8 +29,8 @@
 CPPFLAGS+=     -I${ARCHDIR} -I${LIBPDIR} -I${.CURDIR}
 
 assym.h: genassym.sh ${ARCHDIR}/genassym.cf
-       ${HOST_SH} ${.CURDIR}/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
-               < ${ARCHDIR}/genassym.cf > assym.h.tmp && \
+       ${TOOL_GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \
+               ${GENASSYM_CPPFLAGS} < ${ARCHDIR}/genassym.cf > assym.h.tmp && \
        mv -f assym.h.tmp assym.h
 
 SRCS=  pthread_dbg.c 
diff -r ce9874e562e2 -r 73beff24318d sys/arch/i386/bioscall/Makefile
--- a/sys/arch/i386/bioscall/Makefile   Tue Mar 04 13:47:32 2014 +0000
+++ b/sys/arch/i386/bioscall/Makefile   Tue Mar 04 14:58:14 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.19 2010/07/06 05:59:59 mrg Exp $
+#      $NetBSD: Makefile,v 1.20 2014/03/04 14:58:14 joerg Exp $
 
 CPPFLAGS=      ${APMCPPFLAGS}
 KSRC=${.CURDIR}/../../..
@@ -34,8 +34,8 @@
        ${LD} -Bstatic -N -Ttext 0 -e do_bios_call -o $@ $(OBJS)
 
 assym.h: machine x86 genassym.cf
-       ${TOOL_GENASSYM} -- ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
-           < ${.CURDIR}/genassym.cf > assym.h.tmp && \
+       ${TOOL_GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \
+           ${GENASSYM_CPPFLAGS} < ${.CURDIR}/genassym.cf > assym.h.tmp && \
        mv -f assym.h.tmp assym.h
 
 biostramp.S: assym.h
diff -r ce9874e562e2 -r 73beff24318d sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Tue Mar 04 13:47:32 2014 +0000
+++ b/sys/conf/Makefile.kern.inc        Tue Mar 04 14:58:14 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.kern.inc,v 1.164 2013/10/18 08:06:06 mbalmer Exp $
+#      $NetBSD: Makefile.kern.inc,v 1.165 2014/03/04 14:58:14 joerg Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -334,7 +334,7 @@
        ${_MKTARGET_CREATE}
        cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} | \
            ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \
-           > assym.h.tmp && \
+           ${GENASSYM_CPPFLAGS} > assym.h.tmp && \
        mv -f assym.h.tmp assym.h
 ${MD_SFILES:C/\.[Ss]/.o/} ${SFILES:C/\.[Ss]/.o/}: assym.h
 .endif
@@ -440,7 +440,7 @@
        ${_MKTARGET_CREATE}
        cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} | \
            ${GENASSYM} -- ${MKDEP} -f assym.dep -- \
-           ${CFLAGS:N-Wa,*} ${CPPFLAGS}
+           ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${GENASSYM_CPPFLAGS}
        ${TOOL_SED} -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >${.TARGET}
        rm -f assym.dep
 
diff -r ce9874e562e2 -r 73beff24318d sys/dev/arcbios/Makefile.inc
--- a/sys/dev/arcbios/Makefile.inc      Tue Mar 04 13:47:32 2014 +0000
+++ b/sys/dev/arcbios/Makefile.inc      Tue Mar 04 14:58:14 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.1 2011/02/20 08:02:46 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.2 2014/03/04 14:58:15 joerg Exp $
 
 GENASSYM_CONF= ${S}/dev/arcbios/genassym.cf
 
@@ -7,7 +7,7 @@
        ${_MKTARGET_CREATE}
        cat ${GENASSYM_CONF} ${GENASSYM_EXTRA} | \
            ${TOOL_GENASSYM} -- ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
-           > assym.h.tmp && \
+           ${GENASSYM_CPPFLAGS} > assym.h.tmp && \
        mv -f assym.h.tmp assym.h
 ${SRCS:C/\.[Ss]/.o/} ${SRCS:C/\.[Ss]/.d/}: assym.h
 .endif
diff -r ce9874e562e2 -r 73beff24318d sys/modules/Makefile.assym
--- a/sys/modules/Makefile.assym        Tue Mar 04 13:47:32 2014 +0000
+++ b/sys/modules/Makefile.assym        Tue Mar 04 14:58:14 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.assym,v 1.3 2013/11/09 17:30:46 jmcneill Exp $
+#      $NetBSD: Makefile.assym,v 1.4 2014/03/04 14:58:15 joerg Exp $
 
 DPSRCS+=       assym.h
 CLEANFILES+=   assym.h
@@ -27,5 +27,6 @@
 #       ${GENASSYM_DIR}/genassym.cf
        @echo ${S}
        ${TOOL_GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \
-               < ${GENASSYM_DIR}/genassym.cf > assym.h.tmp && \
+               ${GENASSYM_CPPFLAGS} < ${GENASSYM_DIR}/genassym.cf \
+               > assym.h.tmp && \
        mv -f assym.h.tmp assym.h