Revert "Sync libiberty sources with master version in gcc repository. Updated stabs demangling and cxxfilt tests to match."

The previous commit breaks the GDB build, which is still using functions
cplus_demangle_opname & co.  Since removing these usages is not an
obvious fix, let's revert this patch until we get rid of them.

1 files changed, 5 insertions, 29 deletions

diff --git a/binutils/testsuite/binutils-all/cxxfilt.exp b/binutils/testsuite/binutils-all/cxxfilt.exp
index 203a703..116caeb 100644
--- a/binutils/testsuite/binutils-all/cxxfilt.exp
+++ b/binutils/testsuite/binutils-all/cxxfilt.exp
@@ -14,30 +14,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
-# For some reason cxxfilt is not working on the following targets.
-# FIXME: Investigate why.
-if { [istarget "cris*-*-*"] || \
-     [istarget "cr16-*-*"] || \
-     [istarget "crx*-*-*"] || \
-     [istarget "epiphany-*-*"] || \
-     [istarget "ip2k-*-*"] || \
-     [istarget "metag-*-*"] || \
-     [istarget "mn10200-*-*"] || \
-     [istarget "mn10300-*-*"] || \
-     [istarget "ns32k-*-*"] || \
-     [istarget "pdp11-*-*"] || \
-     [istarget "rl78-*-*"] || \
-     [istarget "rx-*-*"] || \
-     [istarget "sh-*-*"] || \
-     [istarget "tic4*-*-*"] || \
-     [istarget "tic54*-*-*"] || \
-     [istarget "v850-*-*"] || \
-     [istarget "z8k-*-*"] || \
-     [istarget "*-*-cygwin"] || \
-     [istarget "*-*-mingw32"] } then {
-    return
-}
-
 proc test_cxxfilt {options mangled_string demangled_string} {
     global CXXFILT
     global CXXFILTFLAGS
@@ -56,12 +32,12 @@ proc test_cxxfilt {options mangled_string demangled_string} {
 
 # Mangled and demangled strings stolen from libiberty/testsuite/demangle-expected.
 test_cxxfilt {} \
-    "_Z1fIvJiELb0EEvPDOT1_EFT_DpT0_E" \
-    "void f.void, int, false.(void (.)(int) noexcept(false))*"
+    "AddAlignment__9ivTSolverUiP12ivInteractorP7ivTGlue" \
+    "ivTSolver::AddAlignment(unsigned int, ivInteractor ., ivTGlue .)*"
 
-test_cxxfilt {--format=gnu-v3} \
-    "_Z14int_if_addableI1YERiP1AIXszpldecvPT_Li0EdecvS4_Li0EEE" \
-    "int& int_if_addable.Y.(A.sizeof ((.((Y.)(0))).(.((Y.)(0))))..)*"
+test_cxxfilt {--format=lucid} \
+    "__ct__12strstreambufFPFl_PvPFPv_v" \
+    "strstreambuf..(strstreambuf|_ct)(void .(.)(long), void (.)(void .))*"
 
 test_cxxfilt {--no-recurse-limit} \
     "Z3fooiPiPS_PS0_PS1_PS2_PS3_PS4_PS5_PS6_PS7_PS8_PS9_PSA_PSB_PSC_" \