Installed.

Andreas.

        * g++.dg/debug/dwarf2/pubnames-2.C: Support all known comment
        characters.

diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/pubnames-2.C 
b/gcc/testsuite/g++.dg/debug/dwarf2/pubnames-2.C
index 375b856..3b7f95e 100644
--- a/gcc/testsuite/g++.dg/debug/dwarf2/pubnames-2.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/pubnames-2.C
@@ -1,63 +1,63 @@
 // { dg-do compile }
 // { dg-options "-gpubnames -gdwarf-4 -std=c++0x -dA" }
 // { dg-final { scan-assembler ".section\t.debug_pubnames" } }
-// { dg-final { scan-assembler "\"\\(anonymous namespace\\)\\\\0\"+\[ 
\t\]+\[#;/]+\[ \t\]+external name" } }
-// { dg-final { scan-assembler "\"one\\\\0\"+\[ \t\]+\[#;/]+\[ \t\]+external 
name" } }
-// { dg-final { scan-assembler "\"one::G_A\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"one::G_B\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"one::G_C\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"one::\\(anonymous namespace\\)\\\\0\"+\[ 
\t\]+\[#;/]+\[ \t\]+external name" } }
-// { dg-final { scan-assembler "\"two\\\\0\"+\[ \t\]+\[#;/]+\[ \t\]+external 
name" } }
-// { dg-final { scan-assembler "\"F_A\\\\0\"+\[ \t\]+\[#;/]+\[ \t\]+external 
name" } }
-// { dg-final { scan-assembler "\"F_B\\\\0\"+\[ \t\]+\[#;/]+\[ \t\]+external 
name" } }
-// { dg-final { scan-assembler "\"F_C\\\\0\"+\[ \t\]+\[#;/]+\[ \t\]+external 
name" } }
-// { dg-final { scan-assembler "\"inline_func_1\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"one::c1::c1\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"one::c1::~c1\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"one::c1::val\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"check_enum\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"main\\\\0\"+\[ \t\]+\[#;/]+\[ \t\]+external 
name" } }
-// { dg-final { scan-assembler "\"two::c2<int>::c2\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"two::c2<double>::c2\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"two::c2<int const\\\*>::c2\\\\0\"+\[ 
\t\]+\[#;/]+\[ \t\]+external name" } }
-// { dg-final { scan-assembler "\"check<one::c1>\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"check<two::c2<int> \\>\\\\0\"+\[ 
\t\]+\[#;/]+\[ \t\]+external name" } }
-// { dg-final { scan-assembler "\"check<two::c2<double> \\>\\\\0\"+\[ 
\t\]+\[#;/]+\[ \t\]+external name" } }
-// { dg-final { scan-assembler "\"check<two::c2<int const\\\*> \\>\\\\0\"+\[ 
\t\]+\[#;/]+\[ \t\]+external name" } }
-// { dg-final { scan-assembler "\"two::c2<int>::val\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"two::c2<double>::val\\\\0\"+\[ 
\t\]+\[#;/]+\[ \t\]+external name" } }
-// { dg-final { scan-assembler "\"two::c2<int const\\\*>::val\\\\0\"+\[ 
\t\]+\[#;/]+\[ \t\]+external name" } }
-// { dg-final { scan-assembler 
"\"__static_initialization_and_destruction_0\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"two::c2<int>::~c2\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"two::c2<double>::~c2\\\\0\"+\[ 
\t\]+\[#;/]+\[ \t\]+external name" } }
-// { dg-final { scan-assembler "\"two::c2<int const\\\*>::~c2\\\\0\"+\[ 
\t\]+\[#;/]+\[ \t\]+external name" } }
-// { dg-final { scan-assembler "\"_GLOBAL__sub_I__ZN3one3c1vE\\\\0\"+\[ 
\t\]+\[#;/]+\[ \t\]+external name" } }
-// { dg-final { scan-assembler "\"anonymous_union_var\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"two::ci\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"two::c2v1\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"two::c2v2\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"two::c2v3\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"one::c1v\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"one::\\(anonymous 
namespace\\)::one_anonymous_var\\\\0\"+\[ \t\]+\[#;/]+\[ \t\]+external name" } }
-// { dg-final { scan-assembler "\"\\(anonymous 
namespace\\)::c1_count\\\\0\"+\[ \t\]+\[#;/]+\[ \t\]+external name" } }
-// { dg-final { scan-assembler "\"\\(anonymous 
namespace\\)::c2_count\\\\0\"+\[ \t\]+\[#;/]+\[ \t\]+external name" } }
-// { dg-final { scan-assembler "\"\\(anonymous namespace\\)::three\\\\0\"+\[ 
\t\]+\[#;/]+\[ \t\]+external name" } }
-// { dg-final { scan-assembler "\"\\(anonymous 
namespace\\)::three::anonymous_three_var\\\\0\"+\[ \t\]+\[#;/]+\[ \t\]+external 
name" } }
+// { dg-final { scan-assembler "\"\\(anonymous namespace\\)\\\\0\"+\[ 
\t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"one\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"one::G_A\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"one::G_B\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"one::G_C\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"one::\\(anonymous namespace\\)\\\\0\"+\[ 
\t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"two\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"F_A\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"F_B\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"F_C\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"inline_func_1\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"one::c1::c1\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"one::c1::~c1\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"one::c1::val\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"check_enum\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"main\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"two::c2<int>::c2\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"two::c2<double>::c2\\\\0\"+\[ 
\t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"two::c2<int const\\\*>::c2\\\\0\"+\[ 
\t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"check<one::c1>\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"check<two::c2<int> \\>\\\\0\"+\[ 
\t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"check<two::c2<double> \\>\\\\0\"+\[ 
\t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"check<two::c2<int const\\\*> \\>\\\\0\"+\[ 
\t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"two::c2<int>::val\\\\0\"+\[ 
\t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"two::c2<double>::val\\\\0\"+\[ 
\t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"two::c2<int const\\\*>::val\\\\0\"+\[ 
\t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler 
"\"__static_initialization_and_destruction_0\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"two::c2<int>::~c2\\\\0\"+\[ 
\t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"two::c2<double>::~c2\\\\0\"+\[ 
\t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"two::c2<int const\\\*>::~c2\\\\0\"+\[ 
\t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"_GLOBAL__sub_I__ZN3one3c1vE\\\\0\"+\[ 
\t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"anonymous_union_var\\\\0\"+\[ 
\t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"two::ci\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"two::c2v1\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"two::c2v2\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"two::c2v3\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"one::c1v\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"one::\\(anonymous 
namespace\\)::one_anonymous_var\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" 
} }
+// { dg-final { scan-assembler "\"\\(anonymous 
namespace\\)::c1_count\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"\\(anonymous 
namespace\\)::c2_count\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"\\(anonymous namespace\\)::three\\\\0\"+\[ 
\t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"\\(anonymous 
namespace\\)::three::anonymous_three_var\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
 // { dg-final { scan-assembler ".section\t.debug_pubtypes" } }
