Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

share/mk: finish USE_COMBINE, NOCOMBINE deprecation 

Remove the leftover remnants of deprecated USE_COMBINE and NOCOMBINE,
as gcc -combine has been EOL for many years.

Completes the work done by maya@ on 2019-05-10 in bsd.kmodule.mk rev 1.61.
This commit is contained in:
lukem 2023-05-28 10:33:13 +00:00
parent a2dd66b846
commit 09b4f93adb
2 changed files with 2 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
share/mk/bsd.lib.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.lib.mk,v 1.392 2023/05/09 22:52:22 riastradh Exp $
# $NetBSD: bsd.lib.mk,v 1.393 2023/05/28 10:33:13 lukem Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@ -428,37 +428,7 @@ _LIBS=${_LIB.a}
_LIBS=
.endif
.if ${LIBISPRIVATE} != "no" \
&& (defined(USE_COMBINE) && ${USE_COMBINE} == "yes" \
&& !defined(NOCOMBINE)) # {
.for f in ${SRCS:N*.h:N*.sh:C/\.[yl]$/.c/g}
COMBINEFLAGS.${LIB}.$f := ${CPPFLAGS.$f:D1} ${CPUFLAGS.$f:D2} ${COPTS.$f:D3} ${OBJCOPTS.$f:D4} ${CXXFLAGS.$f:D5}
.if empty(COMBINEFLAGS.${LIB}.${f}) && !defined(NOCOMBINE.$f)
COMBINESRCS+= ${f}
NODPSRCS+= ${f}
.else
OBJS+= ${f:R:S/$/.o/}
.endif
.endfor
.if !empty(COMBINESRCS)
OBJS+= ${_LIB}_combine.o
${_LIB}_combine.o: ${COMBINESRCS}
${_MKTARGET_COMPILE}
${COMPILE.c} -MD --combine ${.ALLSRC} -o ${.TARGET}
.if defined(LIBSTRIPOBJS)
${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
.endif
CLEANFILES+= ${_LIB}_combine.d
.if exists("${_LIB}_combine.d")
.include "${_LIB}_combine.d"
.endif
.endif # empty(XSRCS.${LIB})
.else # } {
OBJS+=${SRCS:N*.h:N*.sh:R:S/$/.o/g}
.endif # }
STOBJS+=${OBJS}

53
share/mk/bsd.prog.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.prog.mk,v 1.344 2023/05/24 10:07:16 lukem Exp $
# $NetBSD: bsd.prog.mk,v 1.345 2023/05/28 10:33:13 lukem Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@ -475,56 +475,6 @@ LOBJS.${_P}+= ${LSRCS:.c=.ln} ${SRCS.${_P}:M*.c:.c=.ln}
.if defined(OBJS.${_P}) && !empty(OBJS.${_P}) # {
.NOPATH: ${OBJS.${_P}} ${_P} ${_YPSRCS.${_P}}
.if (defined(USE_COMBINE) && ${USE_COMBINE} != "no" && !commands(${_P}) \
&& (${_CCLINK.${_P}} == ${_CCLINK.CDEFAULT} \
|| ${_CCLINK.${_P}} == ${_CCLINK.CXXDEFAULT}) \
&& !defined(NOCOMBINE.${_P}) && !defined(NOCOMBINE))
.for f in ${SRCS.${_P}:N*.h:N*.sh:N*.fth:C/\.[yl]$/.c/g}
#_XFLAGS.$f := ${CPPFLAGS.$f:D1} ${CPUFLAGS.$f:D2} \
# ${COPTS.$f:D3} ${OBJCOPTS.$f:D4} ${CXXFLAGS.$f:D5}
.if (${CPPFLAGS.$f:D1} == "1" || ${CPUFLAGS.$f:D2} == "2" \
|| ${COPTS.$f:D3} == "3" || ${OBJCOPTS.$f:D4} == "4" \
|| ${CXXFLAGS.$f:D5} == "5") \
|| ("${f:M*.[cyl]}" == "" || commands(${f:R:S/$/.o/}))
XOBJS.${_P}+= ${f:R:S/$/.o/}
.else
XSRCS.${_P}+= ${f}
NODPSRCS+= ${f}
.endif
.endfor
${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${XOBJS.${_P}} ${SRCS.${_P}} \
${DPSRCS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
${_MKTARGET_LINK}
.if defined(DESTDIR)
${_CCLINK.${_P}} -Wl,-nostdlib \
${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} ${_PROGLDOPTS} \
-B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \
-MD --combine ${_CPPFLAGS.${_P}} ${_CFLAGS.${_P}} ${_COPTS.${_P}} \
${XSRCS.${_P}:@.SRC.@${.ALLSRC:M*.c:M*${.SRC.}}@:O:u} ${XOBJS.${_P}} \
${_LDADD.${_P}} -L${_GCC_LIBGCCDIR} -L${DESTDIR}/usr/lib
.else
${_CCLINK.${_P}} ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} ${_PROGLDOPTS} \
-MD --combine ${_CPPFLAGS.${_P}} ${_COPTS.${_P}}
${XSRCS.${_P}:@.SRC.@${.ALLSRC:M*.c:M*${.SRC.}}@:O:u} ${XOBJS.${_P}} \
${_LDADD.${_P}}
.endif # defined(DESTDIR)
.if defined(CTFMERGE)
${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS.${_P}}
.endif
.if defined(PAXCTL_FLAGS.${_P})
${PAXCTL} ${PAXCTL_FLAGS.${_P}} ${.TARGET}
.endif
.if ${MKSTRIPIDENT} != "no"
${OBJCOPY} -R .ident ${.TARGET}
.endif
CLEANFILES+= ${_P}.d
.if exists(${_P}.d)
.include "${_P}.d" # include -MD depend for program.
.endif
.else # USE_COMBINE
${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}
${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} \
@ -544,7 +494,6 @@ ${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} \
${OBJCOPY} -R .ident ${.TARGET}
.endif
.endif # !commands(${_P})
.endif # USE_COMBINE
${_P}.ro: ${OBJS.${_P}} ${_DPADD.${_P}}
${_MKTARGET_LINK}