aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2022-11-18 20:47:13 +0000
committerEd Maste <emaste@FreeBSD.org>2022-12-12 15:36:02 +0000
commit86edb11e7491e657e6c75ef6814867021665c377 (patch)
tree6db238085ddbb4d90eec12cd9cc6561975e51ead
parent85dd853236149dd029d5c065efce0e802f9c1e9a (diff)
downloadsrc-86edb11e7491.tar.gz
src-86edb11e7491.zip
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 MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37445
-rw-r--r--UPDATING8
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc7
-rw-r--r--usr.bin/clang/llvm-objdump/Makefile2
3 files changed, 10 insertions, 7 deletions
diff --git a/UPDATING b/UPDATING
index 001ec9f6de3a..13007feb15c6 100644
--- a/UPDATING
+++ b/UPDATING
@@ -27,6 +27,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW:
world, or to merely disable the most expensive debugging functionality
at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20221212:
+ 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.
+
20221205:
dma(8) has replaced sendmail(8) as the default mta. For people willing
to reenable sendmail(8):
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 0802d4340ef9..dacc89f9e78e 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1182,6 +1182,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
@@ -1192,6 +1193,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
@@ -2098,11 +2100,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 443128460f99..44d8c7f82e33 100644
--- a/usr.bin/clang/llvm-objdump/Makefile
+++ b/usr.bin/clang/llvm-objdump/Makefile
@@ -31,9 +31,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"