 @@ -1,541 +1,535 @@
-$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:
 	    checking dependency style of gcc... none
 	    configure: error: no usable dependency style found
 	Fix it by rebuilding and re-installing env.
 20101119:
 	Recent Xorg updates in xsrc/external/mit/ may cause various build
 	or run-time problems.  Delete your entire DESTDIR and OBJDIR if you
 	have any build problems with xsrc, or problems with mismatched
 	versions between xorg-server and drivers.
 20100604:
 	The update of ATF to 0.9 causes old tests written in shell to fail
 	unless they are rebuilt.  If you are building with MKUPDATE=yes,
 	you need to clean the src/external/bsd/atf/tests/ and the src/tests/
 	trees by hand.
 20100522:
 	Recent Xorg updates in xsrc/external/mit/ will cause various build
 	problems.  Delete your entire DESTDIR and OBJDIR if you have any
 	build problems with xsrc.
 20100522:
 	private section of <ctype.h> was splitted, and now mklocale(1)
 	include ctype_local.h, so you have to make cleandir in tools/mklocale.
 20100520:
 	The location of the xkb compiled descriptions has changed. Please
 	remove usr/X11R7/lib/X11/xkb/compiled from your $DESTDIR.
 20100222:
 	The shared objects file extension has been changed from .so to
 	.pico, in order to avoid conflicts with shared libraries names
 	libXX.so.  All now stale regular .so files can be removed from
 	your object directories.
 20100204:
 	The termcap database has been removed from the sources,
 	but has not been marked obsolete so it is not removed
 	from the system when upgrading.
 	As such, you will need to remove them from your object
 	and destination directories.
 20091101:
         After updating, it may be necessary to make the 'cleandir'
         target in src/tools/yacc/ and in src/usr.bin/yacc/ before a
         'build.sh -u tools' or 'build.sh -u distribution'.  Ditto
         src/tools/lex/ and src/usr.bin/lex/.
 20091001:
 	On amd64 you must rebuild tools (to get the new binutils)
 	before building a kernel, or the build fails on cpufunc.S.
 20091001:
 	An error will create a ./usr/X11R7/lib/X11/xkb/compiled/xkb
 	symlink, failing the build.  Delete the link, and the subdir
 	it is in, and retry your build.
 20090718:
 	libc build changed so that strchr() provides the extra entry
 	point for index(). Update build of libc.a (and libc_pic.a)
 	may fail because the archive contains the unwanted index.o.
 	(Similarly for strrchr() and rindex().)
 20090709:
 	Native Xorg was upgraded again.  Builds will probably fail again
 	without a clean objdir, at least for src/external/mit/xorg.
 20090616:
 	Native Xorg was upgraded.  Builds will need a clean objdir for
 	src/external/mit/xorg.  Upgrading a system from sets will not
 	work properly yet as the /usr/X11R7/lib/X11/xkb/symbols/pc
 	subdirectory has been changed into a file, and this needs to
 	be manually "rm -r"'ed before installing xbase.tgz.
 20090501:
 	Several new functions were added to string.h/libc, and this
 	can cause autoconf problems during the tool build for people
 	who fail to clean out their tools objects properly. If you
 	note messages about stpcpy, stpncpy or strnlen accompanying a
 	failure during the tool build, clean out all your tools
 	objects and start again.
 20090325:
 	The i386 port was switched to i486 default toolchain.  This requires
 	cleaning your src/tools directory and $TOOLDIR and rebuilding them.
 20090126:
 	The __posix_fadvise50 system call changed assembly stub type. You
 	need to 'rm -f __posix_fadvise50.*' in the libc build directory
 	to avoid using the old assembly stub.
 20090202:
 	pkg_install now depends on the pkgdb cache for automatic conflict
 	detection.  It is recommented to rebuild the cache with
 	``pkg_admin rebuild''.
 20090110:
 	time_t and dev_t have been bumped to 64 bit quantities. To upgrade:
 . Make sure your kernel has COMPAT_50 in it. Build and install.
 	   This is needed even in the MODULAR kernel because there is
 	   conditionally compiled code in rtsock.c.
 . make sure build.sh completes and the binaries in a chroot work
 	   before installing.
 . If you don't use build.sh and you build directly to root, and
 	   your build breaks in the middle, don't despair. Make sure headers
 	   are installed properly, and start building libraries first libc
 	   and libutil, install them and then continue building all the
 	   libraries in src/lib and src/gnu/lib and install them. Once
 	   the new libraries are installed, you can restart the build.
 . If you compile packages and you notice link time warnings,
 	   rebuild the required packages to update their shared libraries.
 	   Any package you rebuild will require rebuilding all the packages
 	   that depend on it.
 . Next time you run pwd_mkdb with the new binary, the file
 	   will be upgraded and it will not be backwards compatible.
 . The utmpx/wtmpx files (/var/run/utmpx and /var/log/wtmpx, see
 	   lastlogx(5)) have been versioned, and there is a heuristic
 	   for utmp. You are better off removing the old files after
 	   upgrading.  The automated clearing of /var/run during
 	   boot, and the automated rotating of files in /var/log by
 	   newsyslog(8), may mean that you do not have to remove the
 	   files manually.
 . The optional accounting file (/var/account/acct, see
 	   accton(8)) has not been versioned, and will need to be
 	   removed.  The automatic rotation of the accounting file by
 	   /etc/daily limits the bad consequences of failure to remove
 	   the file.
 . Application software that writes time_t to binary files on
 	   disk will break or need attention. Most notably: if you are
 	   using PostgreSQL < 8.4, you need to dump your databases,
 	   rebuild PostgreSQL with the new time_t, then restore.
 20081219:
 	config(1) has been updated, and one of the files it creates -
 	swapnetbsd.o - has changed format.  You need to rebuild config
 	(done automatically by build.sh) and then you need to rerun
 	config on all kernel configuration files before rebuilding those
 	kernels.
 20081205:
 	If you build with MKX11=no, you should remove /etc/rc.d/xdm and
 	/etc/rc.d/xfs from DESTDIR because those files were moved to the xetc
 	set and will appear as extra files for MKX11=no update builds.
 20081122:
 	On i386, various kernel options(4) in GENERIC including
 	file systems have been disabled and moved into kernel modules.
 	Before trying a new GENERIC kernel, you have to prepare the
 	following files as well as a new GENERIC kernel:
 	- build and install kernel modules from src/sys/modules
 	- install the latest bootloader, which will load a module
 	  for the file system from which the kernel is loaded automatically
 	If you have to load your kernel from a file system which is not of
 	the same type as the root file system, you have to load the necessary
 	file system module manually on the boot prompt or in the boot.cfg file.
 20080827:
 	If you built and installed a libc from sources between
 /08/20 and 2008/08/26 you got a broken strtouq(3)
 	which results in false errors reported by lint(1).
 	Since this breaks the libc build itself, manual help is
 	needed -- lint must be disabled temporarily, e.g.:
 	  $ (cd lib/libc && make MKLINT=no dependall install)
 20080813:
 	MKDEBUG build was broken because the .depend files did not know
 	about .go files. You need to remove all .depend files and rebuild.
 20080802:
 	A regression in binary compatibility for pthread_mutex_t has
 	been fixed. Unfortunately, the price is breaking compatibility
 	for -current.
 	Threaded programs (using libpthread) and C++ programs (using
 	libstdc++) compiled after 20070907 and before 20080802 need to
 	be recompiled.
 	One way to find affected pkgsrc packages:
 	  $ grep REQUIRES=/usr/lib/libpthread /var/db/pkg/*/+BUILD_INFO
 	  $ grep REQUIRES=/usr/lib/libstdc++ /var/db/pkg/*/+BUILD_INFO
 20080731:
 	WAPBL (metadata journaling support) has been added, but at this
 	time isn't backwards compatible with pre-WAPBL aware kernels
 	and userland (fsck_ffs in particular).  Please make sure you
 	don't use a journaled filesystem with an older kernel/userland,
 	especially an uncleanly mounted journaled filesystem.  WAPBL
 	also requires the super block to be in the UFS2 format.  You
 	can use fsck_ffs -c 4 to update the superblock format.
 20080721:
 	Assembler warnings are now fatal if $WARNS>0 and $NOGCCERROR
 	isn't defined.
 20080531:
 	The ioctl number of DRVSUSPENDDEV command on /dev/drvctl changed
 	from 125 (conflicted with DRVCTLCOMMAND) to 129. The drvctl(8)
 	utility needs to be rebuilt and reinstalled as older binaries
 	won't work correctly. The following sequence of commands:
 	  $ (cd sys/sys/ && nbmake-$arch includes)
 	  $ (cd sbin/drvctl/ && nbmake-$arch clean)
 	  $ (cd sbin/drvctl/ && nbmake-$arch all)
 	leaves new drvctl utility in sbin/drvctl build directory.
 20080503:
 	The <bsd.lib.mk> variable MKPRIVATELIB was renamed to LIBISPRIVATE.
 20080521:
 	For a while, unprivileged UPDATE builds would fail to
 	succeed at the checkflist stage, complaining that
 	${DESTDIR}/stand/<arch>/ did not exist.  A fix for this
 	problem was committed to share/mk/bsd.kmodule.mk, revision 1.9.
 	If you already hit this problem, update the .mk file,
 	remove ${DESTDIR}/stand/<arch>, and re-run the build.
 20080303:
 	Linker warnings are now fatal if $WARNS>0.
 20080126:
 	The posix_fadvise system call has been changed from an assembly
 	stub, to a c file that calls an assembly stub. You need to
 	'rm -f posix_fadvise.* .depend' in the libc build directory to
 	avoid using the old assembly stub.
 20071209:
 	The acpiec(4) driver has been split into two attachments. If you
 	get ACPI errors before the attachment, please update your kernel
 	configuration file appropriately or see GENERIC for more details.
 20071115:
 	The it(4) driver has been renamed to itesio(4) and the old port
 	argument specified in the kernel configuration file is not valid
 	anymore. The itesio(4) driver now uses the Super I/O address port
 	rather than the EC address port. Please update your kernel
 	configuration file appropriately or see GENERIC for more details.
 20071028:
 	The pccons(4) driver has been removed from the NetBSD/shark port.
 	You need to update any custom kernel configuration file you have
 	to remove any references to pccons (which includes removing the
 	now useless XSERVER option) and replace them with the correct
 	entries for the wscons driver.  See the GENERIC configuration file
 	for more details.
 20070913:
 	A latent bug in dhclient/dhcpd that caused it to be unable to
 	enumerate interfaces was fixed.  The bug began to cause
 	problems after 20070911 when the kernel's SIOCGIFCONF
 	implementation was repaired.  From 20070529 to 20070911 racoon
 	could not enumerate interfaces.  (These are noted because
 	normal kernel/userspace version matching hygiene is not
 	sufficient to avoid this problem.)  Ensure that both kernel
 	and userland are from after 20070913.
 20070703:
 	nbinstall has been renamed ${MACHINE_GNU_ARCH}-install. It
 	calls the target-specific strip program, and the logic to pass
 	down STRIP from make has been removed.  This requires a
 	re-installation of tools.
 20070422:
 	The way OS emulations lookup filenames inside the emulation root
 	has been changed.  Rather than modify the pathname (and copy back
 	to userspace) namei() and lookup() directly check the emulation
 	root. One side effect is that absolute symlinks inside the emulated
 	root file system will be relative to that file system - unless they
 	start /../ this is useful when the emulated root is a real install
 	that has such links.
 	This might affect symlinks that have been added to reference outside
 	the emulated root.
 20070412:
 	The pckbc driver on sgimips IP32 has been removed. Use macekbc
 	instead. See the GENERIC32_IP3x kernel configuration for an
 	example.
 20070319:
         src/lib/libc/Makefile revision 1.129 broke libc and ld.elf_so
         on many platforms due to incorrect flags settings.  If you
         updated and built after about 20070315, do "nbmake-$arch
 	cleandir" in src/lib/libc and src/libexec/ld.elf_so to force a
 	rebuild of object files that might have been built
 	incorrectly, and ensure that you have at least
 	src/lib/libc/Makefile 1.130.
 20070210:
         src/sys/sys/{sa.h,savar.h} were removed.
           find ${OBJDIR} \( -name .depend -o -name '*.d' \) -print \
               | xargs egrep -l '/sa.h|/savar.h' | xargs rm
         will allow dependencies on those files to get get rebuilt
 20070209:
         The threading model was changed when the newlock2 branch
         was merged to NetBSD-current.  If you boot with a new
         kernel (version 4.99.10), then you also need a new pthread
         library (/usr/lib/libpthread.so.0.7).  If you boot with
         an old kernel, then you need the old pthread library
         (/usr/lib/libpthread.so.0.6).  Provided you keep the kernel and
         the pthread library in sync, old threaded applications should
         continue to work with an old or new kernel.  Note that named(8)
 	is the only threaded application in the base system.
 20061214:
 	Following the move of string_to_flags() and flags_to_string()
 	from the bin/ls/ sources to libutil, users doing UPDATE builds
 	will need to do a "make cleandir" in
 		tools/mtree/, tools/makefs/, tools/binstall/, tools/pax/,
 		bin/pax/, bin/ls/, usr.sbin/mtree/, usr.sbin/makefs/,
 		usr.bin/xinstall/, libexec/ftpd/, rescue/, as well
 		as the installation images in distrib/
 	in order to excise stale references to the old stat_flags.h header
 	file in the ls sources -- stat_flags.h has been removed.
 20061108:
 	The configure script used in the src/tools/gcc compiler has been
 	changed to indicate that our libc has ssp support built-in and
 	does not depend on -lssp and -lssp-nonshared. You'll need to
 	make clean in src/tools/gcc first to rebuild the compiler.
 20061009:
 	The sysctl variables net.inet{,6}.tcp{,6}.newreno are no longer
 	available. Use net.inet{,6}.tcp{,6}.congctl.selected instead.
 20060814:
 	The vt, vidcconsole, kbd, and rpckbd drivers on acorn32 have been
 	withdrawn.  Use vidcvideo and pckbd instead.  See the GENERIC
 	kernel configuration for an example.  X servers from the last
 	few years should cope.
 20060703:
 	MPACPI is no more. We always configure PCI interrupts using ACPI
 	if we have an ACPI kernel. The option MPACPI_SCANPCI has been renamed
 	to ACPI_SCANPCI. Thanks to work from fvdl.
 20060627:
 	socket(2) has changed, and its system call has been versioned.
 	For userlands with the old version of socket(2), make sure that
 	your kernel has 'options COMPAT_30' set, or else 'bad system call'
 	errors will result.
 Hints for a more successful build:
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     Use build.sh, but do not use its "expert mode":
 	This will automatically build the tools in the
 	   correct order, and it will keep the tools and the
 	   new build products from interfering with the running
 	   system.  This will allow you to ignore most of the
 	   other advice in this file.
     Build a new kernel first:
 	This makes sure that any new system calls or features
 	   expected by the new userland will be present.  This
 	   helps to avoid critical errors when upgrading.
     Use object directories:
 	This helps to keep stale object
 	   files from polluting the build if a Makefile "forgets"
 	   about one.  It also makes it easier to clean up after
 	   a build.  It's also necessary if you want to use the
 	   same source tree for multiple machines.
 	   To use object directories with build.sh:
 	    a) invoke build.sh with the "-M" or "-O" options.
 	   To use object directories without using build.sh:
 	    a) cd /usr/src ; make cleandir
 	    b) Add "OBJMACHINE=yes" to /etc/mk.conf
 	    c) Add "MKOBJDIRS=yes" to /etc/mk.conf
 	    d) cd /usr/src ; make build
 	   Note that running "make obj" in a directory will create
 	   in obj.$MACHINE directory.
     Build to a DESTDIR:
 	This helps to keep old installed files (especially libraries)
 	   from interfering with the new build.
 	   To build to a DESTDIR with build.sh, use the "-D" option.
 	   To build to a DESTDIR without using build.sh, set the DESTDIR
 	   environment variable before running make build.  It should be
 	   set to the pathname of an initially empty directory.
 	   Problems: if you do not use build.sh, you might need to
 		update critical utilities without using DESTDIR since
 		nothing is executed from what is installed in DESTDIR.
 		(See critical utils, below.)
     Build often:
 	This keeps critical utilities current enough to not choke
 	on any other part of the source tree that depends on up to
 	date functionality.  If you use build.sh, you should not have
 	this problem.
 What to do if things don't work:
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 When things don't work there is usually a few things that commonly
 should be done.
 )	make includes
 	This should be done automatically by make build.
 )  cd share/mk && make install
 	Again, automatically done by make build.
 Failsafe rebuild of a small part of the tree:
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 To make sure you rebuild something correctly you want to do
 something like the following:
 )  Make sure the includes and .mk files are up to date.
 )  Make sure any program used to build the particular
 	utility is up to date.  (yacc, lex, etc...)
 )  cd ...path/to/util...
 	make cleandir
 	rm ...all obj directories...
 	make cleandir			# yes, again
 	make obj
 	make depend && make
 Failsafe rebuild of the entire tree:
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 If you really want to make sure the source tree is clean and
 ready for a build try the following.  Note that sourcing /etc/mk.conf
 (a make(1) Makefile) in this manner is not right, and will not work
 for anyone who uses any make(1) features in /etc/mk.conf.
 ---cut here---
 #!/bin/sh
 . /etc/mk.conf
 if [ -z $NETBSDSRCDIR ] ; then
     NETBSDSRCDIR=/usr/src
 fi
 if [ \! -d $NETBSDSRCDIR ] ; then
     echo Unable to find sources
     exit 1
 fi
 find $NETBSDSRCDIR -name \*.o -o -name obj.\* -o -name obj -exec rm \{\} \;
 if [ -z $BSDOBJDIR ] ; then
     BSDOBJDIR=/usr/obj
 fi
 if [ -d $BSDOBJDIR ] ; then
     rm -rf $BSDOBJDIR
 fi
 cd $NETBSDSRCDIR && make cleandir
 ---cut here---
 Critical utilities:
 ^^^^^^^^^^^^^^^^^^^
 	usr.bin/compile_et
 	usr.bin/make
 	usr.bin/yacc
 	usr.bin/lex
 	usr.bin/xlint
 	usr.bin/config
 Other problems and possible solutions:
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Symptom:Complaints involving a Makefile.
 Fix:	Rebuild usr.bin/make:
 	cd usr.bin/make && make && make install
 	Or, a failsafe method if that doesn't work:
 	cd usr.bin/make && cc *.c */*.c -I . -o make && mv make /usr/bin
 Fix:	Make sure .mk files are up to date.
 	cd share/mk && make install
 Symptom:Kernel `config' fails to configure any kernel, including GENERIC.
 Fix:	Rebuild usr.bin/config
 Symptom:
 Fix:	Rebuild usr.bin/yacc
 Symptom:
 Fix:	Rebuild usr.bin/lex
 Symptom:
 Fix:	rm /usr/lib/libbfd.a
 Symptom:Obsolete intermediate files are used during compilation
 Fix:	Try the following sequence of commands in the directory in question.
 	make cleandir; rm `make print-objdir`; make cleandir; make obj
 	(If you built the tree without "make obj" in the past, obsolete files
 	may remain.  The command tries to clean everything up)
 Symptom:.../sysinst/run.c:xx: warning: initialization from incompatible
 	pointer type
 Fix:	Rebuild and install usr.bin/menuc
 Symptom:mklocale not found during build in share/locale/ctype
 Fix:	Build and install usr.bin/mklocale
 Symptom:undefined reference to `__assert13' or `__unsetenv13'
 Fix:    Rebuild and install lib/libc
 Symptom:usr.bin/config fails to build.
 Fix:	Try building with -DMAKE_BOOTSTRAP added to CFLAGS in Makefile.
 Symptom:undefined reference to `getprogname' or `setprogname'
 Fix:    Rebuild and install lib/libc
 Symptom:lint does not understand the '-X' option
 Fix:    May need to build & install libs with NOLINT=1 before rebuilding lint

 @@ -1,108 +1,108 @@
-#	$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.
+#
 # To specify debugging, add the config line: makeoptions DEBUG="-g"
 # A better way is to specify -g only for a few files.
+#
 #	makeoptions DEBUGLIST="uvm* trap if_*"
 USETOOLS?=	no
 NEED_OWN_INSTALL_TARGET?=no
 .include <bsd.own.mk>
 ##
 ## (1) port identification
 ##
 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
 	${NORMAL_S}
 vectors.o: ${ARM}/arm/vectors.S assym.h
 	${NORMAL_S}
 bcopyinout.o copyinout.o copystr.o cpu_in_cksum.o fiq_subr.o: assym.h
 sigcode.o: assym.h
 ##
 ## (5) link settings
 ##
 TEXTADDR?=	0x02098000
 LINKFORMAT=	-N
 # Strip ARM mapping symbols from the kernel image, as they interfere
 # with ddb. Do it differently if 'makeoptions DEBUG="-g"' was specified.
 .if !defined(DEBUG) || empty(DEBUG:M-g*)
 SYSTEM_LD_TAIL?=	@${OBJCOPY} --strip-symbol='$$a'	 \
 				    --strip-symbol='$$t'	 \
 				    --strip-symbol='$$d' $@	;\
 			${SIZE} $@; chmod 755 $@
 .else
 STRIPFLAGS=-g --strip-symbol='$$a' --strip-symbol='$$t' --strip-symbol='$$d'
 .endif
 ##
 ## (6) port specific target dependencies
 ##
 ##
 ## (7) misc settings
 ##
 ##
 ## (8) config(8) generated machinery
 ##
 %INCLUDES
 %OBJS
 %CFILES
 %SFILES
 %LOAD
 %RULES
 ##
 ## (9) port independent kernel machinery
 ##
 .include "$S/conf/Makefile.kern.inc"
 ##
 ## (10) Appending make options.
 ##
 %MAKEOPTIONSAPPEND

 @@ -1,109 +1,109 @@
-#	$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.
+#
 # To specify debugging, add the config line: makeoptions DEBUG="-g"
 # A better way is to specify -g only for a few files.
+#
 #	makeoptions DEBUGLIST="uvm* trap if_*"
 MACHINE_ARCH=m68k
 USETOOLS?=	no
 NEED_OWN_INSTALL_TARGET?=no
 .include <bsd.own.mk>
 ##
 ## (1) port identification
 ##
 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
 .include "$S/arch/m68k/060sp/Makefile.inc"
 MD_OBJS=	locore.o ${FPSP}
 MD_CFILES=
 MD_SFILES=	${AMIGA}/amiga/locore.s
 copy.o copypage.o lock_stubs.o: assym.h
 locore.o: ${AMIGA}/amiga/locore.s assym.h
 	${NORMAL_S}
 ##
 ## (5) link settings
 ##
 TEXTADDR?=	0
 LINKFORMAT=	-n
 ##
 ## (6) port specific target dependencies
 ##
 # depend on CPU configuration
 amiga_init.o locore.o pmap.o sys_machdep.o: Makefile
 bzsc.o bztzsc.o cbiisc.o cbsc.o flsc.o sbic.o: Makefile
 # depends on defined(DRACO)
 a2kbbc.o: Makefile
 ##
 ## (7) misc settings
 ##
 ##
 ## (8) config(8) generated machinery
 ##
 %INCLUDES
 %OBJS
 %CFILES
 %SFILES
 %LOAD
 %RULES
 ##
 ## (9) port independent kernel machinery
 ##
 .include "$S/conf/Makefile.kern.inc"
 ##
 ## (10) Appending make options.
 ##
 %MAKEOPTIONSAPPEND

 @@ -1,77 +1,77 @@
-# $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
 .if exists(version)
 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
 	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version ${MACHINE}
 SRCS+=	vers.c
 CLEANFILES+= vers.c
 .endif
 ### find out what to use for libsa
 SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_USE_LOADFILE=yes
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA=   ${SALIB}
 ### find out what to use for libkern
 .include "${S}/lib/libkern/Makefile.inc"
 LIBKERN= ${KERNLIB}
 ### find out what to use for libz
 .include "${S}/lib/libz/Makefile.inc"
 LIBZ=    ${ZLIB}
 LIBS=  ${LIBSA} ${LIBKERN} ${LIBZ}
 cleandir distclean: .WAIT cleanlibdir
 cleanlibdir:
 	-rm -rf lib
 ${PROG}: ${OBJS} ${LIBS}
 	${LD} -Map ${PROG}.map -N -x -Ttext ${TEXTADDR} -T ${LDSCRIPT} \
 	    -e start -o ${PROG}.elf ${OBJS} ${LIBS}
 	@${SIZE} ${PROG}.elf
 	${OBJCOPY} --impure -O ecoff-littlemips \
 	    -R .pdr -R .mdebug.abi32 -R .comment -R .ident \
 	    ${PROG}.elf ${.TARGET}
 CLEANFILES+=	${PROG}.elf ${PROG}.map
 .include <bsd.klinks.mk>
 .include <bsd.prog.mk>

 @@ -1,100 +1,100 @@
-#	$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.
 MACHINE_ARCH=m68k
 USETOOLS?=	no
 NEED_OWN_INSTALL_TARGET?=no
 .include <bsd.own.mk>
 ##
 ## (1) port identification
 ##
 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
 .include "$S/arch/m68k/060sp/Makefile.inc"
 MD_OBJS=	locore.o ${FPSP}
 MD_CFILES=
 MD_SFILES=	${ATARI}/atari/locore.s
 copy.o copypage.o lock_stubs.o: assym.h
 locore.o: ${ATARI}/atari/locore.s assym.h
 	${NORMAL_S}
 ##
 ## (5) link settings
 ##
 TEXTADDR?=	0
 LINKFORMAT=	-n
 ##
 ## (6) port specific target dependencies
 ##
 # depend on CPU configuration
 locore.o pmap.o pmap_motorola.o sys_machdep.o: Makefile
 ##
 ## (7) misc settings
 ##
 ##
 ## (8) config(8) generated machinery
 ##
 %INCLUDES
 %OBJS
 %CFILES
 %SFILES
 %LOAD
 %RULES
 ##
 ## (9) port independent kernel machinery
 ##
 .include "$S/conf/Makefile.kern.inc"
 ##
 ## (10) Appending make options.
 ##
 %MAKEOPTIONSAPPEND

 @@ -1,85 +1,85 @@
-#	$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
 ELF2PEF= ${.CURDIR}/../../../powerpc/stand/mkbootimage
 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
 .elif (${BASE} == "boot_vga")
 CPPFLAGS+= -DCONS_VGA
 .endif
 STRIPFLAG=
 BINMODE= 444
 # XXX SHOULD NOT NEED TO DEFINE THESE!
 LIBCRT0=
 LIBC=
 LIBCRTBEGIN=
 LIBCRTEND=
 RELOC= 0x700000
 CLEANFILES+= vers.c machine powerpc ${PROG}.elf
 LIBS= ${L}/sa/libsa.a ${L}/kern/libkern.a ${L}/z/libz.a
 .if !make(obj) && !make(clean) && !make(cleandir)
 .BEGIN: machine powerpc
 .NOPATH: machine powerpc
 machine::
 	-rm -f $@
 	ln -s ${S}/arch/${MACHINE}/include $@
 powerpc::
 	-rm -f $@
 	ln -s ${S}/arch/powerpc/include $@
 .endif
 vers.c: ${.CURDIR}/../boot/version
 	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/../boot/version \
 		"bebox" ${NEWVERSWHAT}
 ${PROG}: ${OBJS} ${LIBS}
 	${LD} -o ${PROG}.elf -N -T ${.CURDIR}/../boot/ld.script \
 		-Ttext ${RELOC} ${OBJS} ${LIBS}
 	${STRIP} -o ${PROG} ${PROG}.elf
 .include <bsd.prog.mk>

 @@ -1,95 +1,95 @@
-#	$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.
+#
 # To specify debugging, add the config line: makeoptions DEBUG="-g"
 # A better way is to specify -g only for a few files.
+#
 #	makeoptions DEBUGLIST="uvm* trap if_*"
 MACHINE_ARCH=m68k
 USETOOLS?=	no
 NEED_OWN_INSTALL_TARGET?=no
 .include <bsd.own.mk>
 ##
 ## (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"
 MD_OBJS=	locore.o ${FPSP}
 MD_CFILES=
 MD_SFILES=	${CESFIC}/cesfic/locore.s
 locore.o: ${CESFIC}/cesfic/locore.s assym.h
 	${NORMAL_S}
 ##
 ## (5) link settings
 ##
 LINKFORMAT=	-n
 TEXTADDR?=	2000
 ##
 ## (6) port specific target dependencies
 ##
 ##
 ## (7) misc settings
 ##
 ##
 ## (8) config(8) generated machinery
 ##
 %INCLUDES
 %OBJS
 %CFILES
 #%SFILES
 %LOAD
 %RULES
 ##
 ## (9) port independent kernel machinery
 ##
 .include "$S/conf/Makefile.kern.inc"
 ##
 ## (10) Appending make options.
 ##
 %MAKEOPTIONSAPPEND

 @@ -1,96 +1,96 @@
-#	$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.
+#
 # To specify debugging, add the config line: makeoptions DEBUG="-g"
 # A better way is to specify -g only for a few files.
+#
 #	makeoptions DEBUGLIST="uvm* trap if_*"
 MACHINE_ARCH=m68k
 USETOOLS?=	no
 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}
 MD_CFILES=
 MD_SFILES=	${HP300}/hp300/locore.s
 locore.o: ${HP300}/hp300/locore.s assym.h
 	${NORMAL_S}
 ##
 ## (5) link settings
 ##
 LINKFORMAT=	-n
 TEXTADDR?=	0
 ##
 ## (6) port specific target dependencies
 ##
 # depend on CPU configuration
 dma.o hpux_machdep.o locore.o machdep.o pmap.o pmap_boostrap.o sys_machdep.o trap.o: Makefile
 ##
 ## (7) misc settings
 ##
 ##
 ## (8) config(8) generated machinery
 ##
 %INCLUDES
 %OBJS
 %CFILES
 #%SFILES
 %LOAD
 %RULES
 ##
 ## (9) port independent kernel machinery
 ##
 .include "$S/conf/Makefile.kern.inc"
 ##
 ## (10) Appending make options.
 ##
 %MAKEOPTIONSAPPEND

 @@ -1,85 +1,85 @@
-#	$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
 #CPPFLAGS+=	-DDEBUG -DNET_DEBUG -DNETIF_DEBUG -DARP_DEBUG \
 #		-DETHER_DEBUG -DBOOTP_DEBUG
 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
 .NOPATH: machine
 .endif
 CLEANFILES+= machine mips
 ${OBJS}: machine mips
 ### find out what to use for libkern
 .include "${S}/lib/libkern/Makefile.inc"
 LIBKERN=	${KERNLIB}
 ### find out what to use for libz
 .include "${S}/lib/libz/Makefile.inc"
 LIBZ=	${ZLIB}
 ### find out what to use for libsa
 SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes"
 SAMISCMAKEFLAGS+="SA_USE_CREAD=yes"
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA=	${SALIB}
 LIBLIST=	${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN} ${LIBSA}
 # if there is a 'version' file, add rule for vers.c and add it to SRCS
 # and CLEANFILES
 .if exists (${VERSIONFILE})
 SRCS+=	vers.c
 CLEANFILES+=	vers.c
 .PHONY: vers.c
 vers.c: ${VERSIONFILE}
 	${HOST_SH} ${S}/conf/newvers_stand.sh ${.ALLSRC} 'hpcmips' ${NEWVERSWHAT}
 .endif
 CLEANFILES+=	${PROG}
 ${PROG}: ${OBJS} ${LIBKERN} ${LIBSA} ${LIBZ}
 	${LD} -o ${PROG} -T ${LD_SCRIPT} ${OBJS} ${LIBLIST}
 CLEANFILES+=	${SREC}
 all: ${SREC}
 ${SREC}: ${PROG}
 	${OBJCOPY} -S -O srec ${PROG} ${SREC}
 .include <bsd.prog.mk>

 @@ -1,96 +1,96 @@
-#	$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"
 # A better way is to specify -g only for a few files.
+#
 #	makeoptions DEBUGLIST="uvm* trap if_*"
 MACHINE_ARCH=m68k
 USETOOLS?=	no
 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=
 MD_SFILES=
 locore.o: ${LUNA68K}/luna68k/locore.s assym.h
 	${NORMAL_S}
 ##
 ## (5) link settings
 ##
 LINKFORMAT=	-N
 TEXTADDR?=	0xc000
 ##
 ## (6) port specific target dependencies
 ##
 # depend on CPU configuration
 machdep.c trap.o: Makefile
 copy.o copypage.o lock_stubs.o: assym.h
 ##
 ## (7) misc settings
 ##
 ##
 ## (8) config(8) generated machinery
 ##
 %INCLUDES
 %OBJS
 %CFILES
 %SFILES
 %LOAD
 %RULES
 ##
 ## (9) port independent kernel machinery
 ##
 .include "$S/conf/Makefile.kern.inc"
 ##
 ## (10) Appending make options.
 ##
 %MAKEOPTIONSAPPEND

 @@ -1,98 +1,98 @@
-#	$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.
+#
 # To specify debugging, add the config line: makeoptions DEBUG="-g"
 # A better way is to specify -g only for a few files.
+#
 #	makeoptions DEBUGLIST="uvm* trap if_*"
 MACHINE_ARCH=m68k
 USETOOLS?=	no
 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}
 MD_CFILES=
 MD_SFILES=	${MAC68K}/mac68k/locore.s
 locore.o: ${MAC68K}/mac68k/locore.s assym.h
 	${NORMAL_S}
 ##
 ## (5) link settings
 ##
 LINKFORMAT=	-n
 TEXTADDR?=	0
 ##
 ## (6) port specific target dependencies
 ##
 # depend on CPU configuration
 locore.o pmap.o trap.o: Makefile
 copy.o copypage.o lock_stubs.o macromasm.o: assym.h
 ##
 ## (7) misc settings
 ##
 ##
 ## (8) config(8) generated machinery
 ##
 %INCLUDES
 %OBJS
 %CFILES
 %SFILES
 %LOAD
 %RULES
 ##
 ## (9) port independent kernel machinery
 ##
 .include "$S/conf/Makefile.kern.inc"
 ##
 ## (10) Appending make options.
 ##
 %MAKEOPTIONSAPPEND

 @@ -1,151 +1,151 @@
-#	$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.
+#
 # To specify debugging, add the config line: makeoptions DEBUG="-g"
 # A better way is to specify -g only for a few files.
+#
 #	makeoptions DEBUGLIST="uvm* trap if_*"
 USETOOLS?=	no
 NEED_OWN_INSTALL_TARGET?=no
 .include <bsd.own.mk>
 ##
 ## (0) toolchain settings for things that aren't part of the standard
 ## toolchain
 ##
 ELF2ECOFF?=	elf2ecoff
 ##
 ## (1) port identification
 ##
 .ifndef S
 S=		../../../..
 .endif
 THISMIPS=	$S/arch/${MACHINE}
 MIPS=		$S/arch/mips
 GENASSYM_CONF=	${MIPS}/mips/genassym.cf
 .-include "${THISMIPS}/conf/Makefile.${MACHINE}.inc"
 ##
 ## (2) compile settings
 ##
 ## Note: -ffixed-?? must be kept in sync with cpu.h.
 ##
 CPPFLAGS+=	-D${MACHINE}
 DEFGP?=		-G 0
 GP?=		${DEFGP}
 CFLAGS+=	${GP} -mno-abicalls -msoft-float -ffixed-23
 .if defined(LP64) && ${LP64} == "yes"
 .if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
 CFLAGS+=	-msym32 -mabi=64
 AFLAGS+=	-msym32 -mabi=64
 .endif
 .if ${MACHINE_ARCH} == "mips64eb"
 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
 MD_CFILES=
 MD_SFILES=	${MIPS}/mips/locore.S ${THISMIPS}/${MACHINE}/locore_machdep.S
 locore.o: ${MIPS}/mips/locore.S assym.h
 	${NORMAL_S}
 locore_machdep.o: ${THISMIPS}/${MACHINE}/locore_machdep.S assym.h
 	${NORMAL_S}
 ##
 ## (5) link settings
 ##
 .if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
 TEXTADDR?=              ${DEFTEXTADDR:C/0x8/0xFFFFFFFF8/}
 .else
 TEXTADDR?=		${DEFTEXTADDR}
 .endif
 KERNLDSCRIPT?=		${MIPS}/conf/kern.ldscript
 # some mips ports specify a "magic" format
 LINKFORMAT+=		-T ${KERNLDSCRIPT}
 EXTRA_LINKFLAGS=	${GP} ${LDOPTS}
 LINKFLAGS_NORMAL=	-X
 STRIPFLAGS=		-g -X
 ##
 ## (6) port specific target dependencies
 ##
 # depend on CPU configuration
 machdep.o mainbus.o trap.o: Makefile
 # depend on System V IPC/shmem options
 mips_machdep.o pmap.o: Makefile
 # various assembly files that depend on assym.h
 copy.o fp.o locore.o locore_mips1.o locore_mips3.o: assym.h
 lock_stubs.o mips32_subr.o mips3_subr.o mips5900_subr.o: assym.h
 mips64_subr.o mipsX_subr.o sigcode.o: assym.h
 ##
 ## (7) misc settings
 ##
 ##
 ## (8) config(8) generated machinery
 ##
 %INCLUDES
 %OBJS
 %CFILES
 %SFILES
 %LOAD
 %RULES
 ##
 ## (9) port independent kernel machinery
 ##
 .include "$S/conf/Makefile.kern.inc"
 ##
 ## (10) Appending make options.
 ##
 %MAKEOPTIONSAPPEND

 @@ -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,114 +1,114 @@
-#	$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.
+#
 # To specify debugging, add the config line: makeoptions DEBUG="-g"
 # A better way is to specify -g only for a few files.
+#
 #	makeoptions DEBUGLIST="uvm* trap if_*"
 MACHINE_ARCH=m68k
 USETOOLS?=	no
 NEED_OWN_INSTALL_TARGET?=no
 .include <bsd.own.mk>
 ##
 ## (1) port identification
 ##
 MVME68K=	$S/arch/mvme68k
 GENASSYM_CONF=	${MVME68K}/mvme68k/genassym.cf
 ##
 ## (2) compile settings
 ##
 CPPFLAGS+=	-Dmvme68k
 .if empty(IDENT:M-DMVME172) && empty(IDENT:M-DMVME177)
 .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
 .include "$S/arch/m68k/060sp/Makefile.inc"
 MD_OBJS=	locore.o ${FPSP}
 MD_CFILES=
 MD_SFILES=	${MVME68K}/mvme68k/locore.s
 locore.o: ${MVME68K}/mvme68k/locore.s assym.h
 	${NORMAL_S}
 ##
 ## (5) link settings
 ##
 LINKFORMAT=	-n
 TEXTADDR?=	8000
 ##
 ## (6) port specific target dependencies
 ##
 # depend on CPU configuration
 locore.o pmap.o sys_machdep.o trap.o: Makefile
 copy.o copypage.o lock_stubs.o: assym.h
 ##
 ## (7) misc settings
 ##
 ##
 ## (8) config(8) generated machinery
 ##
 %INCLUDES
 %OBJS
 %CFILES
 %SFILES
 %LOAD
 %RULES
 ##
 ## (9) port independent kernel machinery
 ##
 .include "$S/conf/Makefile.kern.inc"
 ##
 ## (10) Appending make options.
 ##
 %MAKEOPTIONSAPPEND

 @@ -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,34 +1,34 @@
-#	$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}
 sboot.srec:	${PROG}
 	${OBJCOPY} -O srec ${.OBJDIR}/sboot ${.TARGET}
 .include "../Makefile.booters"
 all realall:	sboot.srec
 install:	sboot.srec
 	${INSTALL_FILE} ${STRIPFLAG} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${.OBJDIR}/sboot.srec ${DESTDIR}${MDEC_DIR}/sboot
 .include <bsd.prog.mk>

 @@ -1,98 +1,98 @@
-#	$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.
+#
 # To specify debugging, add the config line: makeoptions DEBUG="-g"
 # A better way is to specify -g only for a few files.
+#
 #	makeoptions DEBUGLIST="uvm* trap if_*"
 MACHINE_ARCH=m68k
 USETOOLS?=	no
 NEED_OWN_INSTALL_TARGET?=no
 .include <bsd.own.mk>
 ##
 ## (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
 locore.o: ${NEWS68K}/news68k/locore.s assym.h
 	${NORMAL_S}
 ##
 ## (5) link settings
 ##
 LINKFORMAT=	-n
 TEXTADDR?=	0
 ##
 ## (6) port specific target dependencies
 ##
 # depend on CPU configuration
 machdep.o mainbus.o trap.o: Makefile
 copy.o copypage.o lock_stubs.o: assym.h
 ##
 ## (7) misc settings
 ##
 ##
 ## (8) config(8) generated machinery
 ##
 %INCLUDES
 %OBJS
 %CFILES
 %SFILES
 %LOAD
 %RULES
 ##
 ## (9) port independent kernel machinery
 ##
 .include "$S/conf/Makefile.kern.inc"
 ##
 ## (10) Appending make options.
 ##
 %MAKEOPTIONSAPPEND

 @@ -1,98 +1,98 @@
-# $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.
+#
 # To specify debugging, add the config line: makeoptions DEBUG="-g"
 # A better way is to specify -g only for a few files.
+#
 #	makeoptions DEBUGLIST="uvm* trap if_*"
 MACHINE_ARCH=m68k
 USETOOLS?=	no
 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}
 MD_CFILES=
 MD_SFILES=	${NEXT68K}/next68k/locore.s
 locore.o: ${NEXT68K}/next68k/locore.s assym.h
 	${NORMAL_S}
 copy.o copypage.o lock_stubs.o: assym.h
 ##
 ## (5) link settings
 ##
 LINKFORMAT=	-n
 TEXTADDR?=	0
 ##
 ## (6) port specific target dependencies
 ##
 # depend on CPU configuration
 locore.o pmap.o trap.o: Makefile
 ##
 ## (7) misc settings
 ##
 ##
 ## (8) config(8) generated machinery
 ##
 %INCLUDES
 %OBJS
 %CFILES
 %SFILES
 %LOAD
 %RULES
 ##
 ## (9) port independent kernel machinery
 ##
 .include "$S/conf/Makefile.kern.inc"
 ##
 ## (10) Appending make options.
 ##
 %MAKEOPTIONSAPPEND

 @@ -1,79 +1,79 @@
-#	$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
 STRIPFLAG=
 BINMODE= 444
 # XXX SHOULD NOT NEED TO DEFINE THESE!
 LIBCRT0=
 LIBC=
 LIBCRTBEGIN=
 LIBCRTEND=
 RELOC= 0x800000
 CLEANFILES+= vers.c machine powerpc ${PROG}.elf
 LIBS= ${L}/sa/libsa.a ${L}/kern/libkern.a ${L}/z/libz.a
 .if !make(obj) && !make(clean) && !make(cleandir)
 .BEGIN: machine powerpc
 .NOPATH: machine powerpc
 machine::
 	-rm -f $@
 	ln -s ${S}/arch/${MACHINE}/include $@
 powerpc::
 	-rm -f $@
 	ln -s ${S}/arch/powerpc/include $@
 .endif
 vers.c: ${.CURDIR}/../boot/version
 	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/../boot/version "prep" ${NEWVERSWHAT}
 ${PROG}: ${OBJS} ${LIBS}
 	${LD} -o ${PROG}.elf -N -T ${.CURDIR}/../boot/ld.script \
 		-Ttext ${RELOC} ${OBJS} ${LIBS}
 	${STRIP} -o ${PROG} ${PROG}.elf
 .include <bsd.prog.mk>

 @@ -1,73 +1,73 @@
-#	$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
 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+= 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=
 LIBCRTBEGIN=
 LIBCRTEND=
 RELOC= 0x800000
 #RELOC= 0x0
 CLEANFILES+= vers.c machine powerpc
 LIBS= ${L}/sa/libsa.a ${L}/kern/libkern.a ${L}/z/libz.a
 .if !make(obj) && !make(clean) && !make(cleandir)
 .BEGIN: machine powerpc
 .NOPATH: machine powerpc
 machine::
 	-rm -f $@
 	ln -s ${S}/arch/${MACHINE}/include $@
 powerpc::
 	-rm -f $@
 	ln -s ${S}/arch/powerpc/include $@
 .endif
 vers.c: ${.CURDIR}/../boot/version
 	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/../boot/version "rs6000" ${NEWVERSWHAT}
 ${PROG}: ${OBJS} ${LIBS}
 	${LD} -o ${PROG} -s -N -T ${.CURDIR}/../boot/ld.script \
 		-Ttext ${RELOC} ${OBJS} ${LIBS}
 .include <bsd.prog.mk>

 @@ -1,96 +1,96 @@
-#	$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.
+#
 # To specify debugging, add the config line: makeoptions DEBUG="-g"
 # A better way is to specify -g only for a few files.
+#
 #	makeoptions DEBUGLIST="uvm* trap if_*"
 USETOOLS?=	no
 NEED_OWN_INSTALL_TARGET?=no
 .include <bsd.own.mk>
 ##
 ## (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
 locore.o: ${THISSH3}/${MACHINE}/locore.S assym.h
 	${NORMAL_S}
 cpu_in_cksum.o exception_vector.o locore_subr.o: assym.h
 ##
 ## (5) link settings
 ##
 TEXTADDR?=	${DEFTEXTADDR}
 LINKFLAGS_NORMAL=	-X
 ##
 ## (6) port specific target dependencies
 ##
 # depend on CPU configuration
 locore.o machdep.o: Makefile
 ##
 ## (7) misc settings
 ##
 ##
 ## (8) config(8) generated machinery
 ##
 %INCLUDES
 %OBJS
 %CFILES
 %SFILES
 %LOAD
 %RULES
 ##
 ## (9) port independent kernel machinery
 ##
 .include "$S/conf/Makefile.kern.inc"
 ##
 ## (10) Appending make options.
 ##
 %MAKEOPTIONSAPPEND

 @@ -1,108 +1,108 @@
-# $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.
+#
 # To specify debugging, add the config line: makeoptions DEBUG="-g"
 # A better way is to specify -g only for a few files.
+#
 #	makeoptions DEBUGLIST="uvm* trap if_*"
 MACHINE_ARCH=m68000
 USETOOLS?=	no
 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
 MD_CFILES=
 MD_SFILES=	${SUN2}/sun2/locore.s
 locore.o: ${SUN2}/sun2/locore.s
 	${NORMAL_S}
 ##
 ## (5) link settings
 ##
 LINKFORMAT=	-N
 TEXTADDR?=	00006000
 ##
 ## (6) port specific target dependencies
 ##
 # For cross-compilation, the "gcc -M" mkdep script is convenient,
 # but that does not correctly make rules from *.s files.  The
 # easiest work-around is to just list those dependencies here.
 locore.o:   assym.h m68k/asm.h m68k/trap.h
 copy.o:     assym.h m68k/asm.h $S/sys/errno.h
 bcopy.o:    assym.h m68k/asm.h
 copypage.o: assym.h m68k/asm.h
 lock_stubs.o: assym.h
 # depend on CPU configuration
 db_machdep.o dvma.o machdep.o pmap.o sun2_startup.o vm_machdep.o: Makefile
 # depends on DDB, etc.
 stub.o: Makefile
 ##
 ## (7) misc settings
 ##
 ##
 ## (8) config(8) generated machinery
 ##
 %INCLUDES
 %OBJS
 %CFILES
 %SFILES
 %LOAD
 %RULES
 ##
 ## (9) port independent kernel machinery
 ##
 .include "$S/conf/Makefile.kern.inc"
 ##
 ## (10) Appending make options.
 ##
 %MAKEOPTIONSAPPEND

 @@ -1,109 +1,109 @@
-# $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.
+#
 # To specify debugging, add the config line: makeoptions DEBUG="-g"
 # A better way is to specify -g only for a few files.
+#
 #	makeoptions DEBUGLIST="uvm* trap if_*"
 MACHINE_ARCH=m68k
 USETOOLS?=	no
 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
 locore.o: ${SUN3}/${MACHTYPE}/locore.s
 	${NORMAL_S}
 ##
 ## (5) link settings
 ##
 .if ${MACHTYPE} == "sun3x"
 TEXTADDR?=	F8004000
 .else
 TEXTADDR?=	0E004000
 .endif
 LINKFORMAT=	-N
 ##
 ## (6) port specific target dependencies
 ##
 # For cross-compilation, the "gcc -M" mkdep script is convenient,
 # but that does not correctly make rules from *.s files.  The
 # easiest work-around is to just list those dependencies here.
 locore.o:   assym.h m68k/asm.h m68k/trap.h
 copy.o:     assym.h m68k/asm.h $S/sys/errno.h
 bcopy.o:    assym.h m68k/asm.h
 copypage.o: assym.h m68k/asm.h
 lock_stubs.o: assym.h
 # depend on CPU configuration
 db_machdep.o dvma.o machdep.o pmap.o sun3_startup.o vm_machdep.o: Makefile
 # depends on DDB, etc.
 stub.o: Makefile
 ##
 ## (7) misc settings
 ##
 ##
 ## (8) config(8) generated machinery
 ##
 %INCLUDES
 %OBJS
 %CFILES
 %SFILES
 %LOAD
 %RULES
 ##
 ## (9) port independent kernel machinery
 ##
 .include "$S/conf/Makefile.kern.inc"
 ##
 ## (10) Appending make options.
 ##
 %MAKEOPTIONSAPPEND

 @@ -1,70 +1,70 @@
-# $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=
 ##
 ## (5) link settings
 ##
 ##
 ## (6) port specific target dependencies
 ##
 ##
 ## (7) misc settings
 ##
 ##
 ## (8) config(8) generated machinery
 %INCLUDES
 %OBJS
 %CFILES
 %SFILES
 %LOAD
 %RULES
 ##
 ## (9) port independent kernel machinery
 ##
 .include "$S/conf/Makefile.kern.inc"
 ##
 ## (10) appending make options
 ##
 %MAKEOPTIONSAPPEND

 @@ -1,104 +1,104 @@
-#	$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.
+#
 # To specify debugging, add the config line: makeoptions DEBUG="-g"
 # A better way is to specify -g only for a few files.
+#
 #	makeoptions DEBUGLIST="uvm* trap if_*"
 MACHINE_ARCH=	vax
 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
 intvec.o: ${VAX}/vax/intvec.S assym.h
 	${NORMAL_S}
 subr.o: ${VAX}/vax/subr.S assym.h
 	${NORMAL_S}
 ##
 ## (5) link settings
 ##
 TEXTADDR?=	80000000
 LINKFORMAT=	-N
 LINKFLAGS_DEBUG=	-X
 LINKFLAGS_NORMAL=	-S
 ##
 ## (6) port specific target dependencies
 ##
 # depend on CPU configuration
 tmscp.o ts.o uba.o uda.o clock.o emulate.o intvec.o: Makefile
 sbi.o subr.o: Makefile
 lock_stubs.o unimpl_emul.o: assym.h
 ##
 ## (7) misc settings
 ##
 # XXX recent gcc4 gets ICE on this one
 COPTS.db_command.c+=	-fno-tree-ter
 ##
 ## (8) config(8) generated machinery
 ##
 %INCLUDES
 %OBJS
 %CFILES
 %SFILES
 %LOAD
 %RULES
 ##
 ## (9) port independent kernel machinery
 ##
 .include "$S/conf/Makefile.kern.inc"
 ##
 ## (10) Appending make options.
 ##
 %MAKEOPTIONSAPPEND

 @@ -1,112 +1,112 @@
-#	$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.
+#
 # To specify debugging, add the config line: makeoptions DEBUG="-g"
 # A better way is to specify -g only for a few files.
+#
 #	makeoptions DEBUGLIST="uvm* trap if_*"
 MACHINE_ARCH=m68k
 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"
 # for the Motorola 68060 Software Support Package
 .include "$S/arch/m68k/060sp/Makefile.inc"
 MD_OBJS=	locore.o ${FPSP}
 MD_CFILES=
 MD_SFILES=	${X68K}/x68k/locore.s
 locore.o: ${X68K}/x68k/locore.s assym.h Makefile
 	${NORMAL_S}
 copy.o copypage.o lock_stubs.o: assym.h
 ##
 ## (5) link settings
 ##
 TEXTADDR?=	0
 LINKFORMAT=	-n
 ##
 ## (6) port specific target dependencies
 ##
 # depend on root or device configuration
 autoconf.o conf.o: Makefile
 # depend on maxusers
 machdep.o: Makefile
 # depend on DEBUG and/or DIAGNOSTIC options
 grf.o par.o sram.o: Makefile
 intio_dmac.o mfp.o neptune.o opm.o scsirom.o xel.o zs.o bus.o: Makefile
 intio.o vm_machdep.o: Makefile
 ##
 ## (7) misc settings
 ##
 ##
 ## (8) config(8) generated machinery
 ##
 %INCLUDES
 %OBJS
 %CFILES
 %SFILES
 %LOAD
 %RULES
 ##
 ## (9) port independent kernel machinery
 ##
 .include "$S/conf/Makefile.kern.inc"
 ##
 ## (10) Appending make options.
 ##
 %MAKEOPTIONSAPPEND

 @@ -1,276 +1,270 @@
-#	$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" || \
     ${MACHINE_ARCH} == "powerpc" || \
     ${MACHINE_ARCH} == "sparc" || \
     ${MACHINE_ARCH} == "sparc64"
 DBG?=	-O2
 .elif ${MACHINE_ARCH} == "sh3el" || ${MACHINE_ARCH} == "sh3eb"
 # -O2 is too -falign-* zealous for low-memory sh3 machines
 DBG?=	-Os -freorder-blocks
 .elif ${MACHINE_ARCH} == "vax"
 DBG?=	-O1 -fgcse -fstrength-reduce -fgcse-after-reload
 .elif ${MACHINE_ARCH} == "m68000"
 # see src/doc/HACKS for details
 DBG?=	-O1
 .else
 DBG?=	-O
 .endif
 CFLAGS?=	${DBG}
 LDFLAGS?=
 COMPILE.c?=	${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
 # C Type Format data is required for DTrace
 # XXX TBD VERSION is not defined
 CTFFLAGS	?=	-L VERSION
 CTFMFLAGS	?=	-t -L VERSION
 .if defined(MKDTRACE) && ${MKDTRACE} != "no"
 CTFCONVERT	?=	${TOOL_CTFCONVERT}
 CTFMERGE	?=	${TOOL_CTFMERGE}
 .if defined(CFLAGS) && (${CFLAGS:M-g} != "")
 CTFFLAGS	+=	-g
 CTFMFLAGS	+=	-g
 .else
 CFLAGS		+=	-g
 .endif
 .endif
 CXX?=		c++
 CXXFLAGS?=	${CFLAGS:N-Wno-traditional:N-Wstrict-prototypes:N-Wmissing-prototypes:N-Wno-pointer-sign:N-ffreestanding:N-std=gnu99}
 __ALLSRC1=	${empty(DESTDIR):?${.ALLSRC}:${.ALLSRC:S|^${DESTDIR}|^destdir|}}
 __ALLSRC2=	${empty(MAKEOBJDIR):?${__ALLSRC1}:${__ALLSRC1:S|^${MAKEOBJDIR}|^obj|}}
 __ALLSRC3=	${empty(NETBSDSRCDIR):?${__ALLSRC2}:${__ALLSRC2:S|^${NETBSDSRCDIR}|^src|}}
 _CXXSEED?=	${BUILDSEED:D-frandom-seed=${BUILDSEED:Q}/${__ALLSRC3:O:Q}/${.TARGET:Q}}
 COMPILE.cc?=	${CXX} ${_CXXSEED} ${CXXFLAGS} ${CPPFLAGS} -c
 LINK.cc?=	${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}
 OBJC?=		${CC}
 OBJCFLAGS?=	${CFLAGS}
 COMPILE.m?=	${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c
 LINK.m?=	${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS}
 CPP?=		cpp
 CPPFLAGS?=
 FC?=		f77
 FFLAGS?=	-O
 RFLAGS?=
 COMPILE.f?=	${FC} ${FFLAGS} -c
 LINK.f?=	${FC} ${FFLAGS} ${LDFLAGS}
 COMPILE.F?=	${FC} ${FFLAGS} ${CPPFLAGS} -c
 LINK.F?=	${FC} ${FFLAGS} ${CPPFLAGS} ${LDFLAGS}
 COMPILE.r?=	${FC} ${FFLAGS} ${RFLAGS} -c
 LINK.r?=	${FC} ${FFLAGS} ${RFLAGS} ${LDFLAGS}
 INSTALL?=	install
 LD?=		ld
 LEX?=		lex
 LFLAGS?=
 LEX.l?=		${LEX} ${LFLAGS}
 LINT?=		lint
 LINTFLAGS?=	-chapbxzFS
 LORDER?=	lorder
 MAKE?=		make
 NM?=		nm
 PC?=		pc
 PFLAGS?=
 COMPILE.p?=	${PC} ${PFLAGS} ${CPPFLAGS} -c
 LINK.p?=	${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS}
 SHELL?=		sh
 SIZE?=		size
 TSORT?= 	tsort -q
 YACC?=		yacc
 YFLAGS?=
 YACC.y?=	${YACC} ${YFLAGS}
 # C
 .c:
 	${LINK.c} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
 .c.o:
 	${COMPILE.c} ${.IMPSRC}
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
 .c.a:
 	${COMPILE.c} ${.IMPSRC}
 	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
 	rm -f ${.PREFIX}.o
 .c.ln:
 	${LINT} ${LINTFLAGS} \
 	    ${CPPFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
 	    -i ${.IMPSRC}
 # C++
 .cc .cpp .cxx .C:
 	${LINK.cc} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
 .cc.o .cpp.o .cxx.o .C.o:
 	${COMPILE.cc} ${.IMPSRC}
 .cc.a .cpp.a .cxx.a .C.a:
 	${COMPILE.cc} ${.IMPSRC}
 	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
 	rm -f ${.PREFIX}.o
 # Fortran/Ratfor
 .f:
 	${LINK.f} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
 .f.o:
 	${COMPILE.f} ${.IMPSRC}
 .f.a:
 	${COMPILE.f} ${.IMPSRC}
 	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
 	rm -f ${.PREFIX}.o
 .F:
 	${LINK.F} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
 .F.o:
 	${COMPILE.F} ${.IMPSRC}
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
 .F.a:
 	${COMPILE.F} ${.IMPSRC}
 	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
 	rm -f ${.PREFIX}.o
 .r:
 	${LINK.r} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
 .r.o:
 	${COMPILE.r} ${.IMPSRC}
 .r.a:
 	${COMPILE.r} ${.IMPSRC}
 	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
 	rm -f ${.PREFIX}.o
 # Pascal
 .p:
 	${LINK.p} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
 .p.o:
 	${COMPILE.p} ${.IMPSRC}
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
 .p.a:
 	${COMPILE.p} ${.IMPSRC}
 	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
 	rm -f ${.PREFIX}.o
 # Assembly
 .s:
 	${LINK.s} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
 .s.o:
 	${COMPILE.s} ${.IMPSRC}
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
 .s.a:
 	${COMPILE.s} ${.IMPSRC}
 	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
 	rm -f ${.PREFIX}.o
 .S:
 	${LINK.S} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
 .S.o:
 	${COMPILE.S} ${.IMPSRC}
 .if defined(CTFCONVERT)
 	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .endif
 .S.a:
 	${COMPILE.S} ${.IMPSRC}
 	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
 	rm -f ${.PREFIX}.o
 # Lex
 .l:
 	${LEX.l} ${.IMPSRC}
 	${LINK.c} -o ${.TARGET} lex.yy.c ${LDLIBS} -ll
 	rm -f lex.yy.c
 .l.c:
 	${LEX.l} ${.IMPSRC}
 	mv lex.yy.c ${.TARGET}
 .l.o:
 	${LEX.l} ${.IMPSRC}
 	${COMPILE.c} -o ${.TARGET} lex.yy.c
 	rm -f lex.yy.c
 # Yacc
 .y:
 	${YACC.y} ${.IMPSRC}
 	${LINK.c} -o ${.TARGET} y.tab.c ${LDLIBS}
 	rm -f y.tab.c
 .y.c:
 	${YACC.y} ${.IMPSRC}
 	mv y.tab.c ${.TARGET}
 .y.o:
 	${YACC.y} ${.IMPSRC}
 	${COMPILE.c} -o ${.TARGET} y.tab.c
 	rm -f y.tab.c
 # Shell
 .sh:
 	rm -f ${.TARGET}
 	cp ${.IMPSRC} ${.TARGET}
 	chmod a+x ${.TARGET}