 @@ -1,979 +1,981 @@
-#	$NetBSD: bsd.own.mk,v 1.562 2009/05/01 20:47:53 apb Exp $
+#	$NetBSD: bsd.own.mk,v 1.563 2009/05/04 21:32:31 ad Exp $
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
 MAKECONF?=	/etc/mk.conf
 .-include "${MAKECONF}"
+#
 # CPU model, derived from MACHINE_ARCH
+#
 MACHINE_CPU=	${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/}
+#
 # Subdirectory used below ${RELEASEDIR} when building a release
+#
 RELEASEMACHINEDIR?=	${MACHINE}
+#
 # Subdirectory or path component used for the following paths:
 #   distrib/${RELEASEMACHINE}
 #   distrib/notes/${RELEASEMACHINE}
 #   etc/etc.${RELEASEMACHINE}
 # Used when building a release.
+#
 RELEASEMACHINE?=	${MACHINE}
+#
 # NEED_OWN_INSTALL_TARGET is set to "no" by pkgsrc/mk/bsd.pkg.mk to
 # ensure that things defined by <bsd.own.mk> (default targets,
 # INSTALL_FILE, etc.) are not conflicting with bsd.pkg.mk.
+#
 NEED_OWN_INSTALL_TARGET?=	yes
+#
 # This lists the platforms which do not have working in-tree toolchains.
 # For the in-tree gcc 3.3.2 toolchain, this list is empty.
 # If some future port is not supported by the in-tree toolchain, this
 # should be set to "yes" for that port only.
+#
 TOOLCHAIN_MISSING?=	no
 # default to GCC4
 .if !defined(HAVE_GCC) && !defined(HAVE_PCC)
 HAVE_GCC=	4
 .endif
 # default to GDB6
 HAVE_GDB?=	6
 CPPFLAG_ISYSTEM=	-isystem
 .if defined(HAVE_GCC)
 .if ${HAVE_GCC} == 3
 CPPFLAG_ISYSTEMXX=	-isystem-cxx
 .else	# GCC 4
 CPPFLAG_ISYSTEMXX=	-cxx-isystem
 .endif
 .endif
 .if empty(.MAKEFLAGS:M-V*)
 .if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)
 PRINTOBJDIR=	${MAKE} -r -V .OBJDIR -f /dev/null xxx
 .else
 PRINTOBJDIR=	${MAKE} -V .OBJDIR
 .endif
 .else
 PRINTOBJDIR=	echo # prevent infinite recursion
 .endif
+#
 # Determine if running in the NetBSD source tree by checking for the
 # existence of build.sh and tools/ in the current or a parent directory,
 # and setting _SRC_TOP_ to the result.
+#
 .if !defined(_SRC_TOP_)			# {
 _SRC_TOP_!= cd ${.CURDIR}; while :; do \
 		here=`pwd`; \
 		[ -f build.sh  ] && [ -d tools ] && { echo $$here; break; }; \
 		case $$here in /) echo ""; break;; esac; \
 		cd ..; done
 .MAKEOVERRIDES+=	_SRC_TOP_
 .endif					# }
+#
 # If _SRC_TOP_ != "", we're within the NetBSD source tree, so set
 # defaults for NETBSDSRCDIR and _SRC_TOP_OBJ_.
+#
 .if (${_SRC_TOP_} != "")		# {
 NETBSDSRCDIR?=	${_SRC_TOP_}
 .if !defined(_SRC_TOP_OBJ_)
 _SRC_TOP_OBJ_!=		cd ${_SRC_TOP_} && ${PRINTOBJDIR}
 .MAKEOVERRIDES+=	_SRC_TOP_OBJ_
 .endif
 .endif	# _SRC_TOP_ != ""		# }
 .if (${_SRC_TOP_} != "") && \
     (${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN))
 USETOOLS?=	yes
 .endif
 USETOOLS?=	no
 .if ${MACHINE_ARCH} == "mips" || ${MACHINE_ARCH} == "mips64" || \
     ${MACHINE_ARCH} == "sh3"
 .BEGIN:
 	@echo "Must set MACHINE_ARCH to one of ${MACHINE_ARCH}eb or ${MACHINE_ARCH}el"
 	@false
 .elif defined(REQUIRETOOLS) && \
       (${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN)) && \
       ${USETOOLS} == "no"
 .BEGIN:
 	@echo "USETOOLS=no, but this component requires a version-specific host toolchain"
 	@false
 .endif
+#
 # Host platform information; may be overridden
