c++filt: Switch from compiler to binutils versions
authorJohn Marino <draco@marino.st>
Sat, 21 May 2011 11:38:10 +0000 (13:38 +0200)
committerJohn Marino <draco@marino.st>
Sat, 21 May 2011 13:33:49 +0000 (15:33 +0200)
Makefile_upgrade.inc
gnu/usr.bin/binutils220/Makefile
gnu/usr.bin/binutils221/Makefile
gnu/usr.bin/cc41/Makefile
gnu/usr.bin/cc44/Makefile
usr.bin/objformat/Makefile
usr.bin/objformat/objformat.c

index 69d0b1c..a15c321 100644 (file)
@@ -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
index 1b3ed85..a703071 100644 (file)
@@ -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}
 
index 93b1e8d..9dfa4a9 100644 (file)
@@ -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}
 
index 0ee5276..ce50992 100644 (file)
@@ -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
index 09ccd73..91b708d 100644 (file)
@@ -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
index 87622b0..a205fac 100644 (file)
@@ -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
index f82f9c9..c3af402 100644 (file)
@@ -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},