Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2196134/?format=api
{ "id": 2196134, "url": "http://patchwork.ozlabs.org/api/patches/2196134/?format=api", "web_url": "http://patchwork.ozlabs.org/project/gcc/patch/20260212221128.145596-2-feedabl3@gmail.com/", "project": { "id": 17, "url": "http://patchwork.ozlabs.org/api/projects/17/?format=api", "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, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260212221128.145596-2-feedabl3@gmail.com>", "list_archive_url": null, "date": "2026-02-12T22:08:05", "name": "[v3,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/people/92146/?format=api", "name": "feedable", "email": "feedabl3@gmail.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/gcc/patch/20260212221128.145596-2-feedabl3@gmail.com/mbox/", "series": [ { "id": 492031, "url": "http://patchwork.ozlabs.org/api/series/492031/?format=api", "web_url": "http://patchwork.ozlabs.org/project/gcc/list/?series=492031", "date": "2026-02-12T22:08:04", "name": "Clean up test requirements", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/492031/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2196134/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2196134/checks/", "tags": {}, "related": [], "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=Y6WhrGiZ;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org\n (client-ip=2620:52:6:3111::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=Y6WhrGiZ", "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.42" ], "Received": [ "from vm01.sourceware.org (vm01.sourceware.org\n [IPv6:2620:52:6:3111::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 4fBqQ10L3kz1xpY\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 13 Feb 2026 09:16:08 +1100 (AEDT)", "from vm01.sourceware.org (localhost [127.0.0.1])\n\tby sourceware.org (Postfix) with ESMTP id CB8A34B9DB6E\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 12 Feb 2026 22:16:05 +0000 (GMT)", "from mail-wm1-f42.google.com (mail-wm1-f42.google.com\n [209.85.128.42])\n by sourceware.org (Postfix) with ESMTPS id 661A14B9DB66\n for <gcc-patches@gcc.gnu.org>; Thu, 12 Feb 2026 22:11:47 +0000 (GMT)", "by mail-wm1-f42.google.com with SMTP id\n 5b1f17b1804b1-48334ee0aeaso2470865e9.1\n for <gcc-patches@gcc.gnu.org>; Thu, 12 Feb 2026 14:11:47 -0800 (PST)", "from 7a38.moduleworks.com ([2a02:8308:81:a900:fbf:c4a4:796f:57b1])\n by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-4835dfb4bd4sm155439315e9.7.2026.02.12.14.11.45\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 12 Feb 2026 14:11:45 -0800 (PST)" ], "DKIM-Filter": [ "OpenDKIM Filter v2.11.0 sourceware.org CB8A34B9DB6E", "OpenDKIM Filter v2.11.0 sourceware.org 661A14B9DB66" ], "DMARC-Filter": "OpenDMARC Filter v1.4.2 sourceware.org 661A14B9DB66", "ARC-Filter": "OpenARC Filter v1.0.0 sourceware.org 661A14B9DB66", "ARC-Seal": "i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1770934307; cv=none;\n b=FiqerM6BFE99DyXqbWsTGfxiuVlMr8SZAXJsR3InthknX/v25ybuXXHIqu+hCNvtgcUTCyoI7L1TSZWNHAnWVbne3H2KS8DxjflDnsf2OBcKcpo/HscJ9dEa6bG61qQxVbULcwYW1RNRijQVk18i4FEdNt/Bn/zcwLr4EbY+ueQ=", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=sourceware.org; s=key;\n t=1770934307; c=relaxed/simple;\n bh=gzWJ1CipT2MnYk4Eu/fCeDQ4G0K8HXIjnAMZJFbcxx8=;\n h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version;\n b=JCH5u+m/V69ZEA0FR3IY35X0xHokKa+bpb+4f9DvE5Z/JHFNpomEYyUCn/N+9GejQfRyP3SpeA7NA7m4pql9QWh/LK4zykBDF3pDjV8NVDkUGxzH0uIL7K8utz2rBa56x0xKaQObwQzHuxSdO9GAB3bDx7yFRhdxvI6QrulAyCE=", "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=1770934306; x=1771539106; 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=Y6WhrGiZip4B587IqUf+UAePH5UNQLIioFRYr0RLvoMHu+kRSZK6AyyXiobNyuRjRq\n 8PIDX9Cw2VW0N4VIhSQg0rbjwSopOkUs2MKULrkJ/jr6/1amJC4wox+XiNnySDH/c7kY\n nuX7SOM+TVlmyj/+xAQaXi91Aj0ytVAzEMHQ/8e5Al9xOmZRbwd6LzWSfnC12X+0IzAN\n lvAQu9tlOZsIlUGGDkvEWAYUQ0+PU7vKkZgSBKdNW/PzDAKy/zhpdAcyhPDk8T6e27b2\n Go1jmLln9duylKM4SJ9NWfLy3E16zSjYPlU/9ILZrGv4fyAsRhyHGOsUj7UUh1cr/KSH\n iw5w==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1770934306; x=1771539106;\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=bCh6aUTkY1t58HVT31dhZHDa11m7adrA8qP9REdALf94dTfmRjLFmlVsxWEI7IXOUH\n VcH3l22Ryz3YrvPoqhpiHAI4zuCX5cMkjO1QlgHUgMb2VlTze2dlcpoZ/pv0QclEa/oM\n MozY6eD8JLFRgsFvbxzYYhhqJWvhLHUUzrLFqjY9dB90Rk+lTIAONvWX8MMaG4tc8aky\n /3LunKjA8OSTXGkqRLFLTba9lqObGE8A2FMlkjOvj4DbX6JCZwPIKBE4m6Vf2GXzsk36\n Dkuqc2xokMVMhqWsUVTZOB4eSag45s+Y/uZn5359uckT3d6y0RoulixQzxG7e93BiLJf\n lTdg==", "X-Gm-Message-State": "AOJu0YyucEUPnt4nmvZxWgc7UOTFBytZtQAAL704kVOOWJSZ6KewFn5F\n Lf/ZZ6ERmWLsc+WHJTGkvp1iZlOQqgCokGgfEcCBJR4gDdrGsiJlUpEoQDG+lw==", "X-Gm-Gg": "AZuq6aJMw+x068R+IjAmgd7D6462NdofLMDm3LM6J4yOdZOn6GtKjNTQXBTDmvbzSu5\n hoiKkaep9GPd++qe+K+pdJlaLEjBiFci/ucopSMijAnvn4V1AEJd3SYF/7Q30Nnl/zsmbnHJObJ\n yR65JdsX/X8cw3bqqM2WzBCduENAO4tKcZTrEoxZLRyNkNg/dO0tVjdQ2H8X42OQmrbpWDKLoJN\n mpCYvEJH5Z+EYdx5K6I3i8xogZa//za5Gxdf8PDiRgvDhByi/Y1pMPnYWkYwnJLfLE8zYXAukyF\n VAqlu7cY6KfCq3/FTrpeSdfvtv1zPI36im6XnlwsqiGhHYBKVMwQq7qCx55B5psaH5Csnf90RXB\n 3zLu1eBevD00qG80/fAFG42jQipV7IH4WuJQUstudP6ol8h5OgPjlgnHT/5q2GBX2xZADO2qfGj\n A1rKnvUyv8l/ADFy2LlSkLQlwWMENFPhawXg==", "X-Received": "by 2002:a05:600c:4fd4:b0:477:7ab8:aba with SMTP id\n 5b1f17b1804b1-48370e18633mr10550045e9.1.1770934306096;\n Thu, 12 Feb 2026 14:11:46 -0800 (PST)", "From": "feedable <feedabl3@gmail.com>", "To": "gcc-patches@gcc.gnu.org", "Cc": "feedable <feedabl3@gmail.com>", "Subject": "[PATCH v3 1/4] testsuite: Clean up the weak declaration scanning", "Date": "Fri, 13 Feb 2026 00:08:05 +0200", "Message-ID": "<20260212221128.145596-2-feedabl3@gmail.com>", "X-Mailer": "git-send-email 2.53.0", "In-Reply-To": "<20260212221128.145596-1-feedabl3@gmail.com>", "References": "<20260212221128.145596-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": [ "v3", "1/4" ] }