From 5e6fc0e70a04964e241b900c4ed6235427899542 Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Thu, 2 Mar 2023 18:11:20 +0100 Subject: [PATCH] testsuite: Fix various scan-assembler identifiers not handling _-prefix * g++.dg/cpp0x/pr84497.C: Handle USER_LABEL_PREFIX == "_" on scan-assembler identifiers. * gcc.dg/debug/btf/btf-enum64-1.c, gcc.dg/ipa/symver1.c: Ditto. --- gcc/testsuite/g++.dg/cpp0x/pr84497.C | 6 +++--- gcc/testsuite/gcc.dg/debug/btf/btf-enum64-1.c | 6 +++--- gcc/testsuite/gcc.dg/ipa/symver1.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gcc/testsuite/g++.dg/cpp0x/pr84497.C b/gcc/testsuite/g++.dg/cpp0x/pr84497.C index 7eb1aee474e..be5a9d359ec 100644 --- a/gcc/testsuite/g++.dg/cpp0x/pr84497.C +++ b/gcc/testsuite/g++.dg/cpp0x/pr84497.C @@ -34,6 +34,6 @@ extern thread_local Container container_obj; int main() { return !(&base_obj && &derived_obj && &container_obj);} #endif -// { dg-final { scan-assembler ".weak\[ \t\]*_ZTH8base_obj" } } -// { dg-final { scan-assembler ".weak\[ \t\]*_ZTH11derived_obj" } } -// { dg-final { scan-assembler ".weak\[ \t\]*_ZTH13container_obj" } } +// { dg-final { scan-assembler ".weak\[ \t\]*_?_ZTH8base_obj" } } +// { dg-final { scan-assembler ".weak\[ \t\]*_?_ZTH11derived_obj" } } +// { dg-final { scan-assembler ".weak\[ \t\]*_?_ZTH13container_obj" } } diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-enum64-1.c b/gcc/testsuite/gcc.dg/debug/btf/btf-enum64-1.c index e443d4c8c00..5d1487c1183 100644 --- a/gcc/testsuite/gcc.dg/debug/btf/btf-enum64-1.c +++ b/gcc/testsuite/gcc.dg/debug/btf/btf-enum64-1.c @@ -3,9 +3,9 @@ /* { dg-do compile } */ /* { dg-options "-O0 -gbtf -dA" } */ -/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]myenum1,\[\t \]8" 1 } } */ -/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]myenum2,\[\t \]8" 1 } } */ -/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]myenum3,\[\t \]8" 1 } } */ +/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]_?myenum1,\[\t \]8" 1 } } */ +/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]_?myenum2,\[\t \]8" 1 } } */ +/* { dg-final { scan-assembler-times "\[\t \].size\[\t \]_?myenum3,\[\t \]8" 1 } } */ /* { dg-final { scan-assembler-times "\[\t \]0x13000003\[\t \]+\[^\n\]*btt_info" 2 } } */ /* { dg-final { scan-assembler-times "\[\t \]0x93000003\[\t \]+\[^\n\]*btt_info" 1 } } */ /* { dg-final { scan-assembler-times "\[\t \]0xffffffaa\[\t \]+\[^\n\]*bte_value_lo32" 2 } } */ diff --git a/gcc/testsuite/gcc.dg/ipa/symver1.c b/gcc/testsuite/gcc.dg/ipa/symver1.c index 2cd02583669..d120ed5d76b 100644 --- a/gcc/testsuite/gcc.dg/ipa/symver1.c +++ b/gcc/testsuite/gcc.dg/ipa/symver1.c @@ -8,5 +8,5 @@ int foo() return 2; } -/* { dg-final { scan-assembler ".symver.*foo, foo@VER_2" } } */ -/* { dg-final { scan-assembler ".symver.*foo, foo@VER_3" } } */ +/* { dg-final { scan-assembler ".symver.*foo, _?foo@VER_2" } } */ +/* { dg-final { scan-assembler ".symver.*foo, _?foo@VER_3" } } */ -- 2.34.1