+#
 .if !defined(HOST_OSTYPE)
 _HOST_OSNAME!=	uname -s
 _HOST_OSREL!=	uname -r
 # For _HOST_ARCH, if uname -p fails, or prints "unknown", or prints
 # something that does not look like an identifier, then use uname -m.
 _HOST_ARCH!=	uname -p 2>/dev/null
 _HOST_ARCH:=	${HOST_ARCH:tW:C/.*[^-_A-Za-z0-9].*//:S/unknown//}
 .if empty(_HOST_ARCH)
 _HOST_ARCH!=	uname -m
 .endif
 HOST_OSTYPE:=	${_HOST_OSNAME}-${_HOST_OSREL:C/\([^\)]*\)//g:[*]:C/ /_/g}-${_HOST_ARCH:C/\([^\)]*\)//g:[*]:C/ /_/g}
 .MAKEOVERRIDES+= HOST_OSTYPE
 .endif # !defined(HOST_OSTYPE)
 .if ${USETOOLS} == "yes"						# {
+#
 # Provide a default for TOOLDIR.
+#
 .if !defined(TOOLDIR)
 TOOLDIR:=	${_SRC_TOP_OBJ_}/tooldir.${HOST_OSTYPE}
 .MAKEOVERRIDES+= TOOLDIR
 .endif
+#
 # This is the prefix used for the NetBSD-sourced tools.
+#
 _TOOL_PREFIX?=	nb
+#
 # If an external toolchain base is specified, use it.
+#
 .if defined(EXTERNAL_TOOLCHAIN)						# {
 AR=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-ar
 AS=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-as
 LD=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-ld
 NM=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-nm
 OBJCOPY=	${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-objcopy
 OBJDUMP=	${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-objdump
 RANLIB=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-ranlib
 SIZE=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-size
 STRIP=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-strip
 CC=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-gcc
 CPP=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-cpp
 CXX=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-c++
 FC=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-g77
 OBJC=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-gcc
 .else									# } {
 # Define default locations for common tools.
 .if ${USETOOLS_BINUTILS:Uyes} == "yes"					#  {
 AR=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ar
 AS=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-as
 LD=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ld
 NM=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-nm
 OBJCOPY=	${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-objcopy
 OBJDUMP=	${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-objdump
 RANLIB=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ranlib
 SIZE=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-size
 STRIP=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-strip
 .endif									#  }
 .if defined(HAVE_GCC) && ${USETOOLS_GCC:Uyes} == "yes"			#  {
 CC=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-gcc
 CPP=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-cpp
 CXX=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-c++
 FC=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-g77
 OBJC=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-gcc
 .endif									#  }
 .if defined(HAVE_PCC) && ${USETOOLS_PCC:Uyes} == "yes"
 CC=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-pcc
 CPP=		${TOOLDIR}/libexec/${MACHINE_GNU_PLATFORM}-cpp
 CXX=		false
 FC=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-f77
 OBJC=		false
 .endif
 .endif	# EXTERNAL_TOOLCHAIN						# }
 HOST_MKDEP=	${TOOLDIR}/bin/${_TOOL_PREFIX}host-mkdep
 DBSYM=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-dbsym
 ELF2ECOFF=	${TOOLDIR}/bin/${_TOOL_PREFIX}mips-elf2ecoff
 INSTALL=	${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install
 LEX=		${TOOLDIR}/bin/${_TOOL_PREFIX}lex
 LINT=		CC=${CC:Q} ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-lint
 LORDER=		NM=${NM:Q} MKTEMP=${TOOL_MKTEMP:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}lorder
 MKDEP=		CC=${CC:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}mkdep
 PAXCTL=		${TOOLDIR}/bin/${_TOOL_PREFIX}paxctl
 TSORT=		${TOOLDIR}/bin/${_TOOL_PREFIX}tsort -q
 YACC=		${TOOLDIR}/bin/${_TOOL_PREFIX}yacc
 TOOL_AMIGAAOUT2BB=	${TOOLDIR}/bin/${_TOOL_PREFIX}amiga-aout2bb
 TOOL_AMIGAELF2BB=	${TOOLDIR}/bin/${_TOOL_PREFIX}amiga-elf2bb
 TOOL_AMIGATXLT=		${TOOLDIR}/bin/${_TOOL_PREFIX}amiga-txlt
 TOOL_ASN1_COMPILE=	${TOOLDIR}/bin/${_TOOL_PREFIX}asn1_compile
 TOOL_ATF_COMPILE=	${TOOLDIR}/bin/${_TOOL_PREFIX}atf-compile
 TOOL_AWK=		${TOOLDIR}/bin/${_TOOL_PREFIX}awk
 TOOL_CAP_MKDB=		${TOOLDIR}/bin/${_TOOL_PREFIX}cap_mkdb
 TOOL_CAT=		${TOOLDIR}/bin/${_TOOL_PREFIX}cat
 TOOL_CKSUM=		${TOOLDIR}/bin/${_TOOL_PREFIX}cksum
 TOOL_COMPILE_ET=	${TOOLDIR}/bin/${_TOOL_PREFIX}compile_et
 TOOL_CONFIG=		${TOOLDIR}/bin/${_TOOL_PREFIX}config
 TOOL_CRUNCHGEN=		MAKE=${.MAKE:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}crunchgen
 TOOL_CTAGS=		${TOOLDIR}/bin/${_TOOL_PREFIX}ctags
 TOOL_DB=		${TOOLDIR}/bin/${_TOOL_PREFIX}db
 TOOL_DISKLABEL=		${TOOLDIR}/bin/nbdisklabel-${MAKEWRAPPERMACHINE}
 TOOL_EQN=		${TOOLDIR}/bin/${_TOOL_PREFIX}eqn
 TOOL_FDISK=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-fdisk
 TOOL_FGEN=		${TOOLDIR}/bin/${_TOOL_PREFIX}fgen
 TOOL_GENASSYM=		${TOOLDIR}/bin/${_TOOL_PREFIX}genassym
 TOOL_GENCAT=		${TOOLDIR}/bin/${_TOOL_PREFIX}gencat
 TOOL_GMAKE=		${TOOLDIR}/bin/${_TOOL_PREFIX}gmake
 TOOL_GREP=		${TOOLDIR}/bin/${_TOOL_PREFIX}grep
 TOOL_GROFF=		PATH=${TOOLDIR}/lib/groff:$${PATH} ${TOOLDIR}/bin/${_TOOL_PREFIX}groff
 TOOL_HEXDUMP=		${TOOLDIR}/bin/${_TOOL_PREFIX}hexdump
 TOOL_HP300MKBOOT=	${TOOLDIR}/bin/${_TOOL_PREFIX}hp300-mkboot
 TOOL_HP700MKBOOT=	${TOOLDIR}/bin/${_TOOL_PREFIX}hp700-mkboot
 TOOL_INDXBIB=		${TOOLDIR}/bin/${_TOOL_PREFIX}indxbib
 TOOL_INSTALLBOOT=	${TOOLDIR}/bin/${_TOOL_PREFIX}installboot
 TOOL_INSTALL_INFO=	${TOOLDIR}/bin/${_TOOL_PREFIX}install-info
 TOOL_JOIN=		${TOOLDIR}/bin/${_TOOL_PREFIX}join
 TOOL_M4=		${TOOLDIR}/bin/${_TOOL_PREFIX}m4
 TOOL_MACPPCFIXCOFF=	${TOOLDIR}/bin/${_TOOL_PREFIX}macppc-fixcoff
 TOOL_MAKEFS=		${TOOLDIR}/bin/${_TOOL_PREFIX}makefs
 TOOL_MAKEINFO=		${TOOLDIR}/bin/${_TOOL_PREFIX}makeinfo
 TOOL_MAKEWHATIS=	${TOOLDIR}/bin/${_TOOL_PREFIX}makewhatis
 TOOL_MDSETIMAGE=	${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-mdsetimage
 TOOL_MENUC=		MENUDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}menuc
 TOOL_MIPSELF2ECOFF=	${TOOLDIR}/bin/${_TOOL_PREFIX}mips-elf2ecoff
 TOOL_MKCSMAPPER=	${TOOLDIR}/bin/${_TOOL_PREFIX}mkcsmapper
 TOOL_MKESDB=		${TOOLDIR}/bin/${_TOOL_PREFIX}mkesdb
 TOOL_MKLOCALE=		${TOOLDIR}/bin/${_TOOL_PREFIX}mklocale
 TOOL_MKMAGIC=		${TOOLDIR}/bin/${_TOOL_PREFIX}file
 TOOL_MKTEMP=		${TOOLDIR}/bin/${_TOOL_PREFIX}mktemp
 TOOL_MSGC=		MSGDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}msgc
 TOOL_MTREE=		${TOOLDIR}/bin/${_TOOL_PREFIX}mtree
 TOOL_PAX=		${TOOLDIR}/bin/${_TOOL_PREFIX}pax
 TOOL_PIC=		${TOOLDIR}/bin/${_TOOL_PREFIX}pic
 TOOL_POWERPCMKBOOTIMAGE=${TOOLDIR}/bin/${_TOOL_PREFIX}powerpc-mkbootimage
 TOOL_PWD_MKDB=		${TOOLDIR}/bin/${_TOOL_PREFIX}pwd_mkdb
 TOOL_REFER=		${TOOLDIR}/bin/${_TOOL_PREFIX}refer
 TOOL_ROFF_ASCII=	PATH=${TOOLDIR}/lib/groff:$${PATH} ${TOOLDIR}/bin/${_TOOL_PREFIX}nroff
 TOOL_ROFF_DVI=		${TOOL_GROFF} -Tdvi
 TOOL_ROFF_HTML=		${TOOL_GROFF} -Tlatin1 -mdoc2html
 TOOL_ROFF_PS=		${TOOL_GROFF} -Tps
 TOOL_ROFF_RAW=		${TOOL_GROFF} -Z
 TOOL_RPCGEN=		RPCGEN_CPP=${CPP:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}rpcgen
 TOOL_SED=		${TOOLDIR}/bin/${_TOOL_PREFIX}sed
 TOOL_SOELIM=		${TOOLDIR}/bin/${_TOOL_PREFIX}soelim
 TOOL_SPARKCRC=		${TOOLDIR}/bin/${_TOOL_PREFIX}sparkcrc
 TOOL_STAT=		${TOOLDIR}/bin/${_TOOL_PREFIX}stat
 TOOL_STRFILE=		${TOOLDIR}/bin/${_TOOL_PREFIX}strfile
 TOOL_SUNLABEL=		${TOOLDIR}/bin/${_TOOL_PREFIX}sunlabel
 TOOL_TBL=		${TOOLDIR}/bin/${_TOOL_PREFIX}tbl
 TOOL_UUDECODE=		${TOOLDIR}/bin/${_TOOL_PREFIX}uudecode
 TOOL_VGRIND=		${TOOLDIR}/bin/${_TOOL_PREFIX}vgrind -f
 TOOL_ZIC=		${TOOLDIR}/bin/${_TOOL_PREFIX}zic
 .else	# USETOOLS != yes						# } {
 TOOL_AMIGAAOUT2BB=	amiga-aout2bb
 TOOL_AMIGAELF2BB=	amiga-elf2bb
 TOOL_AMIGATXLT=		amiga-txlt
 TOOL_ASN1_COMPILE=	asn1_compile
 TOOL_ATF_COMPILE=	atf-compile
 TOOL_AWK=		awk
 TOOL_CAP_MKDB=		cap_mkdb
 TOOL_CAT=		cat
 TOOL_CKSUM=		cksum
 TOOL_COMPILE_ET=	compile_et
 TOOL_CONFIG=		config
 TOOL_CRUNCHGEN=		crunchgen
 TOOL_CTAGS=		ctags
 TOOL_DB=		db
 TOOL_DISKLABEL=		disklabel
 TOOL_EQN=		eqn
 TOOL_FDISK=		fdisk
 TOOL_FGEN=		fgen
 TOOL_GENASSYM=		genassym
 TOOL_GENCAT=		gencat
 TOOL_GMAKE=		gmake
 TOOL_GREP=		grep
 TOOL_GROFF=		groff
 TOOL_HEXDUMP=		hexdump
 TOOL_HP300MKBOOT=	hp300-mkboot
 TOOL_HP700MKBOOT=	hp700-mkboot
 TOOL_INDXBIB=		indxbib
 TOOL_INSTALLBOOT=	installboot
 TOOL_INSTALL_INFO=	install-info
 TOOL_JOIN=		join
 TOOL_M4=		m4
 TOOL_MACPPCFIXCOFF=	macppc-fixcoff
 TOOL_MAKEFS=		makefs
 TOOL_MAKEINFO=		makeinfo
 TOOL_MAKEWHATIS=	/usr/libexec/makewhatis
 TOOL_MDSETIMAGE=	mdsetimage
 TOOL_MENUC=		menuc
 TOOL_MIPSELF2ECOFF=	mips-elf2ecoff
 TOOL_MKCSMAPPER=	mkcsmapper
 TOOL_MKESDB=		mkesdb
 TOOL_MKLOCALE=		mklocale
 TOOL_MKMAGIC=		file
 TOOL_MKTEMP=		mktemp
 TOOL_MSGC=		msgc
 TOOL_MTREE=		mtree
 TOOL_PAX=		pax
 TOOL_PIC=		pic
 TOOL_POWERPCMKBOOTIMAGE=	powerpc-mkbootimage
 TOOL_PWD_MKDB=		pwd_mkdb
 TOOL_REFER=		refer
 TOOL_ROFF_ASCII=	nroff
 TOOL_ROFF_DVI=		${TOOL_GROFF} -Tdvi
 TOOL_ROFF_HTML=		${TOOL_GROFF} -Tlatin1 -mdoc2html
 TOOL_ROFF_PS=		${TOOL_GROFF} -Tps
 TOOL_ROFF_RAW=		${TOOL_GROFF} -Z
 TOOL_RPCGEN=		rpcgen
 TOOL_SED=		sed
 TOOL_SOELIM=		soelim
 TOOL_SPARKCRC=		sparkcrc
 TOOL_STAT=		stat
 TOOL_STRFILE=		strfile
 TOOL_SUNLABEL=		sunlabel
 TOOL_TBL=		tbl
 TOOL_UUDECODE=		uudecode
 TOOL_VGRIND=		vgrind -f
 TOOL_ZIC=		zic
 .endif	# USETOOLS != yes						# }
+#
 # Targets to check if DESTDIR or RELEASEDIR is provided
+#
 .if !target(check_DESTDIR)
 check_DESTDIR: .PHONY .NOTMAIN
 .if !defined(DESTDIR)
 	@echo "setenv DESTDIR before doing that!"
 	@false
 .else
 	@true
 .endif
 .endif
 .if !target(check_RELEASEDIR)
 check_RELEASEDIR: .PHONY .NOTMAIN
 .if !defined(RELEASEDIR)
 	@echo "setenv RELEASEDIR before doing that!"
 	@false
 .else
 	@true
 .endif
 .endif
 .if ${USETOOLS} == "yes"						# {
+#
 # Make sure DESTDIR is set, so that builds with these tools always
 # get appropriate -nostdinc, -nostdlib, etc. handling.  The default is
 # <empty string>, meaning start from /, the root directory.
+#
 DESTDIR?=
 .endif									# }
+#
 # Build a dynamically linked /bin and /sbin, with the necessary shared
 # libraries moved from /usr/lib to /lib and the shared linker moved
 # from /usr/libexec to /lib
+#
 # Note that if the BINDIR is not /bin or /sbin, then we always use the
 # non-DYNAMICROOT behavior (i.e. it is only enabled for programs in /bin
 # and /sbin).  See <bsd.shlib.mk>.
+#
 MKDYNAMICROOT?=	yes
+#
 # Where the system object and source trees are kept; can be configurable
 # by the user in case they want them in ~/foosrc and ~/fooobj (for example).
+#
 BSDSRCDIR?=	/usr/src
 BSDOBJDIR?=	/usr/obj
 NETBSDSRCDIR?=	${BSDSRCDIR}
 BINGRP?=	wheel
 BINOWN?=	root
 BINMODE?=	555
 NONBINMODE?=	444
 MANDIR?=	/usr/share/man
 MANGRP?=	wheel
 MANOWN?=	root
 MANMODE?=	${NONBINMODE}
 MANINSTALL?=	catinstall htmlinstall maninstall
 INFODIR?=	/usr/share/info
 INFOGRP?=	wheel
 INFOOWN?=	root
 INFOMODE?=	${NONBINMODE}
 LIBDIR?=	/usr/lib
 LINTLIBDIR?=	/usr/libdata/lint
 LIBGRP?=	${BINGRP}
 LIBOWN?=	${BINOWN}
 LIBMODE?=	${NONBINMODE}
 DOCDIR?=	/usr/share/doc
 HTMLDOCDIR?=	/usr/share/doc/html
 DOCGRP?=	wheel
 DOCOWN?=	root
 DOCMODE?=	${NONBINMODE}
 NLSDIR?=	/usr/share/nls
 NLSGRP?=	wheel
 NLSOWN?=	root
 NLSMODE?=	${NONBINMODE}
 KMODULEGRP?=	wheel
 KMODULEOWN?=	root
 KMODULEMODE?=	${NONBINMODE}
 LOCALEDIR?=	/usr/share/locale
 LOCALEGRP?=	wheel
 LOCALEOWN?=	root
 LOCALEMODE?=	${NONBINMODE}
 FIRMWAREDIR?=	/libdata/firmware
 FIRMWAREGRP?=	wheel
 FIRMWAREOWN?=	root
 FIRMWAREMODE?=	${NONBINMODE}
 DEBUGDIR?=	/usr/libdata/debug
 DEBUGGRP?=	wheel
 DEBUGOWN?=	root
 DEBUGMODE?=	${NONBINMODE}
+#
 # Data-driven table using make variables to control how
 # toolchain-dependent targets and shared libraries are built
 # for different platforms and object formats.
+#
 # OBJECT_FMT:		currently either "ELF" or "a.out".
+#
 # All platforms are ELF.
+#
 OBJECT_FMT=	ELF
+#
 # If this platform's toolchain is missing, we obviously cannot build it.
+#
 .if ${TOOLCHAIN_MISSING} != "no"
 MKBFD:= no
 MKGDB:= no
 MKGCC:= no
 .endif
+#
 # If we are using an external toolchain, we can still build the target's
 # BFD stuff, but we cannot build GCC's support libraries, since those are
 # tightly-coupled to the version of GCC being used.
+#
 .if defined(EXTERNAL_TOOLCHAIN)
 MKGCC:= no
 .endif
+#
 # The m68000 port is incomplete.
+#
 .if ${MACHINE_ARCH} == "m68000"
 NOPIC=		# defined
 MKISCSI=	no
 # XXX GCC 4 outputs mcount() calling sequences that try to load values
 # from over 64KB away and this fails to assemble.
 .if defined(HAVE_GCC) && (${HAVE_GCC} == 4)
 NOPROFILE=	# defined
 .endif
 .endif
+#
 # The ia64 port is incomplete.
+#
 .if ${MACHINE_ARCH} == "ia64"
 MKLINT=		no
 MKGDB=		no
 .endif
+#
 # On the MIPS, all libs are compiled with ABIcalls (and are thus PIC),
 # not just shared libraries, so don't build the _pic version.
+#
 .if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb"
 MKPICLIB:=	no
 .endif
+#
 # On VAX using ELF, all objects are PIC, not just shared libraries,
 # so don't build the _pic version.  Unless we are using GCC3 which
 # doesn't support PIC yet.
+#
 .if ${MACHINE_ARCH} == "vax"
 MKPICLIB=	no
 .endif
+#
 # Location of the file that contains the major and minor numbers of the
 # version of a shared library.  If this file exists a shared library
 # will be built by <bsd.lib.mk>.
+#
 SHLIB_VERSION_FILE?= ${.CURDIR}/shlib_version
+#
 # GNU sources and packages sometimes see architecture names differently.
+#
 GNU_ARCH.coldfire=m68k
 GNU_ARCH.i386=i486
 GCC_CONFIG_ARCH.i386=i486
 GCC_CONFIG_TUNE.i386=nocona
 GCC_CONFIG_TUNE.x86_64=nocona
 GNU_ARCH.m68000=m68010
 GNU_ARCH.sh3eb=sh
 GNU_ARCH.sh3el=shle
 GNU_ARCH.mips64eb=mips64
 MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_ARCH}:U${MACHINE_ARCH}}
+#
 # In order to identify NetBSD to GNU packages, we sometimes need
 # an "elf" tag for historically a.out platforms.
+#
 .if ${OBJECT_FMT} == "ELF" && \
     (${MACHINE_GNU_ARCH} == "arm" || \
      ${MACHINE_GNU_ARCH} == "armeb" || \
      ${MACHINE_ARCH} == "i386" || \
      ${MACHINE_CPU} == "m68k" || \
      ${MACHINE_GNU_ARCH} == "sh" || \
      ${MACHINE_GNU_ARCH} == "shle" || \
      ${MACHINE_ARCH} == "sparc" || \
      ${MACHINE_ARCH} == "vax")
 MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsdelf
 .else
 MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsd
 .endif
+#
 # Determine if arch uses native kernel modules with rump
+#
 .if ${MACHINE_ARCH} == "i386" || \
     ${MACHINE_ARCH} == "x86_64"
 RUMPKMOD=	# defined
 .endif
 TARGETS+=	all clean cleandir depend dependall includes \
 		install lint obj regress tags html
 PHONY_NOTMAIN =	all clean cleandir depend dependall distclean includes \
 		install lint obj regress tags beforedepend afterdepend \
 		beforeinstall afterinstall realinstall realdepend realall \
 		html subdir-all subdir-install subdir-depend
 .PHONY:		${PHONY_NOTMAIN}
 .NOTMAIN:	${PHONY_NOTMAIN}
 .if ${NEED_OWN_INSTALL_TARGET} != "no"
 .if !target(install)
 install:	beforeinstall .WAIT subdir-install realinstall .WAIT afterinstall
 beforeinstall:
 subdir-install:
 realinstall:
 afterinstall:
 .endif
 all:		realall subdir-all
 subdir-all:
 realall:
 depend:		realdepend subdir-depend
 subdir-depend:
 realdepend:
 distclean:	cleandir
 cleandir:	clean
 dependall:	.NOTMAIN realdepend .MAKE
 	@cd ${.CURDIR}; ${MAKE} realall
 .endif
+#
 # Define MKxxx variables (which are either yes or no) for users
 # to set in /etc/mk.conf and override in the make environment.
 # These should be tested with `== "no"' or `!= "no"'.
 # The NOxxx variables should only be set by Makefiles.
+#
 # Please keep etc/Makefile and share/man/man5/mk.conf.5 in sync
 # with changes to the MK* variables here.
+#
+#
 # Supported NO* options (if defined, MK* will be forced to "no",
 # regardless of user's mk.conf setting).
+#
 # Source makefiles should set NO*, and not MK*, and must do so before
 # including bsd.own.mk.
+#
 .for var in \
 	NOCRYPTO NODOC NOHTML NOINFO NOLINKLIB NOLINT NOMAN NONLS NOOBJ NOPIC \
 	NOPICINSTALL NOPROFILE NOSHARE NOSTATICLIB
 .if defined(${var})
 MK${var:S/^NO//}:=	no
 .endif
 .endfor
+#
 # Older-style variables that enabled behaviour when set.
+#
 .for var in MANZ UNPRIVED UPDATE
 .if defined(${var})
 MK${var}:=	yes
 .endif
 .endfor
+#
 # MK* options which have variable defaults.
+#
 .if ${MACHINE} == "amd64" || ${MACHINE} == "sparc64"
 MKCOMPAT?=	yes
 .else
 # Don't let this build where it really isn't supported.
 MKCOMPAT:=	no
 .endif
+#
 # MK* options which default to "yes".
+#
 .for var in \
 	MKATF \
 	MKBFD MKBINUTILS \
 	MKCATPAGES MKCRYPTO MKCOMPLEX MKCVS \
 	MKDOC \
 	MKGCC MKGCCCMDS MKGDB \
 	MKHESIOD MKHTML \
 	MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \
 	MKKERBEROS \
 	MKLDAP MKLINKLIB MKLINT \
 	MKMAN \
 	MKNLS \
 	MKOBJ \
 	MKPAM \
 	MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
 	MKSHARE MKSKEY MKSTATICLIB \
 	MKYP
 ${var}?=	yes
 .endfor
+#
 # MK* options which default to "no".
+#
 .for var in \
 	MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG MKDEBUGLIB \
 	MKLVM \
 	MKMANZ MKOBJDIRS \
 	MKPCC MKPCCCMDS \
 	MKSOFTFLOAT MKSTRIPIDENT \
 	MKUNPRIVED MKUPDATE MKX11
 ${var}?=no
 .endfor
+#
 # Do we default to XFree86 or Xorg for this platform?
+#
 .if ${MACHINE} == "alpha" || ${MACHINE} == "acorn32" || \
 	${MACHINE} == "amiga" || ${MACHINE} == "cats" || \
 	${MACHINE} == "dreamcast" || ${MACHINE} == "ews4800mips" || \
 	${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || \
 	${MACHINE} == "hpcsh" || ${MACHINE} == "mac68k" || \
 	${MACHINE} == "netwinder" || ${MACHINE} == "newsmips" || \
 	${MACHINE} == "ofppc" || ${MACHINE} == "pmax" || \
 	${MACHINE} == "sparc" || ${MACHINE} == "sun3" || ${MACHINE} == "x68k"
 X11FLAVOUR?=	XFree86
 .else
 X11FLAVOUR?=	Xorg
 .endif
+#
 # Force some options off if their dependencies are off.
+#
 .if ${MKCRYPTO} == "no"
 MKKERBEROS:=	no
 .endif
 .if ${MKMAN} == "no"
 MKCATPAGES:=	no
 MKHTML:=	no
 .endif
 .if ${MKLINKLIB} == "no"
 MKLINT:=	no
 MKPICINSTALL:=	no
 MKPROFILE:=	no
 .endif
 .if ${MKPIC} == "no"
 MKPICLIB:=	no
 .endif
 .if ${MKOBJ} == "no"
 MKOBJDIRS:=	no
 .endif
 .if ${MKSHARE} == "no"
 MKCATPAGES:=	no
 MKDOC:=		no
 MKINFO:=	no
 MKHTML:=	no
 MKMAN:=		no
 MKNLS:=		no
 .endif
+#
 # install(1) parameters.
+#
 COPY?=		-c
 .if ${MKUPDATE} == "no"
 PRESERVE?=
 .else
 PRESERVE?=	-p
 .endif
 RENAME?=	-r
 HRDLINK?=	-l h
 SYMLINK?=	-l s
 METALOG?=	${DESTDIR}/METALOG
 METALOG.add?=	${TOOL_CAT} -l >> ${METALOG}
 .if (${_SRC_TOP_} != "")	# only set INSTPRIV if inside ${NETBSDSRCDIR}
 .if ${MKUNPRIVED} != "no"
 INSTPRIV.unpriv=-U -M ${METALOG} -D ${DESTDIR} -h sha256
 .else
 INSTPRIV.unpriv=
 .endif
 INSTPRIV?=	${INSTPRIV.unpriv} -N ${NETBSDSRCDIR}/etc
 .endif
 STRIPFLAG?=
 .if ${NEED_OWN_INSTALL_TARGET} != "no"
 INSTALL_DIR?=		${INSTALL} ${INSTPRIV} -d
 INSTALL_FILE?=		${INSTALL} ${INSTPRIV} ${COPY} ${PRESERVE} ${RENAME}
 INSTALL_LINK?=		${INSTALL} ${INSTPRIV} ${HRDLINK} ${RENAME}
 INSTALL_SYMLINK?=	${INSTALL} ${INSTPRIV} ${SYMLINK} ${RENAME}
 HOST_INSTALL_FILE?=	${INSTALL} ${COPY} ${PRESERVE} ${RENAME}
 HOST_INSTALL_DIR?=	${INSTALL} -d
 HOST_INSTALL_SYMLINK?=	${INSTALL} ${SYMLINK} ${RENAME}
 .endif
+#
 # Set defaults for the USE_xxx variables.
+#
+#
 # USE_* options which default to "no" and will be forced to "no" if their
 # corresponding MK* variable is set to "no".
+#
 .for var in USE_SKEY
 .if (${${var:S/USE_/MK/}} == "no")
 ${var}:= no
 .else
 ${var}?= no
 .endif
 .endfor
+#
 # USE_* options which default to "yes" unless their corresponding MK*
 # variable is set to "no".
+#
 .for var in USE_HESIOD USE_INET6 USE_KERBEROS USE_LDAP USE_PAM USE_YP
 .if (${${var:S/USE_/MK/}} == "no")
 ${var}:= no
 .else
 ${var}?= yes
 .endif
 .endfor
+#
 # USE_* options which default to "yes".
+#
 .for var in USE_JEMALLOC
 ${var}?= yes
 .endfor
+#
 # USE_* options which default to "no".
+#
 #.for var in
 #${var}?= no
 #.endfor
+#
 # Where X11 sources are and where it is installed to.
+#
 X11SRCDIR?=		/usr/xsrc
 X11SRCDIR.xc?=		${X11SRCDIR}/xfree/xc
 X11SRCDIR.local?=	${X11SRCDIR}/local
 .if ${X11FLAVOUR} == "Xorg"
 X11ROOTDIR?=		/usr/X11R7
 .else
 X11ROOTDIR?=		/usr/X11R6
 .endif
 X11BINDIR?=		${X11ROOTDIR}/bin
 X11ETCDIR?=		/etc/X11
 X11FONTDIR?=		${X11ROOTDIR}/lib/X11/fonts
 X11INCDIR?=		${X11ROOTDIR}/include
 X11LIBDIR?=		${X11ROOTDIR}/lib/X11
 X11MANDIR?=		${X11ROOTDIR}/man
 X11USRLIBDIR?=		${X11ROOTDIR}/lib
+#
 # New modular-xorg based builds
+#
 X11SRCDIRMIT?=		${X11SRCDIR}/external/mit
 .for _lib in \
 	FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \
 	Xdmcp Xevie Xext Xfixes Xfont Xft Xi Xinerama Xmu Xp Xpm XprintUtil \
 	Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \
 	fontenc xkbfile xkbui Xaw lbxutil Xfontcache XprintAppUtil
 X11SRCDIR.${_lib}?=		${X11SRCDIRMIT}/lib${_lib}/dist
 .endfor
 .for _proto in \
 	xcmisc xext xf86bigfont bigreqs input kb x fonts fixes scrnsaver \
 	xinerama print render resource record video xf86dga xf86misc \
 	xf86vidmode composite damage trap gl randr fontcache xf86dri
 X11SRCDIR.${_proto}proto?=		${X11SRCDIRMIT}/${_proto}proto/dist
 .endfor
 .for _dir in \
 	xtrans fontconfig expat freetype evieext mkfontscale bdftopcf \
 	xkbcomp xorg-cf-files imake xorg-server xbiff xkbdata \
 	xbitmaps appres xeyes xev xedit sessreg pixman \
 	beforelight bitmap editres makedepend fonttosfnt fslsfonts \
 	fstobdf MesaDemos MesaGLUT MesaLib ico iceauth lbxproxy listres lndir \
 	luit xproxymanagementprotocol mkfontdir oclock proxymngr rgb \
 	setxkbmap smproxy twm viewres x11perf xauth xcalc xclipboard \
 	xclock xcmsdb xconsole xcutsel xditview xdpyinfo xdriinfo xdm \
 	xfd xf86dga xfindproxy xfontsel xfwp xgamma xgc xhost xinit \
 	xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xmessage \
 	xmh xmodmap xmore xman xprop xrandr xrdb xrefresh xset \
 	xsetmode xsetpointer xsetroot xsm xstdcmap xvidtune xvinfo \
 	xwininfo xwud xprehashprinterlist xplsprinters xkbprint xkbevd \
 	xterm xwd xfs xfsinfo xphelloworld xtrap xkbutils xkbcomp \
 	xkeyboard-config xinput \
 	font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi \
 	font-adobe-utopia-75dpi font-adobe-utopia-type1 \
 	font-alias \
 	font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi \
 	font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 \
 	font-bitstream-100dpi font-bitstream-75dpi font-bitstream-type1 \
 	font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 \
 	font-isas-misc font-jis-misc font-misc-misc font-mutt-misc \
 	font-sony-misc font-util ttf-bitstream-vera encodings
 X11SRCDIR.${_dir}?=		${X11SRCDIRMIT}/${_dir}/dist
 .endfor
 .for _i in \
 	keyboard mouse vmmouse void
 X11SRCDIR.xf86-input-${_i}?=	${X11SRCDIRMIT}/xf86-input-${_i}/dist
 .endfor
 .for _v in \
 	ag10e apm ark ast ati chips cirrus crime cyrix glint i128 i740 imstt \
 	intel mach64 mga neomagic newport nsc nv nvxbox pnozz r128 radeonhd \
 	rendition s3 s3virge savage siliconmotion sis sunffb suncg6 tdfx tga \
 	trident tseng vesa vga via vmware wsfb
 X11SRCDIR.xf86-video-${_v}?=	${X11SRCDIRMIT}/xf86-video-${_v}/dist
 .endfor
 .if ${X11FLAVOUR} == "Xorg"
 X11DRI?=			yes
 .endif
 X11DRI?=			no
 X11LOADABLE?=			yes
+#
 # MAKEDIRTARGET dir target [extra make(1) params]
 #	run "cd $${dir} && ${MAKE} [params] $${target}", with a pretty message
+#
 MAKEDIRTARGET=\
 	@_makedirtarget() { \
 		dir="$$1"; shift; \
 		target="$$1"; shift; \
 		case "$${dir}" in \
 		/*)	this="$${dir}/"; \
 			real="$${dir}" ;; \
 		.)	this="${_THISDIR_}"; \
 			real="${.CURDIR}" ;; \
 		*)	this="${_THISDIR_}$${dir}/"; \
 			real="${.CURDIR}/$${dir}" ;; \
 		esac; \
 		show=$${this:-.}; \
 		echo "$${target} ===> $${show%/}$${1:+	(with: $$@)}"; \
 		cd "$${real}" \
 		&& ${MAKE} _THISDIR_="$${this}" "$$@" $${target}; \
 	}; \
 	_makedirtarget
+#
 # MAKEVERBOSE support.  Levels are:
 #	0	Minimal output ("quiet")
 #	1	Describe what is occurring
 #	2	Describe what is occurring and echo the actual command
 #	3	Ignore the effect of the "@" prefix in make commands
 #	4	Trace shell commands using the shell's -x flag
+#
 MAKEVERBOSE?=		2
 .if ${MAKEVERBOSE} == 0
 _MKMSG?=	@\#
 _MKSHMSG?=	: echo
 _MKSHECHO?=	: echo
 .SILENT:
 .elif ${MAKEVERBOSE} == 1
 _MKMSG?=	@echo '   '
 _MKSHMSG?=	echo '   '
 _MKSHECHO?=	: echo
 .SILENT:
 .else	# MAKEVERBOSE >= 2
 _MKMSG?=	@echo '\#  '
 _MKSHMSG?=	echo '\#  '
 _MKSHECHO?=	echo
 .SILENT: __makeverbose_dummy_target__
 .endif	# MAKEVERBOSE >= 2
 .if ${MAKEVERBOSE} >= 3
 .MAKEFLAGS:	-dl
 .endif	# ${MAKEVERBOSE} >= 3
 .if ${MAKEVERBOSE} >= 4
 .MAKEFLAGS:	-dx
 .endif	# ${MAKEVERBOSE} >= 4
 _MKMSG_BUILD?=		${_MKMSG} "  build "
 _MKMSG_CREATE?=		${_MKMSG} " create "
 _MKMSG_COMPILE?=	${_MKMSG} "compile "
 _MKMSG_FORMAT?=		${_MKMSG} " format "
 _MKMSG_INSTALL?=	${_MKMSG} "install "
 _MKMSG_LINK?=		${_MKMSG} "   link "
 _MKMSG_LEX?=		${_MKMSG} "    lex "
 _MKMSG_REMOVE?=		${_MKMSG} " remove "
 _MKMSG_YACC?=		${_MKMSG} "   yacc "
 _MKSHMSG_CREATE?=	${_MKSHMSG} " create "
 _MKSHMSG_INSTALL?=	${_MKSHMSG} "install "
 _MKTARGET_BUILD?=	${_MKMSG_BUILD} ${.CURDIR:T}/${.TARGET}
 _MKTARGET_CREATE?=	${_MKMSG_CREATE} ${.CURDIR:T}/${.TARGET}
 _MKTARGET_COMPILE?=	${_MKMSG_COMPILE} ${.CURDIR:T}/${.TARGET}
 _MKTARGET_FORMAT?=	${_MKMSG_FORMAT} ${.CURDIR:T}/${.TARGET}
 _MKTARGET_INSTALL?=	${_MKMSG_INSTALL} ${.TARGET}
 _MKTARGET_LINK?=	${_MKMSG_LINK} ${.CURDIR:T}/${.TARGET}
 _MKTARGET_LEX?=		${_MKMSG_LEX} ${.CURDIR:T}/${.TARGET}
 _MKTARGET_REMOVE?=	${_MKMSG_REMOVE} ${.TARGET}
 _MKTARGET_YACC?=	${_MKMSG_YACC} ${.CURDIR:T}/${.TARGET}
 .endif	# !defined(_BSD_OWN_MK_)

 @@ -1,136 +1,139 @@
-#	$NetBSD: Makefile,v 1.31 2009/03/27 19:19:49 drochner Exp $
+#	$NetBSD: Makefile,v 1.32 2009/05/04 21:32:31 ad Exp $
 .include <bsd.own.mk>
 GCC_LANGUAGES=c c++ objc
 MODULE=			gcc4
 MKNATIVE_TARGET=	gcc4
 MKNATIVE_CONFIG_TARGET_LIBS=
 BINENV=		/usr/bin/env -i
 VAX_CONFIGURE_ARGS=
 .if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64"
 MULTILIB_ARGS= --enable-multilib
 .else
 MULTILIB_ARGS= --disable-multilib
 .endif
 COMMON_CONFIGURE_ARGS=	--target=${MACHINE_GNU_PLATFORM} \
 			--enable-long-long \
 			--enable-threads \
 			${VAX_CONFIGURE_ARGS} \
 			--enable-__cxa_atexit
 .if defined(GCC_CONFIG_ARCH.${MACHINE_ARCH})
 COMMON_CONFIGURE_ARGS+=	--with-arch=${GCC_CONFIG_ARCH.${MACHINE_ARCH}}
 .endif
 .if defined(GCC_CONFIG_TUNE.${MACHINE_ARCH})
 COMMON_CONFIGURE_ARGS+=	--with-tune=${GCC_CONFIG_TUNE.${MACHINE_ARCH}}
 .endif
 CONFIGURE_ARGS=	${COMMON_CONFIGURE_ARGS} \
 		--disable-nls \
 		${MULTILIB_ARGS} \
 		--program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-," \
 		--enable-languages="${GCC_LANGUAGES}"
 MAKE_ARGS=	MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q} \
 		LIBGCC= LIBGCC1= LIBGCC1_TEST= LIBGCC2= INSTALL_LIBGCC= \
 		EXTRA_PARTS= CPPFLAGS=-DNETBSD_TOOLS \
 		AR=${HOST_AR:Q} RANLIB=${HOST_RANLIB:Q}
 CONFIGURE_ENV+= gcc_cv_libc_provides_ssp=yes
 MKNATIVE_ENV=	${BINENV} ${CONFIGURE_ENV:NC*:NLD*} \
 			CC_FOR_BUILD=${HOST_CC:Q} \
 			CC=${CC:Q}' '${CCADDFLAGS:Q} \
 			CXX=${CXX:Q}' '${CCADDFLAGS:Q}' '${CXXADDFLAGS:Q} \
 			CPP=${CPP:Q}' '-I${DESTDIR}/usr/include \
 			CFLAGS= CPPFLAGS= CXXFLAGS= LDFLAGS= \
 			AS=${AS:Q} AWK=${TOOL_AWK:Q} LD=${LD:Q} \
 			MSGFMT=${TOOLDIR}/bin/${_TOOL_PREFIX}msgfmt \
 			NM=${NM:Q} OBJDUMP=${OBJDUMP:Q} \
 			XGETTEXT=${TOOLDIR}/bin/${_TOOL_PREFIX}xgettext \
 			LIBS=-lintl \
 			ac_cv_prog_cc_cross=yes \
 			ac_cv_func_strcoll_works=yes \
 			gcc_cv_func_printf_ptr=yes \
 			gcc_cv_libc_provides_ssp=yes \
 			gdb_cv_printf_has_long_double=yes \
 			gdb_cv_printf_has_long_long=yes \
 			gdb_cv_scanf_has_long_double=yes
 ALL_TARGET=	all-gcc
 INSTALL_TARGET=	install-gcc
 .include "${.CURDIR}/../Makefile.gmakehost"
 BUILD_MAKE=${TOOL_GMAKE}
 CXXADDFLAGS=	${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++
 CCADDFLAGS=	${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/
 NEWCONFIGDIR?=	${.CURDIR}/../..
 MKNATIVE?=	${.CURDIR}/mknative-gcc
 bootstrap-libgcc: .configure_done
 	@echo 'Creating files needed for libgcc by a native bootstrap build.'
 	@MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} lib${MODULE} \
 		${.OBJDIR}/build ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM}
 native-gcc: .native/.configure_done
 	@echo 'Extracting GNU GCC configury for a native toolchain.'
 	@MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} ${MKNATIVE_TARGET} \
 		${.OBJDIR}/.native ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM}
 NATIVE_CONFIGURE_ARGS=	${COMMON_CONFIGURE_ARGS} \
 			--disable-multilib \
 			--disable-symvers \
 			--build=`${.CURDIR}/../../gnu/dist/${MODULE}/config.guess` \
 			--host=${MACHINE_GNU_PLATFORM}
 .native/.configure_done: ${_GNU_CFGSRC} ${.CURDIR}/Makefile
 	mkdir .native 2>/dev/null || true
 	PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
 		(cd .native && ${MKNATIVE_ENV} \
 			${HOST_SH} ${GNUHOSTDIST}/configure \
 			${NATIVE_CONFIGURE_ARGS}) && \
 		(cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE} all-build-libiberty)
 .if ${HAVE_GCC} == 4
 	PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
 		(cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE} configure-gcc configure-libcpp) && \
 		(cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE} configure-libiberty)
 	# edit Makefile so that maybe-all-gcc does not depend on all-gcc any more.
 		(cd .native && mv Makefile Makefile.config && \
 			${TOOL_SED} -e 's/\(maybe-all-gcc:\) all-gcc/\1/' \
 				< Makefile.config > Makefile) && \
 		(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e tree-check.h config.h multilib.h gcov-iov.h)
 .else
 	PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
 		(cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE} all-libiberty) && \
 		(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} tree-check.h config.h)
 .endif
 	PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
 		(cd .native && touch gcc/cc1obj gcc/cc1plus gcc/f771 gcc/libgcc.a gcc/libgcc_s.so && \
 			${MKNATIVE_ENV} ${BUILD_MAKE} configure-target-libiberty \
 			${MKNATIVE_CONFIG_TARGET_LIBS} configure-target-libobjc \
 			configure-target-libstdc++-v3 \
 			ALL_GCC_C= ALL_GCC_CXX= \
 			CC_FOR_TARGET=${CC:Q}' '${CCADDFLAGS:Q} \
 			CXX_FOR_TARGET=${CXX:Q}' '${CCADDFLAGS:Q}' '${CXXADDFLAGS:Q} \
 			RAW_CXX_FOR_TARGET=${CXX:Q}' '${CCADDFLAGS:Q}' '${CXXADDFLAGS:Q} \
 			CPP=${CPP:Q}' '-I${DESTDIR}/usr/include \
 			ac_cv_prog_cc_cross=yes) && \
 	true
 	PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
 		(cd .native/${MACHINE_GNU_PLATFORM}/libstdc++-v3/include && \
 			${MKNATIVE_ENV} ${BUILD_MAKE} \
 			CC_FOR_TARGET=${CC:Q}' '${CCADDFLAGS:Q} \
 			CXX_FOR_TARGET=${CXX:Q}' '${CCADDFLAGS:Q}' '${CXXADDFLAGS:Q} \
 			CPP=${CPP:Q}' '-I${DESTDIR}/usr/include \
 			all-local) && \
 	true
 	PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
 		(cd .native/${MACHINE_GNU_PLATFORM}/libiberty && \
 			${MKNATIVE_ENV} ${BUILD_MAKE} needed-list)
 	@touch $@
 clean: clean.native
 clean.native:
 	-rm -r -f .native

 @@ -1,11 +1,11 @@
 /* This file is automatically generated.  DO NOT EDIT! */
 /* Generated from: 	NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp  */
 /* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
 /* Generated automatically. */
-static const char configuration_arguments[] = "/home/drochner/netbsd/work.src.usbdev/tools/gcc/../../gnu/dist/gcc4/configure --target=i486--netbsdelf --enable-long-long --enable-threads --enable-__cxa_atexit --with-arch=i486 --disable-multilib --disable-symvers --build=i386-unknown-netbsdelf5.99.8 --host=i486--netbsdelf";
+static const char configuration_arguments[] = "/home/drochner/netbsd/work.src.usbdev/tools/gcc/../../gnu/dist/gcc4/configure --target=i486--netbsdelf --enable-long-long --enable-threads --enable-__cxa_atexit --with-arch=i486 --with-tune=nocona --disable-multilib --disable-symvers --build=i386-unknown-netbsdelf5.99.8 --host=i486--netbsdelf";
 static const char thread_model[] = "posix";
 static const struct {
   const char *name, *value;
-} configure_default_options[] = { { "cpu", "i486" }, { "arch", "i486" } };
+} configure_default_options[] = { { "cpu", "i486" }, { "arch", "i486" }, { "tune", "nocona" } };

 @@ -1,11 +1,11 @@
 /* This file is automatically generated.  DO NOT EDIT! */
 /* Generated from: 	NetBSD: mknative-gcc,v 1.23 2008/02/08 18:06:48 skrll Exp  */
 /* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
 /* Generated automatically. */
-static const char configuration_arguments[] = "/usr/src/tools/gcc/../../gnu/dist/gcc4/configure --enable-long-long --disable-multilib --enable-threads --disable-symvers --build=x86_64-unknown-netbsd4.99.72 --host=x86_64--netbsd --target=x86_64--netbsd --enable-__cxa_atexit";
+static const char configuration_arguments[] = "/usr/src/tools/gcc/../../gnu/dist/gcc4/configure --enable-long-long --disable-multilib --enable-threads --disable-symvers --build=x86_64-unknown-netbsd4.99.72 --host=x86_64--netbsd --target=x86_64--netbsd --enable-__cxa_atexit --with-tune=nocona";
 static const char thread_model[] = "posix";
 static const struct {
   const char *name, *value;
-} configure_default_options[] = { { "cpu", "k8" } };
+} configure_default_options[] = { { "cpu", "k8" }, { "tune", "nocona" } };