Merge Makefiles, moving the build up a level and putting the CPU-specific

build flags into conditionals in the Makefile, fixing a few inconsistencies
in the process.

\o/ miod@

15 files changed, 94 insertions, 858 deletions

diff --git a/lib/csu/Makefile b/lib/csu/Makefile
index 887a4ad0f1b..44e2c113c09 100644
--- a/lib/csu/Makefile
+++ b/lib/csu/Makefile
@@ -1,9 +1,97 @@
-#	$OpenBSD: Makefile,v 1.17 2014/11/10 19:06:47 guenther Exp $
+#	$OpenBSD: Makefile,v 1.18 2014/11/12 02:31:47 guenther Exp $
 
-.if make(obj)
-SUBDIR= alpha amd64 arm hppa i386 ia64 m88k mips64 powerpc sh sparc sparc64 vax
-.else
-SUBDIR= ${MACHINE_CPU}
+OBJS=		crt0.o gcrt0.o
+OBJS+=		crtbegin.o crtend.o
+OBJS+=		crtbeginS.o crtendS.o
+SRCS=		crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
+
+ELFDIR=		${.CURDIR}/common_elf
+.PATH:		${ELFDIR}
+CFLAGS+=	-I${ELFDIR} -I${.CURDIR}/${MACHINE_CPU}
+
+# XXX "use -fno-omit-frame-pointer; the reason is almost crazy; pr#287"
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+CFLAGS+=	-fno-omit-frame-pointer
+.endif
+
+# XXX arm doesn't do pie yet???
+.if ${MACHINE_ARCH} == "arm"
+CFLAGS+=	-fpie
+.endif
+
+# Override powerpc default of -fPIE
+# XXX if this is safe, why not override CFLAGS for alpha and sparc64 too?
+# Does it work because the csu bits come first and get the first few GOT
+# entries?
+.if ${MACHINE_ARCH} == "powerpc"
+CFLAGS+=	-fpie
+.endif
+
+# Override sparc64 default of -fPIE
+# XXX Why do we need to compile the csu bits that are linked into the
+# *executable* with -fPIC and not just the default of -fPIE?  The
+# bits for shared libraries are handled below.
+.if ${MACHINE_ARCH} == "sparc64"
+CFLAGS+=	-fPIC
+.endif
+
+.ifdef NOPIC
+PICFLAG=
+.elif ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc" || \
+      ${MACHINE_ARCH} == "sparc64"
+# The objects for shared libraries need to work for all possible
+# libraries, so force big PIC where it matters.
+# Arguably m88k should do this too, but maybe there aren't any
+# libraries big enough to need it there?
+PICFLAG=	-fPIC
 .endif
 
