Index: lib/csu/Makefile.inc
===================================================================
--- lib/csu/Makefile.inc
+++ lib/csu/Makefile.inc
@@ -8,16 +8,51 @@
 
 .if !defined(BUILDING_TESTS)
 
+OBJS+=	Scrt1.o crt1.o gcrt1.o
 OBJS+=	crtbegin.o crtbeginS.o crtbeginT.o
 OBJS+=	crtend.o crtendS.o
+OBJS+=	crti.o crtn.o
 
 ACFLAGS+=	-DLOCORE
 
 CFLAGS+=	-fno-asynchronous-unwind-tables
 CFLAGS+=	-fno-omit-frame-pointer
+CFLAGS+=	-I${.CURDIR:H}/common \
+		-I${SRCTOP}/lib/libc/include
 
 CFLAGS_CRTS=	-DSHARED ${PICFLAG}
 
+FILES=		${OBJS}
+FILESMODE=	${LIBMODE}
+FILESOWN=	${LIBOWN}
+FILESGRP=	${LIBGRP}
+FILESDIR=	${LIBDIR}
+# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
+.undef LIBRARIES_ONLY
+
+CLEANFILES+=	${OBJS} ${CRT1OBJS} crt1_c.o gcrt1_c.o Scrt1_c.o
+
+crt1.o:	crt1_c.o ${CRT1OBJS}
+	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
+.if ${MACHINE_ARCH} == "i386"
+	${OBJCOPY} --localize-symbol _start1 crt1.o
+.endif
+
+gcrt1_c.o: crt1_c.c
+	${CC} ${CFLAGS} -DGCRT -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
+
+gcrt1.o: gcrt1_c.o ${CRT1OBJS}
+	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
+
+Scrt1_c.o: crt1_c.c
+	${CC} ${CFLAGS} -fPIC -DPIC -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
+
+Scrt1.o: Scrt1_c.o ${CRT1OBJS}
+	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
+.if ${MACHINE_ARCH} == "i386"
+	${OBJCOPY} --localize-symbol _start1 crt1.o
+.endif
+
 crtbegin.o: crtbegin.c
 crtbeginS.o: crtbegin.c
 crtbeginT.o: crtbegin.c
Index: lib/csu/aarch64/Makefile
===================================================================
--- lib/csu/aarch64/Makefile
+++ lib/csu/aarch64/Makefile
@@ -2,37 +2,8 @@
 
 .PATH: ${.CURDIR:H}/common
 
-SRCS=		crti.S crtn.S
-OBJS=		${SRCS:N*.h:R:S/$/.o/g}
-OBJS+=		Scrt1.o crt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR:H}/common \
-		-I${SRCTOP}/lib/libc/include
 CFLAGS+=	-DCRT_IRELOC_SUPPRESS
 
-FILES=		${OBJS}
-FILESMODE=	${LIBMODE}
-FILESOWN=	${LIBOWN}
-FILESGRP=	${LIBGRP}
-FILESDIR=	${LIBDIR}
-# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
-.undef LIBRARIES_ONLY
-
-CLEANFILES=	${OBJS} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o
-CLEANFILES+=	crtbrand.o ignore_init_note.o
-
-gcrt1_c.o: crt1_c.c
-	${CC} ${CFLAGS} -DGCRT -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
-
-gcrt1.o: gcrt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
-
-crt1.o:	crt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
-
-Scrt1_c.o: crt1_c.c
-	${CC} ${CFLAGS} -fPIC -DPIC -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
-
-Scrt1.o: Scrt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
+CRT1OBJS=	crt1_s.o crtbrand.o ignore_init_note.o
 
 .include <bsd.lib.mk>
Index: lib/csu/amd64/Makefile
===================================================================
--- lib/csu/amd64/Makefile
+++ lib/csu/amd64/Makefile
@@ -2,37 +2,9 @@
 
 .PATH: ${.CURDIR:H}/common
 
