From e638f2e5164268bc1d005fb9df52bd92934b4e84 Mon Sep 17 00:00:00 2001 From: pinskia Date: Thu, 18 Dec 2003 22:03:44 +0000 Subject: [PATCH] 2003-12-18 Andrew Pinski * 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 --- gcc/testsuite/ChangeLog | 10 ++++++++++ gcc/testsuite/g++.dg/abi/mangle18-1.C | 4 ++-- gcc/testsuite/g++.dg/abi/mangle18-2.C | 4 ++-- gcc/testsuite/g++.dg/abi/mangle19-1.C | 2 +- gcc/testsuite/g++.dg/abi/mangle19-2.C | 2 +- gcc/testsuite/g++.dg/abi/mangle20-1.C | 4 ++-- gcc/testsuite/g++.dg/abi/mangle20-2.C | 4 ++-- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 16703ba..db37a99 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2003-12-18 Andrew Pinski + + * 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 * 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 2e7b3a8..a1be5e4 100644 --- a/gcc/testsuite/g++.dg/abi/mangle18-1.C +++ b/gcc/testsuite/g++.dg/abi/mangle18-1.C @@ -17,7 +17,7 @@ template struct S {}; template struct T {}; void f (S){} -// { 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 be2b6b5..a231d49 100644 --- a/gcc/testsuite/g++.dg/abi/mangle18-2.C +++ b/gcc/testsuite/g++.dg/abi/mangle18-2.C @@ -17,7 +17,7 @@ template struct S {}; template struct T {}; void f (S){} // { 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 7cc946e..c7ab2cb 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 struct S {}; void n (S) {} -// { 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 fbf1a07..f0855e6 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 struct S {}; void n (S) {} // { 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 09cf51b..1985fe3 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 44d3afe..bf3d189 100644 --- a/gcc/testsuite/g++.dg/abi/mangle20-2.C +++ b/gcc/testsuite/g++.dg/abi/mangle20-2.C @@ -11,6 +11,6 @@ template void f(int (*)[2]) {} template 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\]" } } -- 2.7.4