3 files changed, 2 insertions, 7 deletions

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index c915da8ca501..fd25359c7c0b 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -896,6 +896,7 @@ OLD_LIBS+=usr/lib/libprivatellvm.so.19
 .if ${MK_CLANG} == no && ${MK_LLVM_BINUTILS} == no
 OLD_FILES+=usr/bin/llvm-addr2line
 OLD_FILES+=usr/bin/llvm-ar
+OLD_FILES+=usr/bin/llvm-cxxfilt
 OLD_FILES+=usr/bin/llvm-nm
 OLD_FILES+=usr/bin/llvm-objcopy
 OLD_FILES+=usr/bin/llvm-objdump
@@ -908,6 +909,7 @@ OLD_FILES+=usr/bin/llvm-symbolizer
 OLD_FILES+=usr/bin/objdump
 OLD_FILES+=usr/share/man/man1/llvm-addr2line.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-ar.1.gz
+OLD_FILES+=usr/share/man/man1/llvm-cxxfilt.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-nm.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-objcopy.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-ranlib.1.gz
@@ -1388,11 +1390,6 @@ OLD_FILES+=usr/share/man/man1/opt.1.gz
 OLD_FILES+=usr/bin/clang-format
 .endif
 
-.if ${MK_CLANG_EXTRAS} == no && ${MK_LLVM_CXXFILT} == no
-OLD_FILES+=usr/bin/llvm-cxxfilt
-OLD_FILES+=usr/share/man/man1/llvm-cxxfilt.1.gz
-.endif
-
 .if ${MK_CPP} == no
 OLD_FILES+=usr/bin/cpp
 OLD_FILES+=usr/share/man/man1/cpp.1.gz
diff --git a/tools/build/options/WITHOUT_LLVM_CXXFILT b/tools/build/options/WITHOUT_LLVM_CXXFILT
deleted file mode 100644
index e7d263f01f2a..000000000000
--- a/tools/build/options/WITHOUT_LLVM_CXXFILT
+++ /dev/null
@@ -1 +0,0 @@
-Install ELF Tool Chain's cxxfilt as c++filt, instead of LLVM's llvm-cxxfilt.
diff --git a/tools/build/options/WITH_LLVM_CXXFILT b/tools/build/options/WITH_LLVM_CXXFILT
deleted file mode 100644
index f6ac38b20af7..000000000000
--- a/tools/build/options/WITH_LLVM_CXXFILT
+++ /dev/null
@@ -1 +0,0 @@
-Install LLVM's llvm-cxxfilt as c++filt, instead of ELF Tool Chain's cxxfilt.