From 053919c01082dc4b7f741e664bdf2beb1577b29f Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Thu, 24 Mar 2011 22:02:35 +0100
Subject: [PATCH] Hook binutils 2.21 into the build in place of 2.20.

Submitted-by: John Marino <john@marino.st>
---
 etc/mtree/BSD.usr.dist        | 2 +-
 gnu/usr.bin/Makefile          | 2 +-
 share/man/man5/make.conf.5    | 4 ++--
 sys/conf/kern.pre.mk          | 2 +-
 usr.bin/objformat/Makefile    | 2 ++
 usr.bin/objformat/objformat.c | 2 ++
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index e9471656c9..51d055efd5 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -64,7 +64,7 @@
             elf
             ..
         ..
-        binutils220
+        binutils221
             ldscripts
             ..
             elf
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index ca6855d119..7b8837ed81 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -11,7 +11,7 @@ SUBDIR+=gdb
 .endif
 
 SUBDIR+= binutils217
-SUBDIR+= binutils220
+SUBDIR+= binutils221
 
 .if !defined(NO_GCC41)
 SUBDIR+= cc41
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 1faef84f38..c99ff2c2ff 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $
 .\"
-.Dd March 4, 2011
+.Dd March 23, 2011
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -130,7 +130,7 @@ Controls which binutils to use by default.
 Currently accepted values are
 .Dq binutils217
 (default) and
-.Dq binutils220 .
+.Dq binutils221 .
 .It Va CFLAGS
 .Pq Vt str
 Controls the compiler setting when compiling C code.
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 43e7a1e0c6..21fa48638a 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -96,7 +96,7 @@ SYSTEM_LD= @${LD} -Bdynamic -T $S/platform/$P/conf/ldscript.$M \
 	-export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
 .if ${P} == "pc64"
-# XXX swildner: Workaround to make kernels linked with binutils220 boot.
+# XXX swildner: Workaround to make kernels linked with binutils221 boot.
 #
 SYSTEM_LD+= -z max-page-size=1048576
 .endif
diff --git a/usr.bin/objformat/Makefile b/usr.bin/objformat/Makefile
index b1dafab92f..54eb39c37b 100644
--- a/usr.bin/objformat/Makefile
+++ b/usr.bin/objformat/Makefile
@@ -23,6 +23,8 @@ CFLAGS+=	-DOBJFORMAT_PATH_DEFAULT="\"${OBJFORMAT_BUILTIN_PATH_DEFAULT}\""
 LINKS+=	${BINDIR}/objformat ${BINDIR}/addr2line
 LINKS+=	${BINDIR}/objformat ${BINDIR}/ar
 LINKS+=	${BINDIR}/objformat ${BINDIR}/as
+LINKS+= ${BINDIR}/objformat ${BINDIR}/cxxfilt
+LINKS+=	${BINDIR}/objformat ${BINDIR}/elfedit
 LINKS+=	${BINDIR}/objformat ${BINDIR}/ld
 LINKS+=	${BINDIR}/objformat ${BINDIR}/nm
 LINKS+=	${BINDIR}/objformat ${BINDIR}/objcopy
diff --git a/usr.bin/objformat/objformat.c b/usr.bin/objformat/objformat.c
index fc5c9d7e0f..3ddc8985d0 100644
--- a/usr.bin/objformat/objformat.c
+++ b/usr.bin/objformat/objformat.c
@@ -70,6 +70,8 @@ static struct command commands[] = {
 	{"addr2line",	BINUTILS2},
 	{"ar",		BINUTILS2},
 	{"as",		BINUTILS2},
+	{"cxxfilt",	BINUTILS2},
+	{"elfedit",	BINUTILS2},
 	{"ld",		BINUTILS2},
 	{"nm",		BINUTILS2},
 	{"objcopy",	BINUTILS2},
-- 
2.41.0