From 82100819b4d7236be6f1a5b72fd3df10294ab377 Mon Sep 17 00:00:00 2001
From: John Marino <draco@marino.st>
Date: Sat, 21 May 2011 13:38:10 +0200
Subject: [PATCH] c++filt: Switch from compiler to binutils versions

---
 Makefile_upgrade.inc             | 3 +++
 gnu/usr.bin/binutils220/Makefile | 4 +---
 gnu/usr.bin/binutils221/Makefile | 4 +---
 gnu/usr.bin/cc41/Makefile        | 4 +---
 gnu/usr.bin/cc44/Makefile        | 2 +-
 usr.bin/objformat/Makefile       | 3 +--
 usr.bin/objformat/objformat.c    | 3 ---
 7 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index 69d0b1ce70..a15c321e41 100644
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -1646,6 +1646,9 @@ TO_REMOVE+=/usr/share/man/cat3/evasprintf.3.gz
 TO_REMOVE+=/usr/share/man/man3/evasprintf.3.gz
 TO_REMOVE+=/usr/share/man/cat3/esetfun.3.gz
 TO_REMOVE+=/usr/share/man/man3/esetfun.3.gz
+TO_REMOVE+=/usr/bin/cxxfilt
+TO_REMOVE+=/usr/libexec/gcc41/c++filt
+TO_REMOVE+=/usr/libexec/gcc44/c++filt
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/sbin/sgsc
diff --git a/gnu/usr.bin/binutils220/Makefile b/gnu/usr.bin/binutils220/Makefile
index 1b3ed85af4..a7030717d6 100644
--- a/gnu/usr.bin/binutils220/Makefile
+++ b/gnu/usr.bin/binutils220/Makefile
@@ -1,8 +1,6 @@
-# notyet: cxxfilt
-
 SUBDIR=		libiberty libbfd libopcodes libbinutils \
 		addr2line ar as ld nm objcopy objdump ranlib readelf \
-		size strings strip doc
+		size strings strip doc cxxfilt
 
 TARGET_ARCH?=	${MACHINE_ARCH}
 
diff --git a/gnu/usr.bin/binutils221/Makefile b/gnu/usr.bin/binutils221/Makefile
index 93b1e8db01..9dfa4a9613 100644
--- a/gnu/usr.bin/binutils221/Makefile
+++ b/gnu/usr.bin/binutils221/Makefile
@@ -1,8 +1,6 @@
-# notyet: cxxfilt
-
 SUBDIR=		libiberty libbfd libopcodes libbinutils \
 		addr2line ar as ld nm objcopy objdump ranlib readelf \
-		elfedit size strings strip doc libgold gold
+		elfedit size strings strip doc cxxfilt libgold gold
 
 TARGET_ARCH?=	${MACHINE_ARCH}
 
diff --git a/gnu/usr.bin/cc41/Makefile b/gnu/usr.bin/cc41/Makefile
index 0ee5276e81..ce50992191 100644
--- a/gnu/usr.bin/cc41/Makefile
+++ b/gnu/usr.bin/cc41/Makefile
@@ -1,12 +1,10 @@
-# $DragonFly: src/gnu/usr.bin/cc41/Makefile,v 1.3 2008/06/30 12:16:03 hasso Exp $
-
 SUBDIR=		cc_prep
 SUBDIR+=	libiberty
 SUBDIR+=	cc_tools libbackend libcpp cc1 cc doc
 SUBDIR+=	cpp
 SUBDIR+=	gcov
 .if !defined(NO_CXX)
-SUBDIR+=	cc1plus c++ c++filt
+SUBDIR+=	cc1plus c++
 .endif
 .if !defined(NO_OBJC)
 SUBDIR+=	cc1obj
diff --git a/gnu/usr.bin/cc44/Makefile b/gnu/usr.bin/cc44/Makefile
index 09ccd73b85..91b708d6b8 100644
--- a/gnu/usr.bin/cc44/Makefile
+++ b/gnu/usr.bin/cc44/Makefile
@@ -5,7 +5,7 @@ SUBDIR+=	cc_tools libbackend libcpp cc1 cc doc
 SUBDIR+=	cpp
 SUBDIR+=	gcov
 .if !defined(NO_CXX)
-SUBDIR+=	cc1plus c++ c++filt
+SUBDIR+=	cc1plus c++
 .endif
 .if !defined(NO_OBJC)
 SUBDIR+=	cc1obj
diff --git a/usr.bin/objformat/Makefile b/usr.bin/objformat/Makefile
index 87622b08ee..a205fac689 100644
--- a/usr.bin/objformat/Makefile
+++ b/usr.bin/objformat/Makefile
@@ -23,7 +23,7 @@ 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}/c++filt
 LINKS+=	${BINDIR}/objformat ${BINDIR}/elfedit
 LINKS+=	${BINDIR}/objformat ${BINDIR}/ld
 LINKS+=	${BINDIR}/objformat ${BINDIR}/nm
@@ -40,7 +40,6 @@ LINKS+=	${BINDIR}/objformat ${BINDIR}/strip
 LINKS+=	${BINDIR}/objformat ${BINDIR}/CC
 LINKS+=	${BINDIR}/objformat ${BINDIR}/cpp
 LINKS+=	${BINDIR}/objformat ${BINDIR}/c++
-LINKS+=	${BINDIR}/objformat ${BINDIR}/c++filt
 LINKS+=	${BINDIR}/objformat ${BINDIR}/cc
 LINKS+=	${BINDIR}/objformat ${BINDIR}/g++
 LINKS+=	${BINDIR}/objformat ${BINDIR}/gcc
diff --git a/usr.bin/objformat/objformat.c b/usr.bin/objformat/objformat.c
index f82f9c94f6..c3af40295a 100644
--- a/usr.bin/objformat/objformat.c
+++ b/usr.bin/objformat/objformat.c
@@ -58,7 +58,6 @@ struct command {
 static struct command commands[] = {
 	{"CC",		COMPILER},
 	{"c++",		COMPILER},
-	{"c++filt",	COMPILER},
 	{"cc",		COMPILER},
 	{"cpp",		COMPILER},
 	{"g++",		COMPILER},
@@ -67,9 +66,7 @@ static struct command commands[] = {
 	{"addr2line",	BINUTILS},
 	{"ar",		BINUTILS},
 	{"as",		BINUTILS},
-#if 0
 	{"c++filt",	BINUTILS},
-#endif
 	{"elfedit",	BINUTILS},
 	{"ld",		BINUTILS},
 	{"nm",		BINUTILS},
-- 
2.41.0