git: 982e61aacc79 - stable/13 - Always install llvm-objdump as objdump

The branch stable/13 has been updated by emaste:

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

commit 982e61aacc79f5b972e4c6e1dab6221403e58b0a
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-11-18 20:47:13 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-04-05 01:33:57 +0000

    Always install llvm-objdump as objdump
    
    Instead of providing no /usr/bin/objdump when LLVM_BINUTILS is false.
    
    PR:             267854 [exp-run]
    Reviewed by:    dim
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D37445
    
    (cherry picked from commit 86edb11e7491e657e6c75ef6814867021665c377)
---
 UPDATING                                 | 8 ++++++++
 tools/build/mk/OptionalObsoleteFiles.inc | 7 ++-----
 usr.bin/clang/llvm-objdump/Makefile      | 2 --
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/UPDATING b/UPDATING
index 60f583ac26cf..d2c07cf5a80b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,14 @@ Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before updating system packages
 and/or ports.
 
+20230404:
+	llvm-objump is now always installed as objdump.  Previously there was
+	no /usr/bin/objdump unless the WITH_LLVM_BINUTILS knob was used.
+
+	Some LLVM objdump options have a different output format compared to
+	GNU objdump; readelf is available for inspecting ELF files, and GNU
+	objdump is available from the devel/binutils port or package.
+
 20230217:
 	Bump __FreeBSD_verion after various changes to LinuxKPI pci and 802.11
 	in order to help out-of-tree consumers to deal accordingly.
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 81ab89eff94f..e30dc2bc74e8 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1173,6 +1173,7 @@ OLD_FILES+=usr/bin/llvm-readobj
 OLD_FILES+=usr/bin/llvm-size
 OLD_FILES+=usr/bin/llvm-strings
 OLD_FILES+=usr/bin/llvm-symbolizer
+OLD_FILES+=usr/bin/objdump
 OLD_FILES+=usr/share/man/man1/llvm-addr2line.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-ar.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-nm.1.gz
@@ -1183,6 +1184,7 @@ OLD_FILES+=usr/share/man/man1/llvm-readobj.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-size.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-strings.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-symbolizer.1.gz
+OLD_FILES+=usr/share/man/man1/objdump.1.gz
 .endif
 
 .if ${MK_CLANG} == no
@@ -2095,11 +2097,6 @@ OLD_FILES+=usr/share/man/man8/strfile.8.gz
 OLD_FILES+=usr/share/man/man8/unstr.8.gz
 .endif
 
-.if ${MK_LLVM_BINUTILS} == no
-OLD_FILES+=usr/bin/objdump
-OLD_FILES+=usr/share/man/man1/objdump.1.gz
-.endif
-
 .if ${MK_LLVM_COV} == no && !defined(WITH_PORT_BASE_GCC)
 OLD_FILES+=usr/bin/gcov
 OLD_FILES+=usr/share/man/man1/gcov.1.gz
diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile
index 8a9587129f36..fc81304ddb1a 100644
--- a/usr.bin/clang/llvm-objdump/Makefile
+++ b/usr.bin/clang/llvm-objdump/Makefile
@@ -33,9 +33,7 @@ CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 
 LIBADD+=	z
 
-.if ${MK_LLVM_BINUTILS} != "no"
 LINKS=		${BINDIR}/llvm-objdump ${BINDIR}/objdump
 MLINKS=		llvm-objdump.1 objdump.1
-.endif
 
 .include "../llvm.prog.mk"