MFH r289384-r293170

Sponsored by:	The FreeBSD Foundation

49 files changed, 131 insertions, 141 deletions

diff --git a/gnu/Makefile b/gnu/Makefile
index 25480c7..bd84bc4 100644
--- a/gnu/Makefile
+++ b/gnu/Makefile
@@ -3,10 +3,13 @@
 
 .include <src.opts.mk>
 
-SUBDIR= lib ${_tests} usr.bin
+SUBDIR= lib .WAIT \
+	${_tests} usr.bin
 
 .if ${MK_TESTS} != "no"
 _tests=	tests
 .endif
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 4fff36a..b77f9e3 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -24,6 +24,9 @@ SUBDIR+=	libreadline
 # have taken care of that already.
 .if ${MK_GNUCXX} != "no"
 SUBDIR+= libstdc++ libsupc++
+SUBDIR_DEPENDS_libsupc++:= libstdc++
 .endif
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>
diff --git a/gnu/lib/libdialog/Makefile.depend b/gnu/lib/libdialog/Makefile.depend
index 1c00d92..8b0f9a7 100644
--- a/gnu/lib/libdialog/Makefile.depend
+++ b/gnu/lib/libdialog/Makefile.depend
@@ -11,7 +11,6 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/msun \
 	lib/ncurses/ncursesw \
-	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/lib/libgcc/Makefile.depend b/gnu/lib/libgcc/Makefile.depend
index 6dd413b..ce72494 100644
--- a/gnu/lib/libgcc/Makefile.depend
+++ b/gnu/lib/libgcc/Makefile.depend
@@ -7,7 +7,6 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
-	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/lib/libgomp/Makefile.depend b/gnu/lib/libgomp/Makefile.depend
index d8c89db..fd53a3f 100644
--- a/gnu/lib/libgomp/Makefile.depend
+++ b/gnu/lib/libgomp/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile
index a16d216..17c84ae 100644
--- a/gnu/lib/libreadline/readline/Makefile
+++ b/gnu/lib/libreadline/readline/Makefile
@@ -16,12 +16,11 @@ INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \
 CFLAGS+=	-I${.OBJDIR}/..
 SRCDIR=	${.CURDIR}/../../../../contrib/libreadline
 
-beforebuild: ${INSTALLED_HEADERS}
 CLEANFILES+= ${INSTALLED_HEADERS}
-DPSRCS+= ${INSTALLED_HEADERS}
+SRCS+= ${INSTALLED_HEADERS}
 
 .for _h in ${INSTALLED_HEADERS}
-${_h}:	${SRCDIR}/${_h}
+${_h}:	${SRCDIR}/${_h} .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
 .endfor
 
diff --git a/gnu/lib/libregex/Makefile.depend b/gnu/lib/libregex/Makefile.depend
index 1eb05a0..2defba8 100644
--- a/gnu/lib/libregex/Makefile.depend
+++ b/gnu/lib/libregex/Makefile.depend
@@ -9,7 +9,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/lib/libssp/Makefile.depend b/gnu/lib/libssp/Makefile.depend
index 79eb58b..3646e2e 100644
--- a/gnu/lib/libssp/Makefile.depend
+++ b/gnu/lib/libssp/Makefile.depend
@@ -2,11 +2,13 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcompiler_rt \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index d55b67e..27f3236 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -88,7 +88,7 @@ ATOMICITY_H=	${SRCDIR}/config/cpu/generic/atomicity_builtins/atomicity.h
 .endif
 .endif
 
-atomicity.cc:	${ATOMICITY_H}
+atomicity.cc:	${ATOMICITY_H} .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
 CLEANFILES+=	atomicity.cc
 
@@ -599,7 +599,7 @@ unwind.h: ${GCCDIR}/config/arm/unwind-arm.h
 unwind.h: ${GCCDIR}/unwind-generic.h
 .endif
 
