git: ca0fc8ef2f97 - main - elfcopy: Restore upstream name

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=ca0fc8ef2f97709d3dfeac54e2c762e1c6ec6559

commit ca0fc8ef2f97709d3dfeac54e2c762e1c6ec6559
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-03-31 13:37:35 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
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