-.include <bsd.subdir.mk>
+all: ${OBJS}
+
+crt0.o: crt0.c
+	@echo ${COMPILE.c} ${ELFDIR}/crt0.c -o ${.TARGET}
+	@${COMPILE.c} ${ELFDIR}/crt0.c -o ${.TARGET}.o
+	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
+	@rm -f ${.TARGET}.o
+
+gcrt0.o: crt0.c
+	@echo ${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
+	@${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
+	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
+	@rm -f ${.TARGET}.o
+
+crtbegin.o: crtbegin.c
+	@echo ${COMPILE.c} ${ELFDIR}/crtbegin.c -o ${.TARGET}
+	@${COMPILE.c} ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
+	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
+	@rm -f ${.TARGET}.o
+
+crtbeginS.o: crtbeginS.c
+	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}
+	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
+	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
+	@rm -f ${.TARGET}.o
+
+crtend.o: crtend.c
+	@echo ${COMPILE.c} ${ELFDIR}/crtend.c -o ${.TARGET}
+	@${COMPILE.c} ${ELFDIR}/crtend.c -o ${.TARGET}.o
+	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
+	@rm -f ${.TARGET}.o
+
+crtendS.o: crtendS.c
+	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}
+	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}.o
+	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
+	@rm -f ${.TARGET}.o
+
+realinstall:
+	${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
+	    ${DESTDIR}/usr/lib
+
+afterdepend: .depend
+	@(TMP=/tmp/_depend$$$$; \
+	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o:/' \
+	    < .depend > $$TMP; \
+	mv $$TMP .depend)
+
+.include <bsd.prog.mk>
diff --git a/lib/csu/alpha/Makefile b/lib/csu/alpha/Makefile
deleted file mode 100644
index f668d772d21..00000000000
--- a/lib/csu/alpha/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#	$OpenBSD: Makefile,v 1.21 2013/12/03 06:21:40 guenther Exp $
-#	$NetBSD: Makefile,v 1.6 1996/10/18 05:27:38 thorpej Exp $
-
-CFLAGS+=	-DELFSIZE=64
-OBJS=		crt0.o gcrt0.o crtbegin.o crtend.o crtbeginS.o crtendS.o
-SRCS=		crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
-
-ELFDIR=		${.CURDIR}/../common_elf
-.PATH:		${ELFDIR}
-CFLAGS+=	-I${ELFDIR} -I${.CURDIR}
-
-all: ${OBJS}
-
-crt0.o: crt0.c
-	@echo ${COMPILE.c} -DCRT0 -fPIE ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DCRT0 -fPIE ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-gcrt0.o: crt0.c
-	@echo ${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbegin.o: crtbegin.c
-	@echo ${COMPILE.c} -fPIE ${ELFDIR}/crtbegin.c -o ${.TARGET}
-	@${COMPILE.c} -fPIE ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbeginS.o: crtbeginS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtend.o: crtend.c
-	@echo ${COMPILE.c} -fPIE ${ELFDIR}/crtend.c -o ${.TARGET}
-	@${COMPILE.c} -fPIE ${ELFDIR}/crtend.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtendS.o: crtendS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-realinstall:
-	${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
-	    ${DESTDIR}/usr/lib
-
-afterdepend:: .depend
-	@(TMP=/tmp/_depend$$$$; \
-	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o:/' \
-	    < .depend > $$TMP; \
-	mv $$TMP .depend)
-
-.include <bsd.prog.mk>
diff --git a/lib/csu/amd64/Makefile b/lib/csu/amd64/Makefile
deleted file mode 100644
index 1ac2bbc2fe9..00000000000
--- a/lib/csu/amd64/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#	$OpenBSD: Makefile,v 1.8 2013/12/03 06:21:40 guenther Exp $
-
-CFLAGS+=	-fno-omit-frame-pointer
-OBJS=		crt0.o gcrt0.o
-OBJS+=		crtbegin.o crtend.o
-OBJS+=		crtbeginS.o crtendS.o
-SRCS=		crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
-
-ELFDIR=		${.CURDIR}/../common_elf
-.PATH:		${ELFDIR}
-CFLAGS+=	-I${ELFDIR} -I${.CURDIR}
-
-all: ${OBJS}
-
-crt0.o: crt0.c
-	@echo ${COMPILE.c} -DCRT0 -fpie ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DCRT0 -fpie ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-gcrt0.o: crt0.c
-	@echo ${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbegin.o: crtbegin.c
-	@echo ${COMPILE.c} -fpie ${ELFDIR}/crtbegin.c -o ${.TARGET}
-	@${COMPILE.c} -fpie ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbeginS.o: crtbeginS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtend.o: crtend.c
-	@echo ${COMPILE.c} -fpie ${ELFDIR}/crtend.c -o ${.TARGET}
-	@${COMPILE.c} -fpie ${ELFDIR}/crtend.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtendS.o: crtendS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-realinstall:
-	${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
-	    ${DESTDIR}/usr/lib
-
-afterdepend: .depend
-	@(TMP=/tmp/_depend$$$$; \
-	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o:/' \
-	    < .depend > $$TMP; \
-	mv $$TMP .depend)
-
-.include <bsd.prog.mk>
diff --git a/lib/csu/arm/Makefile b/lib/csu/arm/Makefile
deleted file mode 100644
index 8e047967ebf..00000000000
--- a/lib/csu/arm/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#	$OpenBSD: Makefile,v 1.9 2013/12/03 06:21:40 guenther Exp $
-#	from: @(#)Makefile	8.1 (Berkeley) 6/1/93
-
-OBJS=		crt0.o gcrt0.o crtbegin.o crtend.o crtbeginS.o crtendS.o
-SRCS=		crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
-
-ELFDIR=		${.CURDIR}/../common_elf
-.PATH:		${ELFDIR}
-CFLAGS+=	-I${ELFDIR} -I${.CURDIR}
-
-all: ${OBJS}
-
-crt0.o: crt0.c
-	@echo ${COMPILE.c} -DCRT0 -fpie -DPIC ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DCRT0 -fpie -DPIC ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-gcrt0.o: crt0.c
-	@echo ${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbegin.o: crtbegin.c
-	@echo ${COMPILE.c} -fpie -DPIC ${ELFDIR}/crtbegin.c -o ${.TARGET}
-	@${COMPILE.c} -fpie -DPIC ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbeginS.o: crtbeginS.c
-	@echo ${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtbeginS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtend.o: crtend.c
-	@echo ${COMPILE.c} -fpie -DPIC ${ELFDIR}/crtend.c -o ${.TARGET}
-	@${COMPILE.c} -fpie -DPIC ${ELFDIR}/crtend.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtendS.o: crtendS.c
-	@echo ${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtendS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtendS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-realinstall:
-	${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
-	    ${DESTDIR}/usr/lib
-
-afterdepend:: .depend
-	@(TMP=/tmp/_depend$$$$; \
-	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o:/' \
-	    < .depend > $$TMP; \
-	mv $$TMP .depend)
-
-.include <bsd.prog.mk>
diff --git a/lib/csu/hppa/Makefile b/lib/csu/hppa/Makefile
deleted file mode 100644
index f3dcbbaea5d..00000000000
--- a/lib/csu/hppa/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#	$OpenBSD: Makefile,v 1.10 2013/12/03 06:21:40 guenther Exp $
-#	from: @(#)Makefile	5.5 (Berkeley) 5/21/91
-
-OBJS=		crt0.o gcrt0.o crtbegin.o crtend.o crtbeginS.o crtendS.o
-SRCS=		crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
-
-ELFDIR=		${.CURDIR}/../common_elf
-.PATH:		${ELFDIR}
-CFLAGS+=	-I${ELFDIR} -I${.CURDIR}
-
-all: ${OBJS}
-
-crt0.o: crt0.c
-	@echo ${COMPILE.c} -DCRT0 -fpie ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DCRT0 -fpie ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-gcrt0.o: crt0.c
-	@echo ${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbegin.o: crtbegin.c
-	@echo ${COMPILE.c} -fpie ${ELFDIR}/crtbegin.c -o ${.TARGET}
-	@${COMPILE.c} -fpie ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbeginS.o: crtbeginS.c
-	@echo ${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtbeginS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtend.o: crtend.c
-	@echo ${COMPILE.c} -fpie ${ELFDIR}/crtend.c -o ${.TARGET}
-	@${COMPILE.c} -fpie ${ELFDIR}/crtend.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtendS.o: crtendS.c
-	@echo ${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtendS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtendS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-realinstall:
-	${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
-	    ${DESTDIR}/usr/lib
-
-afterdepend:: .depend
-	@(TMP=/tmp/_depend$$$$; \
-	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o:/' \
-	    < .depend > $$TMP; \
-	mv $$TMP .depend)
-
-.include <bsd.prog.mk>
diff --git a/lib/csu/hppa64/Makefile b/lib/csu/hppa64/Makefile
deleted file mode 100644
index b86144e75ed..00000000000
--- a/lib/csu/hppa64/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#	$OpenBSD: Makefile,v 1.5 2013/12/03 06:21:40 guenther Exp $
-#	from: @(#)Makefile	5.5 (Berkeley) 5/21/91
-
-OBJS=		crt0.o gcrt0.o crtbegin.o crtend.o crtbeginS.o crtendS.o
-SRCS=		crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
-
-ELFDIR=		${.CURDIR}/../common_elf
-.PATH:		${ELFDIR}
-CFLAGS+=	-I${ELFDIR} -I${.CURDIR}
-
-all: ${OBJS}
-
-crt0.o: crt0.c
-	@echo ${COMPILE.c} -DCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-gcrt0.o: crt0.c
-	@echo ${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbegin.o: crtbegin.c
-	@echo ${COMPILE.c} ${ELFDIR}/crtbegin.c -o ${.TARGET}
-	@${COMPILE.c} ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbeginS.o: crtbeginS.c
-	@echo ${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtbeginS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtend.o: crtend.c
-	@echo ${COMPILE.c} ${ELFDIR}/crtend.c -o ${.TARGET}
-	@${COMPILE.c} ${ELFDIR}/crtend.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtendS.o: crtendS.c
-	@echo ${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtendS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtendS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-realinstall:
-	${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
-	    ${DESTDIR}/usr/lib
-
-afterdepend:: .depend
-	@(TMP=/tmp/_depend$$$$; \
-	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o:/' \
-	    < .depend > $$TMP; \
-	mv $$TMP .depend)
-
-.include <bsd.prog.mk>
diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile
deleted file mode 100644
index 9c38e9b084e..00000000000
--- a/lib/csu/i386/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#	$OpenBSD: Makefile,v 1.16 2013/12/03 06:21:41 guenther Exp $
-#	from: @(#)Makefile	5.5 (Berkeley) 5/21/91
-
-CFLAGS+=	-fno-omit-frame-pointer
-OBJS=		crt0.o gcrt0.o
-OBJS+=		crtbegin.o crtend.o
-OBJS+=		crtbeginS.o crtendS.o
-SRCS=		crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
-
-ELFDIR=		${.CURDIR}/../common_elf
-.PATH:		${ELFDIR}
-CFLAGS+=	-I${ELFDIR} -I${.CURDIR}
-
-all: ${OBJS}
-
-crt0.o: crt0.c
-	@echo ${COMPILE.c} -DCRT0 -fpie ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DCRT0 -fpie ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-gcrt0.o: crt0.c
-	@echo ${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbegin.o: crtbegin.c
-	@echo ${COMPILE.c} -fpie ${ELFDIR}/crtbegin.c -o ${.TARGET}
-	@${COMPILE.c} -fpie ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbeginS.o: crtbeginS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtend.o: crtend.c
-	@echo ${COMPILE.c} -fpie ${ELFDIR}/crtend.c -o ${.TARGET}
-	@${COMPILE.c} -fpie ${ELFDIR}/crtend.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtendS.o: crtendS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-realinstall:
-	${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
-	    ${DESTDIR}/usr/lib
-
-afterdepend: .depend
-	@(TMP=/tmp/_depend$$$$; \
-	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o:/' \
-	    < .depend > $$TMP; \
-	mv $$TMP .depend)
-
-.include <bsd.prog.mk>
diff --git a/lib/csu/ia64/Makefile b/lib/csu/ia64/Makefile
deleted file mode 100644
index fb2da9d3a47..00000000000
--- a/lib/csu/ia64/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 2011/11/08 10:37:09 guenther Exp $
-
-CFLAGS+=	-fno-omit-frame-pointer
-OBJS=		crt0.o gcrt0.o
-OBJS+=		crtbegin.o crtend.o
-OBJS+=		crtbeginS.o crtendS.o
-SRCS=		crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
-
-ELFDIR=		${.CURDIR}/../common_elf
-.PATH:		${ELFDIR}
-CFLAGS+=	-I${ELFDIR} -I${.CURDIR}
-
-all: ${OBJS}
-
-crt0.o: crt0.c
-	@echo ${COMPILE.c} -DCRT0 -fpie ${.CURDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DCRT0 -fpie ${.CURDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-gcrt0.o: crt0.c
-	@echo ${COMPILE.c} -DMCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DMCRT0 ${.CURDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbegin.o: crtbegin.c
-	@echo ${COMPILE.c} -fpie ${ELFDIR}/crtbegin.c -o ${.TARGET}
-	@${COMPILE.c} -fpie ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbeginS.o: crtbeginS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtend.o: crtend.c
-	@echo ${COMPILE.c} -fpie ${ELFDIR}/crtend.c -o ${.TARGET}
-	@${COMPILE.c} -fpie ${ELFDIR}/crtend.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtendS.o: crtendS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-realinstall:
-	${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
-	    ${DESTDIR}/usr/lib
-
-afterdepend: .depend
-	@(TMP=/tmp/_depend$$$$; \
-	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o:/' \
-	    < .depend > $$TMP; \
-	mv $$TMP .depend)
-
-.include <bsd.prog.mk>
diff --git a/lib/csu/m88k/Makefile b/lib/csu/m88k/Makefile
deleted file mode 100644
index c508cd295ff..00000000000
--- a/lib/csu/m88k/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#	$OpenBSD: Makefile,v 1.6 2013/12/03 06:21:41 guenther Exp $
-#	from: @(#)Makefile	8.1 (Berkeley) 6/1/93
-
-OBJS=		crt0.o gcrt0.o
-OBJS+=		crtbegin.o crtend.o
-OBJS+=		crtbeginS.o crtendS.o
-SRCS=		crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
-
-ELFDIR=		${.CURDIR}/../common_elf
-.PATH:		${ELFDIR}
-CFLAGS+=	-I${ELFDIR} -I${.CURDIR}
-
-#PICFLAG=	-fPIC
-PICFLAG=	-fpic
-
-all: ${OBJS}
-
-crt0.o: crt0.c
-	@echo ${COMPILE.c} -DCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-gcrt0.o: crt0.c
-	@echo ${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbegin.o: crtbegin.c
-	@echo ${COMPILE.c} ${ELFDIR}/crtbegin.c -o ${.TARGET}
-	@${COMPILE.c} ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbeginS.o: crtbeginS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtend.o: crtend.c
-	@echo ${COMPILE.c} ${ELFDIR}/crtend.c -o ${.TARGET}
-	@${COMPILE.c} ${ELFDIR}/crtend.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtendS.o: crtendS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-realinstall:
-	${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
-	    ${DESTDIR}/usr/lib
-
-afterdepend:: .depend
-	@(TMP=/tmp/_depend$$$$; \
-	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o:/' \
-	    < .depend > $$TMP; \
-	mv $$TMP .depend)
-
-.include <bsd.prog.mk>
diff --git a/lib/csu/mips64/Makefile b/lib/csu/mips64/Makefile
deleted file mode 100644
index d348c28d1e3..00000000000
--- a/lib/csu/mips64/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#	$OpenBSD: Makefile,v 1.6 2013/12/23 14:22:12 kettenis Exp $
-
-OBJS=		crt0.o gcrt0.o
-OBJS+=		crtbegin.o crtend.o
-OBJS+=		crtbeginS.o crtendS.o
-SRCS=		crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
-
-ELFDIR=		${.CURDIR}/../common_elf
-.PATH:		${ELFDIR}
-CFLAGS+=	-I${ELFDIR} -I${.CURDIR}
-
-all: ${OBJS}
-
-crt0.o: crt0.c
-	@echo ${COMPILE.c} -DCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-gcrt0.o: crt0.c
-	@echo ${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbegin.o: crtbegin.c
-	@echo ${COMPILE.c} ${ELFDIR}/crtbegin.c -o ${.TARGET}
-	@${COMPILE.c} ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbeginS.o: crtbeginS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtend.o: crtend.c
-	@echo ${COMPILE.c} ${ELFDIR}/crtend.c -o ${.TARGET}
-	@${COMPILE.c} ${ELFDIR}/crtend.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtendS.o: crtendS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-realinstall:
-	${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
-	    ${DESTDIR}/usr/lib
-
-afterdepend: .depend
-	@(TMP=/tmp/_depend$$$$; \
-	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o:/' \
-	    < .depend > $$TMP; \
-	mv $$TMP .depend)
-
-.include <bsd.prog.mk>
diff --git a/lib/csu/powerpc/Makefile b/lib/csu/powerpc/Makefile
deleted file mode 100644
index 7168c8fd398..00000000000
--- a/lib/csu/powerpc/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#	$OpenBSD: Makefile,v 1.23 2013/12/03 06:21:41 guenther Exp $
-#	from: @(#)Makefile	8.1 (Berkeley) 6/1/93
-
-OBJS=		crt0.o gcrt0.o
-OBJS+=		crtbegin.o crtend.o
-OBJS+=		crtbeginS.o crtendS.o
-SRCS=		crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
-
-ELFDIR=		${.CURDIR}/../common_elf
-.PATH:		${ELFDIR}
-CFLAGS+=	-I${ELFDIR} -I${.CURDIR}
-
-PICFLAG=	-fPIC
-
-all: ${OBJS}
-
-crt0.o: crt0.c
-	@echo ${COMPILE.c} -fpie -DCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -fpie -DCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-gcrt0.o: crt0.c
-	@echo ${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbegin.o: crtbegin.c
-	@echo ${COMPILE.c} -fpie ${ELFDIR}/crtbegin.c -o ${.TARGET}
-	@${COMPILE.c} -fpie ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbeginS.o: crtbeginS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtend.o: crtend.c
-	@echo ${COMPILE.c} -fpie ${ELFDIR}/crtend.c -o ${.TARGET}
-	@${COMPILE.c} -fpie ${ELFDIR}/crtend.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtendS.o: crtendS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-realinstall:
-	${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
-	    ${DESTDIR}/usr/lib
-
-afterdepend:: .depend
-	@(TMP=/tmp/_depend$$$$; \
-	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o:/' \
-	    < .depend > $$TMP; \
-	mv $$TMP .depend)
-
-.include <bsd.prog.mk>
diff --git a/lib/csu/sh/Makefile b/lib/csu/sh/Makefile
deleted file mode 100644
index 2e59cd613c1..00000000000
--- a/lib/csu/sh/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#	$OpenBSD: Makefile,v 1.6 2013/12/03 06:21:41 guenther Exp $
-#	from: @(#)Makefile	8.1 (Berkeley) 6/1/93
-
-OBJS=		crt0.o gcrt0.o crtbegin.o crtend.o crtbeginS.o crtendS.o
-SRCS=		crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
-
-ELFDIR=		${.CURDIR}/../common_elf
-.PATH:		${ELFDIR}
-CFLAGS+=	-I${ELFDIR} -I${.CURDIR}
-
-all: ${OBJS}
-
-crt0.o: crt0.c
-	@echo ${COMPILE.c} -DCRT0 -fpie -DPIC ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DCRT0 -fpie -DPIC ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-gcrt0.o: crt0.c
-	@echo ${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbegin.o: crtbegin.c
-	@echo ${COMPILE.c} -fpie -DPIC ${ELFDIR}/crtbegin.c -o ${.TARGET}
-	@${COMPILE.c} -fpie -DPIC ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbeginS.o: crtbeginS.c
-	@echo ${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtbeginS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtend.o: crtend.c
-	@echo ${COMPILE.c} -fpie -DPIC ${ELFDIR}/crtend.c -o ${.TARGET}
-	@${COMPILE.c} -fpie -DPIC ${ELFDIR}/crtend.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtendS.o: crtendS.c
-	@echo ${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtendS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} -DPIC ${ELFDIR}/crtendS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-realinstall:
-	${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
-	    ${DESTDIR}/usr/lib
-
-afterdepend:: .depend
-	@(TMP=/tmp/_depend$$$$; \
-	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o:/' \
-	    < .depend > $$TMP; \
-	mv $$TMP .depend)
-
-.include <bsd.prog.mk>
diff --git a/lib/csu/sparc/Makefile b/lib/csu/sparc/Makefile
deleted file mode 100644
index 83ca2230804..00000000000
--- a/lib/csu/sparc/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#	$OpenBSD: Makefile,v 1.13 2013/12/03 06:21:41 guenther Exp $
-#	from: @(#)Makefile	5.5 (Berkeley) 5/21/91
-
-OBJS=		crt0.o gcrt0.o crtbegin.o crtend.o crtbeginS.o crtendS.o
-SRCS=		crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
-
-ELFDIR=		${.CURDIR}/../common_elf
-.PATH:		${ELFDIR}
-CFLAGS+=	-I${ELFDIR} -I${.CURDIR}
-
-PICFLAG=	-fPIC
-
-all: ${OBJS}
-
-crt0.o: crt0.c
-	@echo ${COMPILE.c} -DCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-gcrt0.o: crt0.c
-	@echo ${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbegin.o: crtbegin.c
-	@echo ${COMPILE.c} ${ELFDIR}/crtbegin.c -o ${.TARGET}
-	@${COMPILE.c} ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbeginS.o: crtbeginS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtend.o: crtend.c
-	@echo ${COMPILE.c} ${ELFDIR}/crtend.c -o ${.TARGET}
-	@${COMPILE.c} ${ELFDIR}/crtend.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtendS.o: crtendS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-realinstall:
-	${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
-	    ${DESTDIR}/usr/lib
-
-afterdepend:: .depend
-	@(TMP=/tmp/_depend$$$$; \
-	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o:/' \
-	    < .depend > $$TMP; \
-	mv $$TMP .depend)
-
-.include <bsd.prog.mk>
diff --git a/lib/csu/sparc64/Makefile b/lib/csu/sparc64/Makefile
deleted file mode 100644
index 1cb19d20c04..00000000000
--- a/lib/csu/sparc64/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#	$OpenBSD: Makefile,v 1.10 2013/12/03 06:21:41 guenther Exp $
-#	$NetBSD: Makefile,v 1.6 1996/10/18 05:27:38 thorpej Exp $
-
-CFLAGS+=	-DELFSIZE=64
-OBJS=		crt0.o gcrt0.o
-OBJS+=		crtbegin.o crtend.o
-OBJS+=		crtbeginS.o crtendS.o
-SRCS=		crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
-
-ELFDIR=		${.CURDIR}/../common_elf
-.PATH:		${ELFDIR}
-CFLAGS+=	-I${ELFDIR} -I${.CURDIR}
-
-all: ${OBJS}
-
-crt0.o: crt0.c
-	@echo ${COMPILE.c} -DCRT0 -fPIC ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DCRT0 -fPIC ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-gcrt0.o: crt0.c
-	@echo ${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbegin.o: crtbegin.c
-	@echo ${COMPILE.c} -fPIC ${ELFDIR}/crtbegin.c -o ${.TARGET}
-	@${COMPILE.c} -fPIC ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbeginS.o: crtbeginS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtend.o: crtend.c
-	@echo ${COMPILE.c} -fPIC ${ELFDIR}/crtend.c -o ${.TARGET}
-	@${COMPILE.c} -fPIC ${ELFDIR}/crtend.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtendS.o: crtendS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-realinstall:
-	${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
-	    ${DESTDIR}/usr/lib
-
-afterdepend:: .depend
-	@(TMP=/tmp/_depend$$$$; \
-	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o:/' \
-	    < .depend > $$TMP; \
-	mv $$TMP .depend)
-
-.include <bsd.prog.mk>
diff --git a/lib/csu/vax/Makefile b/lib/csu/vax/Makefile
deleted file mode 100644
index dceeb1e039c..00000000000
--- a/lib/csu/vax/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#	$OpenBSD: Makefile,v 1.10 2013/12/03 06:21:41 guenther Exp $
-#	from: @(#)Makefile	5.6 (Berkeley) 5/22/91
-
-OBJS=		crt0.o gcrt0.o crtbegin.o crtend.o crtbeginS.o crtendS.o
-SRCS=		crt0.c crtbegin.c crtbeginS.c crtend.c crtendS.c
-
-ELFDIR=		${.CURDIR}/../common_elf
-.PATH:		${ELFDIR}
-CFLAGS+=	-I${ELFDIR} -I${.CURDIR}
-
-#PICFLAG?=-fpic
-PICFLAG=
-
-all: ${OBJS}
-
-crt0.o: crt0.c
-	@echo ${COMPILE.c} -DCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-gcrt0.o: crt0.c
-	@echo ${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}
-	@${COMPILE.c} -DMCRT0 ${ELFDIR}/crt0.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbegin.o: crtbegin.c
-	@echo ${COMPILE.c} ${ELFDIR}/crtbegin.c -o ${.TARGET}
-	@${COMPILE.c} ${ELFDIR}/crtbegin.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtbeginS.o: crtbeginS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtbeginS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtend.o: crtend.c
-	@echo ${COMPILE.c} ${ELFDIR}/crtend.c -o ${.TARGET}
-	@${COMPILE.c} ${ELFDIR}/crtend.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-crtendS.o: crtendS.c
-	@echo ${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}
-	@${COMPILE.c} ${PICFLAG} ${ELFDIR}/crtendS.c -o ${.TARGET}.o
-	@${LD} -x -r -o ${.TARGET} ${.TARGET}.o
-	@rm -f ${.TARGET}.o
-
-realinstall:
-	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
-	    ${DESTDIR}/usr/lib
-
-afterdepend: .depend
-	@(TMP=/tmp/_depend$$$$; \
-	    sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o:/' \
-	    < .depend > $$TMP; \
-	mv $$TMP .depend)
-
-.include <bsd.prog.mk>