-SRCS=		crti.S crtn.S
-OBJS=		${SRCS:N*.h:R:S/$/.o/g}
-OBJS+=		Scrt1.o crt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR} -I${.CURDIR:H}/common \
-		-I${SRCTOP}/lib/libc/include
+CFLAGS+=	-I${.CURDIR}
 CFLAGS+=	-fno-omit-frame-pointer -DCRT_IRELOC_RELA
 
-FILES=		${OBJS}
-FILESMODE=	${LIBMODE}
-FILESOWN=	${LIBOWN}
-FILESGRP=	${LIBGRP}
-FILESDIR=	${LIBDIR}
-# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
-.undef LIBRARIES_ONLY
-
-CLEANFILES=	${OBJS} crt1_c.o gcrt1_c.o Scrt1_c.o
-CLEANFILES+=	crtbrand.o ignore_init_note.o
-
-gcrt1_c.o: crt1_c.c
-	${CC} ${CFLAGS} -DGCRT -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
-
-gcrt1.o: gcrt1_c.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o gcrt1.o -r crtbrand.o ignore_init_note.o gcrt1_c.o
-
-crt1.o:	crt1_c.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o crt1.o -r crtbrand.o ignore_init_note.o crt1_c.o
-
-Scrt1_c.o: crt1_c.c
-	${CC} ${CFLAGS} -fPIC -DPIC -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
-
-Scrt1.o: Scrt1_c.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o Scrt1.o -r crtbrand.o ignore_init_note.o Scrt1_c.o
+CRT1OBJS=	crtbrand.o ignore_init_note.o
 
 .include <bsd.lib.mk>
Index: lib/csu/arm/Makefile
===================================================================
--- lib/csu/arm/Makefile
+++ lib/csu/arm/Makefile
@@ -2,40 +2,8 @@
 
 .PATH: ${.CURDIR:H}/common
 
-SRCS=		crti.S crtn.S
-OBJS=		${SRCS:N*.h:R:S/$/.o/g}
-OBJS+=		Scrt1.o crt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR:H}/common \
-		-I${SRCTOP}/lib/libc/include
 CFLAGS+=	-DCRT_IRELOC_SUPPRESS
 
-FILES=		${OBJS}
-FILESMODE=	${LIBMODE}
-FILESOWN=	${LIBOWN}
-FILESGRP=	${LIBGRP}
-FILESDIR=	${LIBDIR}
-# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
-.undef LIBRARIES_ONLY
-
-CLEANFILES=	${OBJS} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o
-CLEANFILES+=	crtbrand.o ignore_init_note.o
-
-crt1_c.o: crt1_c.c
-	${CC} ${CFLAGS} -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
-
-crt1.o:	crt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
-
-gcrt1_c.o: crt1_c.c
-	${CC} ${CFLAGS} -DGCRT -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
-
-gcrt1.o: gcrt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
-
-Scrt1_c.o: crt1_c.c
-	${CC} ${CFLAGS} -fPIC -DPIC -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
-
-Scrt1.o: Scrt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
+CRT1OBJS=	crt1_s.o crtbrand.o ignore_init_note.o
 
 .include <bsd.lib.mk>
Index: lib/csu/i386/Makefile
===================================================================
--- lib/csu/i386/Makefile
+++ lib/csu/i386/Makefile
@@ -2,39 +2,9 @@
 
 .PATH: ${.CURDIR:H}/common
 
-SRCS=		crti.S crtn.S
-OBJS=		${SRCS:N*.h:R:S/$/.o/g}
-OBJS+=		Scrt1.o crt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR} -I${.CURDIR:H}/common \
-		-I${SRCTOP}/lib/libc/include
+CFLAGS+=	-I${.CURDIR}
 CFLAGS+=	-DCRT_IRELOC_REL
 
