From 37c5a0dbec037771c8f75f042916d547d8117a41 Mon Sep 17 00:00:00 2001
From: John Marino <draco@marino.st>
Date: Sat, 26 Nov 2011 00:05:34 +0100
Subject: [PATCH 1/1] binutils 2.22: Activate building in world

The next commit will change the default to make binutils 2.22 prime
and demote binutils 2.21 to be the backup.
---
 UPDATING                   | 5 ++---
 etc/mtree/BSD.usr.dist     | 6 ++++++
 gnu/usr.bin/Makefile       | 3 +--
 share/man/man5/make.conf.5 | 2 ++
 share/man/man7/hier.7      | 9 +++++++++
 usr.bin/objformat/Makefile | 1 +
 6 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/UPDATING b/UPDATING
index 19476b22f7..370e971d14 100644
--- a/UPDATING
+++ b/UPDATING
@@ -45,9 +45,8 @@ 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.
+Binutils 2.20 has been removed in favor of Binutils 2.22.  The accepted
+values of BINUTILSVERS have changed accordingly.
 
 +-----------------------------------------------------------------------+
 +         UPGRADING DRAGONFLY FROM 2.8 to later versions                +
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index b95c9ada0e..2c6f222f8b 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -64,6 +64,12 @@
             elf
             ..
         ..
+        binutils222
+            ldscripts
+            ..
+            elf
+            ..
+        ..
         custom
         ..
         gcc41
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index cd39579794..bf71fd081d 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -10,8 +10,7 @@ SUBDIR+=cvs
 SUBDIR+=gdb
 .endif
 
-# XXX marino: Step 1 for moving back to a single binutils system
-#SUBDIR+= binutils220
+SUBDIR+= binutils222
 SUBDIR+= binutils221
 
 .if !defined(NO_GCC41)
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 5b1787af7d..0e86e33145 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -128,6 +128,8 @@ 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 binutils222
+and
 .Dq binutils221
 (default).
 .It Va CFLAGS
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index ed011a8fd5..8e861ae9d8 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -331,6 +331,15 @@ see
 .Xr ld 1
 .El
 .Pp
+.It Pa binutils222/
+.Pp
+.Bl -tag -width ".Pa ldscripts/" -compact
+.It Pa ldscripts/
+linker scripts;
+see
+.Xr ld 1
+.El
+.Pp
 .It Pa lpr/
 utilities and filters for LP print system;
 see
diff --git a/usr.bin/objformat/Makefile b/usr.bin/objformat/Makefile
index 5258a035ab..e1d3d13197 100644
--- a/usr.bin/objformat/Makefile
+++ b/usr.bin/objformat/Makefile
@@ -26,6 +26,7 @@ LINKS+=	${BINDIR}/objformat ${BINDIR}/as
 LINKS+=	${BINDIR}/objformat ${BINDIR}/c++filt
 LINKS+=	${BINDIR}/objformat ${BINDIR}/elfedit
 LINKS+=	${BINDIR}/objformat ${BINDIR}/gprof
+LINKS+=	${BINDIR}/objformat ${BINDIR}/incremental-dump
 LINKS+=	${BINDIR}/objformat ${BINDIR}/ld
 LINKS+=	${BINDIR}/objformat ${BINDIR}/nm
 LINKS+=	${BINDIR}/objformat ${BINDIR}/objcopy
-- 
2.41.0