> >Description:
> /usr/bin/c++filt is compiled from src/gnu/usr.bin/cxxfilt.
> That directory also includes a man page, which is not
> installed. The installed c++filt(1) comes from
> src/gnu/usr.bin/binutils-2.17/binutils/doc/cxxfilt.man.
You're right. The binutils cxxfilt codebase is more recent and
should be installed; the diff below takes care of this.
Note that, for platforms using clang as the system compiler, we should
eventually install llvm-cxxfilt as well, but that's a later task.
Thanks for reporting this!
Miod
Index: gnu/usr.bin/Makefile
===================================================================
RCS file: /OpenBSD/src/gnu/usr.bin/Makefile,v
retrieving revision 1.63
diff -u -p -r1.63 Makefile
--- gnu/usr.bin/Makefile 3 May 2021 03:45:40 -0000 1.63
+++ gnu/usr.bin/Makefile 19 Oct 2022 05:57:49 -0000
@@ -17,7 +17,7 @@ SUBDIR+= clang
. endif
.endif
-SUBDIR+= cxxfilt cvs
+SUBDIR+= cvs
# binutils-2.17 needs to build gdb in binutils at the moment
.if make(obj)
SUBDIR+= binutils
Index: gnu/usr.bin/binutils-2.17/binutils/Makefile.am
===================================================================
RCS file: /OpenBSD/src/gnu/usr.bin/binutils-2.17/binutils/Makefile.am,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.am
--- gnu/usr.bin/binutils-2.17/binutils/Makefile.am 4 Jul 2011 23:58:26
-0000 1.3
+++ gnu/usr.bin/binutils-2.17/binutils/Makefile.am 19 Oct 2022 05:57:49
-0000
@@ -59,7 +59,7 @@ bin_PROGRAMS = $(OBJDUMP_PROG) $(AR_PROG
## We need a special rule to install the programs which are built with
## -new, and to rename cxxfilt to c++filt.
-noinst_PROGRAMS = $(STRIP_PROG)
+noinst_PROGRAMS = $(STRIP_PROG) $(DEMANGLER_PROG)
EXTRA_PROGRAMS = $(NLMCONV_PROG) srconv sysdump coffdump $(DLLTOOL_PROG)
$(WINDRES_PROG) $(DLLWRAP_PROG)
@@ -203,7 +203,7 @@ objdump_LDADD = $(OPCODES) $(BFDLIB) $(L
objdump.o:objdump.c
$(COMPILE) -c $(OBJDUMP_DEFS) $(srcdir)/objdump.c
-#cxxfilt_SOURCES = cxxfilt.c $(BULIBS)
+cxxfilt_SOURCES = cxxfilt.c $(BULIBS)
ar_SOURCES = arparse.y arlex.l ar.c not-ranlib.c arsup.c rename.c binemul.c \
emul_$(EMULATION).c $(BULIBS)
Index: gnu/usr.bin/binutils-2.17/binutils/Makefile.in
===================================================================
RCS file: /OpenBSD/src/gnu/usr.bin/binutils-2.17/binutils/Makefile.in,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.in
--- gnu/usr.bin/binutils-2.17/binutils/Makefile.in 4 Jul 2011 23:58:26
-0000 1.3
+++ gnu/usr.bin/binutils-2.17/binutils/Makefile.in 19 Oct 2022 05:57:49
-0000
@@ -41,7 +41,7 @@ bin_PROGRAMS = $(am__EXEEXT_6) $(am__EXE
$(am__EXEEXT_8) $(am__EXEEXT_9) $(am__EXEEXT_10) \
@BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@ @BUILD_WINDRES@ \
$(am__EXEEXT_11) $(am__EXEEXT_12) @BUILD_DLLWRAP@ @BUILD_MISC@
-noinst_PROGRAMS = $(am__EXEEXT_14)
+noinst_PROGRAMS = $(am__EXEEXT_14) $(am__EXEEXT_15)
EXTRA_PROGRAMS = $(am__EXEEXT_1) srconv$(EXEEXT) sysdump$(EXEEXT) \
coffdump$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_3) \
$(am__EXEEXT_4)
@@ -210,7 +210,7 @@ YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFL
LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \
$(AM_YFLAGS)
SOURCES = $(addr2line_SOURCES) $(ar_SOURCES) $(coffdump_SOURCES) \
- $(dlltool_SOURCES) $(dllwrap_SOURCES) \
+ $(cxxfilt_SOURCES) $(dlltool_SOURCES) $(dllwrap_SOURCES) \
$(nlmconv_SOURCES) $(nm_new_SOURCES) $(objcopy_SOURCES) \
$(objdump_SOURCES) $(ranlib_SOURCES) $(readelf_SOURCES) \
$(size_SOURCES) $(srconv_SOURCES) $(strings_SOURCES) \
@@ -253,7 +253,7 @@ CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@
-#DEMANGLER_NAME = @DEMANGLER_NAME@
+DEMANGLER_NAME = @DEMANGLER_NAME@
DEPDIR = @DEPDIR@
DLLTOOL_DEFS = @DLLTOOL_DEFS@
ECHO_C = @ECHO_C@
@@ -466,7 +466,7 @@ strip_new_SOURCES = objcopy.c is-strip.c
nm_new_SOURCES = nm.c budemang.c $(BULIBS)
objdump_SOURCES = objdump.c dwarf.c budemang.c prdbg.c $(DEBUG_SRCS) $(BULIBS)
objdump_LDADD = $(OPCODES) $(BFDLIB) $(LIBIBERTY) $(INTLLIBS)
-#cxxfilt_SOURCES = cxxfilt.c $(BULIBS)
+cxxfilt_SOURCES = cxxfilt.c $(BULIBS)
ar_SOURCES = arparse.y arlex.l ar.c not-ranlib.c arsup.c rename.c binemul.c \
emul_$(EMULATION).c $(BULIBS)
@@ -599,6 +599,9 @@ ar$(EXEEXT): $(ar_OBJECTS) $(ar_DEPENDEN
coffdump$(EXEEXT): $(coffdump_OBJECTS) $(coffdump_DEPENDENCIES)
@rm -f coffdump$(EXEEXT)
$(LINK) $(coffdump_LDFLAGS) $(coffdump_OBJECTS) $(coffdump_LDADD)
$(LIBS)
+cxxfilt$(EXEEXT): $(cxxfilt_OBJECTS) $(cxxfilt_DEPENDENCIES)
+ @rm -f cxxfilt$(EXEEXT)
+ $(LINK) $(cxxfilt_LDFLAGS) $(cxxfilt_OBJECTS) $(cxxfilt_LDADD) $(LIBS)
dlltool$(EXEEXT): $(dlltool_OBJECTS) $(dlltool_DEPENDENCIES)
@rm -f dlltool$(EXEEXT)
$(LINK) $(dlltool_LDFLAGS) $(dlltool_OBJECTS) $(dlltool_LDADD) $(LIBS)