-unwind.h:
+unwind.h: .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
 
 SRCS+=		unwind.h
@@ -624,7 +624,7 @@ CLEANFILES+=	c++config.h
 
 VERSION_MAP=  	libstdc++.map
 
-${VERSION_MAP}: ${SRCDIR}/config/abi/pre/gnu.ver
+${VERSION_MAP}: ${SRCDIR}/config/abi/pre/gnu.ver .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
 
 CLEANFILES+=	${VERSION_MAP}
diff --git a/gnu/lib/libstdc++/Makefile.depend b/gnu/lib/libstdc++/Makefile.depend
index 760b9b8..0e1a73c 100644
--- a/gnu/lib/libstdc++/Makefile.depend
+++ b/gnu/lib/libstdc++/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	lib/libc \
 	lib/libcompiler_rt \
 	lib/msun \
-	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile
index 0531a73..b78e9d8 100644
--- a/gnu/lib/libsupc++/Makefile
+++ b/gnu/lib/libsupc++/Makefile
@@ -38,7 +38,7 @@ unwind.h: ${GCCDIR}/config/arm/unwind-arm.h
 unwind.h: ${GCCDIR}/unwind-generic.h
 .endif
 
-unwind.h:
+unwind.h: .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
 
 SRCS+=		unwind.h
diff --git a/gnu/lib/libsupc++/Makefile.depend b/gnu/lib/libsupc++/Makefile.depend
index 2ffe3c4..5584517 100644
--- a/gnu/lib/libsupc++/Makefile.depend
+++ b/gnu/lib/libsupc++/Makefile.depend
@@ -10,7 +10,6 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	usr.bin/xinstall.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index e15fdae..5058c0a 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -48,9 +48,10 @@ CLEANFILES+=	ldemul-list.h stringify.sed
 
 FILES=		${LDSCRIPTS:S|^|ldscripts/|}
 FILESDIR=	${SCRIPTDIR}
+LINKS=		${BINDIR}/ld ${BINDIR}/ld.bfd
 
 HOST=		${TARGET_TUPLE}
-LIBSEARCHPATH=	\"${TOOLS_PREFIX}/lib\":\"${TOOLS_PREFIX}/usr/lib\"
+LIBSEARCHPATH=	\"=/lib\":\"=/usr/lib\"
 .for ext in ${ELF_SCR_EXT}
 LDSCRIPTS+=	${NATIVE_EMULATION}.${ext}
 ldscripts/${NATIVE_EMULATION}.${ext}: e${NATIVE_EMULATION}.c
@@ -67,8 +68,8 @@ ldemul-list.h:
 	echo "${EMXFR}" > ${.TARGET}
 	echo "#define EMULATION_LIST ${EMLST} 0" >> ${.TARGET}
 
-stringify.sed:
-	ln -sf ${SRCDIR}/ld/emultempl/astring.sed ${.TARGET}
+stringify.sed: ${SRCDIR}/ld/emultempl/astring.sed .NOMETA
+	ln -sf ${.ALLSRC} ${.TARGET}
 
 GENDIRDEPS_FILTER.host+= Nusr.bin/yacc
 
diff --git a/gnu/usr.bin/binutils/ld/genscripts.sh b/gnu/usr.bin/binutils/ld/genscripts.sh
index 5090cd3..238263e 100755
--- a/gnu/usr.bin/binutils/ld/genscripts.sh
+++ b/gnu/usr.bin/binutils/ld/genscripts.sh
@@ -50,8 +50,7 @@ fi
 if test -d ldscripts; then
   true
 else
-  rm -f ldscripts
-  mkdir ldscripts
+  mkdir -p ldscripts
 fi
 
 # Set some flags for the emultempl scripts.  USE_LIBPATH will
diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index 41349cf..378abab 100644
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -5,7 +5,8 @@
 # The order of some of these are rather important.  Some depend on previous
 # subdirs.
 
