Module Name: src
Committed By: joerg
Date: Fri Jan 21 15:59:10 UTC 2011
Modified Files:
src: UPDATING
src/share/mk: sys.mk
src/sys/arch/acorn26/conf: Makefile.acorn26
src/sys/arch/amiga/conf: Makefile.amiga
src/sys/arch/arc/stand/boot: Makefile
src/sys/arch/atari/conf: Makefile.atari
src/sys/arch/bebox/stand/boot: Makefile
src/sys/arch/cesfic/conf: Makefile.cesfic
src/sys/arch/hp300/conf: Makefile.hp300
src/sys/arch/hpcmips/stand/lcboot: Makefile
src/sys/arch/luna68k/conf: Makefile.luna68k
src/sys/arch/mac68k/conf: Makefile.mac68k
src/sys/arch/mips/conf: Makefile.mips
src/sys/arch/mips/include: Makefile.inc
src/sys/arch/mvme68k/conf: Makefile.mvme68k
src/sys/arch/mvme68k/stand/bootxx: Makefile
src/sys/arch/mvme68k/stand/libbug: Makefile
src/sys/arch/mvme68k/stand/sboot: Makefile
src/sys/arch/news68k/conf: Makefile.news68k
src/sys/arch/next68k/conf: Makefile.next68k
src/sys/arch/prep/stand/boot: Makefile
src/sys/arch/rs6000/stand/boot: Makefile
src/sys/arch/sh3/conf: Makefile.sh3
src/sys/arch/sun2/conf: Makefile.sun2
src/sys/arch/sun3/conf: Makefile.sun3
src/sys/arch/usermode/conf: Makefile.usermode
src/sys/arch/vax/conf: Makefile.vax
src/sys/arch/x68k/conf: Makefile.x68k
Log Message:
Switch remaining platforms to modern CPP for assembler.
To generate a diff of this commit:
cvs rdiff -u -r1.219 -r1.220 src/UPDATING
cvs rdiff -u -r1.103 -r1.104 src/share/mk/sys.mk
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/acorn26/conf/Makefile.acorn26
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/amiga/conf/Makefile.amiga
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arc/stand/boot/Makefile
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/atari/conf/Makefile.atari
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/bebox/stand/boot/Makefile
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/cesfic/conf/Makefile.cesfic
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/hp300/conf/Makefile.hp300
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hpcmips/stand/lcboot/Makefile
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/luna68k/conf/Makefile.luna68k
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/mac68k/conf/Makefile.mac68k
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/mips/conf/Makefile.mips
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/include/Makefile.inc
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/mvme68k/conf/Makefile.mvme68k
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mvme68k/stand/bootxx/Makefile
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mvme68k/stand/libbug/Makefile
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mvme68k/stand/sboot/Makefile
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/news68k/conf/Makefile.news68k
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/next68k/conf/Makefile.next68k
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/prep/stand/boot/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/rs6000/stand/boot/Makefile
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sh3/conf/Makefile.sh3
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sun2/conf/Makefile.sun2
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/sun3/conf/Makefile.sun3
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/usermode/conf/Makefile.usermode
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/vax/conf/Makefile.vax
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/x68k/conf/Makefile.x68k
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/UPDATING
diff -u src/UPDATING:1.219 src/UPDATING:1.220
--- src/UPDATING:1.219 Mon Jan 17 18:11:09 2011
+++ src/UPDATING Fri Jan 21 15:59:04 2011
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.219 2011/01/17 18:11:09 joerg Exp $
+$NetBSD: UPDATING,v 1.220 2011/01/21 15:59:04 joerg Exp $
This file (UPDATING) is intended to be a brief reference to recent
changes that might cause problems in the build process, and a guide for
@@ -15,17 +15,11 @@
Recent changes:
^^^^^^^^^^^^^^^
-20110117:
- Assembler files on the following platforms no longer use -tradition-cpp:
- - Alpha,
- - AMD64,
- - i386,
- - SPARC,
- - SPARC64.
- This can break the build of individual parts of the tree. This is
- handled correctly by build.sh. Manual builds have to update
- /usr/share/mk and re-run config(1) for any kernel configurations as
- needed.
+20110121:
+ Assembler files no longer use -tradition-cpp. This can break
+ the build of individual parts of the tree. This is handled
+ correctly by build.sh. Manual builds have to update /usr/share/mk
+ and re-run config(1) for any kernel configurations as needed.
20101217:
The tcpdump(8) program was changed to drop privileges and chroot(2)
Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.103 src/share/mk/sys.mk:1.104
--- src/share/mk/sys.mk:1.103 Mon Jan 17 18:11:10 2011
+++ src/share/mk/sys.mk Fri Jan 21 15:59:04 2011
@@ -1,4 +1,4 @@
-# $NetBSD: sys.mk,v 1.103 2011/01/17 18:11:10 joerg Exp $
+# $NetBSD: sys.mk,v 1.104 2011/01/21 15:59:04 joerg Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
unix?= We run NetBSD.
@@ -15,13 +15,7 @@
AFLAGS?=
COMPILE.s?= ${CC} ${AFLAGS} -c
LINK.s?= ${CC} ${AFLAGS} ${LDFLAGS}
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
- ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc" || \
- ${MACHINE_ARCH} == "sparc64"
_ASM_TRADITIONAL_CPP= -x assembler-with-cpp
-.else
-_ASM_TRADITIONAL_CPP= -traditional-cpp
-.endif
COMPILE.S?= ${CC} ${AFLAGS} ${CPPFLAGS} ${_ASM_TRADITIONAL_CPP} -c
LINK.S?= ${CC} ${AFLAGS} ${CPPFLAGS} ${LDFLAGS}
Index: src/sys/arch/acorn26/conf/Makefile.acorn26
diff -u src/sys/arch/acorn26/conf/Makefile.acorn26:1.10 src/sys/arch/acorn26/conf/Makefile.acorn26:1.11
--- src/sys/arch/acorn26/conf/Makefile.acorn26:1.10 Wed Feb 13 23:37:17 2008
+++ src/sys/arch/acorn26/conf/Makefile.acorn26 Fri Jan 21 15:59:04 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.acorn26,v 1.10 2008/02/13 23:37:17 joerg Exp $
+# $NetBSD: Makefile.acorn26,v 1.11 2011/01/21 15:59:04 joerg Exp $
# Makefile for NetBSD
#
@@ -36,7 +36,7 @@
# We'd like GCC to leave R14 alone as much as possible (so page faults in the
# kernel are safer).
CFLAGS+= -ffixed-r14 -mapcs-frame -fno-omit-frame-pointer
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
Index: src/sys/arch/amiga/conf/Makefile.amiga
diff -u src/sys/arch/amiga/conf/Makefile.amiga:1.106 src/sys/arch/amiga/conf/Makefile.amiga:1.107
--- src/sys/arch/amiga/conf/Makefile.amiga:1.106 Sun Jan 25 22:25:08 2009
+++ src/sys/arch/amiga/conf/Makefile.amiga Fri Jan 21 15:59:05 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amiga,v 1.106 2009/01/25 22:25:08 abs Exp $
+# $NetBSD: Makefile.amiga,v 1.107 2011/01/21 15:59:05 joerg Exp $
# Makefile for NetBSD
#
@@ -37,7 +37,7 @@
CMACHFLAGS+= -Wa,-m68030 -Wa,-m68851
.endif
CFLAGS+= ${CMACHFLAGS} -msoft-float
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
Index: src/sys/arch/arc/stand/boot/Makefile
diff -u src/sys/arch/arc/stand/boot/Makefile:1.9 src/sys/arch/arc/stand/boot/Makefile:1.10
--- src/sys/arch/arc/stand/boot/Makefile:1.9 Thu May 27 06:58:12 2010
+++ src/sys/arch/arc/stand/boot/Makefile Fri Jan 21 15:59:05 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/05/27 06:58:12 dholland Exp $
+# $NetBSD: Makefile,v 1.10 2011/01/21 15:59:05 joerg Exp $
.include <bsd.own.mk>
.include <bsd.sys.mk> # for ${HOST_SH}
@@ -21,7 +21,7 @@
LIBCRTBEGIN=
LIBCRTEND=
-AFLAGS= -x assembler-with-cpp -traditional-cpp -mno-abicalls -mips2
+AFLAGS= -x assembler-with-cpp -mno-abicalls -mips2
AFLAGS+= -D_LOCORE -D_KERNEL
CFLAGS= -Os -mmemcpy -G 1024
CFLAGS+= -ffreestanding -mno-abicalls -msoft-float -mips2
Index: src/sys/arch/atari/conf/Makefile.atari
diff -u src/sys/arch/atari/conf/Makefile.atari:1.74 src/sys/arch/atari/conf/Makefile.atari:1.75
--- src/sys/arch/atari/conf/Makefile.atari:1.74 Mon Oct 19 13:40:28 2009
+++ src/sys/arch/atari/conf/Makefile.atari Fri Jan 21 15:59:05 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.atari,v 1.74 2009/10/19 13:40:28 tsutsui Exp $
+# $NetBSD: Makefile.atari,v 1.75 2011/01/21 15:59:05 joerg Exp $
# Makefile for NetBSD
#
@@ -32,7 +32,7 @@
CMACHFLAGS+= -Wa,-m68030
.endif
CFLAGS+= ${CMACHFLAGS} -msoft-float
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
Index: src/sys/arch/bebox/stand/boot/Makefile
diff -u src/sys/arch/bebox/stand/boot/Makefile:1.29 src/sys/arch/bebox/stand/boot/Makefile:1.30
--- src/sys/arch/bebox/stand/boot/Makefile:1.29 Thu Oct 14 06:58:22 2010
+++ src/sys/arch/bebox/stand/boot/Makefile Fri Jan 21 15:59:05 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2010/10/14 06:58:22 kiyohara Exp $
+# $NetBSD: Makefile,v 1.30 2011/01/21 15:59:05 joerg Exp $
NOMAN= # defined
@@ -27,7 +27,7 @@
SRCS+= setjmp.S
CFLAGS= -Wno-main -ffreestanding
-AFLAGS= -x assembler-with-cpp -traditional-cpp
+AFLAGS= -x assembler-with-cpp
CPPFLAGS= -nostdinc
CPPFLAGS+= -I${.OBJDIR} -I${S} -I${COMMONLIBDIR}/include -I${S}/lib/libsa
Index: src/sys/arch/cesfic/conf/Makefile.cesfic
diff -u src/sys/arch/cesfic/conf/Makefile.cesfic:1.15 src/sys/arch/cesfic/conf/Makefile.cesfic:1.16
--- src/sys/arch/cesfic/conf/Makefile.cesfic:1.15 Fri Sep 1 13:07:51 2006
+++ src/sys/arch/cesfic/conf/Makefile.cesfic Fri Jan 21 15:59:05 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cesfic,v 1.15 2006/09/01 13:07:51 matt Exp $
+# $NetBSD: Makefile.cesfic,v 1.16 2011/01/21 15:59:05 joerg Exp $
# Makefile for NetBSD
#
@@ -34,7 +34,7 @@
CPPFLAGS+= -Dcesfic
CWARNFLAGS+= -Wno-format
CFLAGS+= -msoft-float
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
AFLAGS+= -Wa,-m68040 -Wa,-m68030 -Wa,-m68851
##
Index: src/sys/arch/hp300/conf/Makefile.hp300
diff -u src/sys/arch/hp300/conf/Makefile.hp300:1.87 src/sys/arch/hp300/conf/Makefile.hp300:1.88
--- src/sys/arch/hp300/conf/Makefile.hp300:1.87 Sun Dec 11 12:17:13 2005
+++ src/sys/arch/hp300/conf/Makefile.hp300 Fri Jan 21 15:59:06 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.hp300,v 1.87 2005/12/11 12:17:13 christos Exp $
+# $NetBSD: Makefile.hp300,v 1.88 2011/01/21 15:59:06 joerg Exp $
# Makefile for NetBSD
#
@@ -33,7 +33,7 @@
##
CPPFLAGS+= -Dhp300
CFLAGS+= -msoft-float
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
Index: src/sys/arch/hpcmips/stand/lcboot/Makefile
diff -u src/sys/arch/hpcmips/stand/lcboot/Makefile:1.9 src/sys/arch/hpcmips/stand/lcboot/Makefile:1.10
--- src/sys/arch/hpcmips/stand/lcboot/Makefile:1.9 Fri Jun 2 19:46:24 2006
+++ src/sys/arch/hpcmips/stand/lcboot/Makefile Fri Jan 21 15:59:06 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/06/02 19:46:24 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2011/01/21 15:59:06 joerg Exp $
.include <bsd.own.mk>
ROMICE?= no
@@ -27,7 +27,7 @@
DBG=
AFLAGS+= -D_LOCORE -D_KERNEL
-AFLAGS+= -x assembler-with-cpp -traditional-cpp -mips2 -mno-abicalls
+AFLAGS+= -x assembler-with-cpp -mips2 -mno-abicalls
INCLUDES= -I${.OBJDIR} -I${S} -I${S}/arch
CPPFLAGS+= ${INCLUDES} -nostdinc -D_STANDALONE -DHEAP_LIMIT=0x8002ffff
CFLAGS+= -mips2 -EL -mno-abicalls -ffreestanding -mmemcpy
Index: src/sys/arch/luna68k/conf/Makefile.luna68k
diff -u src/sys/arch/luna68k/conf/Makefile.luna68k:1.19 src/sys/arch/luna68k/conf/Makefile.luna68k:1.20
--- src/sys/arch/luna68k/conf/Makefile.luna68k:1.19 Tue Feb 19 14:38:14 2008
+++ src/sys/arch/luna68k/conf/Makefile.luna68k Fri Jan 21 15:59:06 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.luna68k,v 1.19 2008/02/19 14:38:14 joerg Exp $
+# $NetBSD: Makefile.luna68k,v 1.20 2011/01/21 15:59:06 joerg Exp $
# Makefile for NetBSD
#
@@ -32,7 +32,7 @@
##
CPPFLAGS+= -Dluna68k
CFLAGS+= -msoft-float
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
Index: src/sys/arch/mac68k/conf/Makefile.mac68k
diff -u src/sys/arch/mac68k/conf/Makefile.mac68k:1.89 src/sys/arch/mac68k/conf/Makefile.mac68k:1.90
--- src/sys/arch/mac68k/conf/Makefile.mac68k:1.89 Mon Feb 18 14:01:17 2008
+++ src/sys/arch/mac68k/conf/Makefile.mac68k Fri Jan 21 15:59:07 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mac68k,v 1.89 2008/02/18 14:01:17 joerg Exp $
+# $NetBSD: Makefile.mac68k,v 1.90 2011/01/21 15:59:07 joerg Exp $
# Makefile for NetBSD
#
@@ -33,7 +33,7 @@
##
CPPFLAGS+= -Dmac68k
CFLAGS+= -msoft-float
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
Index: src/sys/arch/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.55 src/sys/arch/mips/conf/Makefile.mips:1.56
--- src/sys/arch/mips/conf/Makefile.mips:1.55 Mon Dec 14 00:46:04 2009
+++ src/sys/arch/mips/conf/Makefile.mips Fri Jan 21 15:59:07 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.55 2009/12/14 00:46:04 matt Exp $
+# $NetBSD: Makefile.mips,v 1.56 2011/01/21 15:59:07 joerg Exp $
# Makefile for NetBSD
#
@@ -67,7 +67,7 @@
${OBJCOPY} -O elf32-nlittlemips $@ $@.elf32
.endif
.endif # LP64=yes
-AFLAGS+= -mno-abicalls -x assembler-with-cpp -traditional-cpp ${AOPTS}
+AFLAGS+= -mno-abicalls -x assembler-with-cpp ${AOPTS}
##
## (3) libkern and compat
Index: src/sys/arch/mips/include/Makefile.inc
diff -u src/sys/arch/mips/include/Makefile.inc:1.8 src/sys/arch/mips/include/Makefile.inc:1.9
--- src/sys/arch/mips/include/Makefile.inc:1.8 Sun Nov 29 23:46:41 2009
+++ src/sys/arch/mips/include/Makefile.inc Fri Jan 21 15:59:07 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2009/11/29 23:46:41 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.9 2011/01/21 15:59:07 joerg Exp $
CFLAGS+= -G 0 -ffixed-23
@@ -12,4 +12,4 @@
CFLAGS+= -msym32
.endif
-AFLAGS+= -x assembler-with-cpp -traditional-cpp ${AOPTS}
+AFLAGS+= -x assembler-with-cpp ${AOPTS}
Index: src/sys/arch/mvme68k/conf/Makefile.mvme68k
diff -u src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.61 src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.62
--- src/sys/arch/mvme68k/conf/Makefile.mvme68k:1.61 Mon Feb 18 14:11:48 2008
+++ src/sys/arch/mvme68k/conf/Makefile.mvme68k Fri Jan 21 15:59:07 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mvme68k,v 1.61 2008/02/18 14:11:48 joerg Exp $
+# $NetBSD: Makefile.mvme68k,v 1.62 2011/01/21 15:59:07 joerg Exp $
# Makefile for NetBSD
#
@@ -46,7 +46,7 @@
.endif
.endif
CFLAGS+= ${CMACHFLAGS} -msoft-float
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
Index: src/sys/arch/mvme68k/stand/bootxx/Makefile
diff -u src/sys/arch/mvme68k/stand/bootxx/Makefile:1.9 src/sys/arch/mvme68k/stand/bootxx/Makefile:1.10
--- src/sys/arch/mvme68k/stand/bootxx/Makefile:1.9 Sun Jan 2 05:30:12 2011
+++ src/sys/arch/mvme68k/stand/bootxx/Makefile Fri Jan 21 15:59:07 2011
@@ -1,7 +1,7 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/10/93
-# $NetBSD: Makefile,v 1.9 2011/01/02 05:30:12 tsutsui Exp $
+# $NetBSD: Makefile,v 1.10 2011/01/21 15:59:07 joerg Exp $
-COMPILE.S= $(CC) -x assembler-with-cpp -traditional-cpp \
+COMPILE.S= $(CC) -x assembler-with-cpp \
$(ASFLAGS) $(CPPFLAGS) $(INCPATH) -c -o $*.o
SRCS= bootxx.c conf.c block_x.S
Index: src/sys/arch/mvme68k/stand/libbug/Makefile
diff -u src/sys/arch/mvme68k/stand/libbug/Makefile:1.15 src/sys/arch/mvme68k/stand/libbug/Makefile:1.16
--- src/sys/arch/mvme68k/stand/libbug/Makefile:1.15 Sun Dec 6 13:31:16 2009
+++ src/sys/arch/mvme68k/stand/libbug/Makefile Fri Jan 21 15:59:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/12/06 13:31:16 tsutsui Exp $
+# $NetBSD: Makefile,v 1.16 2011/01/21 15:59:08 joerg Exp $
LIB=bug
@@ -22,7 +22,7 @@
# separate rule for bugstart.c
# this is build separately from rest of libbug
bugstart.o: bugstart.s
- ${CC} -x assembler-with-cpp -traditional-cpp -nostdinc ${INCPATH} \
+ ${CC} -x assembler-with-cpp -nostdinc ${INCPATH} \
-D_STANDALONE -c ${.IMPSRC}
all realall: lib${LIB}.a
Index: src/sys/arch/mvme68k/stand/sboot/Makefile
diff -u src/sys/arch/mvme68k/stand/sboot/Makefile:1.13 src/sys/arch/mvme68k/stand/sboot/Makefile:1.14
--- src/sys/arch/mvme68k/stand/sboot/Makefile:1.13 Tue Apr 9 19:37:22 2002
+++ src/sys/arch/mvme68k/stand/sboot/Makefile Fri Jan 21 15:59:08 2011
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2002/04/09 19:37:22 scw Exp $
+# $NetBSD: Makefile,v 1.14 2011/01/21 15:59:08 joerg Exp $
#
# sboot would like a newer GNU ld because it can generate S-Records.
# Until then, we convert.
#
-COMPILE.s= $(CC) -x assembler-with-cpp -traditional-cpp \
+COMPILE.s= $(CC) -x assembler-with-cpp \
$(ASFLAGS) $(CPPFLAGS) $(INCPATH) -c -o $*.o
RELOC= 0x4000
Index: src/sys/arch/news68k/conf/Makefile.news68k
diff -u src/sys/arch/news68k/conf/Makefile.news68k:1.19 src/sys/arch/news68k/conf/Makefile.news68k:1.20
--- src/sys/arch/news68k/conf/Makefile.news68k:1.19 Sat Mar 1 14:00:30 2008
+++ src/sys/arch/news68k/conf/Makefile.news68k Fri Jan 21 15:59:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.news68k,v 1.19 2008/03/01 14:00:30 joerg Exp $
+# $NetBSD: Makefile.news68k,v 1.20 2011/01/21 15:59:08 joerg Exp $
#
# Makefile for NetBSD
#
@@ -36,7 +36,7 @@
##
CPPFLAGS+= -Dnews68k
CFLAGS+= -msoft-float
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
Index: src/sys/arch/next68k/conf/Makefile.next68k
diff -u src/sys/arch/next68k/conf/Makefile.next68k:1.29 src/sys/arch/next68k/conf/Makefile.next68k:1.30
--- src/sys/arch/next68k/conf/Makefile.next68k:1.29 Thu Feb 14 00:09:36 2008
+++ src/sys/arch/next68k/conf/Makefile.next68k Fri Jan 21 15:59:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.next68k,v 1.29 2008/02/14 00:09:36 joerg Exp $
+# $NetBSD: Makefile.next68k,v 1.30 2011/01/21 15:59:08 joerg Exp $
# Makefile for NetBSD
#
@@ -33,7 +33,7 @@
##
CPPFLAGS+= -Dnext68k
CFLAGS+= -msoft-float
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
Index: src/sys/arch/prep/stand/boot/Makefile
diff -u src/sys/arch/prep/stand/boot/Makefile:1.23 src/sys/arch/prep/stand/boot/Makefile:1.24
--- src/sys/arch/prep/stand/boot/Makefile:1.23 Mon Jan 12 07:51:02 2009
+++ src/sys/arch/prep/stand/boot/Makefile Fri Jan 21 15:59:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/01/12 07:51:02 tsutsui Exp $
+# $NetBSD: Makefile,v 1.24 2011/01/21 15:59:08 joerg Exp $
NOMAN= # defined
@@ -25,7 +25,7 @@
CFLAGS= -Os -mmultiple -ffreestanding
CFLAGS+= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
-AFLAGS= -x assembler-with-cpp -traditional-cpp
+AFLAGS= -x assembler-with-cpp
CPPFLAGS= -nostdinc -I${.OBJDIR} -I${MKBOOTIMAGE} -I${S}
CPPFLAGS+= -D_STANDALONE -DRELOC=${RELOC} -DUSE_SCAN
Index: src/sys/arch/rs6000/stand/boot/Makefile
diff -u src/sys/arch/rs6000/stand/boot/Makefile:1.2 src/sys/arch/rs6000/stand/boot/Makefile:1.3
--- src/sys/arch/rs6000/stand/boot/Makefile:1.2 Mon Jan 12 07:16:17 2009
+++ src/sys/arch/rs6000/stand/boot/Makefile Fri Jan 21 15:59:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/01/12 07:16:17 tsutsui Exp $
+# $NetBSD: Makefile,v 1.3 2011/01/21 15:59:09 joerg Exp $
NOMAN= # defined
@@ -26,7 +26,7 @@
CFLAGS= -Os -mmultiple -ffreestanding
CFLAGS+= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
-AFLAGS= -x assembler-with-cpp -traditional-cpp
+AFLAGS= -x assembler-with-cpp
CPPFLAGS= -nostdinc -I${.OBJDIR} -I${MKBOOTIMAGE} -I${S}
CPPFLAGS+= -D_STANDALONE -DRELOC=${RELOC} -DUSE_SCAN
Index: src/sys/arch/sh3/conf/Makefile.sh3
diff -u src/sys/arch/sh3/conf/Makefile.sh3:1.26 src/sys/arch/sh3/conf/Makefile.sh3:1.27
--- src/sys/arch/sh3/conf/Makefile.sh3:1.26 Tue May 6 02:25:19 2008
+++ src/sys/arch/sh3/conf/Makefile.sh3 Fri Jan 21 15:59:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sh3,v 1.26 2008/05/06 02:25:19 uwe Exp $
+# $NetBSD: Makefile.sh3,v 1.27 2011/01/21 15:59:09 joerg Exp $
# Makefile for NetBSD
#
@@ -33,7 +33,7 @@
## (2) compile settings
##
CPPFLAGS+= -D${MACHINE}
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
# -O2 is too -falign-* zealous for low-memory sh3 machines
COPTS?= -Os -freorder-blocks
Index: src/sys/arch/sun2/conf/Makefile.sun2
diff -u src/sys/arch/sun2/conf/Makefile.sun2:1.19 src/sys/arch/sun2/conf/Makefile.sun2:1.20
--- src/sys/arch/sun2/conf/Makefile.sun2:1.19 Tue Jan 22 15:24:50 2008
+++ src/sys/arch/sun2/conf/Makefile.sun2 Fri Jan 21 15:59:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sun2,v 1.19 2008/01/22 15:24:50 joerg Exp $
+# $NetBSD: Makefile.sun2,v 1.20 2011/01/21 15:59:09 joerg Exp $
# Makefile for NetBSD
#
@@ -33,7 +33,7 @@
##
CPPFLAGS+= -Dsun2
CFLAGS+= -msoft-float -fno-defer-pop
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
Index: src/sys/arch/sun3/conf/Makefile.sun3
diff -u src/sys/arch/sun3/conf/Makefile.sun3:1.100 src/sys/arch/sun3/conf/Makefile.sun3:1.101
--- src/sys/arch/sun3/conf/Makefile.sun3:1.100 Tue Feb 19 14:31:40 2008
+++ src/sys/arch/sun3/conf/Makefile.sun3 Fri Jan 21 15:59:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sun3,v 1.100 2008/02/19 14:31:40 joerg Exp $
+# $NetBSD: Makefile.sun3,v 1.101 2011/01/21 15:59:09 joerg Exp $
# Makefile for NetBSD
#
@@ -33,7 +33,7 @@
##
CPPFLAGS+= -Dsun3
CFLAGS+= ${CMACHFLAGS} -msoft-float -fno-defer-pop
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
Index: src/sys/arch/usermode/conf/Makefile.usermode
diff -u src/sys/arch/usermode/conf/Makefile.usermode:1.3 src/sys/arch/usermode/conf/Makefile.usermode:1.4
--- src/sys/arch/usermode/conf/Makefile.usermode:1.3 Sat Dec 29 17:48:23 2007
+++ src/sys/arch/usermode/conf/Makefile.usermode Fri Jan 21 15:59:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.usermode,v 1.3 2007/12/29 17:48:23 jmcneill Exp $
+# $NetBSD: Makefile.usermode,v 1.4 2011/01/21 15:59:09 joerg Exp $
MACHINE_ARCH= usermode
USETOOLS?= no
@@ -19,7 +19,7 @@
DEFCOPTS= -O2
CPPFLAGS+= -Dusermode -Dmalloc=kernmalloc -Dfree=kernfree
CPPFLAGS.init_main.c+= -Dmain=kernmain
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
##
## (3) libkern and compat
Index: src/sys/arch/vax/conf/Makefile.vax
diff -u src/sys/arch/vax/conf/Makefile.vax:1.80 src/sys/arch/vax/conf/Makefile.vax:1.81
--- src/sys/arch/vax/conf/Makefile.vax:1.80 Sat Mar 1 13:59:56 2008
+++ src/sys/arch/vax/conf/Makefile.vax Fri Jan 21 15:59:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.vax,v 1.80 2008/03/01 13:59:56 joerg Exp $
+# $NetBSD: Makefile.vax,v 1.81 2011/01/21 15:59:10 joerg Exp $
# Makefile for NetBSD
#
@@ -32,7 +32,7 @@
## (2) compile settings
##
CPPFLAGS+= -D_VAX_INLINE_
-AFLAGS+= -x assembler-with-cpp -traditional-cpp -fno-pic
+AFLAGS+= -x assembler-with-cpp -fno-pic
CFLAGS+= -fno-pic
##
Index: src/sys/arch/x68k/conf/Makefile.x68k
diff -u src/sys/arch/x68k/conf/Makefile.x68k:1.61 src/sys/arch/x68k/conf/Makefile.x68k:1.62
--- src/sys/arch/x68k/conf/Makefile.x68k:1.61 Tue Feb 12 18:26:48 2008
+++ src/sys/arch/x68k/conf/Makefile.x68k Fri Jan 21 15:59:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.x68k,v 1.61 2008/02/12 18:26:48 joerg Exp $
+# $NetBSD: Makefile.x68k,v 1.62 2011/01/21 15:59:10 joerg Exp $
#
# Makefile for NetBSD
#
@@ -32,7 +32,7 @@
## (2) compile settings
##
CPPFLAGS+= -Dx68k
-AFLAGS+= -x assembler-with-cpp -traditional-cpp
+AFLAGS+= -x assembler-with-cpp
CMACHFLAGS?= -m68020-60 -Wa,-m68030 -Wa,-m68851
CFLAGS+= ${CMACHFLAGS} -msoft-float