-FILES=		${OBJS}
-FILESMODE=	${LIBMODE}
-FILESOWN=	${LIBOWN}
-FILESGRP=	${LIBGRP}
-FILESDIR=	${LIBDIR}
-# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
-.undef LIBRARIES_ONLY
-
-CLEANFILES=	${OBJS} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o
-CLEANFILES+=	crtbrand.o ignore_init_note.o
-
-gcrt1_c.o: crt1_c.c
-	${CC} ${CFLAGS} -DGCRT -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
-
-gcrt1.o: gcrt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
-
-crt1.o:	crt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
-	${OBJCOPY} --localize-symbol _start1 crt1.o
-
-Scrt1_c.o: crt1_c.c
-	${CC} ${CFLAGS} -fPIC -DPIC -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
-
-Scrt1.o: Scrt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
-	${OBJCOPY} --localize-symbol _start1 Scrt1.o
+CRT1OBJS=	crt1_s.o crtbrand.o ignore_init_note.o
 
 .include <bsd.lib.mk>
Index: lib/csu/mips/Makefile
===================================================================
--- lib/csu/mips/Makefile
+++ lib/csu/mips/Makefile
@@ -2,37 +2,8 @@
 
 .PATH: ${.CURDIR:H}/common
 
-SRCS=		crti.S crtn.S
-OBJS=		${SRCS:N*.h:R:S/$/.o/g}
-OBJS+=		Scrt1.o crt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR:H}/common \
-		-I${SRCTOP}/lib/libc/include
 CFLAGS+=	-DCRT_IRELOC_SUPPRESS
 
-FILES=		${OBJS}
-FILESMODE=	${LIBMODE}
-FILESOWN=	${LIBOWN}
-FILESGRP=	${LIBGRP}
-FILESDIR=	${LIBDIR}
-# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
-.undef LIBRARIES_ONLY
-
-CLEANFILES=	${OBJS} crt1_c.o gcrt1_c.o Scrt1_c.o
-CLEANFILES+=	crtbrand.o ignore_init_note.o
-
-gcrt1_c.o: crt1_c.c
-	${CC} ${CFLAGS} -DGCRT -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
-
-gcrt1.o: gcrt1_c.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o gcrt1.o -r crtbrand.o ignore_init_note.o gcrt1_c.o
-
-crt1.o:	crt1_c.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o crt1.o -r crtbrand.o ignore_init_note.o crt1_c.o
-
-Scrt1_c.o: crt1_c.c
-	${CC} ${CFLAGS} -fPIC -DPIC -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
-
-Scrt1.o: Scrt1_c.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o Scrt1.o -r crtbrand.o ignore_init_note.o Scrt1_c.o
+CRT1OBJS=	crtbrand.o ignore_init_note.o
 
 .include <bsd.lib.mk>
Index: lib/csu/powerpc/Makefile
===================================================================
--- lib/csu/powerpc/Makefile
+++ lib/csu/powerpc/Makefile
@@ -2,37 +2,9 @@
 
 .PATH: ${.CURDIR:H}/common
 
-SRCS=		crti.S crtn.S crtsavres.S
-OBJS=		${SRCS:N*.h:R:S/$/.o/g}
-OBJS+=		Scrt1.o crt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR:H}/common \
-		-I${SRCTOP}/lib/libc/include
+OBJS+=		crtsavres.o
 CFLAGS+=	-DCRT_IRELOC_SUPPRESS
 
-FILES=		${OBJS}
-FILESMODE=	${LIBMODE}
-FILESOWN=	${LIBOWN}
-FILESGRP=	${LIBGRP}
-FILESDIR=	${LIBDIR}
-# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
-.undef LIBRARIES_ONLY
-
-CLEANFILES=	${OBJS} crt1_c.o gcrt1_c.o Scrt1_c.o
-CLEANFILES+=	crtbrand.o ignore_init_note.o
-
-gcrt1_c.o: crt1_c.c
-	${CC} ${CFLAGS} -DGCRT -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
-
-gcrt1.o: gcrt1_c.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o gcrt1.o -r crtbrand.o ignore_init_note.o gcrt1_c.o
-
-crt1.o:	crt1_c.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o crt1.o -r crtbrand.o ignore_init_note.o crt1_c.o
-
-Scrt1_c.o: crt1_c.c
-	${CC} ${CFLAGS} -fPIC -DPIC -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
-
-Scrt1.o: Scrt1_c.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o Scrt1.o -r crtbrand.o ignore_init_note.o Scrt1_c.o
+CRT1OBJS=	crtbrand.o ignore_init_note.o
 
 .include <bsd.lib.mk>