-SUBDIR= cc_tools libiberty libcpp libdecnumber cc_int cc cc1 include
+SUBDIR= cc_tools .WAIT \
+	libiberty libcpp libdecnumber cc_int cc cc1 include
 
 .if ${MK_CPP} != "no"
 SUBDIR+= cpp
@@ -19,4 +20,13 @@ SUBDIR+= cc1plus c++
 SUBDIR+= gcov
 .endif
 
+SUBDIR_DEPEND_c++:=	libcpp libiberty
+SUBDIR_DEPEND_cc=	libcpp libiberty
+SUBDIR_DEPEND_cpp=	libcpp libiberty
+SUBDIR_DEPEND_cc1plus=	cc_int libcpp libdecnumber libiberty
+SUBDIR_DEPEND_cc1=	cc_int libcpp libdecnumber libiberty
+SUBDIR_DEPEND_gcov=	libiberty
+
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index 368517c..b306bfec2 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -9,7 +9,7 @@ MAN=
 
 PROG=	cc1
 SRCS=	main.c c-parser.c c-lang.c
-BINDIR=	/usr/libexec
+BINDIR=	${LIBEXECDIR}
 .if ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?=yes
 .endif
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index 5d5a64d..761dd69 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -15,7 +15,7 @@ SRCS+=	main.c cp-lang.c c-opts.c call.c class.c cvt.c cxx-pretty-print.c \
 	search.c semantics.c tree.c typeck.c typeck2.c optimize.c \
 	cp-objcp-common.c cp-gimplify.c tree-mudflap.c
 
-BINDIR=	/usr/libexec
+BINDIR=	${LIBEXECDIR}
 .if ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?=yes
 .endif
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index f451171..f645453 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -346,7 +346,7 @@ gstdint.h:
 GENSRCS+=	gstdint.h
 
 # Linked headers
-gthr-default.h: ${GCCDIR}/gthr-posix.h
+gthr-default.h: ${GCCDIR}/gthr-posix.h .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
 
 GENSRCS+=	gthr-default.h
@@ -357,7 +357,7 @@ unwind.h: ${GCCDIR}/config/arm/unwind-arm.h
 unwind.h: ${GCCDIR}/unwind-generic.h
 .endif
 
-unwind.h:
+unwind.h: .NOMETA
 	ln -sf ${.ALLSRC} ${.TARGET}
 
 GENSRCS+=	unwind.h
diff --git a/gnu/usr.bin/diff/Makefile.depend b/gnu/usr.bin/diff/Makefile.depend
index 6029d00..1cce740 100644
--- a/gnu/usr.bin/diff/Makefile.depend
+++ b/gnu/usr.bin/diff/Makefile.depend
@@ -2,20 +2,18 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	gnu/lib/libregex \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcompiler_rt \
 
 
 .include <dirdeps.mk>
 
 .if ${DEP_RELDIR} == ${_DEP_RELDIR}
 # local dependencies - needed for -jN in clean tree
-context.o: context.c
-context.po: context.c
-diff.o: diff.c
-diff.po: diff.c
 .endif
diff --git a/gnu/usr.bin/dtc/Makefile b/gnu/usr.bin/dtc/Makefile
index 7bf8fd5..cdbbf4b 100644
--- a/gnu/usr.bin/dtc/Makefile
+++ b/gnu/usr.bin/dtc/Makefile
@@ -3,8 +3,8 @@
 .include <bsd.own.mk>
 
 DTCDIR=	${.CURDIR}/../../../contrib/dtc
-LIBFDTDIR= ${.CURDIR}/../../../sys/contrib/libfdt
-.PATH: ${DTCDIR} ${LIBFDTDIR}
+_LIBFDTDIR= ${.CURDIR}/../../../sys/contrib/libfdt
+.PATH: ${DTCDIR} ${_LIBFDTDIR}
 
 PROG=	dtc
 
