From nobody Fri Apr 11 19:59:45 2025 X-Original-To: dev-commits-src-main@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 4ZZ6wK33BZz5sZyc; Fri, 11 Apr 2025 19:59:45 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZZ6wK2VCrz3kwj; Fri, 11 Apr 2025 19:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744401585; 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=wSXoAcz7nIIhheaOwuitxc+IwAMz7i+PDUM/6r1p1KE=; b=VrAq4Pk8KUcq44xEYgwL2LRRXVN7JNr2hhHFTAjiKsev0Hb9oFRz+7H5qSYCPeUBMNTmn6 TXFD/glDP1Ex/ImCxdKzzuDuK184z+U1wPNztA2aLRx4ZnbY12Dej8WkBTrJD5kkPaPnXf 5Sw+62pdGEFpALOq5cPcSXo9tNNP3TT4rIUWlSWAbGUgACvkBhUifT2Sl6G97EtdSQ+0wv HbnT3kkELnH4eXhaU94OZANj9vmYYeqTa0XsaiT5+My1ZQB17qGtaG3mpVokyD8wvr/dY+ 1QF+O9y7QwDYqXHzAeXKFl2KnenpbP2jmdPyEJUUC0+7R15azjfttygEcB2LSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744401585; a=rsa-sha256; cv=none; b=m0hIHO/kiuHj0Ow9nFI41fM/lL8KH+xMBM9uxmHT1R9UTaODkw9CdX4LE4bZtvNF7mn3G8 GS2a9Nx/AKOZqtle/p5q0XHqxZneE14zrMQsWt7pfrsAXX01KcrJ05haCOQYmLXwSn31Ck bfmVUgZ2nfJAMjkNC7bgd8OIu5eN/T4/dT2O9fiLBqC2oZEFf672VuM8V/lJJl4KxUUyLE PUEHMJTSPlNLfsJgA/9GQ4ZmjoQEqcPgZs7lK2iKbY2utjx4bnIBuREnedLDMm2rQvBTco X4y/cIVTshoo0C0Zg3AGW8qZsrdCdqn20+hmFP13nltXzu9PiFu31rBYvkqFWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744401585; 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=wSXoAcz7nIIhheaOwuitxc+IwAMz7i+PDUM/6r1p1KE=; b=oquLMWYfAAU5XQAggaIcD2QjjLO7BnDMXpXfHrEpkj07un8cNc02ag5X3+PgWzGAMCQRD5 xo1Uv7eu5uYMxfcxBNBTaZ27rXpOu3VDLS1ZO71P5LvxUB5HEk1iRcr/L+LFUcfQA4hAm1 G4akAior2c6b2eEtWf8pzZS4zhxw+JXJDzWc1uY/t0qplXIwbgtpgRzia2oqSltyPz+LvP U0shRm6dJgtXto9iwl70Wk6M1IMM2pSLfapxkgxX1wVrbyUnQ0iH33nqC+/d8QBd1k+z84 zlVbP0X9esLT5hgRM7IUrxFlQQW07hpShLw2V/eZtfGLD/WbB7rth3VzACvqug== 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 4ZZ6wK24hnzmyx; Fri, 11 Apr 2025 19:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53BJxjvg010825; Fri, 11 Apr 2025 19:59:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53BJxjK7010822; Fri, 11 Apr 2025 19:59:45 GMT (envelope-from git) Date: Fri, 11 Apr 2025 19:59:45 GMT Message-Id: <202504111959.53BJxjK7010822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ca0fc8ef2f97 - main - elfcopy: Restore upstream name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ca0fc8ef2f97709d3dfeac54e2c762e1c6ec6559 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ca0fc8ef2f97709d3dfeac54e2c762e1c6ec6559 commit ca0fc8ef2f97709d3dfeac54e2c762e1c6ec6559 Author: Ed Maste AuthorDate: 2025-03-31 13:37:35 +0000 Commit: Ed Maste CommitDate: 2025-04-11 19:44:40 +0000 elfcopy: Restore upstream name ELF Tool Chain's objcopy-equivalent is called elfcopy. Restore the upstream name in our build infrastructure to make it more clear where different binary utility components come from. Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49784 --- Makefile.inc1 | 12 ++++++------ usr.bin/Makefile | 4 ++-- usr.bin/{objcopy => elfcopy}/Makefile | 0 usr.bin/{objcopy => elfcopy}/Makefile.depend | 0 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index af9e4736a65a..a18d10e80f17 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2910,14 +2910,14 @@ _dtrace_tools= cddl/lib/libctf cddl/lib/libspl cddl/usr.bin/ctfconvert \ .endif .if ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no" -# Some bespoke tools from or based on ELF Tool Chain. objcopy (elfcopy) is -# included because llvm-objcopy is currently not capable of translating ELF to -# PE32+, which is required for EFI boot programs. +# Some bespoke tools from or based on ELF Tool Chain. elfcopy is included +# because llvm-objcopy is currently not capable of translating ELF to PE32+, +# which is required for EFI boot programs. _elftctools= lib/libelftc \ lib/libpe \ + usr.bin/elfcopy \ usr.bin/elfctl \ - usr.bin/elfdump \ - usr.bin/objcopy + usr.bin/elfdump # If we're given an XNM we don't need to build standard binary utilities. .if ${XNM:M/*} == "" _elftctools+= usr.bin/nm \ @@ -3011,7 +3011,7 @@ NXBDIRS+= \ usr.bin/cmp \ usr.bin/diff \ usr.bin/dirname \ - usr.bin/objcopy \ + usr.bin/elfcopy \ usr.bin/env \ usr.bin/fetch \ usr.bin/find \ diff --git a/usr.bin/Makefile b/usr.bin/Makefile index b9e4d6c1153a..87896a2c0781 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -263,14 +263,14 @@ SUBDIR.${MK_TOOLCHAIN}+= ctags .if ${MK_LLVM_CXXFILT} == "no" SUBDIR.${MK_TOOLCHAIN}+= cxxfilt .endif +# ELF Tool Chain elfcopy required for EFI objects (PR280771) +SUBDIR.${MK_TOOLCHAIN}+= elfcopy SUBDIR.${MK_TOOLCHAIN}+= file2c SUBDIR.${MK_TOOLCHAIN}+= gprof SUBDIR.${MK_TOOLCHAIN}+= indent SUBDIR.${MK_TOOLCHAIN}+= lex SUBDIR.${MK_TOOLCHAIN}+= lorder SUBDIR.${MK_TOOLCHAIN}+= mkstr -# ELF Tool Chain elfcopy required for EFI objects (PR280771) -SUBDIR.${MK_TOOLCHAIN}+= objcopy SUBDIR.${MK_TOOLCHAIN}+= rpcgen SUBDIR.${MK_TOOLCHAIN}+= unifdef SUBDIR.${MK_TOOLCHAIN}+= xstr diff --git a/usr.bin/objcopy/Makefile b/usr.bin/elfcopy/Makefile similarity index 100% rename from usr.bin/objcopy/Makefile rename to usr.bin/elfcopy/Makefile diff --git a/usr.bin/objcopy/Makefile.depend b/usr.bin/elfcopy/Makefile.depend similarity index 100% rename from usr.bin/objcopy/Makefile.depend rename to usr.bin/elfcopy/Makefile.depend