Module Name: src
Committed By: joerg
Date: Sun Mar 25 06:55:20 UTC 2012
Modified Files:
src/lib/csu/common: Makefile.inc
src/sys/conf: Makefile.kern.inc
src/sys/modules: Makefile.assym
Log Message:
Don't pass assembler flags to genassym, it doesn't compile.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/csu/common/Makefile.inc
cvs rdiff -u -r1.154 -r1.155 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.1 -r1.2 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/csu/common/Makefile.inc
diff -u src/lib/csu/common/Makefile.inc:1.6 src/lib/csu/common/Makefile.inc:1.7
--- src/lib/csu/common/Makefile.inc:1.6 Tue Jan 31 20:08:28 2012
+++ src/lib/csu/common/Makefile.inc Sun Mar 25 06:55:19 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2012/01/31 20:08:28 uwe Exp $
+# $NetBSD: Makefile.inc,v 1.7 2012/03/25 06:55:19 joerg Exp $
.include <bsd.own.mk>
@@ -68,7 +68,7 @@ gcrt0.o: crt0.S crt0-common.c
sysident_assym.h: ${GENASSYM_CONF} ${GENASSYM_EXTRAS}
${_MKTARGET_CREATE}
cat ${COMMON_DIR}/sysident_assym.cf | \
- ${TOOL_GENASSYM} -- ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
+ ${TOOL_GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \
> sysident_assym.h.tmp && \
mv -f sysident_assym.h.tmp sysident_assym.h
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.154 src/sys/conf/Makefile.kern.inc:1.155
--- src/sys/conf/Makefile.kern.inc:1.154 Sun Mar 25 01:56:02 2012
+++ src/sys/conf/Makefile.kern.inc Sun Mar 25 06:55:20 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.154 2012/03/25 01:56:02 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.155 2012/03/25 06:55:20 joerg Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -322,7 +322,7 @@ SYSTEM_LD_TAIL+=${SYSTEM_LD_TAIL_EXTRA}
assym.h: ${GENASSYM_CONF} ${GENASSYM_EXTRAS}
${_MKTARGET_CREATE}
cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} | \
- ${GENASSYM} -- ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
+ ${GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \
> assym.h.tmp && \
mv -f assym.h.tmp assym.h
${MD_SFILES:C/\.[Ss]/.o/} ${SFILES:C/\.[Ss]/.o/}: assym.h
@@ -428,7 +428,7 @@ assym.d: assym.h
${_MKTARGET_CREATE}
cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} | \
${GENASSYM} -- ${MKDEP} -f assym.dep -- \
- ${CFLAGS} ${CPPFLAGS}
+ ${CFLAGS:N-Wa,*} ${CPPFLAGS}
${TOOL_SED} -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >${.TARGET}
rm -f assym.dep
Index: src/sys/modules/Makefile.assym
diff -u src/sys/modules/Makefile.assym:1.1 src/sys/modules/Makefile.assym:1.2
--- src/sys/modules/Makefile.assym:1.1 Wed Jan 16 12:34:56 2008
+++ src/sys/modules/Makefile.assym Sun Mar 25 06:55:20 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.assym,v 1.1 2008/01/16 12:34:56 ad Exp $
+# $NetBSD: Makefile.assym,v 1.2 2012/03/25 06:55:20 joerg Exp $
DPSRCS+= assym.h
CLEANFILES+= assym.h
@@ -22,6 +22,6 @@ GENASSYM_DIR?=
assym.h:
# ${GENASSYM_DIR}/genassym.cf
@echo ${S}
- ${TOOL_GENASSYM} -- ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
+ ${TOOL_GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \
< ${GENASSYM_DIR}/genassym.cf > assym.h.tmp && \
mv -f assym.h.tmp assym.h
