[src/trunk]: src/sys/arch/usermode/conf Make NetBSD/usermode link again!

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

details:   https://anonhg.NetBSD.org/src/rev/2454dc5d62fa
branches:  trunk
changeset: 828988:2454dc5d62fa
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Sat Jan 13 16:20:33 2018 +0000

description:
Make NetBSD/usermode link again!

diffstat:

 sys/arch/usermode/conf/GENERIC.common    |  6 +++---
 sys/arch/usermode/conf/Makefile.usermode |  7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (45 lines):

diff -r 2ce4c4489a12 -r 2454dc5d62fa sys/arch/usermode/conf/GENERIC.common
--- a/sys/arch/usermode/conf/GENERIC.common     Sat Jan 13 15:15:03 2018 +0000
+++ b/sys/arch/usermode/conf/GENERIC.common     Sat Jan 13 16:20:33 2018 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: GENERIC.common,v 1.26 2017/09/14 07:58:44 mrg Exp $
+# $NetBSD: GENERIC.common,v 1.27 2018/01/13 16:20:33 reinoud Exp $
 
 include "arch/usermode/conf/std.usermode"
 
 options        INCLUDE_CONFIG_FILE
-#ident                 "GENERIC-$Revision: 1.26 $"
+#ident                 "GENERIC-$Revision: 1.27 $"
 maxusers       32
 
 makeoptions    DEBUG="-O1 -g3"
 
-makeoptions    COPY_SYMTAB=1
+#makeoptions   COPY_SYMTAB=1
 
 options        RTC_OFFSET=0
 options        NTP
diff -r 2ce4c4489a12 -r 2454dc5d62fa sys/arch/usermode/conf/Makefile.usermode
--- a/sys/arch/usermode/conf/Makefile.usermode  Sat Jan 13 15:15:03 2018 +0000
+++ b/sys/arch/usermode/conf/Makefile.usermode  Sat Jan 13 16:20:33 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.usermode,v 1.40 2017/12/10 14:29:47 christos Exp $
+# $NetBSD: Makefile.usermode,v 1.41 2018/01/13 16:20:33 reinoud Exp $
 
 USETOOLS?=                     no
 NEED_OWN_INSTALL_TARGET?=      no
@@ -71,12 +71,11 @@
 KERNLDSCRIPT?= ${USERMODE}/conf/kern.ldscript
 
 SYSTEM_LD=     @do_system_ld() { \
-               target=$$1; shift; \
                ${_MKSHMSG} "   link  ${.CURDIR:T}/${.TARGET}"; \
                ${_MKSHECHO}\
-               ${CC} -static ${COPTS} -Wl,-Map,$${target}.map -o $${target} ${LINKFORMAT} -Ttext ${TEXTADDR} '$${SYSTEM_OBJ}' '$${EXTRA_OBJ}' vers.o ${USERMODE_LIBS} $$@; \
+               ${CC} -static ${COPTS} -Wl,-Map,$${target}.map -o ${.TARGET} ${LINKFORMAT} -Ttext ${TEXTADDR} '$${SYSTEM_OBJ}' '$${EXTRA_OBJ}' vers.o ${USERMODE_LIBS} $$@; \
                ${SYSTEM_LD_FIX} \
-               ${CC} -static ${COPTS} -Wl,-Map,$${target}.map -o $${target} ${LINKFORMAT} -Ttext ${TEXTADDR} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o ${USERMODE_LIBS} $$@; \
+               ${CC} -static ${COPTS} -Wl,-Map,$${target}.map -o ${.TARGET} ${LINKFORMAT} -Ttext ${TEXTADDR} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o ${USERMODE_LIBS} $$@; \
                }; \
                do_system_ld
 NVFLAGS=       -n