From nobody Fri Dec 24 18:54:24 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E82E11904339; Fri, 24 Dec 2021 18:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JLGSc2fNCz3J7F; Fri, 24 Dec 2021 18:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3558BBD9; Fri, 24 Dec 2021 18:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BOIsOha044559; Fri, 24 Dec 2021 18:54:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BOIsOJn044558; Fri, 24 Dec 2021 18:54:24 GMT (envelope-from git) Date: Fri, 24 Dec 2021 18:54:24 GMT Message-Id: <202112241854.1BOIsOJn044558@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 4339e0c6dbff - stable/12 - Add elf2aout as a cross-tool for sparc64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 4339e0c6dbffe28731f443a99ca7eaeaea0c9883 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640372064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qaWETkTV6QjJUPXEpRUXgcQ/XF9eXvboMcobJ+kg1Zw=; b=vKwukvCstsk5fy+gxo0krCskyuaCcOIzhPrsid0cWdtcp+J/cC7Dh4DMT5zHKdAqS5y8UX z7oz3kNiGEaBEd78o8A6ZVPVt0kYrsOpQ0mczneIYQFYd7nDNSShITorGoHx4K65s6c/e7 8Y2h+xXDISsQ6VZR7pjff5sBjjEYNxDMaLh1RZGr/im0I5Ut6E6qxKDuZ7bSALAYxaVtGY 87g8bAp30IS6f+uFlBUMDDj/6O7l7+lgLqTfoEtvRKY+1nB+bO00KIjfR8ld2jttaDatdM EoBosD+y+Mfagj+M16/3sXWARHz9UL6hI1LyvmJwg77iLtsjDLbtf0MKJsaJvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640372064; a=rsa-sha256; cv=none; b=UFM1lxOauw0a62pnaWesGwwCo7D15zD9V5zG0G/uSZa9gm5/pXBSRZQ5Yt5cmwmRKo7y9T sU4/sj/x6hjLTCbAVsv1Y9iVEx2EdqnG4uY2aSq23dpMjy1ceANUkrEtAAYNBt8BzI9p5G 3wc6FZ0ItlmyJdjjuNVQja7+5r3HZC59yTJYOJUZStmIsJ2PdVyCcGUYH0XQruwRKwTEff lyAdA9HEQUVVbkAhL0ImA7YpbNC9Gfj4LCCKeqHSYnTQp9hSZGD2e2ROej0r+Mvqe5S+jo GHL/sqJgK4ZGQUAsKPZ0SfQ3HVbUTX+KA7nQcyIwtQweCK1aSigIfn7ntFzLqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4339e0c6dbffe28731f443a99ca7eaeaea0c9883 commit 4339e0c6dbffe28731f443a99ca7eaeaea0c9883 Author: Dimitry Andric AuthorDate: 2021-12-24 18:53:44 +0000 Commit: Dimitry Andric 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}; \