Module Name: src
Committed By: christos
Date: Tue Jan 1 19:41:05 UTC 2019
Modified Files:
src/sys/arch/ews4800mips/stand/boot: Makefile
src/sys/arch/mips/conf: Makefile.mips
src/sys/arch/mipsco/conf: Makefile.mipsco.inc
src/sys/arch/pmax/conf: Makefile.pmax.inc
src/sys/arch/pmax/stand: Makefile.booters
src/sys/arch/pmax/stand/smallnet/setnetimage: Makefile
src/sys/arch/sgimips/conf: Makefile.sgimips.inc
src/sys/arch/sgimips/stand/boot: Makefile
Log Message:
ELF2ECOFF -> MIPS_ELF2ECOFF
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/ews4800mips/stand/boot/Makefile
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/mips/conf/Makefile.mips
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mipsco/conf/Makefile.mipsco.inc
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/pmax/conf/Makefile.pmax.inc
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/pmax/stand/Makefile.booters
cvs rdiff -u -r1.5 -r1.6 \
src/sys/arch/pmax/stand/smallnet/setnetimage/Makefile
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sgimips/conf/Makefile.sgimips.inc
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sgimips/stand/boot/Makefile
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/ews4800mips/stand/boot/Makefile
diff -u src/sys/arch/ews4800mips/stand/boot/Makefile:1.22 src/sys/arch/ews4800mips/stand/boot/Makefile:1.23
--- src/sys/arch/ews4800mips/stand/boot/Makefile:1.22 Sat Apr 8 15:53:20 2017
+++ src/sys/arch/ews4800mips/stand/boot/Makefile Tue Jan 1 14:41:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2017/04/08 19:53:20 christos Exp $
+# $NetBSD: Makefile,v 1.23 2019/01/01 19:41:04 christos Exp $
WARNS ?= 1
NOMAN =
@@ -126,7 +126,7 @@ ${PROG}: ${BINKERNEL_DUMMY_O} ${OBJS} ${
${PROG}.coff: ${PROG}
${_MKTARGET_CREATE}
- ${ELF2ECOFF} ${PROG} ${.TARGET}.tmp
+ ${MIPS_ELF2ECOFF} ${PROG} ${.TARGET}.tmp
mv ${.TARGET}.tmp ${.TARGET}
${BOOT_KERNEL}.gz: ${BINKERNEL_O} ${OBJS} ${LIBS}
Index: src/sys/arch/mips/conf/Makefile.mips
diff -u src/sys/arch/mips/conf/Makefile.mips:1.69 src/sys/arch/mips/conf/Makefile.mips:1.70
--- src/sys/arch/mips/conf/Makefile.mips:1.69 Sat Sep 22 08:24:02 2018
+++ src/sys/arch/mips/conf/Makefile.mips Tue Jan 1 14:41:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mips,v 1.69 2018/09/22 12:24:02 rin Exp $
+# $NetBSD: Makefile.mips,v 1.70 2019/01/01 19:41:04 christos Exp $
# Makefile for NetBSD
#
@@ -25,7 +25,7 @@ NEED_OWN_INSTALL_TARGET?=no
## (0) toolchain settings for things that aren't part of the standard
## toolchain
##
-ELF2ECOFF?= elf2ecoff
+MIPS_ELF2ECOFF?= elf2ecoff
##
## (1) port identification
Index: src/sys/arch/mipsco/conf/Makefile.mipsco.inc
diff -u src/sys/arch/mipsco/conf/Makefile.mipsco.inc:1.6 src/sys/arch/mipsco/conf/Makefile.mipsco.inc:1.7
--- src/sys/arch/mipsco/conf/Makefile.mipsco.inc:1.6 Fri Nov 15 05:12:40 2002
+++ src/sys/arch/mipsco/conf/Makefile.mipsco.inc Tue Jan 1 14:41:04 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.mipsco.inc,v 1.6 2002/11/15 10:12:40 wdk Exp $
+# $NetBSD: Makefile.mipsco.inc,v 1.7 2019/01/01 19:41:04 christos Exp $
SYSTEM_LD_TAIL_EXTRA=; \
- echo ${ELF2ECOFF} $@ [email protected]; ${ELF2ECOFF} $@ [email protected]; \
+ echo ${MIPS_ELF2ECOFF} $@ [email protected]; \
+ ${MIPS_ELF2ECOFF} $@ [email protected]; \
${SIZE} [email protected]; chmod 755 [email protected]
EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ecoff@}
Index: src/sys/arch/pmax/conf/Makefile.pmax.inc
diff -u src/sys/arch/pmax/conf/Makefile.pmax.inc:1.6 src/sys/arch/pmax/conf/Makefile.pmax.inc:1.7
--- src/sys/arch/pmax/conf/Makefile.pmax.inc:1.6 Sun Dec 13 19:46:09 2009
+++ src/sys/arch/pmax/conf/Makefile.pmax.inc Tue Jan 1 14:41:04 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.pmax.inc,v 1.6 2009/12/14 00:46:09 matt Exp $
+# $NetBSD: Makefile.pmax.inc,v 1.7 2019/01/01 19:41:04 christos Exp $
.if ${MACHINE_ARCH} == "mipsel"
SYSTEM_LD_TAIL_EXTRA=; \
- echo ${ELF2ECOFF} $@ [email protected]; ${ELF2ECOFF} $@ [email protected]; \
+ echo ${MIPS_ELF2ECOFF} $@ [email protected]; \
+ ${MIPS_ELF2ECOFF} $@ [email protected]; \
chmod 755 [email protected]
.endif
Index: src/sys/arch/pmax/stand/Makefile.booters
diff -u src/sys/arch/pmax/stand/Makefile.booters:1.63 src/sys/arch/pmax/stand/Makefile.booters:1.64
--- src/sys/arch/pmax/stand/Makefile.booters:1.63 Sat Apr 8 15:53:22 2017
+++ src/sys/arch/pmax/stand/Makefile.booters Tue Jan 1 14:41:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.63 2017/04/08 19:53:22 christos Exp $
+# $NetBSD: Makefile.booters,v 1.64 2019/01/01 19:41:04 christos Exp $
NOMAN= # defined
NOPIE= # defined
@@ -118,7 +118,7 @@ ${PROG}: ${OBJS} ${LIBS}
.if defined(DO_ECOFF_BINARY)
@echo -n "Creating ECOFF binary... "
@mv ${PROG} ${PROG}.elf
- @${ELF2ECOFF} ${PROG}.elf ${PROG}
+ @${MIPS_ELF2ECOFF} ${PROG}.elf ${PROG}
.endif
.include <bsd.klinks.mk>
Index: src/sys/arch/pmax/stand/smallnet/setnetimage/Makefile
diff -u src/sys/arch/pmax/stand/smallnet/setnetimage/Makefile:1.5 src/sys/arch/pmax/stand/smallnet/setnetimage/Makefile:1.6
--- src/sys/arch/pmax/stand/smallnet/setnetimage/Makefile:1.5 Fri Apr 12 01:11:18 2002
+++ src/sys/arch/pmax/stand/smallnet/setnetimage/Makefile Tue Jan 1 14:41:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/04/12 05:11:18 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2019/01/01 19:41:04 christos Exp $
PROG= setnetimage
NOMAN= # defined
@@ -27,7 +27,7 @@ smallnet.elf: ${SNDIR}/smallnet
kernel: smallnet.elf
./${PROG} ${KERNEL} ${.ALLSRC}
- ${ELF2ECOFF} smallnet.elf smallnet
+ ${MIPS_ELF2ECOFF} smallnet.elf smallnet
.endif
.include <bsd.prog.mk>
Index: src/sys/arch/sgimips/conf/Makefile.sgimips.inc
diff -u src/sys/arch/sgimips/conf/Makefile.sgimips.inc:1.12 src/sys/arch/sgimips/conf/Makefile.sgimips.inc:1.13
--- src/sys/arch/sgimips/conf/Makefile.sgimips.inc:1.12 Sun Feb 20 02:59:49 2011
+++ src/sys/arch/sgimips/conf/Makefile.sgimips.inc Tue Jan 1 14:41:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sgimips.inc,v 1.12 2011/02/20 07:59:49 matt Exp $
+# $NetBSD: Makefile.sgimips.inc,v 1.13 2019/01/01 19:41:04 christos Exp $
WANT_ECOFF?=no
@@ -6,6 +6,7 @@ GENASSYM_EXTRAS+= ${S}/dev/arcbios/genas
.if ${WANT_ECOFF} == "yes"
SYSTEM_LD_TAIL_EXTRA=; \
- echo ${ELF2ECOFF} $@ [email protected]; ${ELF2ECOFF} $@ [email protected]; \
+ echo ${MIPS_ELF2ECOFF} $@ [email protected]; \
+ ${MIPS_ELF2ECOFF} $@ [email protected]; \
chmod 755 [email protected]
.endif
Index: src/sys/arch/sgimips/stand/boot/Makefile
diff -u src/sys/arch/sgimips/stand/boot/Makefile:1.20 src/sys/arch/sgimips/stand/boot/Makefile:1.21
--- src/sys/arch/sgimips/stand/boot/Makefile:1.20 Sun Sep 2 08:06:16 2018
+++ src/sys/arch/sgimips/stand/boot/Makefile Tue Jan 1 14:41:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/09/02 12:06:16 tsutsui Exp $
+# $NetBSD: Makefile,v 1.21 2019/01/01 19:41:05 christos Exp $
# Don't strip the ECOFF'ed version on install -- strip gets confused by that,
@@ -12,7 +12,7 @@ SRCS= start.S boot.c bootinfo.c conf.c d
PROG= aoutboot
${PROG}: ip2xboot ip3xboot
.if ${MACHINE_ARCH} == "mipseb"
- ${ELF2ECOFF} ip2xboot ${.TARGET}
+ ${MIPS_ELF2ECOFF} ip2xboot ${.TARGET}
.else
touch ${.TARGET}
.endif
