Index: head/gnu/lib/libreadline/readline/Makefile
===================================================================
--- head/gnu/lib/libreadline/readline/Makefile	(revision 284288)
+++ head/gnu/lib/libreadline/readline/Makefile	(revision 284289)
@@ -1,28 +1,32 @@
 # $FreeBSD$
 
 LIB=    readline
 INTERNALLIB=	yes
 NO_MAN=	yes
 
 TILDESRC= tilde.c
 SRCS=     readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \
 	  rltty.c complete.c bind.c isearch.c display.c signals.c \
 	  util.c kill.c undo.c macro.c input.c callback.c terminal.c \
 	  text.c nls.c misc.c compat.c xmalloc.c $(HISTSRC) $(TILDESRC)
 
 INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \
 		   rlstdc.h rlconf.h rltypedefs.h
 
 CFLAGS+=	-I${.OBJDIR}/..
 SRCDIR=	${.CURDIR}/../../../../contrib/libreadline
 
+.NOPATH: ${INSTALLED_HEADERS}
+
+beforebuild: ${INSTALLED_HEADERS}
+CLEANFILES+= ${INSTALLED_HEADERS}
+DPSRCS+= ${INSTALLED_HEADERS}
+
 .for _h in ${INSTALLED_HEADERS}
-CLEANFILES+=	${_h}
-DPSRCS+=	${.OBJDIR}/${_h}
-${.OBJDIR}/${_h}:	${SRCDIR}/${_h}
-	${INSTALL} ${.ALLSRC} ${.TARGET}
+${_h}:	${SRCDIR}/${_h}
+	ln -sf ${.ALLSRC} ${.TARGET}
 .endfor
 
 LIBADD=	ncursesw
 
 .include <bsd.lib.mk>
Index: head/gnu/usr.bin/cc/cc_tools/Makefile
===================================================================
--- head/gnu/usr.bin/cc/cc_tools/Makefile	(revision 284288)
+++ head/gnu/usr.bin/cc/cc_tools/Makefile	(revision 284289)
@@ -1,553 +1,556 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 CFLAGS+=	-I.
 
 .include "../Makefile.inc"
 
 CFLAGS+=	-g
 CFLAGS+=	-DGENERATOR_FILE -DHAVE_CONFIG_H
 
 # Override LIBIBERTY set by Makefile.inc, We use our own for
 # build tools.
 LIBIBERTY=	libiberty.a
 
 .PATH:	${GCCDIR} ${GCCLIB}/libiberty
 
 #-----------------------------------------------------------------------
 # Determine content of variables used by the target/host config files
 
 #
 # The list of headers to go into tm.h
 #
 TARGET_INC+=	options.h
 .if ${TARGET_CPUARCH} == "amd64"
 TARGET_INC+=	i386/biarch64.h
 .endif
 .if ${TARGET_CPUARCH} != "arm"
 TARGET_INC+=	${GCC_CPU}/${GCC_CPU}.h
 .endif
 .if ${TARGET_CPUARCH} == "i386" || ${TARGET_CPUARCH} == "amd64"
 TARGET_INC+=	${GCC_CPU}/unix.h
 TARGET_INC+=	${GCC_CPU}/att.h
 .endif
 TARGET_INC+=	dbxelf.h
 TARGET_INC+=	elfos-undef.h
 TARGET_INC+=	elfos.h
 TARGET_INC+=	freebsd-native.h
 TARGET_INC+=	freebsd-spec.h
 TARGET_INC+=	freebsd.h
 .if ${TARGET_CPUARCH} != "i386" && ${TARGET_CPUARCH} != "amd64"
 . if exists(${GCCDIR}/config/${GCC_CPU}/sysv4.h)
 TARGET_INC+=	${GCC_CPU}/sysv4.h
 . endif
 .endif
 .if ${TARGET_CPUARCH} == "amd64"
 TARGET_INC+=	${GCC_CPU}/x86-64.h
 .endif
 .if ${TARGET_CPUARCH} == "arm" || ${TARGET_CPUARCH} == "mips"
 TARGET_INC+=	${GCC_CPU}/elf.h
 .endif
 .if ${TARGET_CPUARCH} == "arm"
 TARGET_INC+=	${GCC_CPU}/aout.h
 TARGET_INC+=	${GCC_CPU}/bpabi.h
 .endif
 .if ${TARGET_ARCH} == "powerpc64"
 TARGET_INC+=	${GCC_CPU}/biarch64.h
 TARGET_INC+=    ${GCC_CPU}/default64.h
 .endif
 TARGET_INC+=	${GCC_CPU}/freebsd.h
 .if ${TARGET_CPUARCH} == "amd64"
 TARGET_INC+=	${GCC_CPU}/freebsd64.h
 .endif
 .if ${TARGET_CPUARCH} == "arm"
 TARGET_INC+=	${GCC_CPU}/arm.h
 .endif
 TARGET_INC+=	defaults.h
 
 .for H in ${TARGET_INC}
 .for D in ${GCCDIR}/config ${GCCDIR} ${.CURDIR}
 .if exists($D/$H)
 TARGET_INC_FILES+=     $D/$H
 .endif
 .endfor
 .endfor
 
 #
 # gtyp includes.
 #
 srcdir=		${GCCDIR}
 CPPLIB_H=	${GCCLIB}/libcpp/include/line-map.h \
 		${GCCLIB}/libcpp/include/cpplib.h
 SYMTAB_H=	${GCCLIB}/libcpp/include/symtab.h
 CPP_ID_DATA_H=	${CPPLIB_H} ${GCCLIB}/libcpp/include/cpp-id-data.h
 HASHTAB_H=	${GCCLIB}/include/hashtab.h
 SPLAY_TREE_H=	${GCCLIB}/include/splay-tree.h
 out_file=	${srcdir}/config/${GCC_CPU}/${GCC_CPU}.c
 tm_file_list=	${TARGET_INC_FILES}
 host_xm_file_list= ${.CURDIR}/auto-host.h ${GCCLIB}/include/ansidecl.h
 GTFILES_SRCDIR=	${srcdir}
 
 # Copied unchanged from gcc/Makefile.in
 GTFILES = $(srcdir)/input.h $(srcdir)/coretypes.h \
   $(CPP_ID_DATA_H) $(host_xm_file_list) \
   $(tm_file_list) $(HASHTAB_H) $(SPLAY_TREE_H) $(srcdir)/bitmap.h \
   $(srcdir)/coverage.c $(srcdir)/rtl.h \
   $(srcdir)/optabs.h $(srcdir)/tree.h $(srcdir)/function.h $(srcdir)/libfuncs.h $(SYMTAB_H) \
   $(srcdir)/real.h $(srcdir)/varray.h $(srcdir)/insn-addr.h $(srcdir)/hwint.h \
   $(srcdir)/ipa-reference.h $(srcdir)/output.h \
   $(srcdir)/cselib.h $(srcdir)/basic-block.h  $(srcdir)/cgraph.h \
   $(srcdir)/c-common.h $(srcdir)/c-tree.h $(srcdir)/reload.h \
   $(srcdir)/alias.c $(srcdir)/bitmap.c $(srcdir)/cselib.c $(srcdir)/cgraph.c \
   $(srcdir)/ipa-prop.c $(srcdir)/ipa-cp.c $(srcdir)/ipa-inline.c \
   $(srcdir)/dbxout.c $(srcdir)/dwarf2out.c $(srcdir)/dwarf2asm.c \
   $(srcdir)/dojump.c $(srcdir)/tree-profile.c \
   $(srcdir)/emit-rtl.c $(srcdir)/except.c $(srcdir)/explow.c $(srcdir)/expr.c \
   $(srcdir)/function.c $(srcdir)/except.h \
   $(srcdir)/gcse.c $(srcdir)/integrate.c $(srcdir)/lists.c $(srcdir)/optabs.c \
   $(srcdir)/profile.c $(srcdir)/regclass.c \
   $(srcdir)/reg-stack.c $(srcdir)/cfglayout.c \
   $(srcdir)/sdbout.c $(srcdir)/stor-layout.c \
   $(srcdir)/stringpool.c $(srcdir)/tree.c $(srcdir)/varasm.c \
   $(srcdir)/tree-mudflap.c $(srcdir)/tree-flow.h \
   $(srcdir)/c-objc-common.c $(srcdir)/c-common.c $(srcdir)/c-parser.c \
   $(srcdir)/tree-ssanames.c $(srcdir)/tree-eh.c $(srcdir)/tree-ssa-address.c \
   $(srcdir)/tree-phinodes.c $(srcdir)/tree-cfg.c \
   $(srcdir)/tree-dfa.c $(srcdir)/tree-ssa-propagate.c \
   $(srcdir)/tree-iterator.c $(srcdir)/gimplify.c \
   $(srcdir)/tree-chrec.h $(srcdir)/tree-vect-generic.c \
   $(srcdir)/tree-ssa-operands.h $(srcdir)/tree-ssa-operands.c \
   $(srcdir)/tree-profile.c $(srcdir)/tree-nested.c \
   $(srcdir)/ipa-reference.c $(srcdir)/tree-ssa-structalias.h \
   $(srcdir)/tree-ssa-structalias.c \
   $(srcdir)/c-pragma.h $(srcdir)/omp-low.c \
   $(srcdir)/targhooks.c $(srcdir)/cgraphunit.c $(out_file) \
 
 # The list of frontend directories to look into
 GTFILES_LANG_DIR_NAMES=
 
 .if ${MK_CXX} != "no"
 GTFILES_LANG_DIR_NAMES+=	cp
 .endif
 
 # The list of language specific files for gengtype
 .for L in ${GTFILES_LANG_DIR_NAMES} c
 .if exists(${GCCDIR}/$L-config-lang.in)
 # Source the language config file
 L_GTFILES!=	sh -c '. ${GCCDIR}/$L-config-lang.in; echo $$gtfiles'
 .else
 L_GTFILES!=	sh -c '. ${GCCDIR}/$L/config-lang.in; echo $$gtfiles'
 .endif
 .for F in ${L_GTFILES}
 GTFILES_FILES+=	$F
 GTFILES_LANGS+= $L
 .endfor
 .endfor
 GTFILES+=	${GTFILES_FILES}
 
 #
 # Tree definition files.
 #
 TREE_DEF_FILES=
 
 .if ${MK_CXX} != "no"
 TREE_DEF_FILES+=	cp/cp-tree.def
 .endif
 
 #
 # Option files.
 #
 OPT_FILES=	c.opt common.opt
 
 .if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.opt)
 OPT_FILES+=	${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.opt
 .endif
 
 .if exists(${.CURDIR}/${GCC_CPU}-freebsd.opt)
 OPT_FILES+=	${.CURDIR}/${GCC_CPU}-freebsd.opt
 .endif
 
 .if ${TARGET_CPUARCH} == "powerpc"
 OPT_FILES+=	${GCCDIR}/config/${GCC_CPU}/sysv4.opt
 .endif
 
 .if ${TARGET_CPUARCH} == "sparc64"
 OPT_FILES+=	${GCCDIR}/config/${GCC_CPU}/long-double-switch.opt
 .endif
 
 .if exists(${.CURDIR}/freebsd.opt)
 OPT_FILES+=	${.CURDIR}/freebsd.opt
 .endif
 
 #-----------------------------------------------------------------------
 # Build rules for header files and generator tools
 
 # Host config
 config.h:
 	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
 	HEADERS="auto-host.h ansidecl.h" \
 	DEFINES="" \
 	/bin/sh ${GCCDIR}/mkconfig.sh ${.TARGET}
 
 GENSRCS+=	config.h
 CLEANFILES+=	cs-config.h
 
 # Build config
 bconfig.h:
 	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
 	HEADERS="auto-host.h ansidecl.h" \
 	DEFINES="" \
 	/bin/sh ${GCCDIR}/mkconfig.sh ${.TARGET}
 .if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}-modes.def)
 	echo '#define EXTRA_MODES_FILE "${GCC_CPU}/${GCC_CPU}-modes.def"' >> ${.TARGET}
 .endif
 
 GENSRCS+=	bconfig.h
 CLEANFILES+=	cs-bconfig.h
 
 # tconfig.h
 tconfig.h:
 	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
 	HEADERS="auto-host.h ansidecl.h" \
 	DEFINES="USED_FOR_TARGET" \
 	/bin/sh ${GCCDIR}/mkconfig.sh ${.TARGET}
 
 GENSRCS+=	tconfig.h
 CLEANFILES+=	cs-tconfig.h
