Module Name: src
Committed By: uebayasi
Date: Mon Apr 14 13:04:44 UTC 2014
Modified Files:
src/sys/arch/i386/stand/boot: Makefile.boot
Log Message:
Other boot loaders name ELF *.sym, not *.syms. Follow that convention.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/i386/stand/boot/Makefile.boot
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/i386/stand/boot/Makefile.boot
diff -u src/sys/arch/i386/stand/boot/Makefile.boot:1.64 src/sys/arch/i386/stand/boot/Makefile.boot:1.65
--- src/sys/arch/i386/stand/boot/Makefile.boot:1.64 Sun Jan 12 15:26:29 2014
+++ src/sys/arch/i386/stand/boot/Makefile.boot Mon Apr 14 13:04:44 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.64 2014/01/12 15:26:29 tsutsui Exp $
+# $NetBSD: Makefile.boot,v 1.65 2014/04/14 13:04:44 uebayasi Exp $
S= ${.CURDIR}/../../../../..
@@ -123,7 +123,7 @@ cleanlibdir:
LIBLIST= ${LIBI386} ${LIBSA} ${LIBZ} ${LIBKERN} ${LIBI386} ${LIBSA}
# LIBLIST= ${LIBSA} ${LIBKERN} ${LIBI386} ${LIBSA} ${LIBZ} ${LIBKERN}
-CLEANFILES+= ${PROG}.tmp ${PROG}.map ${PROG}.syms vers.c
+CLEANFILES+= ${PROG}.tmp ${PROG}.map ${PROG}.sym vers.c
vers.c: ${VERSIONFILE} ${SOURCES} ${LIBLIST} ${.CURDIR}/../Makefile.boot
${HOST_SH} ${S}/conf/newvers_stand.sh ${VERSIONFILE} x86 ${NEWVERSWHAT}
@@ -133,7 +133,7 @@ vers.c: ${VERSIONFILE} ${SOURCES} ${LIBL
# explicitly pull in the required objects before any other library code.
${PROG}: ${OBJS} ${LIBLIST} ${.CURDIR}/../Makefile.boot
${_MKTARGET_LINK}
- bb="$$( ${CC} -o ${PROG}.syms ${LDFLAGS} -Wl,-Ttext,0 -Wl,-cref \
+ bb="$$( ${CC} -o ${PROG}.sym ${LDFLAGS} -Wl,-Ttext,0 -Wl,-cref \
${OBJS} ${LIBLIST} | ( \
while read symbol file; do \
[ -z "$$file" ] && continue; \
@@ -149,9 +149,9 @@ ${PROG}: ${OBJS} ${LIBLIST} ${.CURDIR}/.
do :; \
done; \
) )"; \
- ${CC} -o ${PROG}.syms ${LDFLAGS} -Wl,-Ttext,0 \
+ ${CC} -o ${PROG}.sym ${LDFLAGS} -Wl,-Ttext,0 \
-Wl,-Map,${PROG}.map -Wl,-cref ${OBJS} $$bb ${LIBLIST}
- ${OBJCOPY} -O binary ${PROG}.syms ${PROG}
+ ${OBJCOPY} -O binary ${PROG}.sym ${PROG}
.include <bsd.prog.mk>
KLINK_MACHINE= i386
