Module Name: src
Committed By: reinoud
Date: Sat Jan 13 16:20:33 UTC 2018
Modified Files:
src/sys/arch/usermode/conf: GENERIC.common Makefile.usermode
Log Message:
Make NetBSD/usermode link again!
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/usermode/conf/GENERIC.common
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/usermode/conf/Makefile.usermode
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/usermode/conf/GENERIC.common
diff -u src/sys/arch/usermode/conf/GENERIC.common:1.26 src/sys/arch/usermode/conf/GENERIC.common:1.27
--- src/sys/arch/usermode/conf/GENERIC.common:1.26 Thu Sep 14 07:58:44 2017
+++ src/sys/arch/usermode/conf/GENERIC.common Sat Jan 13 16:20:33 2018
@@ -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
Index: src/sys/arch/usermode/conf/Makefile.usermode
diff -u src/sys/arch/usermode/conf/Makefile.usermode:1.40 src/sys/arch/usermode/conf/Makefile.usermode:1.41
--- src/sys/arch/usermode/conf/Makefile.usermode:1.40 Sun Dec 10 14:29:47 2017
+++ src/sys/arch/usermode/conf/Makefile.usermode Sat Jan 13 16:20:33 2018
@@ -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 @@ LINKFLAGS_NORMAL= -X
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