+
+.NOPATH: ${GENSRCS} ${CLEANFILES}
+
 # Options
 optionlist: ${OPT_FILES}
 	LC_ALL=C awk -f ${GCCDIR}/opt-gather.awk ${.ALLSRC} > ${.TARGET}
 
 options.h:	optionlist
 	LC_ALL=C awk -f ${GCCDIR}/opt-functions.awk \
 	    -f ${GCCDIR}/opth-gen.awk \
 		< ${.ALLSRC} > ${.TARGET}
 
 options.c:	optionlist
 	LC_ALL=C awk -f ${GCCDIR}/opt-functions.awk \
 	    -f ${GCCDIR}/optc-gen.awk \
 		-v header_name="config.h system.h coretypes.h tm.h" \
 		< ${.ALLSRC} > ${.TARGET}
 GENONLY+=	optionlist options.h options.c
 
 # Target machine config
 tm.h:
 	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
 	HEADERS="${TARGET_INC}" \
 	DEFINES="" \
 	/bin/sh ${GCCDIR}/mkconfig.sh ${.TARGET}
 .if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}-modes.def)
 	echo '#define EXTRA_MODES_FILE "${GCC_CPU}/${GCC_CPU}-modes.def"' >> ${.TARGET}
 .endif
 
 GENSRCS+=	tm.h
 CLEANFILES+=	cs-tm.h
 
 # Target machine protos/preds.
 tm_p.h:
 	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
 	HEADERS="${GCC_CPU}/${GCC_CPU}-protos.h tm-preds.h" \
 	DEFINES="" \
 	/bin/sh ${GCCDIR}/mkconfig.sh tm_p.h
 
 GENSRCS+=	tm_p.h
 CLEANFILES+=	cs-tm_p.h
 
 # gencheck
 gencheck.h: ${TREE_DEF_FILES}
 .for F in ${TREE_DEF_FILES}
 	echo "#include \"$F\""					>> ${.TARGET}
 .endfor
 	touch ${.TARGET}
 
 GENSRCS+=	gencheck.h
 
 
 # Source header for gtyp generator.
 gtyp-gen.h:	${GTFILES}
 	echo "/* This file is machine generated.  Do not edit.  */" > ${.TARGET}
 	echo "static const char * const srcdir = "		>> ${.TARGET}
 	echo "\"$(GTFILES_SRCDIR)\";"				>> ${.TARGET}
 	echo "static const char * const lang_files[] = {"	>> ${.TARGET}
 .for F in ${GTFILES_FILES}
 	echo "\"$F\", "						>> ${.TARGET}
 .endfor
 	echo "NULL};"						>> ${.TARGET}
 	echo "static const char * const langs_for_lang_files[] = {">> ${.TARGET}
 .for F in ${GTFILES_LANGS}
 	echo "\"$F\", "						>> ${.TARGET}
 .endfor
 	echo "NULL};"						>> ${.TARGET}
 	echo "static const char * const all_files[] = {"	>> ${.TARGET}
 .for F in ${GTFILES}
 	echo "\"$F\", "						>> ${.TARGET}
 .endfor
 	echo "NULL};"						>> ${.TARGET}
 	echo "static const char * const lang_dir_names[] = {"	>> ${.TARGET}
 .for F in c ${GTFILES_LANG_DIR_NAMES}
 	echo "\"$F\", "						>> ${.TARGET}
 .endfor
 	echo "NULL};"						>> ${.TARGET}
 
 GENSRCS+=	gtyp-gen.h
 
 # Version header for gcov
 gcov-iov.h:
 	echo "#define GCOV_VERSION ((gcov_unsigned_t)0x34303270)" >> ${.TARGET}
 
 GENSRCS+=	gcov-iov.h
 
 # Multilib config file
 multilib.h:
 .if ${TARGET_ARCH} == "powerpc64" || ${TARGET_ARCH} == "amd64"
 	echo 'static const char *const multilib_raw[] = { \
 	    ". !m64 !m32;", \
 	    "64:../lib m64 !m32;", \
 	    "32:../lib32 !m64 m32;", NULL };'			> ${.TARGET}
 	echo 'static const char *multilib_options = "m64/m32";'	>> ${.TARGET}
 	echo 'static const char *const multilib_matches_raw[] = { \
 	    "m64 m64;", "m32 m32;", NULL };'			>> ${.TARGET}
 .else
 	echo 'static const char *const multilib_raw[] = { \
 	    ". ;", NULL };'					> ${.TARGET}
 	echo 'static const char *multilib_options = "";'	>> ${.TARGET}
 	echo 'static const char *const multilib_matches_raw[] = { \
 	    NULL };'						>> ${.TARGET}
 .endif
 	echo 'static const char *multilib_extra = "";'		>> ${.TARGET}
 	echo 'static const char *const multilib_exclusions_raw[] = { \
 	    NULL };'						>> ${.TARGET}
 
 GENSRCS+=	multilib.h
 
 configargs.h:
 	echo 'static const char configuration_arguments[] ='	> ${.TARGET}
 	echo '	"FreeBSD/${TARGET_ARCH} system compiler";'	>> ${.TARGET}
 	echo 'static const char thread_model[] = "posix";'	>> ${.TARGET}
 	echo 'static const struct {'				>> ${.TARGET}
 	echo '	const char *name, *value;'			>> ${.TARGET}
 	echo '} configure_default_options[] = {'		>> ${.TARGET}
 	echo '	{ "NULL", "NULL" } };'				>> ${.TARGET}
 
 GENSRCS+=	configargs.h
 
 # Language spec files
 specs.h:
 	echo '#include "cp/lang-specs.h"'			> ${.TARGET}
 
 GENSRCS+=	specs.h
 
 gstdint.h:
 	echo '#include "sys/types.h"'				> ${.TARGET}
 	echo '#include "sys/stdint.h"'				>> ${.TARGET}
 
 GENSRCS+=	gstdint.h
 
 # Linked headers
 gthr-default.h: ${GCCDIR}/gthr-posix.h
 	ln -sf ${.ALLSRC} ${.TARGET}
 
 GENSRCS+=	gthr-default.h
 
 .if ${TARGET_CPUARCH} == "arm"
 unwind.h: ${GCCDIR}/config/arm/unwind-arm.h
 .else
 unwind.h: ${GCCDIR}/unwind-generic.h
 .endif
 
 unwind.h:
 	ln -sf ${.ALLSRC} ${.TARGET}
 
 GENSRCS+=	unwind.h
 
 #
 # gtype gunk
 #
 gengtype-lex.c:	gengtype-lex.l
 	flex -ogengtype-lex.c ${.ALLSRC}
 
 gengtype-yacc.h: gengtype-yacc.y
 	yacc -d -o gengtype-yacc.c ${.ALLSRC}
 
 gengtype-yacc.c: gengtype-yacc.h
 
 gengtype-yacc+%DIKED.c: gengtype-yacc.c
 	cat    ${.ALLSRC} > ${.TARGET}
 	sed -e "s/xmalloc/malloc/g" \
 	    -e "s/xrealloc/realloc/g" \
 	    -e "s/malloc/xmalloc/g" \
 	    -e "s/realloc/xrealloc/g" \
 	    ${.ALLSRC} > ${.TARGET}
 
 GENSRCS+= gengtype-lex.c gengtype-yacc.h gengtype-yacc+%DIKED.c
 CLEANFILES+= gengtype-yacc.c
 
 gengtype: gengtype.o gengtype-yacc+%DIKED.o gengtype-lex.o errors.o \
 	  ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 gtype-desc.h:	gengtype
 	./gengtype
 	touch ${.TARGET}
 
 gtype-desc.c:	gtype-desc.h
 
 GENONLY+=	gtype-desc.c gtype-desc.h
 CLEANFILES+=	gt-*.h gtype-*.h
 
 #
 # Generator tools.
 #
 .for F in check checksum genrtl modes
 gen$F:	gen$F.o errors.o ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 .endfor
 
 .for F in attr attrtab automata codes conditions config constants emit \
 	extract flags  opinit output peep preds recog
 gen$F:	gen$F.o rtl.o read-rtl.o ggc-none.o vec.o min-insn-modes.o \
 	gensupport.o print-rtl.o errors.o ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lm
 .endfor
 
 gencondmd:	gencondmd.o
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 #
 # Generated .md files.
 #
 insn-conditions.md:	gencondmd
 	./gencondmd > ${.TARGET}
 GENSRCS+=	insn-conditions.md
 
 #
 # Generated header files.
 #
 
 .for F in constants
 insn-$F.h:	gen$F ${MD_FILE}
 	./gen$F ${MD_FILE} > ${.TARGET}
 GENSRCS+=	insn-$F.h
 .endfor
 
 .for F in attr codes config flags
 insn-$F.h:	gen$F ${MD_FILE} insn-conditions.md
 	./gen$F ${MD_FILE} insn-conditions.md > ${.TARGET}
 GENSRCS+=	insn-$F.h
 .endfor
 
 # Header files with irregular names.
 genrtl.h:	gengenrtl
 	./gengenrtl -h > ${.TARGET}
 GENSRCS+=	genrtl.h
 
 tm-preds.h:	genpreds
 	./genpreds -h ${MD_FILE} > ${.TARGET}
 GENSRCS+=	tm-preds.h
 
 tm-constrs.h:	genpreds
 	./genpreds -c ${MD_FILE} > ${.TARGET}
 GENSRCS+=	tm-constrs.h
 
 tree-check.h:	gencheck
 	./gencheck > ${.TARGET}
 GENSRCS+=	tree-check.h
 
 insn-modes.h:	genmodes
 	./genmodes -h > ${.TARGET}
 GENSRCS+=	insn-modes.h
 
 #
 # Generated source files.
 #
 .for F in attrtab automata emit extract opinit output peep preds recog
 insn-$F.c:	gen$F ${MD_FILE} insn-conditions.md
 	./gen$F ${MD_FILE} insn-conditions.md > ${.TARGET}
 GENONLY+=	insn-$F.c
 .endfor
 
 .for F in conditions
 insn-$F.c:	gen$F ${MD_FILE}
 	./gen$F ${MD_FILE} > ${.TARGET}
 GENSRCS+=	insn-$F.c
 .endfor
 
 # Source files with irregular names.
 insn-modes.c:	genmodes
 	./genmodes > ${.TARGET}
 GENONLY+=	insn-modes.c
 
 min-insn-modes.c:	genmodes
 	./genmodes -m > ${.TARGET}
 GENSRCS+=	min-insn-modes.c
 
 genrtl.c:	gengenrtl
 	./gengenrtl > ${.TARGET}
 GENONLY+=	genrtl.c
 
 gencondmd.c:	genconditions ${MD_FILE}
 	./genconditions ${MD_FILE} > ${.TARGET}
 GENSRCS+=	gencondmd.c
 
 #-----------------------------------------------------------------------
 # Build tools.
 
 GNTOOLS+=	genattr genattrtab genautomata gencodes gencheck genchecksum \
 		genconditions gencondmd genconfig genconstants genemit \
 		genextract genflags gengenrtl gengtype genmodes genopinit \
 		genoutput genpeep genpreds genrecog
 
 all: ${GNTOOLS} ${GENSRCS} ${GENONLY}
 beforedepend: ${GENONLY}
 
 #
 #-----------------------------------------------------------------------
 # Build 'pocket' libiberty exclusively for build tools use.
 
 LIBIBERTY_SRCS=	choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \
 	dyn-string.c fibheap.c fopen_unlocked.c getpwd.c getruntime.c \
 	hashtab.c hex.c lbasename.c make-temp-file.c md5.c obstack.c \
 	partition.c pex-unix.c physmem.c safe-ctype.c splay-tree.c xexit.c \
 	xmalloc.c xmemdup.c xstrdup.c xstrerror.c
 LIBIBERTY_OBJS=	${LIBIBERTY_SRCS:R:S/$/.o/g}
 
 .for _src in ${LIBIBERTY_SRCS}
 ${_src:R:S/$/.o/}: ${_src}
 	${CC} -c -I ${.CURDIR}/../libiberty ${CFLAGS} -o ${.TARGET} ${.IMPSRC}
 .endfor
 
 ${LIBIBERTY}: ${LIBIBERTY_OBJS}
 	@rm -f ${.TARGET}
 	@${AR} ${ARFLAGS} ${.TARGET} `lorder ${LIBIBERTY_OBJS} | tsort -q`
 	${RANLIB} ${.TARGET}
 CLEANFILES+=	${LIBIBERTY} ${LIBIBERTY_OBJS}
 
 
 #-----------------------------------------------------------------------
 # Fixups.
 
 # Set OBJS the same as bsd.prog.mk would do if we defined PROG.  We can't
 # define PROG because we have multiple programs.
 #
 SRCS=		errors.c genattr.c genattrtab.c \
 		genautomata.c gencheck.c genchecksum.c gencodes.c \
 		genconditions.c genconfig.c genconstants.c genemit.c \
 		genextract.c genflags.c gengenrtl.c gengtype.c genmodes.c \
 		genopinit.c genoutput.c genpeep.c genpreds.c genrecog.c \
 		gensupport.c ggc-none.c print-rtl.c read-rtl.c rtl.c \
 		vec.c
 
 SRCS+=		${GENSRCS}
 OBJS+=		${SRCS:N*.h:R:S/$/.o/g}
 GENOBJS+=	${GENSRCS:N*.h:R:S/$/.o/g}
 CLEANFILES+=	${GENSRCS} ${GENONLY} ${GENOBJS} ${GNTOOLS}
 
 #-----------------------------------------------------------------------
 # Manual dependencies.
 .if !exists(${DEPENDFILE})
 .include  "Makefile.dep"
 .endif
 
 .include <bsd.prog.mk>
 # DO NOT DELETE
