 @@ -1,41 +1,35 @@
-$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
 what to do if something doesn't work.
 For a more detailed description of the recommended way to build NetBSD
 using build.sh, see the BUILDING file.
 Note that much of the advice in this UPDATING file was written before
 build.sh existed.  Nevertheless, the advice here may be useful for
 working around specific problems with build.sh.
 See also: BUILDING, build.sh, Makefile.
 Recent changes:
 ^^^^^^^^^^^^^^^
-20110117:
+20110121:
-	Assembler files on the following platforms no longer use -tradition-cpp:
+	Assembler files no longer use -tradition-cpp.  This can break
-	- Alpha,
+	the build of individual parts of the tree.  This is handled
-	- AMD64,
+	correctly by build.sh.  Manual builds have to update /usr/share/mk
-	- i386,
+	and re-run config(1) for any kernel configurations as needed.
 	- 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.
 20101217:
 	The tcpdump(8) program was changed to drop privileges and chroot(2)
 	by default. It may be necessary to manually update passwd(5) and
 	group(5) in order to make the program work with existing setups.
 20101125:
 	The latest changes to setenv(3) dissallow setting environment
 	variables with names that contain '='. Revision 1.18 of env.c
 	assumed that this was allowed. Installing a new libc with an
 	old copy of /usr/bin/env causes env x=1 printenv | grep x= to
 	break which affects the autoconf tests for dependency finding,
 	so building gcc will end up printing:

 @@ -1,14 +1,14 @@
-#	$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
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/acorn26/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/acorn26/conf/Makefile.i386
 # after which config should be rerun for all machines of that type.
+#
 @@ -26,27 +26,27 @@ NEED_OWN_INSTALL_TARGET?=no
 ##
 ARM=		$S/arch/arm
 ACORN26=	$S/arch/acorn26
 GENASSYM_CONF=	${ACORN26}/acorn26/genassym.cf
 ##
 ## (2) compile settings
 ##
 CPPFLAGS+=	-Dacorn26
 CWARNFLAGS+=	-Wcomment
 # 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
 ##
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
 MD_OBJS=	vectors.o locore.o
 MD_CFILES=
 MD_SFILES=	${ARM}/arm/vectors.S ${ACORN26}/acorn26/locore.S
 locore.o: ${ACORN26}/acorn26/locore.S assym.h

 @@ -1,14 +1,14 @@
-#	$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
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/amiga/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/amiga/conf/Makefile.amiga
 # after which config should be rerun for all machines of that type.
+#
 @@ -27,27 +27,27 @@ NEED_OWN_INSTALL_TARGET?=no
 ##
 AMIGA=		$S/arch/amiga
 GENASSYM_CONF=	${AMIGA}/amiga/genassym.cf
 ##
 ## (2) compile settings
 ##
 CPPFLAGS+=	-Damiga -DFPCOPROC
 .if !defined(CMACHFLAGS)
 .include "$S/arch/m68k/Makefile.cmachflags"
 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
 ##
 KERN_AS=	obj
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
 # for the Motorola 68040 Floating Point Software Product
 .include "$S/arch/m68k/fpsp/Makefile.inc"
 # for the Motorola 68060 Software Support Package

 @@ -1,37 +1,37 @@
-# $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}
 S!= cd ${.CURDIR}/../../../..; pwd
 PROG= boot
 MKMAN= no		# defined
 STRIPFLAG=
 BINMODE= 444
 NETBSD_VERS!=	${HOST_SH} ${S}/conf/osrelease.sh
 SRCS=	start.S
 SRCS+=	boot.c bootinfo.c conf.c devopen.c disk.c getchar.c getopt.c putchar.c
 # XXX SHOULD NOT NEED TO DEFINE THESE!
 LIBCRT0=
 LIBC=
 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
 CFLAGS+=   -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
 CPPFLAGS+= -nostdinc -I. -I${S}
 CPPFLAGS+= -D_STANDALONE -DNO_ABICALLS -D${MACHINE}
 CPPFLAGS+= -DNETBSD_VERS='"${NETBSD_VERS}"'
 #CPPFLAGS+= -DBOOT_DEBUG
 LDSCRIPT=  ${S}/arch/mips/conf/stand.ldscript
 TEXTADDR=  0x80f00000
 # if there is a 'version' file, add rule for vers.c and add it to SRCS
 # and CLEANFILES

 @@ -1,14 +1,14 @@
