From 463e5243af35a58c3a8b9e44b53f8d0bb9858596 Mon Sep 17 00:00:00 2001 From: zrj Date: Sat, 19 Nov 2016 20:52:45 +0200 Subject: [PATCH] Replace binutils 2.24 with latest binutils 2.27. --- Makefile_upgrade.inc | 16 ++++++++++++++++ etc/mtree/BSD.usr.dist | 6 ++++-- gnu/usr.bin/Makefile.buo | 2 +- share/man/man5/make.conf.5 | 2 +- share/man/man7/hier.7 | 6 +++--- 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 4aad282bed..e8ffa25fde 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -3152,6 +3152,22 @@ TO_REMOVE+=/usr/include/unctrl.h TO_REMOVE+=/usr/include/sys/link_aout.h TO_REMOVE+=/usr/lib/libdevstat.so.3 TO_REMOVE+=/usr/lib/libsmb.so.2 +TO_REMOVE+=/usr/libexec/binutils224 +TO_REMOVE+=/usr/share/man/man1/addr2line224.1.gz +TO_REMOVE+=/usr/share/man/man1/ar224.1.gz +TO_REMOVE+=/usr/share/man/man1/as224.1.gz +TO_REMOVE+=/usr/share/man/man1/c++filt224.1.gz +TO_REMOVE+=/usr/share/man/man1/elfedit224.1.gz +TO_REMOVE+=/usr/share/man/man1/gprof224.1.gz +TO_REMOVE+=/usr/share/man/man1/ld224.1.gz +TO_REMOVE+=/usr/share/man/man1/nm224.1.gz +TO_REMOVE+=/usr/share/man/man1/objcopy224.1.gz +TO_REMOVE+=/usr/share/man/man1/objdump224.1.gz +TO_REMOVE+=/usr/share/man/man1/ranlib224.1.gz +TO_REMOVE+=/usr/share/man/man1/readelf224.1.gz +TO_REMOVE+=/usr/share/man/man1/size224.1.gz +TO_REMOVE+=/usr/share/man/man1/strings224.1.gz +TO_REMOVE+=/usr/share/man/man1/strip224.1.gz .if !defined(WANT_INSTALLER) TO_REMOVE+=/usr/sbin/dfuibe_installer diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index e8a612ffeb..4612adeaf4 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -88,13 +88,15 @@ .. .. libexec - binutils224 + binutils225 + bfd-plugins + .. ldscripts .. elf .. .. - binutils225 + binutils227 bfd-plugins .. ldscripts diff --git a/gnu/usr.bin/Makefile.buo b/gnu/usr.bin/Makefile.buo index 9356f6a5f1..d0e7cbe44d 100644 --- a/gnu/usr.bin/Makefile.buo +++ b/gnu/usr.bin/Makefile.buo @@ -10,7 +10,7 @@ # copied over in most cases. BU_PRIMARY= binutils225 -BU_BACKUP= binutils224 +BU_BACKUP= binutils227 .if defined(BUVERSION) .if (${BUVERSION} == ${BU_PRIMARY}) diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 472d7edf34..abe7a52f9a 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -148,7 +148,7 @@ is the default value. .Pq Vt str Controls which binutils to use by default. Currently accepted values are -.Dq binutils224 +.Dq binutils227 and .Dq binutils225 (default). diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 8de5448c3b..3cd61148c5 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -301,8 +301,8 @@ misc. utility data files .It Pa libexec/ system daemons & system utilities (executed by other programs) .Pp -.Bl -tag -width ".Pa binutils224/" -compact -.It Pa binutils224/ +.Bl -tag -width ".Pa binutils225/" -compact +.It Pa binutils225/ .Pp .Bl -tag -width ".Pa ldscripts/" -compact .It Pa ldscripts/ @@ -311,7 +311,7 @@ see .Xr ld 1 .El .Pp -.It Pa binutils225/ +.It Pa binutils227/ .Pp .Bl -tag -width ".Pa ldscripts/" -compact .It Pa ldscripts/ -- 2.11.4.GIT