@@ -14,7 +14,7 @@ SRCS=	dtc.c checks.c fstree.c livetree.c treesource.c data.c \
 	fdt_sw.c fdt_wip.c ${DTCVERSIONFILE}
 
 WARNS?=	2
-CFLAGS+= -I. -I${.CURDIR} -I${DTCDIR} -I${LIBFDTDIR}
+CFLAGS+= -I. -I${.CURDIR} -I${DTCDIR} -I${_LIBFDTDIR}
 
 VERSIONMAJ!= awk '/^VERSION =/ { print $$3 }' ${DTCDIR}/Makefile
 VERSIONMIN!= awk '/^PATCHLEVEL =/ { print $$3 }' ${DTCDIR}/Makefile
diff --git a/gnu/usr.bin/dtc/Makefile.depend b/gnu/usr.bin/dtc/Makefile.depend
index 01e6ecb..93a3a02 100644
--- a/gnu/usr.bin/dtc/Makefile.depend
+++ b/gnu/usr.bin/dtc/Makefile.depend
@@ -2,11 +2,14 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libcompiler_rt \
+	usr.bin/yacc.host \
 
 
 .include <dirdeps.mk>
@@ -19,6 +22,6 @@ dtc-lexer.lex.po: dtc-lexer.lex.c
 dtc-lexer.lex.po: dtc-parser.tab.h
 dtc-parser.tab.o: dtc-parser.tab.c
 dtc-parser.tab.po: dtc-parser.tab.c
-dtc.o: version_gen.h
-dtc.po: version_gen.h
+util.o: version_gen.h
+util.po: version_gen.h
 .endif
diff --git a/gnu/usr.bin/gdb/kgdb/Makefile b/gnu/usr.bin/gdb/kgdb/Makefile
index 8af2e18..5867f7a 100644
--- a/gnu/usr.bin/gdb/kgdb/Makefile
+++ b/gnu/usr.bin/gdb/kgdb/Makefile
@@ -8,12 +8,8 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \
 	${OBJ_BU}/libiberty/libiberty.a
 GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
 
-DPADD=	${GDBLIBS} ${BULIBS} ${LIBKVM}
-LDADD=	${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX}
-LIBADD+=	m readline ncursesw gnuregex
-
-.if defined(GDB_CROSS_DEBUGGER)
-CFLAGS+= -Wl,-export-dynamic
-.endif
+DPADD=	${GDBLIBS} ${BULIBS}
+LDADD=	${GDBLIBS} ${BULIBS}
+LIBADD+=	m readline ncursesw gnuregex kvm
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64 b/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64
index f675e83..3c60b31 100644
--- a/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64
+++ b/gnu/usr.bin/gdb/kgdb/Makefile.depend.amd64
@@ -15,6 +15,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libelf \
 	lib/libkvm \
 	lib/msun \
 	lib/ncurses/ncursesw \
diff --git a/gnu/usr.bin/gdb/kgdb/main.c b/gnu/usr.bin/gdb/kgdb/main.c
index 19246c0..aa062a2 100644
--- a/gnu/usr.bin/gdb/kgdb/main.c
+++ b/gnu/usr.bin/gdb/kgdb/main.c
@@ -41,9 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <kvm.h>
 #include <limits.h>
 #include <paths.h>
-#ifdef CROSS_DEBUGGER
-#include <proc_service.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -81,24 +78,6 @@ static struct ui_file *parse_gdberr;
 
 static void (*kgdb_new_objfile_chain)(struct objfile * objfile);
 