-// { dg-final { scan-assembler "\"one::G\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"one::c1\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"int\\\\0\"+\[ \t\]+\[#;/]+\[ \t\]+external 
name" } }
-// { dg-final { scan-assembler "\"one::c1\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"two::c2<int>\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"two::c2<int>\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"two::c2<double>\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"double\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"two::c2<double>\\\\0\"+\[ \t\]+\[#;/]+\[ 
\t\]+external name" } }
-// { dg-final { scan-assembler "\"two::c2<int const\\\*>\\\\0\"+\[ 
\t\]+\[#;/]+\[ \t\]+external name" } }
-// { dg-final { scan-assembler "\"two::c2<int const\\\*>\\\\0\"+\[ 
\t\]+\[#;/]+\[ \t\]+external name" } }
-// { dg-final { scan-assembler "\"F\\\\0\"+\[ \t\]+\[#;/]+\[ \t\]+external 
name" } }
-// { dg-final { scan-assembler "\"anonymous_union_container\\\\0\"+\[ 
\t\]+\[#;/]+\[ \t\]+external name" } }
-// { dg-final { scan-assembler "\"bool\\\\0\"+\[ \t\]+\[#;/]+\[ \t\]+external 
name" } }
+// { dg-final { scan-assembler "\"one::G\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"one::c1\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"int\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"one::c1\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"two::c2<int>\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"two::c2<int>\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"two::c2<double>\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"double\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"two::c2<double>\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
+// { dg-final { scan-assembler "\"two::c2<int const\\\*>\\\\0\"+\[ 
\t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"two::c2<int const\\\*>\\\\0\"+\[ 
\t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"F\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external 
name" } }
+// { dg-final { scan-assembler "\"anonymous_union_container\\\\0\"+\[ 
\t\]+\[#;/|@!]+\[ \t\]+external name" } }
+// { dg-final { scan-assembler "\"bool\\\\0\"+\[ \t\]+\[#;/|@!]+\[ 
\t\]+external name" } }
 
 namespace
 {
-- 
1.7.11.2

-- 
Andreas Schwab, sch...@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Reply via email to