From 15c0cf863a4c052fa68b6ad8422c4566a2ad754d Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@FreeBSD.org>
Date: Sat, 15 Jun 2019 17:08:32 +0000
Subject: [PATCH] Support reading in .depend files.

This is for an upcoming change that fixes .depend handling in here.
It will cause some duplicate sources which need to be trimmed out.

MFC after:	2 weeks
Sponsored by:	DellEMC
---
 gnu/lib/csu/Makefile     | 10 +++++-----
 gnu/lib/libgcc/Makefile  | 10 +++++-----
 gnu/lib/libgcov/Makefile |  6 +++---
 lib/csu/Makefile.inc     |  5 +++--
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile
index d754a588a6f..c8dd499d141 100644
--- a/gnu/lib/csu/Makefile
+++ b/gnu/lib/csu/Makefile
@@ -49,23 +49,23 @@ CLEANFILES=	${OBJS} ${SOBJS} ${TGTOBJS}
 
 crtbegin.o:	${BEGINSRC}
 	${CC} ${CFLAGS} -g0 -DCRT_BEGIN \
-		-c -o ${.TARGET} ${.ALLSRC:N*.h}
+	    -c -o ${.TARGET} ${.ALLSRC:N*.h:[1]}
 
 crtbeginT.o:	${BEGINSRC}
 	${CC} ${CFLAGS} -g0 -DCRT_BEGIN -DCRTSTUFFT_O \
-		-c -o ${.TARGET} ${.ALLSRC:N*.h}
+	    -c -o ${.TARGET} ${.ALLSRC:N*.h:[1]}
 
 crtbeginS.o:	${BEGINSRC}
 	${CC} ${CFLAGS} -g0 -DCRT_BEGIN ${CRTS_CFLAGS} \
-		-c -o ${.TARGET} ${.ALLSRC:N*.h}
+	    -c -o ${.TARGET} ${.ALLSRC:N*.h:[1]}
 
 crtend.o:	${ENDSRC}
 	${CC} ${CFLAGS} -g0 -DCRT_END \
-		-c -o ${.TARGET} ${.ALLSRC:N*.h}
+	    -c -o ${.TARGET} ${.ALLSRC:N*.h:[1]}
 
 crtendS.o:	${ENDSRC}
 	${CC} ${CFLAGS} -g0 -DCRT_END ${CRTS_CFLAGS} \
-		-c -o ${.TARGET} ${.ALLSRC:N*.h}
+	    -c -o ${.TARGET} ${.ALLSRC:N*.h:[1]}
 
 COMMONHDRS+=	tm.h tconfig.h options.h
 CLEANFILES+=	${COMMONHDRS} optionlist cs-tconfig.h cs-tm.h
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 157495368c7..9c5aae96185 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -224,11 +224,11 @@ ${T}_OBJS_S =	${${T}_FUNCS:S/$/.pico/}
 SOBJS +=	${${T}_FUNCS:S/$/.pico/}
 
 ${${T}_OBJS_T}: ${${T}_CFILE} ${COMMONHDRS}
-	${CC_T} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
+	${CC_T} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c:[1]}
 ${${T}_OBJS_P}: ${${T}_CFILE} ${COMMONHDRS}
-	${CC_P} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
+	${CC_P} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c:[1]}
 ${${T}_OBJS_S}: ${${T}_CFILE} ${COMMONHDRS}
-	${CC_S} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
+	${CC_S} ${${T}_CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c:[1]}
 .endfor
 
 #-----------------------------------------------------------------------
@@ -249,9 +249,9 @@ STAT_OBJS_P = 	${SYMS_ST:S/$/.po/}
 STATICOBJS  =	${SYMS_ST:S/$/.o/}
 
 ${STAT_OBJS_T}:	${STD_CFILE} ${COMMONHDRS}
-	${CC_T} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
+	${CC_T} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c:[1]}
 ${STAT_OBJS_P}:	${STD_CFILE} ${COMMONHDRS}
-	${CC_P} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
+	${CC_P} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c:[1]}
 
 #-----------------------------------------------------------------------
 #
diff --git a/gnu/lib/libgcov/Makefile b/gnu/lib/libgcov/Makefile
index 58c765515a6..1510eea759b 100644
--- a/gnu/lib/libgcov/Makefile
+++ b/gnu/lib/libgcov/Makefile
@@ -51,16 +51,16 @@ CLEANFILES+=	${COMMONHDRS} cs-tm.h cs-tconfig.h options.h optionlist
 ${OBJS} beforedepend: ${COMMONHDRS}
 
 ${OBJS_T}: libgcov.c
-	${CC_T} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
+	${CC_T} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c:[1]}
 
 .if !defined(NO_PIC)
 ${OBJS_S}: libgcov.c
-	${CC_S} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
+	${CC_S} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c:[1]}
 .endif
 
 .if ${MK_PROFILE} != "no"
 ${OBJS_P}: libgcov.c
-	${CC_P} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
+	${CC_P} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c:[1]}
 .endif
 
 .include <bsd.lib.mk>
diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc
index e5f6bb7f563..a58edf8d7e1 100644
--- a/lib/csu/Makefile.inc
+++ b/lib/csu/Makefile.inc
@@ -22,10 +22,11 @@ crtend.o: crtend.c
 crtendS.o: crtend.c
 
 crtbegin.o crtend.o crtbeginT.o:
-	${CC} ${CFLAGS} -I${.CURDIR} -c -o ${.TARGET} ${.ALLSRC}
+	${CC} ${CFLAGS} -I${.CURDIR} -c -o ${.TARGET} ${.ALLSRC:N*.h:[1]}
 
 crtbeginS.o crtendS.o:
-	${CC} ${CFLAGS} -I${.CURDIR} ${CFLAGS_CRTS} -c -o ${.TARGET} ${.ALLSRC}
+	${CC} ${CFLAGS} -I${.CURDIR} ${CFLAGS_CRTS} -c -o ${.TARGET} \
+	    ${.ALLSRC:N*.h:[1]}
 
 .endif
 
-- 
2.45.0