Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -31,6 +31,15 @@
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20181123:
+	LLVM's objdump is installed as /usr/bin/objdump on those architecures
+	which use Clang as the system compiler, as one step in the retirement
+	of the obsolete binutils 2.17.50.  It supports many, but not all, of
+	GNU objdump's command line options.  Users requiring the full
+	functionality of GNU objdump should install the binutils port.  Please
+	also add a comment to PR 229046 listing the option or functionality
+	that is missing.
+
 20181115:
 	The set of CTM commands (ctm, ctm_smail, ctm_rmail, ctm_dequeue)
 	has been converted to a port (misc/ctm) and will be removed from
Index: gnu/usr.bin/binutils/Makefile
===================================================================
--- gnu/usr.bin/binutils/Makefile
+++ gnu/usr.bin/binutils/Makefile
@@ -8,8 +8,12 @@
 	libopcodes \
 	libbinutils \
 	as \
-	ld \
-	objdump
+	ld
+
+# We install llvm-objdump as objdump on those architectures using clang.
+.if ${MK_CLANG} != "no"
+SUBDIR+=objdump
+.endif
 
 
 SUBDIR_DEPEND_libbinutils=libbfd		# for bfdver.h
Index: share/man/man5/src.conf.5
===================================================================
--- share/man/man5/src.conf.5
+++ share/man/man5/src.conf.5
@@ -1,6 +1,6 @@
 .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
 .\" $FreeBSD$
-.Dd November 6, 2018
+.Dd November 23, 2018
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -149,7 +149,12 @@
 flag set to indicate that the run-time loader should perform all relocation
 processing at process startup rather than on demand.
 .It Va WITHOUT_BINUTILS
-Set to not build or install binutils (as, ld, and objdump) as part
+Set to not build or install GNU
+.Xr as 1 ,
+.Xr ld.bfd 1 ,
+and for some CPU architectures
+.Xr objdump 1
+as part
 of the normal system build.
 The resulting system cannot build programs from source.
 .Pp
@@ -162,7 +167,12 @@
 .Va WITHOUT_GDB
 .El
 .It Va WITH_BINUTILS
-Set to build and install binutils (as, ld, and objdump) as part
+Set to build and install GNU
+.Xr as 1 ,
+.Xr ld.bfd 1 ,
+and for some CPU architectures
+.Xr objdump 1
+as part
 of the normal system build.
 .Pp
 This is a default setting on
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -209,7 +209,9 @@
 OLD_FILES+=usr/share/man/man1/ld.1.gz
 .endif
 OLD_FILES+=usr/bin/ld.bfd
+.if ${MK_CLANG} == no
 OLD_FILES+=usr/bin/objdump
+.endif
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xc
@@ -1330,6 +1332,9 @@
 .endif
 
 .if ${MK_CLANG} == no
+.if ${MK_BINUTILS} == no
+OLD_FILES+=usr/bin/objdump
+.endif
 OLD_FILES+=usr/bin/clang
 OLD_FILES+=usr/bin/clang++
 OLD_FILES+=usr/bin/clang-cpp
Index: tools/build/options/WITHOUT_BINUTILS
===================================================================
--- tools/build/options/WITHOUT_BINUTILS
+++ tools/build/options/WITHOUT_BINUTILS
@@ -1,4 +1,9 @@
 .\" $FreeBSD$
-Set to not build or install binutils (as, ld, and objdump) as part
+Set to not build or install GNU
+.Xr as 1 ,
+.Xr ld.bfd 1 ,
+and for some CPU architectures
+.Xr objdump 1
+as part
 of the normal system build.
 The resulting system cannot build programs from source.
Index: tools/build/options/WITH_BINUTILS
===================================================================
--- tools/build/options/WITH_BINUTILS
+++ tools/build/options/WITH_BINUTILS
@@ -1,3 +1,8 @@
 .\" $FreeBSD$
-Set to build and install binutils (as, ld, and objdump) as part
+Set to build and install GNU
+.Xr as 1 ,
+.Xr ld.bfd 1 ,
+and for some CPU architectures
+.Xr objdump 1
+as part
 of the normal system build.
Index: usr.bin/clang/llvm-objdump/Makefile
===================================================================
--- usr.bin/clang/llvm-objdump/Makefile
+++ usr.bin/clang/llvm-objdump/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG_CXX=	llvm-objdump
+LINKS=		${BINDIR}/llvm-objdump	${BINDIR}/objdump
 MAN=
 
 SRCDIR=		tools/llvm-objdump