svn commit: r349067 - in head: gnu/lib/csu gnu/lib/libgcc gnu/lib/libgcov lib/csu

[Bryan Drewery]

Author: bdrewery
Date: Sat Jun 15 17:08:32 2019
New Revision: 349067
URL: https://svnweb.freebsd.org/changeset/base/349067

Log:
  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

Modified:
  head/gnu/lib/csu/Makefile
  head/gnu/lib/libgcc/Makefile
  head/gnu/lib/libgcov/Makefile
  head/lib/csu/Makefile.inc

Modified: head/gnu/lib/csu/Makefile
==============================================================================
--- head/gnu/lib/csu/Makefile   Sat Jun 15 17:08:28 2019        (r349066)
+++ head/gnu/lib/csu/Makefile   Sat Jun 15 17:08:32 2019        (r349067)
@@ -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

Modified: head/gnu/lib/libgcc/Makefile
==============================================================================
--- head/gnu/lib/libgcc/Makefile        Sat Jun 15 17:08:28 2019        
(r349066)
+++ head/gnu/lib/libgcc/Makefile        Sat Jun 15 17:08:32 2019        
(r349067)
@@ -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]}
 
 #-----------------------------------------------------------------------
 #

Modified: head/gnu/lib/libgcov/Makefile
==============================================================================
--- head/gnu/lib/libgcov/Makefile       Sat Jun 15 17:08:28 2019        
(r349066)
+++ head/gnu/lib/libgcov/Makefile       Sat Jun 15 17:08:32 2019        
(r349067)
@@ -51,16 +51,16 @@ CLEANFILES+=        ${COMMONHDRS} cs-tm.h cs-tconfig.h 
option
 ${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>

Modified: head/lib/csu/Makefile.inc
==============================================================================
--- head/lib/csu/Makefile.inc   Sat Jun 15 17:08:28 2019        (r349066)
+++ head/lib/csu/Makefile.inc   Sat Jun 15 17:08:32 2019        (r349067)
@@ -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
 
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"