Module Name: src
Committed By: christos
Date: Mon Dec 31 13:31:25 UTC 2018
Modified Files:
src/share/mk: bsd.own.mk bsd.sys.mk
Log Message:
- prefix elf conversion tools with their platform to avoid conflicts
- add arm-elf2aout
To generate a diff of this commit:
cvs rdiff -u -r1.1090 -r1.1091 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.287 -r1.288 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1090 src/share/mk/bsd.own.mk:1.1091
--- src/share/mk/bsd.own.mk:1.1090 Mon Dec 31 07:45:19 2018
+++ src/share/mk/bsd.own.mk Mon Dec 31 08:31:25 2018
@@ -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 @@ LDFLAGS+= --sysroot=/
.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_HTML= ${TOOLDIR}/bin/${_TOOL
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_HTML= mandoc -Thtml
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
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.287 src/share/mk/bsd.sys.mk:1.288
--- src/share/mk/bsd.sys.mk:1.287 Sun Dec 2 16:00:13 2018
+++ src/share/mk/bsd.sys.mk Mon Dec 31 08:31:25 2018
@@ -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_LDFLAGS?= -pie ${${ACTIVE_CC}
PIE_AFLAGS?= -fPIE
.endif
-ELF2ECOFF?= elf2ecoff
+ARM_ELF2AOUT?= arm-elf2aout
+M68K_ELF2AOUT?= m68k-elf2aout
+MIPS_ELF2ECOFF?= mips-elf2ecoff
MKDEP?= mkdep
MKDEPCXX?= mkdep
OBJCOPY?= objcopy
