As described in the PR, four new DWARF-2 tests FAIL on Solaris 2 with
Sun as, IRIX 6.5 with gas, and Darwin. Dominique provided the following
patch.
Tested with the appropriate runtest invocations on i386-pc-solaris2.11
with Sun as and gas and mips-sgi-irix6.5 by myself, and
x86_64-apple-darwin10.6.0 by Dominique.
Installed on mainline.
Rainer
2011-03-26 Dominique d'Humieres <domi...@lps.ens.fr>
PR testsuite/48238
* gcc.dg/debug/dwarf2/pr47939-1.c: Generalize scan-assembler regex.
* gcc.dg/debug/dwarf2/pr47939-2.c: Likewise.
* gcc.dg/debug/dwarf2/pr47939-3.c: Likewise.
* gcc.dg/debug/dwarf2/pr47939-4.c: Likewise.
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-1.c
b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-1.c
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-1.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-1.c
@@ -4,5 +4,5 @@
typedef struct _Harry { int dummy; } Harry_t;
Harry_t harry;
-/* { dg-final { scan-assembler
"DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*DW_AT_name: \"Harry_t\"" } }
*/
+/* { dg-final { scan-assembler
"DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*(DW_AT_name:
\"Harry_t\"|\"Harry_t..\"\[^\\r\\n\]*DW_AT_name)" } } */
/* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-2.c
b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-2.c
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-2.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-2.c
@@ -4,5 +4,5 @@
typedef const struct _Harry { int dummy; } Harry_t;
Harry_t harry;
-/* { dg-final { scan-assembler
"DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*DW_AT_name: \"Harry_t\"" } }
*/
+/* { dg-final { scan-assembler
"DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*(DW_AT_name:
\"Harry_t\"|\"Harry_t..\"\[^\\r\\n\]*DW_AT_name)" } } */
/* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-3.c
b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-3.c
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-3.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-3.c
@@ -4,5 +4,5 @@
typedef struct _Harry { int dummy; } Harry_t;
const Harry_t harry[5];
-/* { dg-final { scan-assembler
"DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*DW_AT_name: \"Harry_t\"" } }
*/
+/* { dg-final { scan-assembler
"DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*(DW_AT_name:
\"Harry_t\"|\"Harry_t..\"\[^\\r\\n\]*DW_AT_name)" } } */
/* { dg-final { cleanup-saved-temps } } */
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-4.c
b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-4.c
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-4.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr47939-4.c
@@ -4,5 +4,5 @@
typedef const struct _Harry { int dummy; } Harry_t;
Harry_t harry[10];
-/* { dg-final { scan-assembler
"DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*DW_AT_name: \"Harry_t\"" } }
*/
+/* { dg-final { scan-assembler
"DW_TAG_typedef\[^\\r\\n\]*\[\\r\\n\]+\[^\\r\\n\]*(DW_AT_name:
\"Harry_t\"|\"Harry_t..\"\[^\\r\\n\]*DW_AT_name)" } } */
/* { dg-final { cleanup-saved-temps } } */
--
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University
