From nobody Mon Dec 06 22:08:54 2021 X-Original-To: dev-commits-src-all@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 8896A18BA347; Mon, 6 Dec 2021 22:08:55 +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 4J7HdM1ky9z3NcY; Mon, 6 Dec 2021 22:08:55 +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 0CFE7140CF; Mon, 6 Dec 2021 22:08:55 +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 1B6M8sVI034944; Mon, 6 Dec 2021 22:08:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6M8seQ034943; Mon, 6 Dec 2021 22:08:54 GMT (envelope-from git) Date: Mon, 6 Dec 2021 22:08:54 GMT Message-Id: <202112062208.1B6M8seQ034943@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a515ae8b638d - stable/13 - Add elfctl to toolchain. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a515ae8b638deadd4c7992c73d688fc58f23d7e0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638828535; 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=9jvjWz4fxMrqWllDrehMog10Kygm5i48oKvFrUv0vYk=; b=BsYZVsvOMu/FIEsrd1HbPpckPbwgKfm1PF/QhJIdbSZG6Zpj8CC4DKlotQ14vu0+VzdScT LZUB428scgbqFjWSq1FFofaezygHsfu7R1dtljPgNt0ghrGCVlCi5cCBqq8QyiEmOY2JXX bZ+8VBm93ltbkvMchVwvZcljhpPeRb3WRthmg3GO+Fh8/BhCO5cXZ5cB6VCUyWsdsUzqGl 7isCsAxjqYD0ergELrRrDHYFd1X2wGcZ3V31F6bRWPtg07TCaE6NjxuJE9Q1NwQZuS2JaH /QFDZQuh5iy/VWxMr8jrB9IpvIIeRtfn165ZpMl0eygFQ/ufIeEC9JUVWZP1pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638828535; a=rsa-sha256; cv=none; b=nG8dyKMY4/XobgRoNI0j6fI9vOaI452caqyP/UmDh4GXnw1z/CGPZ/yXDLUVrlqM4ACjc9 /O5vr6O5oOtIP++UPa/4zhdGYSL4ugjYBLg7ICv88JvI8SVmRy4wSgI4Q/VpMZDc9p88ec KGmy6skC0MyXrlgLxoc6S0CNflfQLEese+zc6xQze9s7vq+FIyyJ5Rmss5NWyI7f7O/fTJ 6RQY5QSpQ32CpATt3AxY/a0fgWcc5RmzFkyy43MD2fvXz17Vcqfc4aPEXHc7tbmFDCAx/m 1+Z0JBo6XMr9yeWuwN1UJbRlY4p5d2zM4795N0H7j08+jsYrXUZCbJ+9T64afQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a515ae8b638deadd4c7992c73d688fc58f23d7e0 commit a515ae8b638deadd4c7992c73d688fc58f23d7e0 Author: Marcin Wojtas AuthorDate: 2021-05-21 09:27:27 +0000 Commit: Ed Maste CommitDate: 2021-12-06 22:08:16 +0000 Add elfctl to toolchain. Add elfctl program to toolchain to allow modifying ELF feature flags during system build. Submitted by: Dawid Gorecki Obtained from: Semihalf Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D29552 (cherry picked from commit c6081dea597a475e4bbcc8588ece03ae78b58978) --- Makefile.inc1 | 8 +++++--- share/mk/sys.mk | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 6829c3c962fd..c18c92d3cd38 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -199,7 +199,7 @@ MK_SYSTEM_LINKER= no .if defined(CROSS_TOOLCHAIN_PREFIX) CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} .endif -XBINUTILS= AS AR LD NM OBJCOPY RANLIB SIZE STRINGS STRIPBIN +XBINUTILS= AS AR ELFCTL LD NM OBJCOPY RANLIB SIZE STRINGS STRIPBIN .for BINUTIL in ${XBINUTILS} .if defined(CROSS_BINUTILS_PREFIX) && \ exists(${CROSS_BINUTILS_PREFIX}/${${BINUTIL}}) @@ -808,8 +808,8 @@ HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT CROSSENV+= CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCXXFLAGS} ${XCFLAGS}" \ CPP="${XCPP} ${XCFLAGS}" \ - AS="${XAS}" AR="${XAR}" LD="${XLD}" LLVM_LINK="${XLLVM_LINK}" \ - NM=${XNM} OBJCOPY="${XOBJCOPY}" \ + AS="${XAS}" AR="${XAR}" ELFCTL="${XELFCTL}" LD="${XLD}" \ + LLVM_LINK="${XLLVM_LINK}" NM=${XNM} OBJCOPY="${XOBJCOPY}" \ RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \ SIZE="${XSIZE}" STRIPBIN="${XSTRIPBIN}" @@ -2617,6 +2617,7 @@ _dtrace_tools= cddl/lib/libctf cddl/lib/libspl cddl/usr.bin/ctfconvert \ .if ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no" _elftctools= lib/libelftc \ lib/libpe \ + usr.bin/elfctl \ usr.bin/objcopy \ usr.bin/nm \ usr.bin/size \ @@ -2630,6 +2631,7 @@ _elftctools+= usr.bin/addr2line # the target (for at least crunchide). _elftctools= lib/libelftc \ lib/libpe \ + usr.bin/elfctl \ usr.bin/objcopy .endif diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 8f456b28593a..89ac2c549656 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -210,6 +210,8 @@ ECHODIR ?= true .endif .endif +ELFCTL ?= elfctl + .if ${.MAKEFLAGS:M-N} # bmake -N is supposed to skip executing anything but it does not skip # exeucting '+' commands. The '+' feature is used where .MAKE