-#ifdef CROSS_DEBUGGER
-ps_err_e
-ps_pglobal_lookup(struct ps_prochandle *ph, const char *obj, const char *name,
-    psaddr_t *sym_addr)
-{
-	struct minimal_symbol *ms;
-	CORE_ADDR addr;
-
-	ms = lookup_minimal_symbol (name, NULL, NULL);
-	if (ms == NULL)
-		return PS_NOSYM;
-
-	addr = SYMBOL_VALUE_ADDRESS (ms);
-	store_typed_address(sym_addr, builtin_type_void_data_ptr, addr);
-	return PS_OK;
-}
-#endif
-
 static void
 usage(void)
 {
diff --git a/gnu/usr.bin/gdb/kgdb/trgt.c b/gnu/usr.bin/gdb/kgdb/trgt.c
index c75edf0..0cf8361 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt.c
@@ -78,6 +78,19 @@ static char kvm_err[_POSIX2_LINE_MAX];
 #define	KERNOFF		(kgdb_kernbase ())
 #define	PINKERNEL(x)	((x) >= KERNOFF)
 
+static int
+kgdb_resolve_symbol(const char *name, kvaddr_t *kva)
+{
+	struct minimal_symbol *ms;
+
+	ms = lookup_minimal_symbol (name, NULL, NULL);
+	if (ms == NULL)
+		return (1);
+
+	*kva = SYMBOL_VALUE_ADDRESS (ms);
+	return (0);
+}
+
 static CORE_ADDR
 kgdb_kernbase (void)
 {
@@ -120,8 +133,8 @@ kgdb_trgt_open(char *filename, int from_tty)
 
 	old_chain = make_cleanup (xfree, filename);
 
-	nkvm = kvm_openfiles(bfd_get_filename(exec_bfd), filename, NULL,
-	    write_files ? O_RDWR : O_RDONLY, kvm_err);
+	nkvm = kvm_open2(bfd_get_filename(exec_bfd), filename,
+	    write_files ? O_RDWR : O_RDONLY, kvm_err, kgdb_resolve_symbol);
 	if (nkvm == NULL)
 		error ("Failed to open vmcore: %s", kvm_err);
 
@@ -254,7 +267,7 @@ kgdb_trgt_xfer_memory(CORE_ADDR memaddr, char *myaddr, int len, int write,
 		if (len == 0)
 			return (0);
 		if (!write)
-			return (kvm_read(kvm, memaddr, myaddr, len));
+			return (kvm_read2(kvm, memaddr, myaddr, len));
 		else
 			return (kvm_write(kvm, memaddr, myaddr, len));
 	}
diff --git a/gnu/usr.bin/gdb/kgdb/trgt_arm.c b/gnu/usr.bin/gdb/kgdb/trgt_arm.c
index cb23aa6..d457bd3 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt_arm.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt_arm.c
@@ -63,7 +63,7 @@ kgdb_trgt_fetch_registers(int regno __unused)
 #ifndef CROSS_DEBUGGER
 	struct kthr *kt;
 	struct pcb pcb;
-	int i, reg;
+	int i;
 
 	kt = kgdb_thr_lookup_tid(ptid_get_pid(inferior_ptid));
 	if (kt == NULL)
@@ -76,12 +76,8 @@ kgdb_trgt_fetch_registers(int regno __unused)
 		supply_register(i, (char *)&pcb.pcb_regs.sf_r4 +
 		    (i - (ARM_A1_REGNUM + 4 )) * 4);
 	}
-	if (pcb.pcb_regs.sf_sp != 0) {
-		if (kvm_read(kvm, pcb.pcb_regs.sf_sp + 4 * 4, &reg, 4) != 4)
-			warnx("kvm_read :%s", kvm_geterr(kvm));
-		else
-			supply_register(ARM_PC_REGNUM, (char *)&reg);
-	}
+	supply_register(ARM_PC_REGNUM, (char *)&pcb.pcb_regs.sf_pc);
+	supply_register(ARM_LR_REGNUM, (char *)&pcb.pcb_regs.sf_lr);
 #endif
 }
 
