Backport PRs 18451, 40738, 40858, 45543

	Backport from mainline
	2010-09-06  Jakub Jelinek  <jakub@redhat.com>

	PR testsuite/45543
	* g++.dg/debug/dwarf2/typedef1.C: Expect just one
	DW_TAG_enumeration_type DIE.

	2010-09-04  Andreas Schwab  <schwab@linux-m68k.org>
	* g++.dg/debug/dwarf2/typedef1.C: Replace ".*" by "\[^\n\]*".

	2009-11-07  Jason Merrill  <jason@redhat.com>

	PR c++/18451
	PR c++/40738
	* g++.dg/other/typedef1.C: Update expected errors.

	2009-08-03  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>

	PR testsuite/40858
	* g++.dg/debug/dwarf2/typedef1.C: Also match assembler string used with
	.ascii.

From-SVN: r165568

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7cee93ae0a85e8a8bdb9c8877ba29e8029c73b09..0f41aa67bbe6d95546ca18bb458f8e6fdfd1004c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,27 @@
 2010-10-16  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
        Backport from mainline
+       2010-09-06  Jakub Jelinek  <jakub@redhat.com>
+
+       PR testsuite/45543
+       * g++.dg/debug/dwarf2/typedef1.C: Expect just one
+       DW_TAG_enumeration_type DIE.
+
+       2010-09-04  Andreas Schwab  <schwab@linux-m68k.org>
+       * g++.dg/debug/dwarf2/typedef1.C: Replace ".*" by "\[^\n\]*".
+
+       2009-11-07  Jason Merrill  <jason@redhat.com>
+
+       PR c++/18451
+       PR c++/40738
+       * g++.dg/other/typedef1.C: Update expected errors.
+
+       2009-08-03  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+       PR testsuite/40858
+       * g++.dg/debug/dwarf2/typedef1.C: Also match assembler string used with
+       .ascii.
+
        2010-09-04  Andreas Schwab  <schwab@linux-m68k.org>
        * g++.dg/debug/dwarf2/pubnames-1.C: Replace ".*" by "\[^\n\]*".
 

diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/typedef1.C b/gcc/testsuite/g++.dg/debug/dwarf2/typedef1.C
index f325ac54ad2918945f71235d626137f42c16d31e..a9ce44d523421e7ff79f8b9f016565b8dee05198 100644 (file)
--- a/gcc/testsuite/g++.dg/debug/dwarf2/typedef1.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/typedef1.C
@@ -3,12 +3,12 @@
 // { dg-options "-g -dA" }
 // { dg-do compile }
 // { dg-final { scan-assembler-times "DW_TAG_structure_type" 2 } }
-// { dg-final { scan-assembler-times "DW_AT_name: \"foo<1u>\"" 1 } }
+// { dg-final { scan-assembler-times "DW_AT_name: \"foo<1u>\"|\"foo<1u>..\"\[^\n\]*DW_AT_name" 1 } }
 // { dg-final { scan-assembler-times "DW_TAG_enumeration_type" 2 } }
-// { dg-final { scan-assembler-times "DW_AT_name: \"typedef foo<1u>::type type\"" 1 } }
-// { dg-final { scan-assembler-times "DIE (.*) DW_TAG_enumeration_type" 2 } }
-// { dg-final { scan-assembler-times "\"e0..\".*DW_AT_name" 1 } }
-// { dg-final { scan-assembler-times "\"e1..\".*DW_AT_name" 1 } }
+// { dg-final { scan-assembler-times "DW_AT_name: \"typedef foo<1u>::type type\"|\"typedef foo<1u>::type type..\"\[^\n\]*DW_AT_name" 1 } }
+// { dg-final { scan-assembler-times "DIE \\(\[^\n\]*\\) DW_TAG_enumeration_type" 1 } }
+// { dg-final { scan-assembler-times "\"e0..\"\[^\n\]*DW_AT_name" 1 } }
+// { dg-final { scan-assembler-times "\"e1..\"\[^\n\]*DW_AT_name" 1 } }
 
 template <unsigned int n>
 struct foo