Index: head/gnu/usr.bin/groff/Makefile.inc
===================================================================
--- head/gnu/usr.bin/groff/Makefile.inc	(revision 284288)
+++ head/gnu/usr.bin/groff/Makefile.inc	(revision 284289)
@@ -1,142 +1,143 @@
 # $FreeBSD$
 
 BINDIR?=	/usr/bin
 SHELL=		/bin/sh
 
 # Define `page' to be letter if your PostScript printer uses 8.5x11
 # paper (USA) and define it to be A4, if it uses A4 paper (rest of the
 # world).
 PAGE=letter
 
 # Normally the Postscript driver, grops, produces output that conforms
 # to version 3.0 of the Adobe Document Structuring Conventions.
 # Unfortunately some spoolers and previewers can't handle such output.
 # The BROKEN_SPOOLER_FLAGS variable tells grops what it should do to
 # make its output acceptable to such programs.  This variable controls
 # only the default behaviour of grops; the behaviour can be changed at
 # runtime by the grops -b option (and so by groff -P-b).
 # Use a value of 0 if your spoolers and previewers are able to handle
 # conforming PostScript correctly.
 # Add 1 if no %%{Begin,End}DocumentSetup comments should be generated;
 # this is needed for early versions of TranScript that get confused by
 # anything between the %%EndProlog line and the first %%Page: comment.
 # Add 2 if lines in included files beginning with %! should be
 # stripped out; this is needed for the OpenWindows 2.0 pageview previewer.
 # Add 4 if %%Page, %%Trailer and %%EndProlog comments should be
 # stripped out of included files; this is needed for spoolers that
 # don't understand the %%{Begin,End}Document comments. I suspect this
 # includes early versions of TranScript.
 # Add 8 if the first line of the PostScript output should be %!PS-Adobe-2.0
 # rather than %!PS-Adobe-3.0; this is needed when using Sun's Newsprint
 # with a printer that requires page reversal.
 BROKEN_SPOOLER_FLAGS=7
 
 # DEVICE is the default device.
 DEVICE=ps
 
 # PSPRINT is the command to use for printing a PostScript file,
 # for example `lpr'.
 PSPRINT=lpr
 
 # DVIPRINT is the command to use for printing a TeX dvi file,
 # for example `lpr -d'.
 DVIPRINT=lpr -d
 ########################################################################
 # Don't touch...
 
 g=
 tmac_s_prefix=
 tmac_m_prefix=
 tmac_an_prefix=
 fontdir=/usr/share/groff_font
 localfontdir=$(fontdir)
 legacyfontdir=$(fontdir)
 tmacdir=/usr/share/tmac
 systemtmacdir=/usr/share/tmac
 localtmacdir=/usr/share/tmac
 docdir=/usr/src/contrib/groff/doc
 exampledir=XXX
 htmldocdir=XXX
 pdfdocdir=XXX
 indexext=.i
 common_words_file=/usr/share/dict/eign
 indexdir=/usr/share/dict/papers
 indexname=Ind
 
 ########################################################################
 # Libraries
 
 LIBGROFF=	${.OBJDIR}/${TOPREL}/src/libs/libgroff/libgroff.a
 LIBDRIVER=	${.OBJDIR}/${TOPREL}/src/libs/libdriver/libdriver.a
 LIBBIB=		${.OBJDIR}/${TOPREL}/src/libs/libbib/libbib.a
 
 CFLAGS+=	-DHAVE_CONFIG_H
 CFLAGS+=	-I${GROFF_DIST}/src/include -I${.CURDIR}/${TOPREL}/src/include
 CXXFLAGS+=	-fno-rtti -fno-exceptions
 
 .y.o:
 	$(YACC) $(YFLAGS) $(.IMPSRC)
 	mv -f y.tab.c $(.PREFIX).cpp
 	mv -f y.tab.h $(.PREFIX)_tab.h
 	${CXX} ${CXXFLAGS} -c $(.PREFIX).cpp -o ${.TARGET}
 
 .y.cpp:
 	$(YACC) $(YFLAGS) $(.IMPSRC)
 	mv -f y.tab.c $(.PREFIX).cpp
 	mv -f y.tab.h $(.PREFIX)_tab.h
 
 .SUFFIXES: .man .1 .2 .3 .4 .5 .6 .7 .8
 
 version=`cat $(GROFF_DIST)/VERSION`
 revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(GROFF_DIST)/REVISION`
 
 .man.8 .man.7 .man.6 .man.5 .man.4 .man.3 .man.2 .man.1:
 	@${ECHO} Making $@ from $<
 	@-rm -f $@
 	@sed -e "s;@BINDIR@;${BINDIR};g" \
 	-e "s;@FONTDIR@;$(fontdir);g" \
 	-e "s;@LOCALFONTDIR@;$(localfontdir);g" \
 	-e "s;@LEGACYFONTDIR@;$(legacyfontdir);g" \
 	-e "s;@MACRODIR@;$(tmacdir);g" \
 	-e "s;@SYSTEMMACRODIR@;$(systemtmacdir);g" \
 	-e "s;@LOCALMACRODIR@;$(localtmacdir);g" \
 	-e "s;@DOCDIR@;$(docdir);g" \
 	-e "s;@EXAMPLEDIR@;$(exampledir);g" \
 	-e "s;@HTMLDOCDIR@;$(htmldocdir);g" \
 	-e "s;@PDFDOCDIR@;$(pdfdocdir);g" \
 	-e "s;@DEVICE@;$(DEVICE);g" \
 	-e "s;@DEFAULT_INDEX@;$(indexdir)/$(indexname);g" \
 	-e "s;@DEFAULT_INDEX_NAME@;$(indexname);g" \
 	-e "s;@INDEX_SUFFIX@;$(indexext);g" \
 	-e "s;@COMMON_WORDS_FILE@;$(common_words_file);g" \
 	-e "s;@MAN1EXT@;1;g" \
 	-e "s;@MAN5EXT@;5;g" \
 	-e "s;@MAN7EXT@;7;g" \
 	-e "s;@TMAC_S_PREFIX@;$(tmac_s_prefix);g" \
 	-e "s;@TMAC_M_PREFIX@;$(tmac_m_prefix);g" \
 	-e "s;@TMAC_AN_PREFIX@;$(tmac_an_prefix);g" \
 	-e "s;@TMAC_MDIR@;$(tmacdir)/mm;g" \
 	-e "s;@BROKEN_SPOOLER_FLAGS@;$(BROKEN_SPOOLER_FLAGS);g" \
 	-e "s;@VERSION@;$(version)$(revision);g" \
 	-e "s;@MDATE@;`$(SHELL) ${GROFF_DIST}/mdate.sh $<`;g" \
 	-e "s;@g@;$(g);g" \
 	-e "s;@G@;`echo $(g) | LC_ALL=C tr a-z A-Z`;g" \
 	$< >$@
 
 .SUFFIXES: .sh .pl
 
 .sh .pl:
 	@${ECHO} Making ${.TARGET} from ${.IMPSRC}
+	@rm -f ${.TARGET}
 	@sed -e "s|@BINDIR@|${BINDIR}|g" \
 	     -e 's|@GROFF_BIN_PATH_SETUP@|GROFF_RUNTIME="$${GROFF_BIN_PATH=${BINDIR}}:"|g' \
 	     -e "s;@FONTDIR@;$(fontdir);g" \
 	     -e "s|@SEP@|:|g" \
 	     -e "s|@VERSION@|$(version)$(revision)|" \
 	     -e "s|@g@|$(g)|g" \
 	     ${.IMPSRC} >${.TARGET}
 
 TOPREL?=	..
 GROFF_DIST=	${.CURDIR}/${TOPREL}/../../../contrib/groff
 DIST_SUBDIR?=	${.CURDIR:T}
 DIST_DIR=	${GROFF_DIST}/${DIST_SUBDIR}
 .PATH: ${DIST_DIR}
Index: head/include/mk-osreldate.sh
===================================================================
--- head/include/mk-osreldate.sh	(revision 284288)
+++ head/include/mk-osreldate.sh	(revision 284289)
@@ -1,52 +1,52 @@
 #!/bin/sh -
 # Copyright (c) 2013 Garrett Cooper
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD$
 
 set -e
 
 CURDIR=$(pwd)
 ECHO=${ECHO:=echo}
 
 tmpfile=$(mktemp osreldate.XXXXXXXX)
 trap "rm -f $tmpfile" EXIT
 
 ${ECHO} creating osreldate.h from newvers.sh
 
 export PARAMFILE="${PARAM_H:=$CURDIR/../sys/sys/param.h}"
 set +e
 . "${NEWVERS_SH:=$CURDIR/../sys/conf/newvers.sh}" || exit 1
 set -e
 cat > $tmpfile <<EOF
 $COPYRIGHT
 #ifdef _KERNEL
 #error "<osreldate.h> cannot be used in the kernel, use <sys/param.h>"
 #else
 #undef __FreeBSD_version
 #define __FreeBSD_version $RELDATE
 #endif
 EOF
 chmod 644 $tmpfile
-mv $tmpfile osreldate.h
+mv -f $tmpfile osreldate.h
Index: head/kerberos5/Makefile.inc
===================================================================
--- head/kerberos5/Makefile.inc	(revision 284288)
+++ head/kerberos5/Makefile.inc	(revision 284289)
@@ -1,49 +1,49 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 NO_LINT=
 
 KRB5DIR=	${.CURDIR}/../../../crypto/heimdal
 
 CFLAGS+=	-DHAVE_CONFIG_H -I${.CURDIR}/../../include
 
 .if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT)
 OPENLDAPBASE?=	/usr/local
 LDAPLDADD=	-lldap -llber
 LDAPDPADD=	${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;}
 LDAPCFLAGS=	-I${OPENLDAPBASE}/include -DOPENLDAP=1 -DLDAP_DEPRECATED=1
 LDAPLDFLAGS=	-L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib
 .endif
 
 .if defined(SRCS)
 
 ETSRCS=	\
 	${KRB5DIR}/lib/asn1/asn1_err.et \
 	${KRB5DIR}/lib/hdb/hdb_err.et \
 	${KRB5DIR}/lib/kadm5/kadm5_err.et \
 	${KRB5DIR}/lib/krb5/heim_err.et \
 	${KRB5DIR}/lib/krb5/k524_err.et \
 	${KRB5DIR}/lib/krb5/krb5_err.et \
 	${KRB5DIR}/lib/krb5/krb_err.et \
 	${KRB5DIR}/lib/gssapi/krb5/gkrb5_err.et \
 	${KRB5DIR}/lib/hx509/hx509_err.et \
 	${KRB5DIR}/lib/wind/wind_err.et \
 	${KRB5DIR}/lib/ntlm/ntlm_err.et
 
 .for ET in ${ETSRCS}
 .for _ET in ${ET:T:R}
 .if ${SRCS:M${_ET}.[ch]} != ""
-.ORDER: ${_ET}.c ${_ET}.h
+.ORDER: ${_ET}.h ${_ET}.c
 ${_ET}.c ${_ET}.h: ${ET}
 	compile_et ${.ALLSRC}
 CLEANFILES+=	${_ET}.h ${_ET}.c
 .endif
 .endfor
 .endfor
 
 .endif # defined(SRCS)
 
 ASN1_COMPILE=	asn1_compile
 MAKE_ROKEN=	make-roken
 SLC=		slc
Index: head/kerberos5/lib/libheimipcc/Makefile
===================================================================
--- head/kerberos5/lib/libheimipcc/Makefile	(revision 284288)
+++ head/kerberos5/lib/libheimipcc/Makefile	(revision 284289)
@@ -1,17 +1,18 @@
 #$FreeBSD$
 
 LIB=	heimipcc
 PRIVATELIB=
 LIBADD=	heimbase roken pthread
 
 SRCS=	\
 	client.c \
 	common.c
 
 CFLAGS+=	-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/base \
-		-I${KRB5DIR}/lib/ipc
+		-I${KRB5DIR}/lib/ipc \
+		-I${KRB5DIR}/include
 
 .include <bsd.lib.mk>
 
 .PATH: ${KRB5DIR}/lib/ipc
Index: head/lib/msun/Makefile
===================================================================
--- head/lib/msun/Makefile	(revision 284288)
+++ head/lib/msun/Makefile	(revision 284289)
@@ -1,228 +1,230 @@
 #  @(#)Makefile 5.1beta 93/09/24
 # $FreeBSD$
 #
 #  ====================================================
 #  Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
 #
 #  Developed at SunPro, a Sun Microsystems, Inc. business.
 #  Permission to use, copy, modify, and distribute this
 #  software is freely granted, provided that this notice
 #  is preserved.
 #  ====================================================
 #
 #
 
 .if ${MACHINE_CPUARCH} == "i386"
 ARCH_SUBDIR= i387
 .else
 ARCH_SUBDIR= ${MACHINE_CPUARCH}
 .endif
 
 .include "${ARCH_SUBDIR}/Makefile.inc"
 
 .PATH:	${.CURDIR}/${ARCH_SUBDIR}
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 .PATH:	${.CURDIR}/x86
 CFLAGS+=	-I${.CURDIR}/x86
 .endif
 
 # long double format
 .if ${LDBL_PREC} == 64
 .PATH:  ${.CURDIR}/ld80
 CFLAGS+=	-I${.CURDIR}/ld80
 .elif ${LDBL_PREC} == 113
 .PATH:  ${.CURDIR}/ld128
 CFLAGS+=	-I${.CURDIR}/ld128
 .endif
 
+CFLAGS+=	-I${.CURDIR}/${ARCH_SUBDIR}
+
 .PATH:	${.CURDIR}/bsdsrc
 .PATH:	${.CURDIR}/src
 .PATH:	${.CURDIR}/man
 
 LIB=	m
 SHLIBDIR?= /lib
 SHLIB_MAJOR= 5
 WARNS?=	1
 IGNORE_PRAGMA=
 COMMON_SRCS= b_exp.c b_log.c b_tgamma.c \
 	e_acos.c e_acosf.c e_acosh.c e_acoshf.c e_asin.c e_asinf.c \
 	e_atan2.c e_atan2f.c e_atanh.c e_atanhf.c e_cosh.c e_coshf.c e_exp.c \
 	e_expf.c e_fmod.c e_fmodf.c e_gamma.c e_gamma_r.c e_gammaf.c \
 	e_gammaf_r.c e_hypot.c e_hypotf.c e_j0.c e_j0f.c e_j1.c e_j1f.c \
 	e_jn.c e_jnf.c e_lgamma.c e_lgamma_r.c e_lgammaf.c e_lgammaf_r.c \
 	e_log.c e_log10.c e_log10f.c e_log2.c e_log2f.c e_logf.c \
 	e_pow.c e_powf.c e_rem_pio2.c \
 	e_rem_pio2f.c e_remainder.c e_remainderf.c e_scalb.c e_scalbf.c \
 	e_sinh.c e_sinhf.c e_sqrt.c e_sqrtf.c fenv.c \
 	imprecise.c \
 	k_cos.c k_cosf.c k_exp.c k_expf.c k_rem_pio2.c k_sin.c k_sinf.c \
 	k_tan.c k_tanf.c \
 	s_asinh.c s_asinhf.c s_atan.c s_atanf.c s_carg.c s_cargf.c s_cargl.c \
 	s_cbrt.c s_cbrtf.c s_ceil.c s_ceilf.c \
 	s_copysign.c s_copysignf.c s_cos.c s_cosf.c \
 	s_csqrt.c s_csqrtf.c s_erf.c s_erff.c \
 	s_exp2.c s_exp2f.c s_expm1.c s_expm1f.c s_fabsf.c s_fdim.c \
 	s_finite.c s_finitef.c \
 	s_floor.c s_floorf.c s_fma.c s_fmaf.c \
 	s_fmax.c s_fmaxf.c s_fmaxl.c s_fmin.c \
 	s_fminf.c s_fminl.c s_frexp.c s_frexpf.c s_ilogb.c s_ilogbf.c \
 	s_ilogbl.c s_isfinite.c s_isnan.c s_isnormal.c \
 	s_llrint.c s_llrintf.c s_llround.c s_llroundf.c s_llroundl.c \
 	s_log1p.c s_log1pf.c s_logb.c s_logbf.c s_lrint.c s_lrintf.c \
 	s_lround.c s_lroundf.c s_lroundl.c s_modff.c \
 	s_nan.c s_nearbyint.c s_nextafter.c s_nextafterf.c \
 	s_nexttowardf.c s_remquo.c s_remquof.c \
 	s_rint.c s_rintf.c s_round.c s_roundf.c \
 	s_scalbln.c s_scalbn.c s_scalbnf.c s_signbit.c \
 	s_signgam.c s_significand.c s_significandf.c s_sin.c s_sinf.c \
 	s_tan.c s_tanf.c s_tanh.c s_tanhf.c s_tgammaf.c s_trunc.c s_truncf.c \
 	w_cabs.c w_cabsf.c w_drem.c w_dremf.c
 
 # Location of fpmath.h and _fpmath.h
 LIBCDIR=	${.CURDIR}/../libc
 .if exists(${LIBCDIR}/${MACHINE_ARCH})
 LIBC_ARCH=${MACHINE_ARCH}
 .else
 LIBC_ARCH=${MACHINE_CPUARCH}
 .endif
 CFLAGS+=	-I${.CURDIR}/src -I${LIBCDIR}/include \
 	-I${LIBCDIR}/${LIBC_ARCH}
 SYM_MAPS+=	${.CURDIR}/Symbol.map
 
 VERSION_DEF=	${LIBCDIR}/Versions.def
 SYMBOL_MAPS=	${SYM_MAPS}
 
 # C99 long double functions
 COMMON_SRCS+=	s_copysignl.c s_fabsl.c s_llrintl.c s_lrintl.c s_modfl.c
 .if ${LDBL_PREC} != 53
 # If long double != double use these; otherwise, we alias the double versions.
 COMMON_SRCS+=	e_acoshl.c e_acosl.c e_asinl.c e_atan2l.c e_atanhl.c \
 	e_coshl.c e_fmodl.c e_hypotl.c \
 	e_lgammal.c e_lgammal_r.c \
 	e_remainderl.c e_sinhl.c e_sqrtl.c \
 	invtrig.c k_cosl.c k_sinl.c k_tanl.c \
 	s_asinhl.c s_atanl.c s_cbrtl.c s_ceill.c s_cosl.c s_cprojl.c \
 	s_csqrtl.c s_erfl.c s_exp2l.c s_expl.c s_floorl.c s_fmal.c \
 	s_frexpl.c s_logbl.c s_logl.c s_nanl.c s_nextafterl.c \
 	s_nexttoward.c s_remquol.c s_rintl.c s_roundl.c s_scalbnl.c \
 	s_sinl.c s_tanhl.c s_tanl.c s_truncl.c w_cabsl.c
 .endif
 
 # C99 complex functions
 COMMON_SRCS+=	catrig.c catrigf.c \
 	s_ccosh.c s_ccoshf.c s_cexp.c s_cexpf.c \
 	s_cimag.c s_cimagf.c s_cimagl.c \
 	s_conj.c s_conjf.c s_conjl.c \
 	s_cproj.c s_cprojf.c s_creal.c s_crealf.c s_creall.c \
 	s_csinh.c s_csinhf.c s_ctanh.c s_ctanhf.c
 
 # FreeBSD's C library supplies these functions:
 #COMMON_SRCS+=	s_fabs.c s_frexp.c s_isnan.c s_ldexp.c s_modf.c
 
 # Exclude the generic versions of what we provide in the MD area.
 .if defined(ARCH_SRCS)
 .for i in ${ARCH_SRCS}
 COMMON_SRCS:=  ${COMMON_SRCS:N${i:R}.c}
 .endfor
 .endif
 
 SRCS=	${COMMON_SRCS} ${ARCH_SRCS}
 
 INCS+=	fenv.h math.h
 
 MAN=	acos.3 acosh.3 asin.3 asinh.3 atan.3 atan2.3 atanh.3 \
 	ceil.3 cacos.3 ccos.3 ccosh.3 cexp.3 \
 	cimag.3 copysign.3 cos.3 cosh.3 csqrt.3 erf.3 exp.3 fabs.3 fdim.3 \
 	feclearexcept.3 feenableexcept.3 fegetenv.3 \
 	fegetround.3 fenv.3 floor.3 \
 	fma.3 fmax.3 fmod.3 hypot.3 ieee.3 ieee_test.3 ilogb.3 j0.3 \
 	lgamma.3 log.3 lrint.3 lround.3 math.3 nan.3 \
 	nextafter.3 remainder.3 rint.3 \
 	round.3 scalbn.3 signbit.3 sin.3 sinh.3 sqrt.3 tan.3 tanh.3 trunc.3 \
 	complex.3
 
 MLINKS+=acos.3 acosf.3 acos.3 acosl.3
 MLINKS+=acosh.3 acoshf.3 acosh.3 acoshl.3
 MLINKS+=asin.3 asinf.3 asin.3 asinl.3
 MLINKS+=asinh.3 asinhf.3 asinh.3 asinhl.3
 MLINKS+=atan.3 atanf.3 atan.3 atanl.3
 MLINKS+=atanh.3 atanhf.3 atanh.3 atanhl.3
 MLINKS+=atan2.3 atan2f.3 atan2.3 atan2l.3 \
 	atan2.3 carg.3 atan2.3 cargf.3 atan2.3 cargl.3
 MLINKS+=cacos.3 cacosf.3 cacos.3 cacosh.3 cacos.3 cacoshf.3 \
 	cacos.3 casin.3 cacos.3 casinf.3 cacos.3 casinh.3 cacos.3 casinhf.3 \
 	cacos.3 catan.3 cacos.3 catanf.3 cacos.3 catanh.3 cacos.3 catanhf.3
 MLINKS+=ccos.3 ccosf.3 ccos.3 csin.3 ccos.3 csinf.3 ccos.3 ctan.3 ccos.3 ctanf.3
 MLINKS+=ccosh.3 ccoshf.3 ccosh.3 csinh.3 ccosh.3 csinhf.3 \
 	ccosh.3 ctanh.3 ccosh.3 ctanhf.3
 MLINKS+=ceil.3 ceilf.3 ceil.3 ceill.3
 MLINKS+=cexp.3 cexpf.3
 MLINKS+=cimag.3 cimagf.3 cimag.3 cimagl.3 \
 	cimag.3 conj.3 cimag.3 conjf.3 cimag.3 conjl.3 \
 	cimag.3 cproj.3 cimag.3 cprojf.3 cimag.3 cprojl.3 \
 	cimag.3 creal.3 cimag.3 crealf.3 cimag.3 creall.3
 MLINKS+=copysign.3 copysignf.3 copysign.3 copysignl.3
 MLINKS+=cos.3 cosf.3 cos.3 cosl.3
 MLINKS+=cosh.3 coshf.3 cosh.3 coshl.3
 MLINKS+=csqrt.3 csqrtf.3 csqrt.3 csqrtl.3
 MLINKS+=erf.3 erfc.3 erf.3 erff.3 erf.3 erfcf.3 erf.3 erfl.3 erf.3 erfcl.3
 MLINKS+=exp.3 expm1.3 exp.3 expm1f.3 exp.3 expm1l.3 exp.3 pow.3 exp.3 powf.3 \
 	exp.3 exp2.3 exp.3 exp2f.3 exp.3 exp2l.3 exp.3 expf.3 exp.3 expl.3
 MLINKS+=fabs.3 fabsf.3 fabs.3 fabsl.3
 MLINKS+=fdim.3 fdimf.3 fdim.3 fdiml.3
 MLINKS+=feclearexcept.3 fegetexceptflag.3 feclearexcept.3 feraiseexcept.3 \
 	feclearexcept.3 fesetexceptflag.3 feclearexcept.3 fetestexcept.3
 MLINKS+=feenableexcept.3 fedisableexcept.3 feenableexcept.3 fegetexcept.3
 MLINKS+=fegetenv.3 feholdexcept.3 fegetenv.3 fesetenv.3 \
 	fegetenv.3 feupdateenv.3
 MLINKS+=fegetround.3 fesetround.3
 MLINKS+=floor.3 floorf.3 floor.3 floorl.3
 MLINKS+=fma.3 fmaf.3 fma.3 fmal.3
 MLINKS+=fmax.3 fmaxf.3 fmax.3 fmaxl.3 \
 	fmax.3 fmin.3 fmax.3 fminf.3 fmax.3 fminl.3
 MLINKS+=fmod.3 fmodf.3 fmod.3 fmodl.3
 MLINKS+=hypot.3 cabs.3 hypot.3 cabsf.3 hypot.3 cabsl.3 \
 	hypot.3 hypotf.3 hypot.3 hypotl.3
 MLINKS+=ieee_test.3 scalb.3 ieee_test.3 scalbf.3
 MLINKS+=ieee_test.3 significand.3 ieee_test.3 significandf.3
 MLINKS+=ilogb.3 ilogbf.3 ilogb.3 ilogbl.3 \
 	ilogb.3 logb.3 ilogb.3 logbf.3 ilogb.3 logbl.3
 MLINKS+=j0.3 j1.3 j0.3 jn.3 j0.3 y0.3 j0.3 y1.3 j0.3 y1f.3 j0.3 yn.3
 MLINKS+=j0.3 j0f.3 j0.3 j1f.3 j0.3 jnf.3 j0.3 y0f.3 j0.3 ynf.3
 MLINKS+=lgamma.3 gamma.3 lgamma.3 gammaf.3 \
 	lgamma.3 lgammaf.3 lgamma.3 lgammal.3 \
 	lgamma.3 tgamma.3 lgamma.3 tgammaf.3
 MLINKS+=log.3 log10.3 log.3 log10f.3 log.3 log10l.3 \
 	log.3 log1p.3 log.3 log1pf.3 log.3 log1pl.3 \
 	log.3 logf.3 log.3 logl.3 \
 	log.3 log2.3 log.3 log2f.3 log.3 log2l.3
 MLINKS+=lrint.3 llrint.3 lrint.3 llrintf.3 lrint.3 llrintl.3 \
 	lrint.3 lrintf.3 lrint.3 lrintl.3
 MLINKS+=lround.3 llround.3 lround.3 llroundf.3 lround.3 llroundl.3 \
 	lround.3 lroundf.3 lround.3 lroundl.3
 MLINKS+=nan.3 nanf.3 nan.3 nanl.3
 MLINKS+=nextafter.3 nextafterf.3 nextafter.3 nextafterl.3
 MLINKS+=nextafter.3 nexttoward.3 nextafter.3 nexttowardf.3
 MLINKS+=nextafter.3 nexttowardl.3
 MLINKS+=remainder.3 remainderf.3 remainder.3 remainderl.3 \
 	remainder.3 remquo.3 remainder.3 remquof.3 remainder.3 remquol.3
 MLINKS+=rint.3 rintf.3 rint.3 rintl.3 \
 	rint.3 nearbyint.3 rint.3 nearbyintf.3 rint.3 nearbyintl.3
 MLINKS+=round.3 roundf.3 round.3 roundl.3
 MLINKS+=scalbn.3 scalbln.3 scalbn.3 scalblnf.3 scalbn.3 scalblnl.3
 MLINKS+=scalbn.3 scalbnf.3 scalbn.3 scalbnl.3
 MLINKS+=sin.3 sinf.3 sin.3 sinl.3
 MLINKS+=sinh.3 sinhf.3 sinh.3 sinhl.3
 MLINKS+=sqrt.3 cbrt.3 sqrt.3 cbrtf.3 sqrt.3 cbrtl.3 sqrt.3 sqrtf.3 \
 	sqrt.3 sqrtl.3
 MLINKS+=tan.3 tanf.3 tan.3 tanl.3
 MLINKS+=tanh.3 tanhf.3 tanh.3 tanhl.3
 MLINKS+=trunc.3 truncf.3 trunc.3 truncl.3
 
 .include <src.opts.mk>
 
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests
 .endif
 
 .include <bsd.lib.mk>
Index: head/tests/sys/pjdfstest/pjdfstest/Makefile
===================================================================
--- head/tests/sys/pjdfstest/pjdfstest/Makefile	(revision 284288)
+++ head/tests/sys/pjdfstest/pjdfstest/Makefile	(revision 284289)
@@ -1,20 +1,20 @@
 # $FreeBSD$
 
 TOP=		${.CURDIR:H:H:H:H}
 
 .PATH: ${TOP}/contrib/pjdfstest
 
 BINDIR=		${TESTSBASE}/sys/pjdfstest
 PROG=		pjdfstest
 MAN=
 
-CFLAGS=		-D__OS_FreeBSD__ -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_FCHFLAGS
+CFLAGS+=	-D__OS_FreeBSD__ -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_FCHFLAGS
 CFLAGS+=	-DHAS_CHFLAGSAT -DHAS_LCHFLAGS -DHAS_FREEBSD_ACL -DHAS_BINDAT
 CFLAGS+=	-DHAS_CONNECTAT
 
 # XXX: the upstream sources need some massaging with how it assigns ngroups in
 # pjdfstest.c
 NO_WERROR=
 WARNS?=		6
 
 .include <bsd.prog.mk>
Index: head/usr.bin/kdump/mkioctls
===================================================================
--- head/usr.bin/kdump/mkioctls	(revision 284288)
+++ head/usr.bin/kdump/mkioctls	(revision 284289)
@@ -1,118 +1,118 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # When editing this script, keep in mind that truss also uses it.
 #
 
 set -e
 
 if [ $# -ne 2 -o \( $1 != "print" -a $1 != "return" \) ]; then
 	echo "usage: sh $0 print|return include-dir"
 	exit 1
 fi
 
 style="$1"
 includedir="$2"
 
 LC_ALL=C; export LC_ALL
 
 # Build a list of headers that have ioctls in them.
 # XXX should we use an ANSI cpp?
 ioctl_includes=$(
 	cd $includedir
 	find -H -s * -name '*.h' | \
 	egrep -v '(.*disk.*|net/pfvar|net/if_pfsync)\.h' | \
 		xargs egrep -l \
 '^#[ 	]*define[ 	]+[A-Za-z_][A-Za-z0-9_]*[ 	]+_IO[^a-z0-9_]' |
 		awk '{printf("#include <%s>\\n", $1)}'
 )
 
 : ${MACHINE=$(uname -m)}
 case "${MACHINE}" in
 *pc98*)
 	ioctl_includes="$ioctl_includes#include <sys/diskpc98.h>\\n"
 	;;
 *)
 	ioctl_includes="$ioctl_includes#include <sys/diskmbr.h>\\n"
 	;;
 esac
 
 awk -v x="$ioctl_includes" 'BEGIN {print x}' |
-	$CPP -I$1 -dM -DCOMPAT_43TTY - |
+	$CPP -nostdinc -I$1 -dM -DCOMPAT_43TTY - |
 	awk -v ioctl_includes="$ioctl_includes" -v style="$style" '
 BEGIN {
 	print "/* XXX obnoxious prerequisites. */"
 	print "#define COMPAT_43"
 	print "#define COMPAT_43TTY"
 	print "#include <sys/param.h>"
 	print "#include <sys/devicestat.h>"
 	print "#include <sys/disklabel.h>"
 	print "#include <sys/socket.h>"
 	print "#include <sys/time.h>"
 	print "#include <sys/tty.h>"
 	print "#include <bsm/audit.h>"
 	print "#include <net/ethernet.h>"
 	print "#include <net/if.h>"
 	print "#ifdef PF"
 	print "#include <net/pfvar.h>"
 	print "#include <net/if_pfsync.h>"
 	print "#endif"
 	print "#include <net/route.h>"
 	print "#include <netinet/in.h>"
 	print "#include <netinet/ip_mroute.h>"
 	print "#include <netinet6/in6_var.h>"
 	print "#include <netinet6/nd6.h>"
 	print "#include <netinet6/ip6_mroute.h>"
 	print "#include <stdio.h>"
 	print "#include <cam/cam.h>"
 	print "#include <stddef.h>"
 	print "#include <stdint.h>"
 	print ""
 	print ioctl_includes
 	print ""
 	if (style == "print") {
 		print "void ioctlname(unsigned long val, int decimal);"
 		print ""
 		print "void"
 		print "ioctlname(unsigned long val, int decimal)"
 	} else {
 		print "const char *ioctlname(unsigned long val);"
 		print ""
 		print "const char *"
 		print "ioctlname(unsigned long val)"
 	}
 	print "{"
 	print "\tconst char *str = NULL;"
 	print ""
 }
 
 /^#[ 	]*define[ 	]+[A-Za-z_][A-Za-z0-9_]*[ 	]+_IO/ {
 
 	# find where the name starts
 	for (i = 1; i <= NF; i++)
 		if ($i ~ /define/)
 			break;
 	++i;
 	#
 	printf("\t");
 	if (n++ > 0)
 		printf("else ");
 	printf("if (val == %s)\n", $i);
 	printf("\t\tstr = \"%s\";\n", $i);
 }
 END {
 	print ""
 	if (style == "print") {
 		print "\tif (str != NULL)"
 		print "\t\tprintf(\"%s\", str);"
 		print "\telse if (decimal)"
 		print "\t\tprintf(\"%lu\", val);"
 		print "\telse"
 		print "\t\tprintf(\"%#lx\", val);"
 	} else {
 		print "\treturn (str);"
 	}
 	print "}"
 }
 '