cxxfilt test failures

Fixes these:
bfin-elf  +FAIL: cxxfilt: demangling _Z1fIvJiELb0EEvPDOT1_EFT_DpT0_E
bfin-elf  +FAIL: cxxfilt: demangling _Z14int_if_addableI1YERiP1AIXszpldecvPT_Li0EdecvS4_Li0EEE
h8300-elf  +FAIL: cxxfilt: demangling _Z1fIvJiELb0EEvPDOT1_EFT_DpT0_E
h8300-elf  +FAIL: cxxfilt: demangling _Z14int_if_addableI1YERiP1AIXszpldecvPT_Li0EdecvS4_Li0EEE
i686-pe  +FAIL: cxxfilt: demangling _Z1fIvJiELb0EEvPDOT1_EFT_DpT0_E
i686-pe  +FAIL: cxxfilt: demangling _Z14int_if_addableI1YERiP1AIXszpldecvPT_Li0EdecvS4_Li0EEE
i686-vxworks  +FAIL: cxxfilt: demangling _Z1fIvJiELb0EEvPDOT1_EFT_DpT0_E
i686-vxworks  +FAIL: cxxfilt: demangling _Z14int_if_addableI1YERiP1AIXszpldecvPT_Li0EdecvS4_Li0EEE
m32c-elf  +FAIL: cxxfilt: demangling _Z1fIvJiELb0EEvPDOT1_EFT_DpT0_E
m32c-elf  +FAIL: cxxfilt: demangling _Z14int_if_addableI1YERiP1AIXszpldecvPT_Li0EdecvS4_Li0EEE

	* testsuite/binutils-all/cxxfilt.exp: Pass --no-strip-underscores
	unconditionally to tests needing the option rather than via a
	list of targets.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 995a6b3f67fc1b99903a51c2109b33e82cef3616..6007c33b83638d33e09cf3b22469e6cf92bfe189 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2019-01-09  Alan Modra  <amodra@gmail.com>
+
+       * testsuite/binutils-all/cxxfilt.exp: Pass --no-strip-underscores
+       unconditionally to tests needing the option rather than via a
+       list of targets.
+
 2019-01-08  Nick Clifton  <nickc@redhat.com>
 
        PR 24044
@@ -8,7 +14,7 @@
        * testsuite/binutils-all/cxxfilt.exp: Use the
        --no-strip-underscore option for targets that do prefix their
        symbols with underscores.
-       Update tests to elimiate those that use gnu v2 encoding.
+       Update tests to eliminate those that use gnu v2 encoding.
 
 2019-01-08  Tamar Christina  <tamar.christina@arm.com>
 

diff --git a/binutils/testsuite/binutils-all/cxxfilt.exp b/binutils/testsuite/binutils-all/cxxfilt.exp
index d59c26ae914eec2db350d2ff04cf89bb45615a3c..ad596ef7abe867b3cf4362fac13974abec6d9c14 100644 (file)
--- a/binutils/testsuite/binutils-all/cxxfilt.exp
+++ b/binutils/testsuite/binutils-all/cxxfilt.exp
@@ -18,33 +18,8 @@ proc test_cxxfilt {options mangled_string demangled_string} {
     global CXXFILT
     global CXXFILTFLAGS
     
-    if {   [istarget "arm*-*-pe"] \
-        || [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 {
-       set cxxfilt_strip_opt "--no-strip-underscore"
-    } else {
-       set cxxfilt_strip_opt ""
-    }
-
     set testname "cxxfilt: demangling $mangled_string"
-    set got [binutils_run $CXXFILT "$cxxfilt_strip_opt $options $CXXFILTFLAGS $mangled_string"]
+    set got [binutils_run $CXXFILT "$options $CXXFILTFLAGS $mangled_string"]
 
     if ![regexp $demangled_string $got] then {
        fail "$testname"
@@ -56,11 +31,11 @@ proc test_cxxfilt {options mangled_string demangled_string} {
 }
 
 # Mangled and demangled strings stolen from libiberty/testsuite/demangle-expected.
-test_cxxfilt {} \
+test_cxxfilt {--no-strip-underscores} \
     "_Z1fIvJiELb0EEvPDOT1_EFT_DpT0_E" \
     "void f.void, int, false.(void (.)(int) noexcept(false))*"
 
-test_cxxfilt {--format=gnu-v3} \
+test_cxxfilt {--format=gnu-v3 --no-strip-underscores} \
     "_Z14int_if_addableI1YERiP1AIXszpldecvPT_Li0EdecvS4_Li0EEE" \
     "int& int_if_addable.Y.(A.sizeof ((.((Y.)(0))).(.((Y.)(0))))..)*"