{"id":2196671,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2196671/?format=json","project":{"id":17,"url":"http://patchwork.ozlabs.org/api/1.0/projects/17/?format=json","name":"GNU Compiler Collection","link_name":"gcc","list_id":"gcc-patches.gcc.gnu.org","list_email":"gcc-patches@gcc.gnu.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20260216003819.147459-2-feedabl3@gmail.com>","date":"2026-02-16T00:37:46","name":"[v4,1/4] testsuite: Clean up the weak declaration scanning","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"07cf17a5827d9e02b8df82a2cfa5b426161bd642","submitter":{"id":92146,"url":"http://patchwork.ozlabs.org/api/1.0/people/92146/?format=json","name":"feedable","email":"feedabl3@gmail.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/gcc/patch/20260216003819.147459-2-feedabl3@gmail.com/mbox/","series":[{"id":492240,"url":"http://patchwork.ozlabs.org/api/1.0/series/492240/?format=json","date":"2026-02-16T00:37:45","name":"Clean up test requirements","version":4,"mbox":"http://patchwork.ozlabs.org/series/492240/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2196671/checks/","tags":{},"headers":{"Return-Path":"<gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org>","X-Original-To":["incoming@patchwork.ozlabs.org","gcc-patches@gcc.gnu.org"],"Delivered-To":["patchwork-incoming@legolas.ozlabs.org","gcc-patches@gcc.gnu.org"],"Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20230601 header.b=AFSPJCM2;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org\n (client-ip=38.145.34.32; helo=vm01.sourceware.org;\n envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org;\n receiver=patchwork.ozlabs.org)","sourceware.org;\n\tdkim=pass (2048-bit key,\n unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20230601 header.b=AFSPJCM2","sourceware.org;\n dmarc=pass (p=none dis=none) header.from=gmail.com","sourceware.org; spf=pass smtp.mailfrom=gmail.com","server2.sourceware.org;\n arc=none smtp.remote-ip=209.85.128.50"],"Received":["from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fDkSb4V2pz1xpY\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 16 Feb 2026 11:39:59 +1100 (AEDT)","from vm01.sourceware.org (localhost [127.0.0.1])\n\tby sourceware.org (Postfix) with ESMTP id 971F84BA23FC\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 16 Feb 2026 00:39:57 +0000 (GMT)","from mail-wm1-f50.google.com (mail-wm1-f50.google.com\n [209.85.128.50])\n by sourceware.org (Postfix) with ESMTPS id 57DBA4BA23C9\n for <gcc-patches@gcc.gnu.org>; Mon, 16 Feb 2026 00:38:31 +0000 (GMT)","by mail-wm1-f50.google.com with SMTP id\n 5b1f17b1804b1-4836f363ad2so29854955e9.1\n for <gcc-patches@gcc.gnu.org>; Sun, 15 Feb 2026 16:38:31 -0800 (PST)","from 7a38 ([2a02:8308:81:a900:fbf:c4a4:796f:57b1])\n by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-48370a694d3sm72013775e9.10.2026.02.15.16.38.29\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Sun, 15 Feb 2026 16:38:29 -0800 (PST)"],"DKIM-Filter":["OpenDKIM Filter v2.11.0 sourceware.org 971F84BA23FC","OpenDKIM Filter v2.11.0 sourceware.org 57DBA4BA23C9"],"DMARC-Filter":"OpenDMARC Filter v1.4.2 sourceware.org 57DBA4BA23C9","ARC-Filter":"OpenARC Filter v1.0.0 sourceware.org 57DBA4BA23C9","ARC-Seal":"i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771202311; cv=none;\n b=tetA050N1XwBZnVKwoS2VI4OGRZzn7V+s/fgNyUbWkVU/b789NRwtLjf9/Pa+dXHcAgwExJudmzM+7TYY5SXYlnUr7gI8pXthdIX/SRSSBn5H+tyDvOiv1mFAMVJd7VTC6zbrfeir6+kOhH0N/0J2Wz8lm9iJ6QkViSO6ukbwm4=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=sourceware.org; s=key;\n t=1771202311; c=relaxed/simple;\n bh=gzWJ1CipT2MnYk4Eu/fCeDQ4G0K8HXIjnAMZJFbcxx8=;\n h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version;\n b=qQG8oPQGaLAmATsPsSjql10uTPhuwV/4NOXVUR7NKcIC55Cl62nf/DowFGdDjtt7s0W/zCkApwOJsMLOXvKSiFEjHKYgL8+84rc/MCSE6eUdqyY9tfXNf0qqlgWqBlJUrTllyO2L682+sdpm1lQDFOWjQN2fcxaMAD5e+SZifQA=","ARC-Authentication-Results":"i=1; server2.sourceware.org","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=gmail.com; s=20230601; t=1771202310; x=1771807110; darn=gcc.gnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=myAROTLclzOlzldhIoGulga2yhgnk3NNZj3H4qyB9yE=;\n b=AFSPJCM2pEcaRjcGyNv672eNW1fxb65xsSb2vbgqUo4Nav3jpQ4JqVlMyGYdODHawY\n zv1s4sXmj7HhhYRME6SObitNnwNGlwCNtfmbWv1IwMCylnnbfXjYCpYx3CBckFsAWRgC\n NUudag8ctTJoiDtKGFJmjirQLwxlNNHOxYPIpPeJz4nakjVwHqeu/IsCm07FAoUhvkxO\n XzVurrzJw2TPVdETIhbLVOAMpR0DxImoaV/BXy7tEFTmWY37/Lj5od5KZFD8Eh0Fhx6D\n NOzBjDHcP+rde6iXj3Ir0Ys3Q3Jlnk3pqFTFzQCmCy7PwRIzoZ3PuZHIaKURoTzPOIyy\n aOWQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1771202310; x=1771807110;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=myAROTLclzOlzldhIoGulga2yhgnk3NNZj3H4qyB9yE=;\n b=jT0iIwZ0uujckcip2bBXXSU7c8F9zBT9LPE7cDWUr+1EP+wsJ/VCcEuyiJ5eKKW+ve\n ct+fLb8XW/06DMLm4f1CwyiGkmx/8G44Rl2a+vauTOf52buMRVIqOPUeYa9NPGvehluq\n qw9ZfBjbtJgWuz3fMCO8BVJ5EZNVgYlOBFTxTkmdQ52jj7JRSadmDr8UqLy/JdTEHxEb\n Q6RwxjyCai4ytweNWU+qBMi/DIL6anX88rYEjefpwz6HPj/cCH+9LsJSChKfrzfYo/bu\n Fuia+qtfHAcL3qJJFGoZ1EK1qboujIvnd846RZBa7z98W1ZeawUMmRcnu7GjlX+Sc4ld\n W9hQ==","X-Gm-Message-State":"AOJu0Yzm/eE72uXDLSFx/u7vPDy2HD0kz/9TBF98CDpdyLZ0Q3Fe5FlH\n HNAk2zfLDbw05OlXhtMQHJdRJlydQMJnO51/4ualdfufBQPIpsctLrQjeuy0qw==","X-Gm-Gg":"AZuq6aJXRKTyhrpbRcrMVL5U5lDLotg9IXnaELvJM/mL7Ol6rJTBwJ6IphEY5KBOj6m\n foqVKIzoHqQHb2/H8FfAcK4hG3Y7V+epI6e3zFXtzJHXK3ZpqOD1MdsE4Bdh+aJp1rSWFJrg3mK\n xlwf9iDI0jhMyA49ECLftR6XHHYg27VKavl2wrXsjN868U66hcBl9shXnhwf61ZoIdgD0xbcpe8\n 7dGOrrB73cDDPhfhno25aAGIiNI2+fCHDr09qCOACswRMxmSV7DlJyj3B2jWXl+3VOxxyNf5Sz6\n lhSBq/i0EN1Eh+VZ6VwKQTZU3hcdcOjsQBZ6Du26EoMBGcWrATA2kjEsEeRbdbijwBkdruObr9q\n fV14sA7HpPPN9e5TaRst89kjyFj+sdgztc1l3qul8TF3qF+rwPRgpBc66Fb3shJdjDD3Ydej9eN\n bQz8XnU0+RjAcg","X-Received":"by 2002:a05:600c:6808:b0:483:2c98:4368 with SMTP id\n 5b1f17b1804b1-48373a3e755mr153080485e9.18.1771202310057;\n Sun, 15 Feb 2026 16:38:30 -0800 (PST)","From":"feedable <feedabl3@gmail.com>","To":"gcc-patches@gcc.gnu.org","Cc":"feedable <feedabl3@gmail.com>","Subject":"[PATCH v4 1/4] testsuite: Clean up the weak declaration scanning","Date":"Mon, 16 Feb 2026 02:37:46 +0200","Message-ID":"<20260216003819.147459-2-feedabl3@gmail.com>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260216003819.147459-1-feedabl3@gmail.com>","References":"<20260216003819.147459-1-feedabl3@gmail.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"gcc-patches@gcc.gnu.org","X-Mailman-Version":"2.1.30","Precedence":"list","List-Id":"Gcc-patches mailing list <gcc-patches.gcc.gnu.org>","List-Unsubscribe":"<https://gcc.gnu.org/mailman/options/gcc-patches>,\n <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe>","List-Archive":"<https://gcc.gnu.org/pipermail/gcc-patches/>","List-Post":"<mailto:gcc-patches@gcc.gnu.org>","List-Help":"<mailto:gcc-patches-request@gcc.gnu.org?subject=help>","List-Subscribe":"<https://gcc.gnu.org/mailman/listinfo/gcc-patches>,\n <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe>","Errors-To":"gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org"},"content":"Add scan-weak function to testsuite, which would work like scan-hidden,\nand allow for format-specific regexes\n\ngcc/testsuite/ChangeLog:\n\n\t* gcc.dg/weak/weak-1.c:\n        Use a function to scan for weak symbols instead of a regex.\n\t* gcc.dg/weak/weak-10.c: Likewise.\n\t* gcc.dg/weak/weak-11.c: Likewise.\n\t* gcc.dg/weak/weak-12.c: Likewise.\n\t* gcc.dg/weak/weak-15.c: Likewise.\n\t* gcc.dg/weak/weak-16.c: Likewise.\n\t* gcc.dg/weak/weak-2.c: Likewise.\n\t* gcc.dg/weak/weak-3.c: Likewise.\n\t* gcc.dg/weak/weak-4.c: Likewise.\n\t* gcc.dg/weak/weak-5.c: Likewise.\n\t* gcc.dg/weak/weak-9.c: Likewise.\n\t* lib/scanasm.exp: Implement the weak-scanning function.\n---\n gcc/testsuite/gcc.dg/weak/weak-1.c  | 16 +++++-----\n gcc/testsuite/gcc.dg/weak/weak-10.c |  2 +-\n gcc/testsuite/gcc.dg/weak/weak-11.c |  2 +-\n gcc/testsuite/gcc.dg/weak/weak-12.c |  2 +-\n gcc/testsuite/gcc.dg/weak/weak-15.c |  8 ++---\n gcc/testsuite/gcc.dg/weak/weak-16.c |  4 +--\n gcc/testsuite/gcc.dg/weak/weak-2.c  | 10 +++---\n gcc/testsuite/gcc.dg/weak/weak-3.c  | 14 ++++-----\n gcc/testsuite/gcc.dg/weak/weak-4.c  | 22 +++++++-------\n gcc/testsuite/gcc.dg/weak/weak-5.c  | 24 +++++++--------\n gcc/testsuite/gcc.dg/weak/weak-9.c  |  8 ++---\n gcc/testsuite/lib/scanasm.exp       | 47 +++++++++++++++++++++++++++++\n 12 files changed, 103 insertions(+), 56 deletions(-)","diff":"diff --git a/gcc/testsuite/gcc.dg/weak/weak-1.c b/gcc/testsuite/gcc.dg/weak/weak-1.c\nindex 9566ee0c6f2..3734cc60750 100644\n--- a/gcc/testsuite/gcc.dg/weak/weak-1.c\n+++ b/gcc/testsuite/gcc.dg/weak/weak-1.c\n@@ -6,14 +6,14 @@\n /* { dg-skip-if \"\" { nvptx-*-* } } */\n /* { dg-skip-if PR119369 { amdgcn-*-* } } */\n \n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?a\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?b\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?c\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?d\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?e\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?g\" } } */\n-/* { dg-final { scan-assembler-not \"weak\\[^ \\t\\]*\\[ \\t\\]_?i\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?j\" } } */\n+/* { dg-final { scan-weak \"a\" } } */\n+/* { dg-final { scan-weak \"b\" } } */\n+/* { dg-final { scan-weak \"c\" } } */\n+/* { dg-final { scan-weak \"d\" } } */\n+/* { dg-final { scan-weak \"e\" } } */\n+/* { dg-final { scan-weak \"g\" } } */\n+/* { dg-final { scan-not-weak \"i\" } } */\n+/* { dg-final { scan-weak \"j\" } } */\n \n #pragma weak a\n int a;\ndiff --git a/gcc/testsuite/gcc.dg/weak/weak-10.c b/gcc/testsuite/gcc.dg/weak/weak-10.c\nindex f39fbc4bbce..7370e5b7239 100644\n--- a/gcc/testsuite/gcc.dg/weak/weak-10.c\n+++ b/gcc/testsuite/gcc.dg/weak/weak-10.c\n@@ -7,7 +7,7 @@\n /* { dg-require-alias \"\" } */\n /* { dg-options \"-fno-common\" } */\n \n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?bar1\" } } */\n+/* { dg-final { scan-weak \"bar1\" } } */\n \n #pragma weak bar1 = foo1\n void foo1 (void) {}\ndiff --git a/gcc/testsuite/gcc.dg/weak/weak-11.c b/gcc/testsuite/gcc.dg/weak/weak-11.c\nindex c20135a3aae..7f02772757c 100644\n--- a/gcc/testsuite/gcc.dg/weak/weak-11.c\n+++ b/gcc/testsuite/gcc.dg/weak/weak-11.c\n@@ -4,7 +4,7 @@\n /* { dg-require-alias \"\" } */\n /* { dg-options \"-funit-at-a-time\" } */\n \n-/* { dg-final { scan-assembler \"xyzzy\" } } */\n+/* { dg-final { scan-weak \"xyzzy\" } } */\n \n static const int local = 1; \n #pragma weak xyzzy = local\ndiff --git a/gcc/testsuite/gcc.dg/weak/weak-12.c b/gcc/testsuite/gcc.dg/weak/weak-12.c\nindex fd18e59a21e..2339d4e76b6 100644\n--- a/gcc/testsuite/gcc.dg/weak/weak-12.c\n+++ b/gcc/testsuite/gcc.dg/weak/weak-12.c\n@@ -6,7 +6,7 @@\n /* { dg-skip-if \"\" { nvptx-*-* } } */\n /* { dg-skip-if PR119369 { amdgcn-*-* } } */\n \n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?foo\" } } */\n+/* { dg-final { scan-weak \"foo\" } } */\n \n #pragma weak foo\n \ndiff --git a/gcc/testsuite/gcc.dg/weak/weak-15.c b/gcc/testsuite/gcc.dg/weak/weak-15.c\nindex 425a70046cc..90944c53fec 100644\n--- a/gcc/testsuite/gcc.dg/weak/weak-15.c\n+++ b/gcc/testsuite/gcc.dg/weak/weak-15.c\n@@ -6,10 +6,10 @@\n /* { dg-skip-if \"\" { nvptx-*-* } } */\n /* { dg-skip-if PR119369 { amdgcn-*-* } } */\n \n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?a\" } } */\n-/* { dg-final { scan-assembler-not \"weak\\[^ \\t\\]*\\[ \\t\\]_?b\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?c\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?d\" } } */\n+/* { dg-final { scan-weak \"a\" } } */\n+/* { dg-final { scan-not-weak \"b\" } } */\n+/* { dg-final { scan-weak \"c\" } } */\n+/* { dg-final { scan-weak \"d\" } } */\n \n #pragma weak a\n extern char a[];\ndiff --git a/gcc/testsuite/gcc.dg/weak/weak-16.c b/gcc/testsuite/gcc.dg/weak/weak-16.c\nindex 44741c54c3d..345907367d6 100644\n--- a/gcc/testsuite/gcc.dg/weak/weak-16.c\n+++ b/gcc/testsuite/gcc.dg/weak/weak-16.c\n@@ -2,8 +2,8 @@\n /* { dg-do compile } */\n /* { dg-require-weak \"\" } */\n /* { dg-options \"-fno-common -Os\" } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?kallsyms_token_index\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?kallsyms_token_table\" } } */\n+/* { dg-final { scan-weak \"kallsyms_token_index\" } } */\n+/* { dg-final { scan-weak \"kallsyms_token_table\" } } */\n /* { dg-skip-if \"\" { x86_64-*-mingw* } } */\n /* NVPTX's weak is applied to the definition,  not declaration.  */\n /* { dg-skip-if \"\" { nvptx-*-* } } */\ndiff --git a/gcc/testsuite/gcc.dg/weak/weak-2.c b/gcc/testsuite/gcc.dg/weak/weak-2.c\nindex f0f55f5360f..395e27876f6 100644\n--- a/gcc/testsuite/gcc.dg/weak/weak-2.c\n+++ b/gcc/testsuite/gcc.dg/weak/weak-2.c\n@@ -6,11 +6,11 @@\n /* { dg-skip-if \"\" { nvptx-*-* } } */\n /* { dg-skip-if PR119369 { amdgcn-*-* } } */\n \n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?ffoo1a\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?ffoo1b\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?ffoo1c\" } } */\n-/* { dg-final { scan-assembler-not \"weak\\[^ \\t\\]*\\[ \\t\\]_?ffoo1d\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?ffoo1e\" } } */\n+/* { dg-final { scan-weak \"ffoo1a\" } } */\n+/* { dg-final { scan-weak \"ffoo1b\" } } */\n+/* { dg-final { scan-weak \"ffoo1c\" } } */\n+/* { dg-final { scan-not-weak \"ffoo1d\" } } */\n+/* { dg-final { scan-weak \"ffoo1e\" } } */\n \n /* test function addresses with #pragma weak */\n \ndiff --git a/gcc/testsuite/gcc.dg/weak/weak-3.c b/gcc/testsuite/gcc.dg/weak/weak-3.c\nindex 2046f1e4d0b..120d6bad75c 100644\n--- a/gcc/testsuite/gcc.dg/weak/weak-3.c\n+++ b/gcc/testsuite/gcc.dg/weak/weak-3.c\n@@ -5,13 +5,13 @@\n /* { dg-skip-if \"\" { x86_64-*-mingw* } } */\n /* { dg-skip-if PR119369 { amdgcn-*-* } } */\n \n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?ffoo1a\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?ffoo1b\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?ffoo1c\" } } */\n-/* { dg-final { scan-assembler-not \"weak\\[^ \\t\\]*\\[ \\t\\]_?ffoo1d\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?ffoo1e\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?ffoo1f\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?ffoo1g\" } } */\n+/* { dg-final { scan-weak \"ffoo1a\" } } */\n+/* { dg-final { scan-weak \"ffoo1b\" } } */\n+/* { dg-final { scan-weak \"ffoo1c\" } } */\n+/* { dg-final { scan-not-weak \"ffoo1d\" } } */\n+/* { dg-final { scan-weak \"ffoo1e\" } } */\n+/* { dg-final { scan-weak \"ffoo1f\" } } */\n+/* { dg-final { scan-weak \"ffoo1g\" } } */\n \n /* test function addresses with __attribute__((weak)) */\n \ndiff --git a/gcc/testsuite/gcc.dg/weak/weak-4.c b/gcc/testsuite/gcc.dg/weak/weak-4.c\nindex 70e63d22901..47cd7c57ea2 100644\n--- a/gcc/testsuite/gcc.dg/weak/weak-4.c\n+++ b/gcc/testsuite/gcc.dg/weak/weak-4.c\n@@ -6,17 +6,17 @@\n /* { dg-skip-if \"\" { nvptx-*-* } } */\n /* { dg-skip-if PR119369 { amdgcn-*-* } } */\n \n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1a\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1b\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1c\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1d\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1e\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1f\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1g\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1h\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1i\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1j\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1k\" } } */\n+/* { dg-final { scan-weak \"vfoo1a\" } } */\n+/* { dg-final { scan-weak \"vfoo1b\" } } */\n+/* { dg-final { scan-weak \"vfoo1c\" } } */\n+/* { dg-final { scan-weak \"vfoo1d\" } } */\n+/* { dg-final { scan-weak \"vfoo1e\" } } */\n+/* { dg-final { scan-weak \"vfoo1f\" } } */\n+/* { dg-final { scan-weak \"vfoo1g\" } } */\n+/* { dg-final { scan-weak \"vfoo1h\" } } */\n+/* { dg-final { scan-weak \"vfoo1i\" } } */\n+/* { dg-final { scan-weak \"vfoo1j\" } } */\n+/* { dg-final { scan-weak \"vfoo1k\" } } */\n \n /* test variable addresses with #pragma weak */\n \ndiff --git a/gcc/testsuite/gcc.dg/weak/weak-5.c b/gcc/testsuite/gcc.dg/weak/weak-5.c\nindex 3b239715e44..70ae7e3e710 100644\n--- a/gcc/testsuite/gcc.dg/weak/weak-5.c\n+++ b/gcc/testsuite/gcc.dg/weak/weak-5.c\n@@ -5,18 +5,18 @@\n /* { dg-skip-if \"\" { x86_64-*-mingw* } } */\n /* { dg-skip-if PR119369 { amdgcn-*-* } } */\n \n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1a\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1b\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1c\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1d\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1e\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1f\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1g\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1h\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1i\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1j\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1k\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?vfoo1l\" } } */\n+/* { dg-final { scan-weak \"vfoo1a\" } } */\n+/* { dg-final { scan-weak \"vfoo1b\" } } */\n+/* { dg-final { scan-weak \"vfoo1c\" } } */\n+/* { dg-final { scan-weak \"vfoo1d\" } } */\n+/* { dg-final { scan-weak \"vfoo1e\" } } */\n+/* { dg-final { scan-weak \"vfoo1f\" } } */\n+/* { dg-final { scan-weak \"vfoo1g\" } } */\n+/* { dg-final { scan-weak \"vfoo1h\" } } */\n+/* { dg-final { scan-weak \"vfoo1i\" } } */\n+/* { dg-final { scan-weak \"vfoo1j\" } } */\n+/* { dg-final { scan-weak \"vfoo1k\" } } */\n+/* { dg-final { scan-weak \"vfoo1l\" } } */\n \n /* test variable addresses with __attribute__ ((weak)) */\n \ndiff --git a/gcc/testsuite/gcc.dg/weak/weak-9.c b/gcc/testsuite/gcc.dg/weak/weak-9.c\nindex abbd0201c46..ddb0f210b8a 100644\n--- a/gcc/testsuite/gcc.dg/weak/weak-9.c\n+++ b/gcc/testsuite/gcc.dg/weak/weak-9.c\n@@ -3,10 +3,10 @@\n /* { dg-require-alias \"\" } */\n /* { dg-options \"-fno-common\" } */\n \n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?f1\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?f2\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?f3\" } } */\n-/* { dg-final { scan-assembler \"weak\\[^ \\t\\]*\\[ \\t\\]_?f4\" } } */\n+/* { dg-final { scan-weak \"f1\" } } */\n+/* { dg-final { scan-weak \"f2\" } } */\n+/* { dg-final { scan-weak \"f3\" } } */\n+/* { dg-final { scan-weak \"f4\" } } */\n \n void notf1() { }\n void notf2() { }\ndiff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp\nindex 97935cb23c3..91a276c1c4c 100644\n--- a/gcc/testsuite/lib/scanasm.exp\n+++ b/gcc/testsuite/lib/scanasm.exp\n@@ -153,6 +153,53 @@ proc hidden-scan-for { symbol } {\n \n }\n \n+proc weak-scan-for { symbol } {\n+\n+    set objformat [gcc_target_object_format]\n+\n+    switch $objformat {\n+        default  { return \"weak\\[^ \\t\\]*\\[ \\t\\]_?$symbol\" }\n+    }\n+}\n+\n+# Check that a symbol is defined as a weak symbol in the .s file\n+# produced by the compiler.\n+\n+proc scan-weak { args } {\n+    set testcase [testname-for-summary]\n+    # The name might include a list of options; extract the file name.\n+    set filename [lindex $testcase 0]\n+    set output_file \"[file rootname [file tail $filename]].s\"\n+\n+    if { [llength $args] > 0 } {\n+\tset symbol [lindex $args 0]\n+\n+\tset weak_scan [weak-scan-for $symbol]\n+\n+\tset args [lreplace $args 0 0 \"$weak_scan\"]\n+    }\n+\n+    dg-scan \"scan-weak\" 1 $testcase $output_file $args\n+}\n+\n+# Check that a symbol is not defined as a weak symbol in the .s file\n+# produced by the compiler.\n+\n+proc scan-not-weak { args } {\n+    set testcase [testname-for-summary]\n+    # The name might include a list of options; extract the file name.\n+    set filename [lindex $testcase 0]\n+    set output_file \"[file rootname [file tail $filename]].s\"\n+\n+    if { [llength $args] > 0 } {\n+\tset symbol [lindex $args 0]\n+\tset weak_scan [weak-scan-for $symbol]\n+\n+\tset args [lreplace $args 0 0 \"$weak_scan\"]\n+    }\n+\n+    dg-scan \"scan-not-weak\" 0 $testcase $output_file $args\n+}\n \n # Check that a symbol is defined as a hidden symbol in the .s file\n # produced by the compiler.\n","prefixes":["v4","1/4"]}