Module Name: src
Committed By: simonb
Date: Mon Apr 5 06:22:00 UTC 2021
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Move the ctfmerge call from SYSTEM_LD_TAIL (used by both STAGE1 and STAGE2)
to SYSTEM_LD_TAIL_STAGE2 only. ctfmerge is slow enough that just calling
it once is enough.
To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.277 src/sys/conf/Makefile.kern.inc:1.278
--- src/sys/conf/Makefile.kern.inc:1.277 Sun Jan 31 23:17:21 2021
+++ src/sys/conf/Makefile.kern.inc Mon Apr 5 06:22:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.277 2021/01/31 23:17:21 rillig Exp $
+# $NetBSD: Makefile.kern.inc,v 1.278 2021/04/05 06:22:00 simonb Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -210,11 +210,6 @@ _MD_OBJS= ${MD_OBJS}
SYSTEM_LIB= ${MD_LIBS} ${LIBKERN}
SYSTEM_OBJ?= ${_MD_OBJS} ${OBJS} ${SYSTEM_LIB}
SYSTEM_DEP+= Makefile ${SYSTEM_OBJ:O}
-.if defined(CTFMERGE)
-SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
-.else
-SYSTEM_CTFMERGE= ${_MKSHECHO}
-.endif
REMOVE_SWAP= [@]
.for k in ${KERNELS}
@@ -242,7 +237,7 @@ LINKFLAGS?= ${LINKFORMAT} ${LINKSCRIPT}
LINKFLAGS_DEBUG?= -X
SYSTEM_LD_TAIL?=@${TOOL_SED} '/const char sccs/!d;s/.*@(.)//;s/" "//;s/\\.*//' vers.c && \
- ${SIZE} $@ && ${SYSTEM_CTFMERGE} && chmod 755 $@
+ ${SIZE} $@ && chmod 755 $@
SYSTEM_LD_TAIL_DEBUG?=&& \
echo mv -f $@ $@.gdb && mv -f $@ $@.gdb && \
echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb && \
@@ -265,6 +260,11 @@ LINKFLAGS+= ${LINKFLAGS_NORMAL}
SYSTEM_LD_HEAD+= ${SYSTEM_LD_HEAD_EXTRA}
SYSTEM_LD_TAIL_STAGE1= ${SYSTEM_LD_TAIL}
SYSTEM_LD_TAIL_STAGE2= ${SYSTEM_LD_TAIL}
+.if defined(CTFMERGE)
+SYSTEM_LD_TAIL_STAGE2+= && echo ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ... \
+ && time -t ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} \
+ ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
+.endif
.if defined(COPY_SYMTAB)
SYSTEM_LD_TAIL_STAGE2+= && echo ${DBSYM} $@ && ${DBSYM} $@
.if !empty(DEBUG:M-g)
