[src/trunk]: src/share/mk - prefix elf conversion tools with their platform t...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d3598de05a92
branches:  trunk
changeset: 447107:d3598de05a92
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Dec 31 13:31:25 2018 +0000

description:
- prefix elf conversion tools with their platform to avoid conflicts
- add arm-elf2aout

diffstat:

 share/mk/bsd.own.mk |  9 ++++++---
 share/mk/bsd.sys.mk |  6 ++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diffs (57 lines):

diff -r aee9c4bb917c -r d3598de05a92 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Mon Dec 31 13:30:17 2018 +0000
+++ b/share/mk/bsd.own.mk       Mon Dec 31 13:31:25 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.1090 2018/12/31 12:45:19 mrg Exp $
+#      $NetBSD: bsd.own.mk,v 1.1091 2018/12/31 13:31:25 christos Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -336,8 +336,9 @@
 .endif
 
 DBSYM=         ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-dbsym
-ELF2AOUT=      ${TOOLDIR}/bin/${_TOOL_PREFIX}m68k-elf2aout
-ELF2ECOFF=     ${TOOLDIR}/bin/${_TOOL_PREFIX}mips-elf2ecoff
+ARM_ELF2AOUT=  ${TOOLDIR}/bin/${_TOOL_PREFIX}arm-elf2aout
+M86K_ELF2AOUT= ${TOOLDIR}/bin/${_TOOL_PREFIX}m68k-elf2aout
+MIPS_ELF2ECOFF=        ${TOOLDIR}/bin/${_TOOL_PREFIX}mips-elf2ecoff
 INSTALL=       ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install
 LEX=           ${TOOLDIR}/bin/${_TOOL_PREFIX}lex
 LINT=          CC=${CC:Q} ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-lint
@@ -403,6 +404,7 @@
 TOOL_MANDOC_LINT=      ${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Tlint
 TOOL_MDSETIMAGE=       ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-mdsetimage
 TOOL_MENUC=            MENUDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}menuc
+TOOL_ARMELF2AOUT=      ${TOOLDIR}/bin/${_TOOL_PREFIX}arm-elf2aout
 TOOL_M68KELF2AOUT=     ${TOOLDIR}/bin/${_TOOL_PREFIX}m68k-elf2aout
 TOOL_MIPSELF2ECOFF=    ${TOOLDIR}/bin/${_TOOL_PREFIX}mips-elf2ecoff
 TOOL_MKCSMAPPER=       ${TOOLDIR}/bin/${_TOOL_PREFIX}mkcsmapper
@@ -516,6 +518,7 @@
 TOOL_MANDOC_LINT=      mandoc -Tlint
 TOOL_MDSETIMAGE=       mdsetimage
 TOOL_MENUC=            menuc
+TOOL_ARMELF2AOUT=      arm-elf2aout
 TOOL_M68KELF2AOUT=     m68k-elf2aout
 TOOL_MIPSELF2ECOFF=    mips-elf2ecoff
 TOOL_MKCSMAPPER=       mkcsmapper
diff -r aee9c4bb917c -r d3598de05a92 share/mk/bsd.sys.mk
--- a/share/mk/bsd.sys.mk       Mon Dec 31 13:30:17 2018 +0000
+++ b/share/mk/bsd.sys.mk       Mon Dec 31 13:31:25 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.sys.mk,v 1.287 2018/12/02 21:00:13 maxv Exp $
+#      $NetBSD: bsd.sys.mk,v 1.288 2018/12/31 13:31:25 christos Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -247,7 +247,9 @@
 PIE_AFLAGS?=       -fPIE
 .endif
 
-ELF2ECOFF?=    elf2ecoff
+ARM_ELF2AOUT?= arm-elf2aout
+M68K_ELF2AOUT?=        m68k-elf2aout
+MIPS_ELF2ECOFF?=       mips-elf2ecoff
 MKDEP?=                mkdep
 MKDEPCXX?=     mkdep
 OBJCOPY?=      objcopy