[src/trunk]: src/sys/conf Add swap<kernel>.o to common ${SYSTEM_LD} as it is ...

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ca912f136858
branches:  trunk
changeset: 810520:ca912f136858
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Wed Sep 02 12:38:48 2015 +0000

description:
Add swap<kernel>.o to common ${SYSTEM_LD} as it is always linked.

diffstat:

 sys/conf/Makefile.kern.inc |  18 +++---------------
 1 files changed, 3 insertions(+), 15 deletions(-)

diffs (54 lines):

diff -r 8b43c58f555b -r ca912f136858 sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Wed Sep 02 11:35:11 2015 +0000
+++ b/sys/conf/Makefile.kern.inc        Wed Sep 02 12:38:48 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.kern.inc,v 1.219 2015/09/02 03:22:41 uebayasi Exp $
+#      $NetBSD: Makefile.kern.inc,v 1.220 2015/09/02 12:38:48 uebayasi Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -248,8 +248,8 @@
                target=$$1; shift; \
                ${_MKSHMSG} "   link  ${.CURDIR:T}/${.TARGET}"; \
                ${_MKSHECHO}\
-               ${LD} -Map $${target}.map --cref ${LINKFLAGS} -o $${target} '$${SYSTEM_OBJ}' '$${EXTRA_OBJ}' vers.o $$@; \
-               ${LD} -Map $${target}.map --cref ${LINKFLAGS} -o $${target} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o $$@; \
+               ${LD} -Map $${target}.map --cref ${LINKFLAGS} -o $${target} '$${SYSTEM_OBJ}' '$${EXTRA_OBJ}' vers.o swap$${target}.o $$@; \
+               ${LD} -Map $${target}.map --cref ${LINKFLAGS} -o $${target} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o swap$${target}.o $$@; \
                }; \
                do_system_ld
 
@@ -482,11 +482,7 @@
 .if !defined(COPY_SYMTAB)
 build_kernel: .USE
        ${SYSTEM_LD_HEAD}
-.if !defined(___USE_SUFFIX_RULES___)
-       ${SYSTEM_LD} ${.TARGET} swap${.TARGET}.o
-.else
        ${SYSTEM_LD} ${.TARGET}
-.endif
        ${SYSTEM_LD_TAIL_STAGE2}
 .else
 .for k in ${KERNELS}
@@ -496,21 +492,13 @@
        ${CC} ${CFLAGS} ${CPPFLAGS} -DCOPY_SYMTAB \
            -c $S/kern/kern_ksyms_buf.c -o kern_ksyms_buf.o
        ${SYSTEM_LD_HEAD}
-.if !defined(___USE_SUFFIX_RULES___)
-       ${SYSTEM_LD} ${.TARGET} swap${.TARGET}.o kern_ksyms_buf.o
-.else
        ${SYSTEM_LD} ${.TARGET} kern_ksyms_buf.o
-.endif
        ${SYSTEM_LD_TAIL_STAGE1}
        ${CC} ${CFLAGS} ${CPPFLAGS} -DCOPY_SYMTAB \
            -DSYMTAB_SPACE=$$(${DBSYM} -P ${.TARGET}${TARGETSFX}) \
            -c $S/kern/kern_ksyms_buf.c -o kern_ksyms_buf_real.o
        ${SYSTEM_LD_HEAD}
-.if !defined(___USE_SUFFIX_RULES___)
-       ${SYSTEM_LD} ${.TARGET} swap${.TARGET}.o kern_ksyms_buf_real.o
-.else
        ${SYSTEM_LD} ${.TARGET} kern_ksyms_buf_real.o
-.endif
        ${SYSTEM_LD_TAIL_STAGE2}
 .endif