diff --git a/gnu/usr.bin/gperf/Makefile.depend b/gnu/usr.bin/gperf/Makefile.depend
index 8c58c1e..b602708 100644
--- a/gnu/usr.bin/gperf/Makefile.depend
+++ b/gnu/usr.bin/gperf/Makefile.depend
@@ -2,12 +2,15 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
-	gnu/lib/libstdc++ \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc++ \
+	lib/libcompiler_rt \
+	lib/libcxxrt \
 	lib/msun \
 
 
diff --git a/gnu/usr.bin/grep/Makefile.depend b/gnu/usr.bin/grep/Makefile.depend
index a5d26c4..676126d 100644
--- a/gnu/usr.bin/grep/Makefile.depend
+++ b/gnu/usr.bin/grep/Makefile.depend
@@ -2,6 +2,7 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	gnu/lib/libregex \
 	include \
@@ -9,6 +10,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libbz2 \
 	lib/libc \
+	lib/libcompiler_rt \
 	lib/libz \
 
 
diff --git a/gnu/usr.bin/grep/savedir.c b/gnu/usr.bin/grep/savedir.c
index cfba77c..6aabe31 100644
--- a/gnu/usr.bin/grep/savedir.c
+++ b/gnu/usr.bin/grep/savedir.c
@@ -71,6 +71,7 @@ char *stpcpy ();
 
 #include <fnmatch.h>
 #include "savedir.h"
+#include "system.h"
 
 char *path;
 size_t pathlen;
