The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4339e0c6dbffe28731f443a99ca7eaeaea0c9883
commit 4339e0c6dbffe28731f443a99ca7eaeaea0c9883 Author: Dimitry Andric <[email protected]> AuthorDate: 2021-12-24 18:53:44 +0000 Commit: Dimitry Andric <[email protected]> CommitDate: 2021-12-24 18:53:44 +0000 Add elf2aout as a cross-tool for sparc64 Because sparc64's boot1 requires elf2aout, and this tool has been removed in FreeBSD 13 and later (dd99ab06f360), add it as a cross-tool for FreeBSD versions >= 1300077. Direct commit to stable/12, since sparc64 is gone in stable/13 and later. --- Makefile.inc1 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 1b1f8b162d92..a90eaf5d66a5 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2338,6 +2338,10 @@ _btxld= usr.sbin/btxld .endif .endif +.if ${TARGET_ARCH} == "sparc64" && ${BOOTSTRAPPING} >= 1300077 +_elf2aout= usr.bin/elf2aout +.endif + # Rebuild ctfconvert and ctfmerge to avoid difficult-to-diagnose failures # resulting from missing bug fixes or ELF Toolchain updates. .if ${MK_CDDL} != "no" @@ -2396,6 +2400,7 @@ cross-tools: .MAKE .PHONY ${_dtrace_tools} \ ${_gcc} \ ${_btxld} \ + ${_elf2aout} \ ${_usb_tools} ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ cd ${.CURDIR}/${_tool}; \
