From f073fd018a457cd43670d68049d5ddbd7f4816e8 Mon Sep 17 00:00:00 2001 From: christos Date: Tue, 1 Jan 2019 19:41:04 +0000 Subject: [PATCH] ELF2ECOFF -> MIPS_ELF2ECOFF --- sys/arch/ews4800mips/stand/boot/Makefile | 4 ++-- sys/arch/mips/conf/Makefile.mips | 4 ++-- sys/arch/mipsco/conf/Makefile.mipsco.inc | 5 +++-- sys/arch/pmax/conf/Makefile.pmax.inc | 5 +++-- sys/arch/pmax/stand/Makefile.booters | 4 ++-- sys/arch/pmax/stand/smallnet/setnetimage/Makefile | 4 ++-- sys/arch/sgimips/conf/Makefile.sgimips.inc | 5 +++-- sys/arch/sgimips/stand/boot/Makefile | 4 ++-- 8 files changed, 19 insertions(+), 16 deletions(-) diff --git a/sys/arch/ews4800mips/stand/boot/Makefile b/sys/arch/ews4800mips/stand/boot/Makefile index f1c2e7eb7bad..f93b19e1e7fb 100644 --- a/sys/arch/ews4800mips/stand/boot/Makefile +++ b/sys/arch/ews4800mips/stand/boot/Makefile @@ -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} ${LIBS} ${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} diff --git a/sys/arch/mips/conf/Makefile.mips b/sys/arch/mips/conf/Makefile.mips index 0d89032c132c..26259f2a0f5a 100644 --- a/sys/arch/mips/conf/Makefile.mips +++ b/sys/arch/mips/conf/Makefile.mips @@ -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 diff --git a/sys/arch/mipsco/conf/Makefile.mipsco.inc b/sys/arch/mipsco/conf/Makefile.mipsco.inc index aecccce87d6c..9e8605b4e70d 100644 --- a/sys/arch/mipsco/conf/Makefile.mipsco.inc +++ b/sys/arch/mipsco/conf/Makefile.mipsco.inc @@ -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} $@ $@.ecoff; ${ELF2ECOFF} $@ $@.ecoff; \ + echo ${MIPS_ELF2ECOFF} $@ $@.ecoff; \ + ${MIPS_ELF2ECOFF} $@ $@.ecoff; \ ${SIZE} $@.ecoff; chmod 755 $@.ecoff EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ecoff@} diff --git a/sys/arch/pmax/conf/Makefile.pmax.inc b/sys/arch/pmax/conf/Makefile.pmax.inc index 4dce4a35eb34..cc4042825235 100644 --- a/sys/arch/pmax/conf/Makefile.pmax.inc +++ b/sys/arch/pmax/conf/Makefile.pmax.inc @@ -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} $@ $@.ecoff; ${ELF2ECOFF} $@ $@.ecoff; \ + echo ${MIPS_ELF2ECOFF} $@ $@.ecoff; \ + ${MIPS_ELF2ECOFF} $@ $@.ecoff; \ chmod 755 $@.ecoff .endif diff --git a/sys/arch/pmax/stand/Makefile.booters b/sys/arch/pmax/stand/Makefile.booters index 1bb649c0e741..67ff94182754 100644 --- a/sys/arch/pmax/stand/Makefile.booters +++ b/sys/arch/pmax/stand/Makefile.booters @@ -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 diff --git a/sys/arch/pmax/stand/smallnet/setnetimage/Makefile b/sys/arch/pmax/stand/smallnet/setnetimage/Makefile index 750416e26e15..705756704bde 100644 --- a/sys/arch/pmax/stand/smallnet/setnetimage/Makefile +++ b/sys/arch/pmax/stand/smallnet/setnetimage/Makefile @@ -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 diff --git a/sys/arch/sgimips/conf/Makefile.sgimips.inc b/sys/arch/sgimips/conf/Makefile.sgimips.inc index 4642334b73c9..718820055b3f 100644 --- a/sys/arch/sgimips/conf/Makefile.sgimips.inc +++ b/sys/arch/sgimips/conf/Makefile.sgimips.inc @@ -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/genassym.cf .if ${WANT_ECOFF} == "yes" SYSTEM_LD_TAIL_EXTRA=; \ - echo ${ELF2ECOFF} $@ $@.ecoff; ${ELF2ECOFF} $@ $@.ecoff; \ + echo ${MIPS_ELF2ECOFF} $@ $@.ecoff; \ + ${MIPS_ELF2ECOFF} $@ $@.ecoff; \ chmod 755 $@.ecoff .endif diff --git a/sys/arch/sgimips/stand/boot/Makefile b/sys/arch/sgimips/stand/boot/Makefile index 65d46cc0bcd1..58ba35e79796 100644 --- a/sys/arch/sgimips/stand/boot/Makefile +++ b/sys/arch/sgimips/stand/boot/Makefile @@ -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 devopen.c putchar.c getchar.c \ PROG= aoutboot ${PROG}: ip2xboot ip3xboot .if ${MACHINE_ARCH} == "mipseb" - ${ELF2ECOFF} ip2xboot ${.TARGET} + ${MIPS_ELF2ECOFF} ip2xboot ${.TARGET} .else touch ${.TARGET} .endif