From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by sourceware.org (Postfix) with ESMTPS id 011D43858C74 for ; Sat, 4 Mar 2023 00:58:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 011D43858C74 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=axis.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=axis.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1677891483; x=1709427483; h=from:to:subject:mime-version:content-transfer-encoding: message-id:date; bh=NIa0Wf6Rc4HA3mSJyNbSg2OkjHoOw4spzjCmUmz2xuA=; b=S4m2ZGP1bCZFzEjmoF3Vlxf1ZFaI9EIjPwZNHxdmybiFblW9BJj/Gbm7 kbTg2Qz8zy75bb5TSYILvBlfcfoI1LX4NK52GH9i7l7culsMsHjtFUFnX cSADkbJs+EkO+4RO98zMtMAoTf4fvIl1tSNB7Y6qCS3FPserkbi6lBSQX 6hGGo+1ip6B9PKUbslio1nArZq38pnQE+Y1aZprxpKMxrbb24kMV35qiM 70rNRptPilFCQPB5QiTKzW/1R6Z+Xu5QFY7oMw1CeYVGoIZH++dvJZLkz Of/xWdQKXTM1qwelk5R8lOVNFuJXii4rl52mfhOg/YT//vhaOKxN516NP g==; From: Hans-Peter Nilsson To: Subject: [COMMITTED] testsuite: Fix various scan-assembler identifiers not handling _-prefix MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8BIT Message-ID: <20230304005801.3F69C20425@pchp3.se.axis.com> Date: Sat, 4 Mar 2023 01:58:01 +0100 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Committed as obvious. -- >8 -- * 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 7eb1aee474e3..be5a9d359ec5 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 e443d4c8c00f..5d1487c1183a 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 2cd025836697..d120ed5d76b1 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.30.2