diff --git a/gnu/usr.bin/groff/Makefile b/gnu/usr.bin/groff/Makefile
index cb83dea..ba76025 100644
--- a/gnu/usr.bin/groff/Makefile
+++ b/gnu/usr.bin/groff/Makefile
@@ -6,4 +6,6 @@ SUBDIR=		contrib font man src tmac
 SUBDIR_DEPEND_${subdir}=	src
 .endfor
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grodvi/Makefile b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
index 3745440..948e9fa 100644
--- a/gnu/usr.bin/groff/src/devices/grodvi/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grodvi/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	grodvi
 SRCS=		dvi.cpp
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD=		${LIBDRIVER} ${LIBGROFF}
+LDADD=		${LIBDRIVER} ${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
index 321f1c8..5b55436 100644
--- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	post-grohtml
 SRCS=		post-html.cpp html-table.cpp html-text.cpp output.cpp
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD=		${LIBDRIVER} ${LIBGROFF}
+LDADD=		${LIBDRIVER} ${LIBGROFF}
+LIBADD=		m
 MAN=
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grolbp/Makefile b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
index 85a41c1..23a3161 100644
--- a/gnu/usr.bin/groff/src/devices/grolbp/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolbp/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	grolbp
 SRCS=		lbp.cpp
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD=		${LIBDRIVER} ${LIBGROFF}
+LDADD=		${LIBDRIVER} ${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grolj4/Makefile b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
index bb3f9e4..eeaeca9 100644
--- a/gnu/usr.bin/groff/src/devices/grolj4/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grolj4/Makefile
@@ -3,8 +3,9 @@
 PROG_CXX=	grolj4
 MAN=		grolj4.1 lj4_font.5
 SRCS=		lj4.cpp
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD=		${LIBDRIVER} ${LIBGROFF}
+LDADD=		${LIBDRIVER} ${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grops/Makefile b/gnu/usr.bin/groff/src/devices/grops/Makefile
index 4511f69..8c83acd 100644
--- a/gnu/usr.bin/groff/src/devices/grops/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grops/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	grops
 SRCS=		ps.cpp psrm.cpp
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD=		${LIBDRIVER} ${LIBGROFF}
+LDADD=		${LIBDRIVER} ${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/grotty/Makefile b/gnu/usr.bin/groff/src/devices/grotty/Makefile
index d15ee8b..c4de8f4 100644
--- a/gnu/usr.bin/groff/src/devices/grotty/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grotty/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	grotty
 SRCS=		tty.cpp
-DPADD=		${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBDRIVER} ${LIBGROFF} -lm
+DPADD=		${LIBDRIVER} ${LIBGROFF}
+LDADD=		${LIBDRIVER} ${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/devices/xditview/Makefile b/gnu/usr.bin/groff/src/devices/xditview/Makefile
deleted file mode 100644
index 91bfcf3..0000000
--- a/gnu/usr.bin/groff/src/devices/xditview/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $FreeBSD$
-
-PROG=		gxditview
-SRCS=		device.c draw.c Dvi.c font.c lex.c page.c parse.c xditview.c
-DPADD=		${LIBM}
-LDADD=		-lm
-CLEANFILES=	${MAN}
-
-GENHDRS=	GXditview-ad.h
-SRCS+=		${GENHDRS}
-CFLAGS+=	-I.
-CLEANFILES+=	${GENHDRS}
-
-GXditview-ad.h: GXditview.ad
-	${SHELL} ${DIST_DIR}/ad2c ${.ALLSRC} >${.TARGET}
-
-# libxutil
-SRCS+=		DviChar.c XFontName.c xmalloc.c
-
-# X11 glue
-CFLAGS+=	-I${X11BASE}/include
-LDFLAGS=	-L${X11BASE}/lib
-DPADD+=		${X11BASE}/lib/libXaw.a
-LDADD+=		-lXaw
-
-BINDIR=		${X11BASE}/bin
-MANDIR=		${X11BASE}/man/man
-FILESDIR=	${X11BASE}/lib/X11/app-defaults
-FILES=		GXditview.ad
-FILESNAME=	GXditview
-
-.include <bsd.prog.mk>
-
-.PATH: ${GROFF_DIST}/src/libs/libxutil
diff --git a/gnu/usr.bin/groff/src/preproc/grn/Makefile b/gnu/usr.bin/groff/src/preproc/grn/Makefile
index 58309d2..7f2e301 100644
--- a/gnu/usr.bin/groff/src/preproc/grn/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/grn/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	grn
 SRCS=		hdb.cpp hpoint.cpp hgraph.cpp main.cpp
-DPADD=	 	${LIBGROFF} ${LIBM}
-LDADD=	 	${LIBGROFF} -lm
+DPADD=	 	${LIBGROFF}
+LDADD=	 	${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/pic/Makefile b/gnu/usr.bin/groff/src/preproc/pic/Makefile
index 3b5939c..18a2cd91 100644
--- a/gnu/usr.bin/groff/src/preproc/pic/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile
@@ -4,8 +4,9 @@ PROG_CXX=	pic
 SRCS=		lex.cpp main.cpp object.cpp pic.cpp pic_tab.h \
 		common.cpp troff.cpp tex.cpp
 CFLAGS+=	-I${DIST_DIR} -I.
-DPADD=		${LIBGROFF} ${LIBM}
-LDADD=		${LIBGROFF} -lm
+DPADD=		${LIBGROFF}
+LDADD=		${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN} pic.cpp pic_tab.h y.tab.c y.tab.h
 
 pic_tab.h: pic.cpp
diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile b/gnu/usr.bin/groff/src/preproc/refer/Makefile
index 8a18f6f..78fc96b 100644
--- a/gnu/usr.bin/groff/src/preproc/refer/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile
@@ -3,8 +3,9 @@
 PROG_CXX=	refer
 SRCS=		command.cpp label.cpp ref.cpp refer.cpp token.cpp
 CFLAGS+=	-I${DIST_DIR}
-DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBBIB} ${LIBGROFF} -lm
+DPADD=		${LIBBIB} ${LIBGROFF}
+LDADD=		${LIBBIB} ${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	label.cpp label_tab.h ${MAN} y.tab.c y.tab.h
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/tbl/Makefile b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
index 29e7ac2..5bf1980 100644
--- a/gnu/usr.bin/groff/src/preproc/tbl/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/tbl/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	tbl
 SRCS=		main.cpp table.cpp
-DPADD=		${LIBGROFF} ${LIBM}
-LDADD=		${LIBGROFF} -lm
+DPADD=		${LIBGROFF}
+LDADD=		${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/roff/groff/Makefile b/gnu/usr.bin/groff/src/roff/groff/Makefile
index 2ae541b..54d8010 100644
--- a/gnu/usr.bin/groff/src/roff/groff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/groff/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	groff
 SRCS=		groff.cpp pipeline.c
-DPADD=		${LIBGROFF} ${LIBM}
-LDADD=		${LIBGROFF} -lm
+DPADD=		${LIBGROFF}
+LDADD=		${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile b/gnu/usr.bin/groff/src/roff/troff/Makefile
index 802af2b..9108ab4 100644
--- a/gnu/usr.bin/groff/src/roff/troff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile
@@ -3,8 +3,9 @@
 PROG_CXX=	troff
 SRCS=		dictionary.cpp div.cpp env.cpp input.cpp \
 		majorminor.cpp mtsm.cpp node.cpp number.cpp reg.cpp
-DPADD=		${LIBGROFF} ${LIBM}
-LDADD=		${LIBGROFF} -lm
+DPADD=		${LIBGROFF}
+LDADD=		${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	majorminor.cpp ${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
index 1376702..d3ca4f5 100644
--- a/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	hpftodit
 SRCS=		hpftodit.cpp hpuni.cpp
-DPADD=		${LIBGROFF} ${LIBM}
-LDADD=		${LIBGROFF} -lm
+DPADD=		${LIBGROFF}
+LDADD=		${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
index 048fed0..b9667fd 100644
--- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	indxbib
 SRCS=		indxbib.cpp signal.c
-DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBBIB} ${LIBGROFF} -lm
+DPADD=		${LIBBIB} ${LIBGROFF}
+LDADD=		${LIBBIB} ${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 FILES=		${DIST_DIR}/eign
 FILESDIR=	${SHAREDIR}/dict/
diff --git a/gnu/usr.bin/groff/src/utils/lkbib/Makefile b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
index f30dc56..3a95268 100644
--- a/gnu/usr.bin/groff/src/utils/lkbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lkbib/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	lkbib
 SRCS=		lkbib.cpp
-DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBBIB} ${LIBGROFF} -lm
+DPADD=		${LIBBIB} ${LIBGROFF}
+LDADD=		${LIBBIB} ${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/lookbib/Makefile b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
index 18834a7..b12f7b7 100644
--- a/gnu/usr.bin/groff/src/utils/lookbib/Makefile
+++ b/gnu/usr.bin/groff/src/utils/lookbib/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	lookbib
 SRCS=		lookbib.cpp
-DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD=		${LIBBIB} ${LIBGROFF} -lm
+DPADD=		${LIBBIB} ${LIBGROFF}
+LDADD=		${LIBBIB} ${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
index ba3bbc5..03f51bd 100644
--- a/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
+++ b/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
@@ -2,8 +2,9 @@
 
 PROG_CXX=	tfmtodit
 SRCS=		tfmtodit.cpp
-DPADD=		${LIBGROFF} ${LIBM}
-LDADD=		${LIBGROFF} -lm
+DPADD=		${LIBGROFF}
+LDADD=		${LIBGROFF}
+LIBADD=		m
 CLEANFILES=	${MAN}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/rcs/Makefile b/gnu/usr.bin/rcs/Makefile
index d6a960b..6b2bd1c 100644
--- a/gnu/usr.bin/rcs/Makefile
+++ b/gnu/usr.bin/rcs/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
-SUBDIR= lib ci co merge rcs rcsclean rcsdiff rcsmerge rlog rcsfreeze
+SUBDIR= lib .WAIT \
+	ci co merge rcs rcsclean rcsdiff rcsmerge rlog rcsfreeze
+SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>