-#	$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
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/atari/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/atari/conf/Makefile.atari
 # after which config should be rerun for all machines of that type.
 @@ -22,27 +22,27 @@ NEED_OWN_INSTALL_TARGET?=no
 ##
 ATARI=		$S/arch/atari
 GENASSYM_CONF=	${ATARI}/atari/genassym.cf
 ##
 ## (2) compile settings
 ##
 CPPFLAGS+=	-Datari
 .if !defined(CMACHFLAGS)
 .include "$S/arch/m68k/Makefile.cmachflags"
 CMACHFLAGS+= -Wa,-m68030
 .endif
 CFLAGS+=	${CMACHFLAGS} -msoft-float
-AFLAGS+=	-x assembler-with-cpp -traditional-cpp
+AFLAGS+=	-x assembler-with-cpp
 ##
 ## (3) libkern and compat
 ##
 KERN_AS=	obj
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
 # for the Motorola 68040 Floating Point Software Product
 .include "$S/arch/m68k/fpsp/Makefile.inc"
 # for the Motorola 68060 Software Support Package

 @@ -1,14 +1,14 @@
-#	$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
 .include <bsd.own.mk>
 COMMON= ${.CURDIR}/../common
 COMMONOBJ!=	cd ${COMMON} && ${PRINTOBJDIR}
 .PATH: ${.CURDIR}/../boot ${COMMONOBJ} ${.CURDIR}/../../../powerpc/powerpc
 S= ${.CURDIR}/../../../..
 L= ${COMMONOBJ}/lib
 @@ -17,27 +17,27 @@ ELF2PEF= ${.CURDIR}/../../../powerpc/sta
 COMMONLIBDIR= ${.CURDIR}/../../../../../common
 BASE?=		boot
 PROG=		${BASE}
 NEWVERSWHAT=	"BOOT"
 SRCS= srt0.s
 SRCS+= boot.c clock.c com.c conf.c cons.c cpu.c devopen.c
 SRCS+= fd.c filesystem.c inkernel.c io.c kbd.c monitor.c ns16550.c
 SRCS+= pci.c prf.c sd.c siop.c tgets.c vers.c vga.c video.c vreset.c wdc.c wd.c
 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
 CPPFLAGS+= -I${ELF2PEF}
 CPPFLAGS+= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
 CPPFLAGS+= -D_STANDALONE -DRELOC=${RELOC} -DUSE_SCAN
 CPPFLAGS+= -D__daddr_t=int32_t
 #CPPFLAGS+= -DDBMONITOR
 .if (${BASE} == "boot")
 CPPFLAGS+= -DCONS_BE
 .elif (${BASE} == "boot_com0")
 CPPFLAGS+= -DCONS_SERIAL -DCOMSPEED=9600 -DCOMPORT=0x3f8

 @@ -1,14 +1,14 @@
-#	$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
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/cesfic/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/cesfic/conf/Makefile.cesfic
 # after which config should be rerun for all machines of that type.
+#
 @@ -24,27 +24,27 @@ NEED_OWN_INSTALL_TARGET?=no
 ##
 ## (1) port identification
 ##
 CESFIC=		$S/arch/cesfic
 GENASSYM_CONF=	${CESFIC}/cesfic/genassym.cf
 ##
 ## (2) compile settings
 ##
 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
 ##
 ## (3) libkern and compat
 ##
 KERN_AS=	obj
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
 # for the Motorola 68040 Floating Point Software Product
 .include "$S/arch/m68k/fpsp/Makefile.inc"

 @@ -1,14 +1,14 @@
