2003-12-18 Andrew Pinski <pinskia@physics.uc.edu>

        * g++.dg/abi/mangle18-1.C: Modify regexp to test for `[: \t\n]' at end
        of label name and allow for USER_LABEL_PREFIX == "_" names.
        * g++.dg/abi/mangle18-2.C: Likewise.
        * g++.dg/abi/mangle19-1.C: Likewise.
        * g++.dg/abi/mangle19-2.C: Likewise.
        * g++.dg/abi/mangle20-1.C: Likewise.
        * g++.dg/abi/mangle20-2.C: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74805 138bc75d-0d04-0410-961f-82ee72b054a4

7 files changed, 20 insertions, 10 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 16703ba5529..db37a9915cc 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2003-12-18  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	* g++.dg/abi/mangle18-1.C: Modify regexp to test for `[: \t\n]' at end
+	of label name and allow for USER_LABEL_PREFIX == "_" names.
+	* g++.dg/abi/mangle18-2.C: Likewise.
+	* g++.dg/abi/mangle19-1.C: Likewise.
+	* g++.dg/abi/mangle19-2.C: Likewise.
+	* g++.dg/abi/mangle20-1.C: Likewise.
+	* g++.dg/abi/mangle20-2.C: Likewise.
+
 2003-12-18  Richard Henderson  <rth@redhat.com>
 
 	* gcc.dg/bitfld-1.c: Expect warnings for enum bitfields.
diff --git a/gcc/testsuite/g++.dg/abi/mangle18-1.C b/gcc/testsuite/g++.dg/abi/mangle18-1.C
index 2e7b3a8382e..a1be5e48c33 100644
--- a/gcc/testsuite/g++.dg/abi/mangle18-1.C
+++ b/gcc/testsuite/g++.dg/abi/mangle18-1.C
@@ -17,7 +17,7 @@ template <void (*)()> struct S {};
 template <int *> struct T {};
 
 void f (S<Foo>){}
-// { dg-final { scan-assembler "\n_Z1f1SIXadL_Z3FooEEE:" } }
+// { dg-final { scan-assembler "\n_?_Z1f1SIXadL_Z3FooEEE\[: \t\n\]" } }
 
 void g (T<&NMS::V>){}
-// { dg-final { scan-assembler "\n_Z1g1TIXadL_Z1VEEE:" } }
+// { dg-final { scan-assembler "\n_?_Z1g1TIXadL_Z1VEEE\[: \t\n\]" } }
diff --git a/gcc/testsuite/g++.dg/abi/mangle18-2.C b/gcc/testsuite/g++.dg/abi/mangle18-2.C
index be2b6b5e434..a231d495fef 100644
--- a/gcc/testsuite/g++.dg/abi/mangle18-2.C
+++ b/gcc/testsuite/g++.dg/abi/mangle18-2.C
@@ -17,7 +17,7 @@ template <void (*)()> struct S {};
 template <int *> struct T {};
 
 void f (S<Foo>){} // { dg-warning "mangled name" }
-// { dg-final { scan-assembler "\n_Z1f1SIXadL3FooEEE:" } }
+// { dg-final { scan-assembler "\n_?_Z1f1SIXadL3FooEEE\[: \t\n\]" } }
 
 void g (T<&NMS::V>){}  // { dg-warning "mangled name" }
-// { dg-final { scan-assembler "\n_Z1g1TIXadL_ZN3NMS1VEEEE:" } }
+// { dg-final { scan-assembler "\n_?_Z1g1TIXadL_ZN3NMS1VEEEE\[: \t\n\]" } }
diff --git a/gcc/testsuite/g++.dg/abi/mangle19-1.C b/gcc/testsuite/g++.dg/abi/mangle19-1.C
index 7cc946e2400..c7ab2cbb9b4 100644
--- a/gcc/testsuite/g++.dg/abi/mangle19-1.C
+++ b/gcc/testsuite/g++.dg/abi/mangle19-1.C
@@ -10,4 +10,4 @@
 extern int N;
 template <int &> struct S {};
 void n (S<N>) {}
-// { dg-final { scan-assembler "\n_Z1n1SILZ1NEE:" } }
+// { dg-final { scan-assembler "\n_?_Z1n1SILZ1NEE\[: \t\n\]" } }
diff --git a/gcc/testsuite/g++.dg/abi/mangle19-2.C b/gcc/testsuite/g++.dg/abi/mangle19-2.C
index fbf1a07eb53..f0855e69d34 100644
--- a/gcc/testsuite/g++.dg/abi/mangle19-2.C
+++ b/gcc/testsuite/g++.dg/abi/mangle19-2.C
@@ -10,4 +10,4 @@
 extern int N;
 template <int &> struct S {};
 void n (S<N>) {}  // { dg-warning "mangled name" }
-// { dg-final { scan-assembler "\n_Z1n1SIXadL_Z1NEEE:" } }
+// { dg-final { scan-assembler "\n_?_Z1n1SIXadL_Z1NEEE\[: \t\n\]" } }
diff --git a/gcc/testsuite/g++.dg/abi/mangle20-1.C b/gcc/testsuite/g++.dg/abi/mangle20-1.C
index 09cf51bcfb5..1985fe3c941 100644
--- a/gcc/testsuite/g++.dg/abi/mangle20-1.C
+++ b/gcc/testsuite/g++.dg/abi/mangle20-1.C
@@ -14,6 +14,6 @@ static const int I=1;
 static const int J=2;
 
 template void f<1>(int (*)[2]);
-//  { dg-final { scan-assembler "\n_Z1fILi1EEvPA2_i:" } }
+//  { dg-final { scan-assembler "\n_?_Z1fILi1EEvPA2_i\[: \t\n\]" } }
 template void g<1>(int (*)[3]);
-//  { dg-final { scan-assembler "\n_Z1gILi1EEvPAplT_Li2E_i:" } }
+//  { dg-final { scan-assembler "\n_?_Z1gILi1EEvPAplT_Li2E_i\[: \t\n\]" } }
diff --git a/gcc/testsuite/g++.dg/abi/mangle20-2.C b/gcc/testsuite/g++.dg/abi/mangle20-2.C
index 44d3afefb54..bf3d189bf0c 100644
--- a/gcc/testsuite/g++.dg/abi/mangle20-2.C
+++ b/gcc/testsuite/g++.dg/abi/mangle20-2.C
@@ -11,6 +11,6 @@ template <int I> void f(int (*)[2]) {}
 template <int I> void g(int (*)[I+2]) {}
 
 template void f<1>(int (*)[2]);  // { dg-warning "mangled name" }
-//  { dg-final { scan-assembler "\n_Z1fILi1EEvPALi2E_i:" } }
+//  { dg-final { scan-assembler "\n_?_Z1fILi1EEvPALi2E_i\[: \t\n\]" } }
 template void g<1>(int (*)[3]);
-//  { dg-final { scan-assembler "\n_Z1gILi1EEvPAplT_Li2E_i:" } }
+//  { dg-final { scan-assembler "\n_?_Z1gILi1EEvPAplT_Li2E_i\[: \t\n\]" } }