From e5e8e422a724516f8f99baa33276f7ae69f1064f Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Sun, 4 Aug 2019 01:18:50 +0000 Subject: [PATCH] objdump: update deprecation notice MFC r350503: objdump: move deprecation notice to indended spot r335217 added a deprecation notice to the source file for the objdump man page, and r335219 added it to the rendered objdump.1, but in the wrong spot. MFC r350505: objdump: be explicit that GNU objdump that will be removed We may install llvm-objdump as objdump (see review D18307) or just provide no /usr/bin/objdump, but either way GNU objdump won't be installed in the future. Sponsored by: The FreeBSD Foundation --- contrib/binutils/binutils/doc/binutils.texi | 4 ++-- gnu/usr.bin/binutils/objdump/objdump.1 | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/binutils/binutils/doc/binutils.texi b/contrib/binutils/binutils/doc/binutils.texi index 05c41848fac..4e12f641b73 100644 --- a/contrib/binutils/binutils/doc/binutils.texi +++ b/contrib/binutils/binutils/doc/binutils.texi @@ -1624,8 +1624,8 @@ program to compile and work. specify archives, @command{objdump} shows information on each of the member object files. -@command{objdump} will be removed from a future version of the -FreeBSD base system. Users who require @command{objdump} are advised +GNU @command{objdump} will be removed from a future version of the +FreeBSD base system. Users who require GNU @command{objdump} are advised to install the binutils port or package. @c man end diff --git a/gnu/usr.bin/binutils/objdump/objdump.1 b/gnu/usr.bin/binutils/objdump/objdump.1 index 6190fac3666..04a7a7f6331 100644 --- a/gnu/usr.bin/binutils/objdump/objdump.1 +++ b/gnu/usr.bin/binutils/objdump/objdump.1 @@ -179,13 +179,13 @@ information is mostly useful to programmers who are working on the compilation tools, as opposed to programmers who just want their program to compile and work. .PP -\&\fBobjdump\fR will be removed from a future version of the -FreeBSD base system. Users who require \&\fBobjdump\fR are advised -to install the binutils port or package. -.PP \&\fIobjfile\fR... are the object files to be examined. When you specify archives, \fBobjdump\fR shows information on each of the member object files. +.PP +GNU \&\fBobjdump\fR will be removed from a future version of the +FreeBSD base system. Users who require GNU \&\fBobjdump\fR are advised +to install the binutils port or package. .SH "OPTIONS" .IX Header "OPTIONS" The long and short forms of options, shown here as alternatives, are -- 2.45.0