Module Name: src
Committed By: uebayasi
Date: Thu Aug 27 03:20:13 UTC 2015
Modified Files:
src/sys/arch/usermode/conf: Makefile.usermode
src/sys/conf: Makefile.kern.inc
Log Message:
Tweak previous.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/usermode/conf/Makefile.usermode
cvs rdiff -u -r1.194 -r1.195 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/arch/usermode/conf/Makefile.usermode
diff -u src/sys/arch/usermode/conf/Makefile.usermode:1.38 src/sys/arch/usermode/conf/Makefile.usermode:1.39
--- src/sys/arch/usermode/conf/Makefile.usermode:1.38 Thu Aug 27 03:17:46 2015
+++ src/sys/arch/usermode/conf/Makefile.usermode Thu Aug 27 03:20:13 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.usermode,v 1.38 2015/08/27 03:17:46 uebayasi Exp $
+# $NetBSD: Makefile.usermode,v 1.39 2015/08/27 03:20:13 uebayasi Exp $
USETOOLS?= no
NEED_OWN_INSTALL_TARGET?= no
@@ -74,9 +74,9 @@ SYSTEM_LD= @do_system_ld() { \
target=$$1; shift; \
${_MKSHMSG} " link ${.CURDIR:T}/${.TARGET}"; \
${_MKSHECHO}\
- ${CC} -static ${COPTS} -Wl,-Map,[email protected] -o $@ ${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,[email protected] -o $@ ${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
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.194 src/sys/conf/Makefile.kern.inc:1.195
--- src/sys/conf/Makefile.kern.inc:1.194 Thu Aug 27 03:17:46 2015
+++ src/sys/conf/Makefile.kern.inc Thu Aug 27 03:20:13 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.194 2015/08/27 03:17:46 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.195 2015/08/27 03:20:13 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -239,8 +239,8 @@ SYSTEM_LD?= @do_system_ld() { \
target=$$1; shift; \
${_MKSHMSG} " link ${.CURDIR:T}/${.TARGET}"; \
${_MKSHECHO}\
- ${LD} -Map [email protected] --cref ${LINKFLAGS} -o $${target} '$${SYSTEM_OBJ}' '$${EXTRA_OBJ}' vers.o $$@; \
- ${LD} -Map [email protected] --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 $$@; \
}; \
do_system_ld
