Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk G/C unused code.



details:   https://anonhg.NetBSD.org/src/rev/8ea69efdad65
branches:  trunk
changeset: 451205:8ea69efdad65
user:      maya <maya%NetBSD.org@localhost>
date:      Thu May 09 23:34:51 2019 +0000

description:
G/C unused code.
gcc -combine is no longer a thing, so this entire block isn't usable.

diffstat:

 share/mk/bsd.kmodule.mk |  36 +-----------------------------------
 1 files changed, 1 insertions(+), 35 deletions(-)

diffs (57 lines):

diff -r 529dfd1464f2 -r 8ea69efdad65 share/mk/bsd.kmodule.mk
--- a/share/mk/bsd.kmodule.mk   Thu May 09 20:50:14 2019 +0000
+++ b/share/mk/bsd.kmodule.mk   Thu May 09 23:34:51 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.kmodule.mk,v 1.60 2019/01/21 21:11:54 christos Exp $
+#      $NetBSD: bsd.kmodule.mk,v 1.61 2019/05/09 23:34:51 maya Exp $
 
 # We are not building this with PIE
 MKPIE=no
@@ -105,39 +105,6 @@
 ##### Build rules
 realall:       ${PROG}
 
-.if (defined(USE_COMBINE) && ${USE_COMBINE} != "no" && !commands(${_P}) \
-   && !defined(NOCOMBINE.${_P}) && !defined(NOCOMBINE))
-.for f in ${SRCS:N*.h:N*.sh:N*.fth:C/\.[yl]$/.c/g}
-.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+=                ${f:R:S/$/.o/}
-.else
-XSRCS+=                ${f}
-NODPSRCS+=     ${f}
-.endif
-.endfor
-
-.if !empty(XOBJS)
-${XOBJS}:      ${DPSRCS}
-.endif
-
-.if ${MKLDSCRIPT} == "yes"
-${KMODSCRIPT}: ${KMODSCRIPTSRC} ${XOBJS} $S/conf/mkldscript.sh
-       @rm -f ${.TARGET}
-       @OBJDUMP=${OBJDUMP} ${HOST_SH} $S/conf/mkldscript.sh \
-           -t ${KMODSCRIPTSRC} ${XOBJS} > ${.TARGET}
-.endif
-
-${PROG}: ${XOBJS} ${XSRCS} ${DPSRCS} ${DPADD} ${KMODSCRIPT}
-       ${CC} ${LDFLAGS} -nostdlib -MD -combine -r -Wl,-T,${KMODSCRIPT},-d \
-               -Wl,-Map=${.TARGET}.map \
-               -o ${.TARGET} ${CFLAGS} ${CPPFLAGS} ${XOBJS} \
-               ${XSRCS:@.SRC.@${.ALLSRC:M*.c:M*${.SRC.}}@:O:u} && \
-       echo '.-include "${KMOD}.d"' > .depend
-
-.else
 OBJS+=         ${SRCS:N*.h:N*.sh:R:S/$/.o/g}
 
 ${OBJS} ${LOBJS}: ${DPSRCS}
@@ -191,7 +158,6 @@
                -Wl,-Map=${.TARGET}.map \
                -o ${.TARGET} ${OBJS}
 .endif
-.endif
 .if defined(CTFMERGE)
        ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS}
 .endif



Home | Main Index | Thread Index | Old Index