Module Name: src
Committed By: joerg
Date: Tue Mar 4 14:58:15 UTC 2014
Modified Files:
src/lib/libc: Makefile
src/lib/libpthread_dbg: Makefile
src/sys/arch/i386/bioscall: Makefile
src/sys/conf: Makefile.kern.inc
src/sys/dev/arcbios: Makefile.inc
src/sys/modules: Makefile.assym
Log Message:
Introduce GENASSYM_CPPFLAGS for options during genassym processing.
Consistently drop assembler flags.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/lib/libc/Makefile
cvs rdiff -u -r1.10 -r1.11 src/lib/libpthread_dbg/Makefile
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/i386/bioscall/Makefile
cvs rdiff -u -r1.164 -r1.165 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/arcbios/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/Makefile.assym
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/Makefile
diff -u src/lib/libc/Makefile:1.164 src/lib/libc/Makefile:1.165
--- src/lib/libc/Makefile:1.164 Wed Jan 29 23:37:18 2014
+++ src/lib/libc/Makefile Tue Mar 4 14:58:14 2014
@@ -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 @@ CLEANFILES+= assym.h assym.h.tmp
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
Index: src/lib/libpthread_dbg/Makefile
diff -u src/lib/libpthread_dbg/Makefile:1.10 src/lib/libpthread_dbg/Makefile:1.11
--- src/lib/libpthread_dbg/Makefile:1.10 Thu Jul 19 06:33:48 2012
+++ src/lib/libpthread_dbg/Makefile Tue Mar 4 14:58:14 2014
@@ -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 @@ ARCHDIR= ${LIBPDIR}/arch/${ARCHSUBDIR}
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
Index: src/sys/arch/i386/bioscall/Makefile
diff -u src/sys/arch/i386/bioscall/Makefile:1.19 src/sys/arch/i386/bioscall/Makefile:1.20
--- src/sys/arch/i386/bioscall/Makefile:1.19 Tue Jul 6 05:59:59 2010
+++ src/sys/arch/i386/bioscall/Makefile Tue Mar 4 14:58:14 2014
@@ -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 @@ biostramp.obj: ${OBJS} ${DEPS}
${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
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.164 src/sys/conf/Makefile.kern.inc:1.165
--- src/sys/conf/Makefile.kern.inc:1.164 Fri Oct 18 08:06:06 2013
+++ src/sys/conf/Makefile.kern.inc Tue Mar 4 14:58:14 2014
@@ -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 @@ assym.h: ${GENASSYM_CONF} ${GENASSYM_EXT
${_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 @@ assym.d: assym.h
${_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
Index: src/sys/dev/arcbios/Makefile.inc
diff -u src/sys/dev/arcbios/Makefile.inc:1.1 src/sys/dev/arcbios/Makefile.inc:1.2
--- src/sys/dev/arcbios/Makefile.inc:1.1 Sun Feb 20 08:02:46 2011
+++ src/sys/dev/arcbios/Makefile.inc Tue Mar 4 14:58:15 2014
@@ -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 @@ assym.h: ${GENASSYM_CONF} ${GENASSYM_EXT
${_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
Index: src/sys/modules/Makefile.assym
diff -u src/sys/modules/Makefile.assym:1.3 src/sys/modules/Makefile.assym:1.4
--- src/sys/modules/Makefile.assym:1.3 Sat Nov 9 17:30:46 2013
+++ src/sys/modules/Makefile.assym Tue Mar 4 14:58:15 2014
@@ -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 @@ assym.h:
# ${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