Index: lib/csu/powerpc64/Makefile
===================================================================
--- lib/csu/powerpc64/Makefile
+++ lib/csu/powerpc64/Makefile
@@ -2,42 +2,15 @@
 
 .PATH: ${.CURDIR:H}/common
 
-SRCS=		crti.S crtn.S
-OBJS=		${SRCS:N*.h:R:S/$/.o/g}
-OBJS+=		Scrt1.o crt1.o crtsavres.o gcrt1.o
-CFLAGS+=	-I${.CURDIR} -I${.CURDIR:H}/common \
-		-I${SRCTOP}/lib/libc/include \
+OBJS+=		crtsavres.o
+CFLAGS+=	-I${.CURDIR} \
 		-mlongcall -DCRT_IRELOC_RELA
 
-FILES=		${OBJS}
-FILESMODE=	${LIBMODE}
-FILESOWN=	${LIBOWN}
-FILESGRP=	${LIBGRP}
-FILESDIR=	${LIBDIR}
-# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
-.undef LIBRARIES_ONLY
-
-CLEANFILES=	${OBJS} crt1_c.o gcrt1_c.o Scrt1_c.o
-CLEANFILES+=	crtbrand.o ignore_init_note.o
+CRT1OBJS=	crtbrand.o ignore_init_note.o
 CLEANFILES+=	crtsavres.S
 
 # On powerpc64 crtsavres is an empty file
 crtsavres.S:
 	touch ${.TARGET}
 
-gcrt1_c.o: crt1_c.c
-	${CC} ${CFLAGS} -DGCRT -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
-
-gcrt1.o: gcrt1_c.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o gcrt1.o -r crtbrand.o ignore_init_note.o gcrt1_c.o
-
-crt1.o:	crt1_c.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o crt1.o -r crtbrand.o ignore_init_note.o crt1_c.o
-
-Scrt1_c.o: crt1_c.c
-	${CC} ${CFLAGS} -fPIC -DPIC -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
-
-Scrt1.o: Scrt1_c.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o Scrt1.o -r crtbrand.o ignore_init_note.o Scrt1_c.o
-
 .include <bsd.lib.mk>
Index: lib/csu/riscv/Makefile
===================================================================
--- lib/csu/riscv/Makefile
+++ lib/csu/riscv/Makefile
@@ -2,37 +2,8 @@
 
 .PATH: ${.CURDIR:H}/common
 
-SRCS=		crti.S crtn.S
-OBJS=		${SRCS:N*.h:R:S/$/.o/g}
-OBJS+=		Scrt1.o crt1.o gcrt1.o
-CFLAGS+=	-I${.CURDIR:H}/common \
-		-I${SRCTOP}/lib/libc/include
 CFLAGS+=	-DCRT_IRELOC_SUPPRESS
 
-FILES=		${OBJS}
-FILESMODE=	${LIBMODE}
-FILESOWN=	${LIBOWN}
-FILESGRP=	${LIBGRP}
-FILESDIR=	${LIBDIR}
-# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
-.undef LIBRARIES_ONLY
-
-CLEANFILES=	${OBJS} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o
-CLEANFILES+=	crtbrand.o ignore_init_note.o
-
-gcrt1_c.o: crt1_c.c
-	${CC} ${CFLAGS} -DGCRT -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
-
-gcrt1.o: gcrt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
-
-crt1.o:	crt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
-
-Scrt1_c.o: crt1_c.c
-	${CC} ${CFLAGS} -fPIC -DPIC -c -o ${.TARGET} ${.CURDIR}/crt1_c.c
-
-Scrt1.o: Scrt1_c.o crt1_s.o crtbrand.o ignore_init_note.o
-	${LD} ${_LDFLAGS} -o ${.TARGET} -r ${.ALLSRC:M*.o}
+CRT1OBJS=	crt1_s.o crtbrand.o ignore_init_note.o
 
 .include <bsd.lib.mk>