From 919eb2192b0e38503be55613615e752194429107 Mon Sep 17 00:00:00 2001 From: John Marino Date: Thu, 3 Nov 2011 22:38:50 +0100 Subject: [PATCH] Binutils 2.20: Effectively remove from world There is no longer a reason to maintain multiple versions of binutils in the base system. While contrib/binutils-2.20 directory isn't being removed quite yet, this commit effectively removed binutils 2.20 from DragonFly. Sometime in the future, binutils may be removed from the objformat handler. The value of the BINUTILSVERS variable no longer has any effect, and the only version of binutils on the system is 2.21. --- Makefile_upgrade.inc | 14 ++++++++++++++ UPDATING | 6 ++++++ etc/mtree/BSD.usr.dist | 6 ------ gnu/usr.bin/Makefile | 3 ++- share/man/man5/make.conf.5 | 2 -- share/man/man7/hier.7 | 10 ---------- 6 files changed, 22 insertions(+), 19 deletions(-) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 0946dcac9d..056da7e731 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -1729,6 +1729,20 @@ TO_REMOVE+=/usr/share/man/man4/i386/ndis.4.gz TO_REMOVE+=/usr/share/info/diff.info.gz TO_REMOVE+=/usr/include/vfs/gnu TO_REMOVE+=/usr/include/crypt.h +TO_REMOVE+=/usr/share/man/man1/addr2line220.1.gz +TO_REMOVE+=/usr/share/man/man1/ar220.1.gz +TO_REMOVE+=/usr/share/man/man1/as220.1.gz +TO_REMOVE+=/usr/share/man/man1/c++filt220.1.gz +TO_REMOVE+=/usr/share/man/man1/ld220.1.gz +TO_REMOVE+=/usr/share/man/man1/nm220.1.gz +TO_REMOVE+=/usr/share/man/man1/objcopy220.1.gz +TO_REMOVE+=/usr/share/man/man1/objdump220.1.gz +TO_REMOVE+=/usr/share/man/man1/ranlib220.1.gz +TO_REMOVE+=/usr/share/man/man1/readelf220.1.gz +TO_REMOVE+=/usr/share/man/man1/size220.1.gz +TO_REMOVE+=/usr/share/man/man1/strings220.1.gz +TO_REMOVE+=/usr/share/man/man1/strip220.1.gz +TO_REMOVE+=/usr/libexec/binutils220 .if ${MACHINE_ARCH} == "x86_64" TO_REMOVE+=/usr/libdata/stallion/2681.sys diff --git a/UPDATING b/UPDATING index 5a91da4f4a..19476b22f7 100644 --- a/UPDATING +++ b/UPDATING @@ -43,6 +43,12 @@ file. If buildkernel complains about any of these drivers, just remove them from your kernel configuration. +BINUTILS 2.20 +------------- +Binutils 2.20 has been removed, leaving Binutils 2.21 as the only +version of Binutils in base. The value of BINUTILSVERS has no effect +at all anymore. + +-----------------------------------------------------------------------+ + UPGRADING DRAGONFLY FROM 2.8 to later versions + +-----------------------------------------------------------------------+ diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index ff24e6bceb..b95c9ada0e 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -58,12 +58,6 @@ .. .. libexec - binutils220 - ldscripts - .. - elf - .. - .. binutils221 ldscripts .. diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 926223528f..cd39579794 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -10,7 +10,8 @@ SUBDIR+=cvs SUBDIR+=gdb .endif -SUBDIR+= binutils220 +# XXX marino: Step 1 for moving back to a single binutils system +#SUBDIR+= binutils220 SUBDIR+= binutils221 .if !defined(NO_GCC41) diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 95e92c4e4b..5b1787af7d 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -128,8 +128,6 @@ All other values will handled according to the settings in .Pq Vt str Controls which binutils to use by default. Currently accepted values are -.Dq binutils220 -and .Dq binutils221 (default). .It Va CFLAGS diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index e162c532c0..ac98dce1de 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -324,16 +324,6 @@ holds the download firmware images .It Pa libexec/ system daemons & system utilities (executed by other programs) .Pp -.Bl -tag -width ".Pa binutils220/" -compact -.It Pa binutils220/ -.Pp -.Bl -tag -width ".Pa ldscripts/" -compact -.It Pa ldscripts/ -linker scripts; -see -.Xr ld 1 -.El -.Pp .It Pa binutils221/ .Pp .Bl -tag -width ".Pa ldscripts/" -compact -- 2.41.0