-#	$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
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/hp300/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/hp300/conf/Makefile.hp300
 # after which config should be rerun for all machines of that type.
+#
 @@ -23,27 +23,27 @@ NEED_OWN_INSTALL_TARGET?=no
 .include <bsd.own.mk>
 ##
 ## (1) port identification
 ##
 HP300=		$S/arch/hp300
 GENASSYM_CONF=	${HP300}/hp300/genassym.cf
 ##
 ## (2) compile settings
 ##
 CPPFLAGS+=	-Dhp300
 CFLAGS+=	-msoft-float
-AFLAGS+=	-x assembler-with-cpp -traditional-cpp
+AFLAGS+=	-x assembler-with-cpp
 ##
 ## (3) libkern and compat
 ##
 KERN_AS=	obj
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
 # for the Motorola 68040 Floating Point Software Product
 .include "$S/arch/m68k/fpsp/Makefile.inc"
 MD_OBJS=	locore.o ${FPSP}

 @@ -1,14 +1,14 @@
-#	$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
 S=	${.CURDIR}/../../../../
 PROG=	lcboot.out
 SREC=	lcboot.srec
 MKMAN=	no
 WARNS=	1
 SRCS=	start.S main.c com.c conf.c dev_flash.c dev_net.c \
 	devopen.c i28f128.c if_cs.c
 @@ -17,27 +17,27 @@ SRCS=	start.S main.c com.c conf.c dev_fl
 STARTOBJS=
 NEWVERSWHAT=    "L-Card+ Boot"
 VERSIONFILE=    ${S}/arch/hpcmips/stand/lcboot/version
 # Make sure we override any optimization options specified by the user.
 #COPTS=  -Os
 COPTS=
 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
 LD_SCRIPT=	lcboot.ldscript
 .if defined(ROMICE) && (${ROMICE} == "yes")
 CPPFLAGS+=	-DROMICE
 .endif
 .if !make(obj) && !make(clean) && !make(cleandir)
 .BEGIN:
 	@([ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine)
 	@[ -h mips ] || ln -s ${S}/arch/mips/include mips

 @@ -1,14 +1,14 @@
-#	$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
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/luna68k/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/luna68k/conf/Makefile.luna68k
 # after which config should be rerun for all machines of that type.
 # To specify debugging, add the config line: makeoptions DEBUG="-g"
 @@ -22,27 +22,27 @@ NEED_OWN_INSTALL_TARGET?=no
 .include <bsd.own.mk>
 ##
 ## (1) port identification
 ##
 LUNA68K=	$S/arch/luna68k
 GENASSYM_CONF=	${LUNA68K}/luna68k/genassym.cf
 ##
 ## (2) compile settings
 ##
 CPPFLAGS+=	-Dluna68k
 CFLAGS+=	-msoft-float
-AFLAGS+=	-x assembler-with-cpp -traditional-cpp
+AFLAGS+=	-x assembler-with-cpp
 ##
 ## (3) libkern and compat
 ##
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
 # for the Motorola 68040 Floating Point Software Product
 # .include "$S/arch/m68k/fpsp/Makefile.inc"
 MD_OBJS=	locore.o ${FPSP}
 MD_CFILES=

 @@ -1,14 +1,14 @@
-#	$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
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/mac68k/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/mac68k/conf/Makefile.mac68k
 # after which config should be rerun for all machines of that type.
+#
 @@ -23,27 +23,27 @@ NEED_OWN_INSTALL_TARGET?=no
 .include <bsd.own.mk>
 ##
 ## (1) port identification
 ##
 MAC68K=		$S/arch/mac68k
 GENASSYM_CONF=	${MAC68K}/mac68k/genassym.cf
 ##
 ## (2) compile settings
 ##
 CPPFLAGS+=	-Dmac68k
 CFLAGS+=	-msoft-float
-AFLAGS+=	-x assembler-with-cpp -traditional-cpp
+AFLAGS+=	-x assembler-with-cpp
 ##
 ## (3) libkern and compat
 ##
 KERN_AS=	obj
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
 # for the Motorola 68040 Floating Point Software Product
 .include "$S/arch/m68k/fpsp/Makefile.inc"
 MD_OBJS=	locore.o ${FPSP}

 @@ -1,14 +1,14 @@
-#	$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
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/<machine>/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/mips/conf/Makefile.mips
 # after which config should be rerun for all machines of that type.
+#
 @@ -57,27 +57,27 @@ LDFLAGS+=	-m elf64btsmip
 LINKFORMAT+=	-m elf64btsmip
 SYSTEM_LD_TAIL_EXTRA+= \
 		;echo ${OBJCOPY} -O elf32-nbigmips $@ $@.elf32; \
 		${OBJCOPY} -O elf32-nbigmips $@ $@.elf32
 .endif
 .if ${MACHINE_ARCH} == "mips64el"
 LDFLAGS+=	-m elf64ltsmip
 LINKFORMAT+=	-m elf64ltsmip
 SYSTEM_LD_TAIL_EXTRA+= \
 		;echo ${OBJCOPY} -O elf32-nlittlemips $@ $@.elf32; \
 		${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
 ##
 OPT_MODULAR=	%MODULAR%
 .if !empty(OPT_MODULAR)
 KERN_AS=	obj
 .endif
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
 MD_OBJS=	locore.o locore_machdep.o

 @@ -1,15 +1,15 @@
-# $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
 # this should really be !(RUMPKERNEL && target=PIC)
 .if !defined(RUMPKERNEL)
 CFLAGS+=	-mno-abicalls
 AFLAGS+=	-mno-abicalls
 .endif
 .if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
 CFLAGS+=	-msym32
 .endif
-AFLAGS+=	-x assembler-with-cpp -traditional-cpp ${AOPTS}
+AFLAGS+=	-x assembler-with-cpp ${AOPTS}

 @@ -1,14 +1,14 @@
-#	$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
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/mvme68k/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/mvme68k/conf/Makefile.mvme68k
 # after which config should be rerun for all machines of that type.
+#
 @@ -36,27 +36,27 @@ CPPFLAGS+=	-Dmvme68k
 .if empty(IDENT:M-DMVME147)
 CMACHFLAGS=	-m68040
 .else
 CMACHFLAGS=	-m68030
 .endif
 .else
 .if empty(IDENT:M-DMVME147) && empty(IDENT:M-DMVME162) && empty(IDENT:M-DMVME167)
 CMACHFLAGS=	-m68060 -Wa,-m68030 -Wa,-m68851
 .else
 CMACHFLAGS=	-m68020-60 -Wa,-m68030 -Wa,-m68851
 .endif
 .endif
 CFLAGS+=	${CMACHFLAGS} -msoft-float
-AFLAGS+=	-x assembler-with-cpp -traditional-cpp
+AFLAGS+=	-x assembler-with-cpp
 ##
 ## (3) libkern and compat
 ##
 KERN_AS=	obj
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
 # for the Motorola 68040 Floating Point Software Product
 .include "$S/arch/m68k/fpsp/Makefile.inc"
 # for the Motorola 68060 Software Support Package

 @@ -1,15 +1,15 @@
 #	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
 PROG=	bootxx
 LIBS=	${LIBSA} ${LIBKERN} ${LIBBUG}
 DPADD=	${LIBS}
 SRTOBJ=
 .include "../Makefile.booters"
 .include <bsd.prog.mk>

 @@ -1,32 +1,32 @@
-#	$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
 NOPIC= # defined
 NOLINT= # defined
 NOPROFILE= # defined
 S=${.CURDIR}/../../../..
 DIR_SA=$S/lib/libsa
 SRCS=	bugcrt.c delay.c diskrd.c diskwr.c getbrdid.c inchr.c instat.c \
 	outln.c outstr.c putchar.c return.c rtc_rd.c
 OBJS+=	bugstart.o
 CLEANFILES+= bugstart.o
 .include "../Makefile.booters"
 # only needed during build
 libinstall::
 # 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
 .include <bsd.own.mk>
 .undef DESTDIR
 .include <bsd.lib.mk>

 @@ -1,21 +1,21 @@
-#	$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
 SRCS=		start.s clock.c console.c etherfun.c le_poll.c \
 		oc_cksum.s sboot.c
 SRTOBJ=
 PROG=		sboot
 LIBS=		${LIBSA}
 DPADD=		${LIBS}
 CLEANFILES+=	sboot.srec
 PROGDEPENDS=	${OBJS} ${LIBS}
 PROGLINKOBJS=	${OBJS} ${LIBS}

 @@ -1,14 +1,14 @@
-#	$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
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/news68k/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/news68k/conf/Makefile.news68k
 # after which config should be rerun for all machines of that type.
+#
 @@ -26,27 +26,27 @@ NEED_OWN_INSTALL_TARGET?=no
 ## (1) port identification
 ##
 .ifndef S
 S=		../../../..
 .endif
 NEWS68K=	$S/arch/news68k
 GENASSYM_CONF=	${NEWS68K}/news68k/genassym.cf
 ##
 ## (2) compile settings
 ##
 CPPFLAGS+=	-Dnews68k
 CFLAGS+=	-msoft-float
-AFLAGS+=	-x assembler-with-cpp -traditional-cpp
+AFLAGS+=	-x assembler-with-cpp
 ##
 ## (3) libkern and compat
 ##
 KERN_AS=	obj
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
 MD_OBJS=	locore.o ${FPSP}
 MD_CFILES=
 MD_SFILES=	${NEWS68K}/news68k/locore.s

 @@ -1,14 +1,14 @@
-# $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
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/next68k/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/next68k/conf/Makefile.next68k
 # after which config should be rerun for all machines of that type.
+#
 @@ -23,27 +23,27 @@ NEED_OWN_INSTALL_TARGET?=no
 .include <bsd.own.mk>
 ##
 ## (1) port identification
 ##
 NEXT68K=	$S/arch/next68k
 GENASSYM_CONF=	${NEXT68K}/next68k/genassym.cf
 ##
 ## (2) compile settings
 ##
 CPPFLAGS+=	-Dnext68k
 CFLAGS+=	-msoft-float
-AFLAGS+=	-x assembler-with-cpp -traditional-cpp
+AFLAGS+=	-x assembler-with-cpp
 ##
 ## (3) libkern and compat
 ##
 KERN_AS=	obj
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
 # for the Motorola 68040 Floating Point Software Product
 .include "$S/arch/m68k/fpsp/Makefile.inc"
 MD_OBJS=	locore.o ${FPSP}

 @@ -1,41 +1,41 @@
-#	$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
 .include <bsd.own.mk>
 COMMON= ${.CURDIR}/../common
 COMMONOBJ!=	cd ${COMMON} && ${PRINTOBJDIR}
 .PATH: ${.CURDIR}/../boot ${COMMONOBJ}
 S= ${.CURDIR}/../../../..
 L= ${COMMONOBJ}/lib
 MKBOOTIMAGE= ${.CURDIR}/../../../powerpc/stand/mkbootimage
 BASE?=		boot
 PROG=		${BASE}
 NEWVERSWHAT=	"BOOT"
 SRCS= srt0.s
 SRCS+= boot.c clock.c com.c conf.c cons.c devopen.c
 SRCS+= filesystem.c inkernel.c io.c tgets.c prf.c monitor.c
 SRCS+= kbd.c ns16550.c vers.c vreset.c vga.c
 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
 CPPFLAGS+= -D__daddr_t=int32_t
 #CPPFLAGS+= -DDBMONITOR
 .if (${BASE} == "boot")
 CPPFLAGS+= -DCONS_VGA -DVGA_RESET
 .elif (${BASE} == "boot_com0")
 CPPFLAGS+= -DCONS_SERIAL -DCOMSPEED=9600 -DCOMPORT=0x3f8
 .elif (${BASE} == "boot_com0_vreset")
 CPPFLAGS+= -DCONS_SERIAL -DCOMSPEED=9600 -DCOMPORT=0x3f8 -DVGA_RESET
 .endif

 @@ -1,14 +1,14 @@
-#	$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
 .include <bsd.own.mk>
 COMMON= ${.CURDIR}/../common
 COMMONOBJ!=	cd ${COMMON} && ${PRINTOBJDIR}
 .PATH: ${.CURDIR}/../boot ${COMMONOBJ}
 S= ${.CURDIR}/../../../..
 L= ${COMMONOBJ}/lib
 @@ -16,27 +16,27 @@ MKBOOTIMAGE= ${.CURDIR}/../../../powerpc
 BASE?=		boot
 PROG=		${BASE}
 NEWVERSWHAT=	"BOOT"
 SRCS= srt0.s
 SRCS+= boot.c clock.c com.c conf.c cons.c devopen.c
 SRCS+= filesystem.c inkernel.c io.c tgets.c prf.c monitor.c
 SRCS+= ns16550.c vers.c
 SRCS+= iplcb.c
 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
 CPPFLAGS+= -D__daddr_t=int32_t
 #CPPFLAGS+= -DDBMONITOR
 CPPFLAGS+= -DCONS_SERIAL -DCOMSPEED=9600 -DCOMPORT=0x30
 STRIPFLAG=
 BINMODE= 444
 # XXX SHOULD NOT NEED TO DEFINE THESE!
 LIBCRT0=
 LIBC=

 @@ -1,14 +1,14 @@
-#	$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
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/<machine>/conf/``machineid''
 # after which you should do
 #	config machineid
 # CPU generic makefile changes should be made in
 #	/sys/arch/sh3/conf/Makefile.sh3
 # after which config should be rerun for all machines of that type.
+#
 @@ -23,27 +23,27 @@ NEED_OWN_INSTALL_TARGET?=no
 ##
 ## (1) port identification
 ##
 THISSH3=	$S/arch/${MACHINE}
 SH3=		$S/arch/sh3
 GENASSYM_CONF=	${SH3}/sh3/genassym.cf
 .-include "${THISSH3}/conf/Makefile.${MACHINE}.inc"
 ##
 ## (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
 ##
 ## (3) libkern and compat
 ##
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
 MD_OBJS=	locore.o
 MD_CFILES=
 MD_SFILES=	${THISSH3}/${MACHINE}/locore.S

 @@ -1,14 +1,14 @@
-# $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
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/sun2/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/sun2/conf/Makefile.sun2
 # after which config should be rerun for all machines of that type.
+#
 @@ -23,27 +23,27 @@ NEED_OWN_INSTALL_TARGET?=no
 .include <bsd.own.mk>
 ##
 ## (1) port identification
 ##
 SUN2=		$S/arch/sun2
 GENASSYM_CONF=	${SUN2}/sun2/genassym.cf
 ##
 ## (2) compile settings
 ##
 CPPFLAGS+=	-Dsun2
 CFLAGS+=	-msoft-float -fno-defer-pop
-AFLAGS+=	-x assembler-with-cpp -traditional-cpp
+AFLAGS+=	-x assembler-with-cpp
 ##
 ## (3) libkern and compat
 ##
 KERN_AS=	obj
 # XXX lib/libkern/arch/m68k/Makefile.inc needs to know that
 # XXX our MACHINE_ARCH is m68000, and not m68k.  --fredette
 KERNMISCMAKEFLAGS=	MACHINE_ARCH=${MACHINE_ARCH}
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
 MD_OBJS=	locore.o

 @@ -1,14 +1,14 @@
-# $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
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/sun3/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/sun3/conf/Makefile.sun3
 # after which config should be rerun for all machines of that type.
+#
 @@ -23,27 +23,27 @@ NEED_OWN_INSTALL_TARGET?=no
 .include <bsd.own.mk>
 ##
 ## (1) port identification
 ##
 SUN3=		$S/arch/sun3
 GENASSYM_CONF=	${SUN3}/${MACHTYPE}/genassym.cf
 ##
 ## (2) compile settings
 ##
 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
 ##
 KERN_AS=	obj
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
 MD_OBJS=	locore.o
 MD_CFILES=
 MD_SFILES=	${SUN3}/${MACHTYPE}/locore.s

 @@ -1,35 +1,35 @@
-# $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
 NEED_OWN_INSTALL_TARGET?=	no
 .include <bsd.own.mk>
 SYSTEM_LD=	${CC} -o netbsd ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
 ##
 ## (1) port identification
 ##
 USERMODE=	$S/arch/usermode
 GENASSYM_CONF=	${USERMODE}/usermode/genassym.cf
 ##
 ## (2) compile settings
 ##
 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
 ##
 KERN_AS=	obj
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
 MD_OBJS=
 MD_CFILES=
 MD_SFILES=

 @@ -1,14 +1,14 @@
-#	$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
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/vax/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/vax/conf/Makefile.vax
 # after which config should be rerun for all machines of that type.
+#
 @@ -22,27 +22,27 @@ USETOOLS?=	no
 NEED_OWN_INSTALL_TARGET?=no
 .include <bsd.own.mk>
 ##
 ## (1) port identification
 ##
 VAX=		$S/arch/vax
 GENASSYM_CONF=	${VAX}/vax/genassym.cf
 ##
 ## (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
 ##
 ## (3) libkern and compat
 ##
 KERN_AS=	obj
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
 MD_OBJS=	intvec.o subr.o
 MD_CFILES=
 MD_SFILES=	${VAX}/vax/intvec.S ${VAX}/vax/subr.S

 @@ -1,14 +1,14 @@
-#	$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
+#
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
 #	/sys/arch/x68k/conf/``machineid''
 # after which you should do
 #	config machineid
 # Machine generic makefile changes should be made in
 #	/sys/arch/x68k/conf/Makefile.x68k
 # after which config should be rerun for all machines of that type.
+#
 @@ -22,27 +22,27 @@ USETOOLS?=	no
 NEED_OWN_INSTALL_TARGET?=no
 .include <bsd.own.mk>
 ##
 ## (1) port identification
 ##
 X68K=		$S/arch/x68k
 GENASSYM_CONF=	${X68K}/x68k/genassym.cf
 ##
 ## (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
 ##
 ## (3) libkern and compat
 ##
 KERN_AS=	obj
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
 # for the Motorola 68040 Floating Point Software Product
 .include "$S/arch/m68k/fpsp/Makefile.inc"

 @@ -1,37 +1,31 @@
-#	$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.
 .SUFFIXES: .a .o .ln .s .S .c .cc .cpp .cxx .C .f .F .r .p .l .y .sh
 .LIBS:		.a
 AR?=		ar
 ARFLAGS?=	rl
 RANLIB?=	ranlib
 AS?=		as
 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}
 CC?=		cc
 .if ${MACHINE_ARCH} == "alpha" || \
     ${MACHINE_ARCH} == "arm" || \
     ${MACHINE_ARCH} == "x86_64" || \
     ${MACHINE_ARCH} == "armeb" || \
     ${MACHINE_ARCH} == "hppa" || \
     ${MACHINE_ARCH} == "i386" || \
     ${MACHINE_ARCH} == "m68k" || \
     ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
     ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb" || \