From patchwork Tue Jun 4 18:30:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 1943505 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=s0KHyl0d; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Vtzjq4s9Hz20Tb for ; Wed, 5 Jun 2024 04:33:03 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E136D3811084 for ; Tue, 4 Jun 2024 18:33:01 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by sourceware.org (Postfix) with ESMTPS id F3A0938B6895 for ; Tue, 4 Jun 2024 18:31:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F3A0938B6895 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=baylibre.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org F3A0938B6895 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::431 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717525887; cv=none; b=KhyyIBuH6U+fVhTEX+NcJJqE9thbQDaKwXulbEM6si1rWeS78wrZr93Cv2HS2OAaOxqoEYRExn2F6SaZIBkh/ZKEwiv3NA7ZEHuc7xYlMp4DWFjaJ+Zvn5aYnkCf1c3jg57OTfPw32YdJlpPPQlrLpuVuGfbVJOj3Uwf0yTVA4s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717525887; c=relaxed/simple; bh=F8YSW7bGJ/qcknQmeDBuiWcMqseXWXvnjylFduYSu8E=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=ALyUATQEqw+3T/bxKR1JQx9V/iltlwwv8ygDA1pxFhq2mmHNtqrXRQUbqLxGrZoCFSqt8onVrousekknrbrHuT7HSnr8CyriHwmfefiUCdsTsR0cCEK78cxH7hS2MW11rQ8vU0rXIUmELIDL5Xr5p4km9xNAcKpsmvI/CWD065c= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-35b447d78f1so70073f8f.0 for ; Tue, 04 Jun 2024 11:31:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1717525884; x=1718130684; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=5go/7OQEmtvXN1AOKWWO/UG9ijE8mrcMsJmTgfy3z2k=; b=s0KHyl0dNY5LAyAiGIlxflcxZ0gkdJHVUcICYIrpnx8jx9XhevQlvtwiTWFN2h0Gnc 08poG0AJAQskrZna4e+r0phxyWU7s38fkRPoxCfZ/xqX8VQPIo732OJuv2yIUDIpXUe/ e410bI5UqYIxvrsUXdu/IOfnMVdCHKhpmn911rUTlfb2Ih/06Pf1VkbFIlUz3jFckjBy RSl1E1+NuGisjfGBwFsrN1fGlxinVAui0IymgJrKvelUBrppw9b9ZKqNQVYesF7TVk7a We8GnBHiDGMJ2d/RCZrGx283NKqPxtiWB4kXT/4O7H6b1+8kc1FsGG4Jd6njrihjWwYN 8kQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717525884; x=1718130684; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5go/7OQEmtvXN1AOKWWO/UG9ijE8mrcMsJmTgfy3z2k=; b=fv2/TXFHKsygIOLOU7eXBTQVtCEcVtPPoYO/3MFJ5RqgqV8111V6COltlUmLIxNCz7 7xoH6FhT8fqkrWnmJ1ulKSbXlDk6aYEj+1CsnsMio03U9d4jKqhjtGqtnz5qqub+3n3Y ovTDeKiJDK8IhYikb7Yj4KB3skzL8HKgwx34faK7AoPi7v2FZ2tio3Lcj6WwPT/LuOtr zP2U7s39nO1la2OIIuSrxL2vA7spqqqRpgjbQ8s9hb4ij6mh5FLubOGslO+WcedbMElt GX+r7rwOll3Q4u4kDYY2q6WE8mDnR2UxLRT2q2bwtR/ZvtOu5h13Hi77dKvL736OOkUc WTKQ== X-Gm-Message-State: AOJu0YzAfTeNAB0TfJnkVx0PnLYxlMptIwCyMWaaxRxedsNh6B4vpN27 1oQNECUfgn1LixPgptYM3y5Yi/zYS2a84+td8ZVdTZPaDTsNc+MAyX06ASqibf8LZw54N2MtK6h 0 X-Google-Smtp-Source: AGHT+IFWGzA9vHKCtb4ayo/IKYHA2rWV3P7s3IJ52TuI524m/p7y1zwLagqW7mbUKwnHq0s6BC1+4w== X-Received: by 2002:adf:f452:0:b0:35e:543a:a930 with SMTP id ffacd0b85a97d-35e7c541a2cmr3230451f8f.18.1717525883391; Tue, 04 Jun 2024 11:31:23 -0700 (PDT) Received: from dem-tschwing-1.schwinge.ddns.net (p200300c8b735b200f3dc200ec7cc31ed.dip0.t-ipconnect.de. [2003:c8:b735:b200:f3dc:200e:c7cc:31ed]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35dd066d317sm12269429f8f.113.2024.06.04.11.31.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jun 2024 11:31:23 -0700 (PDT) From: Thomas Schwinge To: gcc-patches@gcc.gnu.org Subject: [PATCH 4/4] Add 'c-c++-common/initpri1{, -lto, -split}-static.c' as internal linkage variants Date: Tue, 4 Jun 2024 20:30:51 +0200 Message-Id: <20240604183051.1406924-5-tschwinge@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240604183051.1406924-4-tschwinge@baylibre.com> References: <20240604183051.1406924-1-tschwinge@baylibre.com> <20240604183051.1406924-2-tschwinge@baylibre.com> <20240604183051.1406924-3-tschwinge@baylibre.com> <20240604183051.1406924-4-tschwinge@baylibre.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org gcc/testsuite/ * c-c++-common/initpri1_part_c1.c: Consider 'CDTOR_LINKAGE'. * c-c++-common/initpri1_part_c2.c: Likewise. * c-c++-common/initpri1_part_c3.c: Likewise. * c-c++-common/initpri1_part_cd4.c: Likewise. * c-c++-common/initpri1_part_d1.c: Likewise. * c-c++-common/initpri1_part_d2.c: Likewise. * c-c++-common/initpri1_part_d3.c: Likewise. * c-c++-common/initpri1.c: Specify it. * c-c++-common/initpri1-lto.c: Likewise. * c-c++-common/initpri1-split.c: Likewise. * c-c++-common/initpri1-static.c: New. * c-c++-common/initpri1-lto-static.c: Likewise. * c-c++-common/initpri1-split-static.c: Likewise. --- .../c-c++-common/{initpri1-lto.c => initpri1-lto-static.c} | 1 + gcc/testsuite/c-c++-common/initpri1-lto.c | 1 + .../c-c++-common/{initpri1-split.c => initpri1-split-static.c} | 1 + gcc/testsuite/c-c++-common/initpri1-split.c | 1 + .../c-c++-common/{initpri1-lto.c => initpri1-static.c} | 3 +-- gcc/testsuite/c-c++-common/initpri1.c | 1 + gcc/testsuite/c-c++-common/initpri1_part_c1.c | 2 ++ gcc/testsuite/c-c++-common/initpri1_part_c2.c | 2 ++ gcc/testsuite/c-c++-common/initpri1_part_c3.c | 2 ++ gcc/testsuite/c-c++-common/initpri1_part_cd4.c | 2 ++ gcc/testsuite/c-c++-common/initpri1_part_d1.c | 2 ++ gcc/testsuite/c-c++-common/initpri1_part_d2.c | 2 ++ gcc/testsuite/c-c++-common/initpri1_part_d3.c | 2 ++ 13 files changed, 20 insertions(+), 2 deletions(-) copy gcc/testsuite/c-c++-common/{initpri1-lto.c => initpri1-lto-static.c} (81%) copy gcc/testsuite/c-c++-common/{initpri1-split.c => initpri1-split-static.c} (86%) copy gcc/testsuite/c-c++-common/{initpri1-lto.c => initpri1-static.c} (70%) diff --git a/gcc/testsuite/c-c++-common/initpri1-lto.c b/gcc/testsuite/c-c++-common/initpri1-lto-static.c similarity index 81% copy from gcc/testsuite/c-c++-common/initpri1-lto.c copy to gcc/testsuite/c-c++-common/initpri1-lto-static.c index 433ef356c7e..6393f7ec99b 100644 --- a/gcc/testsuite/c-c++-common/initpri1-lto.c +++ b/gcc/testsuite/c-c++-common/initpri1-lto-static.c @@ -2,5 +2,6 @@ /* { dg-require-effective-target lto } */ /* { dg-options "-flto -O3" } */ /* Via the magic string "-std=*++" indicate that testing one (the default) C++ standard is sufficient. */ +/* { dg-additional-options -DCDTOR_LINKAGE=static } */ #include "initpri1.c" diff --git a/gcc/testsuite/c-c++-common/initpri1-lto.c b/gcc/testsuite/c-c++-common/initpri1-lto.c index 433ef356c7e..7fb4bf1aa82 100644 --- a/gcc/testsuite/c-c++-common/initpri1-lto.c +++ b/gcc/testsuite/c-c++-common/initpri1-lto.c @@ -2,5 +2,6 @@ /* { dg-require-effective-target lto } */ /* { dg-options "-flto -O3" } */ /* Via the magic string "-std=*++" indicate that testing one (the default) C++ standard is sufficient. */ +/* { dg-additional-options -DCDTOR_LINKAGE= } */ #include "initpri1.c" diff --git a/gcc/testsuite/c-c++-common/initpri1-split.c b/gcc/testsuite/c-c++-common/initpri1-split-static.c similarity index 86% copy from gcc/testsuite/c-c++-common/initpri1-split.c copy to gcc/testsuite/c-c++-common/initpri1-split-static.c index 11755ee9f6a..02d8b162e19 100644 --- a/gcc/testsuite/c-c++-common/initpri1-split.c +++ b/gcc/testsuite/c-c++-common/initpri1-split-static.c @@ -1,3 +1,4 @@ /* { dg-do run { target init_priority } } */ /* Via the magic string "-std=*++" indicate that testing one (the default) C++ standard is sufficient. */ /* { dg-additional-sources {initpri1_part_c1.c initpri1_part_c2.c initpri1_part_c3.c initpri1_part_d1.c initpri1_part_d2.c initpri1_part_d3.c initpri1_part_cd4.c initpri1_part_main.c} } */ +/* { dg-additional-options -DCDTOR_LINKAGE=static } */ diff --git a/gcc/testsuite/c-c++-common/initpri1-split.c b/gcc/testsuite/c-c++-common/initpri1-split.c index 11755ee9f6a..f1482c7e0c1 100644 --- a/gcc/testsuite/c-c++-common/initpri1-split.c +++ b/gcc/testsuite/c-c++-common/initpri1-split.c @@ -1,3 +1,4 @@ /* { dg-do run { target init_priority } } */ /* Via the magic string "-std=*++" indicate that testing one (the default) C++ standard is sufficient. */ /* { dg-additional-sources {initpri1_part_c1.c initpri1_part_c2.c initpri1_part_c3.c initpri1_part_d1.c initpri1_part_d2.c initpri1_part_d3.c initpri1_part_cd4.c initpri1_part_main.c} } */ +/* { dg-additional-options -DCDTOR_LINKAGE= } */ diff --git a/gcc/testsuite/c-c++-common/initpri1-lto.c b/gcc/testsuite/c-c++-common/initpri1-static.c similarity index 70% copy from gcc/testsuite/c-c++-common/initpri1-lto.c copy to gcc/testsuite/c-c++-common/initpri1-static.c index 433ef356c7e..ac101ff63cb 100644 --- a/gcc/testsuite/c-c++-common/initpri1-lto.c +++ b/gcc/testsuite/c-c++-common/initpri1-static.c @@ -1,6 +1,5 @@ /* { dg-do run { target init_priority } } */ -/* { dg-require-effective-target lto } */ -/* { dg-options "-flto -O3" } */ /* Via the magic string "-std=*++" indicate that testing one (the default) C++ standard is sufficient. */ +/* { dg-additional-options -DCDTOR_LINKAGE=static } */ #include "initpri1.c" diff --git a/gcc/testsuite/c-c++-common/initpri1.c b/gcc/testsuite/c-c++-common/initpri1.c index f50137a489b..73579cdd06b 100644 --- a/gcc/testsuite/c-c++-common/initpri1.c +++ b/gcc/testsuite/c-c++-common/initpri1.c @@ -1,5 +1,6 @@ /* { dg-do run { target init_priority } } */ /* Via the magic string "-std=*++" indicate that testing one (the default) C++ standard is sufficient. */ +/* { dg-additional-options -DCDTOR_LINKAGE= } */ #include "initpri1_part_c1.c" diff --git a/gcc/testsuite/c-c++-common/initpri1_part_c1.c b/gcc/testsuite/c-c++-common/initpri1_part_c1.c index 0f85a2e6cb1..da2f4e6c0bc 100644 --- a/gcc/testsuite/c-c++-common/initpri1_part_c1.c +++ b/gcc/testsuite/c-c++-common/initpri1_part_c1.c @@ -3,8 +3,10 @@ extern int i; +CDTOR_LINKAGE void c1() __attribute__((constructor (500))); +CDTOR_LINKAGE void c1() { if (i++ != 0) __builtin_abort (); diff --git a/gcc/testsuite/c-c++-common/initpri1_part_c2.c b/gcc/testsuite/c-c++-common/initpri1_part_c2.c index e8c556aab17..926608dc0d9 100644 --- a/gcc/testsuite/c-c++-common/initpri1_part_c2.c +++ b/gcc/testsuite/c-c++-common/initpri1_part_c2.c @@ -3,8 +3,10 @@ extern int i; +CDTOR_LINKAGE void c2() __attribute__((constructor (700))); +CDTOR_LINKAGE void c2() { if (i++ != 2) __builtin_abort (); diff --git a/gcc/testsuite/c-c++-common/initpri1_part_c3.c b/gcc/testsuite/c-c++-common/initpri1_part_c3.c index 70880882ce3..59941ce7428 100644 --- a/gcc/testsuite/c-c++-common/initpri1_part_c3.c +++ b/gcc/testsuite/c-c++-common/initpri1_part_c3.c @@ -3,8 +3,10 @@ extern int i; +CDTOR_LINKAGE void c3() __attribute__((constructor (600))); +CDTOR_LINKAGE void c3() { if (i++ != 1) __builtin_abort (); diff --git a/gcc/testsuite/c-c++-common/initpri1_part_cd4.c b/gcc/testsuite/c-c++-common/initpri1_part_cd4.c index b67ff90d9fe..c209db3718e 100644 --- a/gcc/testsuite/c-c++-common/initpri1_part_cd4.c +++ b/gcc/testsuite/c-c++-common/initpri1_part_cd4.c @@ -4,8 +4,10 @@ extern int i; extern int j; +CDTOR_LINKAGE void cd4() __attribute__((constructor (800), destructor (800))); +CDTOR_LINKAGE void cd4() { if (i != 3) __builtin_abort (); diff --git a/gcc/testsuite/c-c++-common/initpri1_part_d1.c b/gcc/testsuite/c-c++-common/initpri1_part_d1.c index 099df37e97c..817603e275b 100644 --- a/gcc/testsuite/c-c++-common/initpri1_part_d1.c +++ b/gcc/testsuite/c-c++-common/initpri1_part_d1.c @@ -3,8 +3,10 @@ extern int i; +CDTOR_LINKAGE void d1() __attribute__((destructor (500))); +CDTOR_LINKAGE void d1() { if (--i != 0) __builtin_abort (); diff --git a/gcc/testsuite/c-c++-common/initpri1_part_d2.c b/gcc/testsuite/c-c++-common/initpri1_part_d2.c index 258cbbc495f..1dcb7367726 100644 --- a/gcc/testsuite/c-c++-common/initpri1_part_d2.c +++ b/gcc/testsuite/c-c++-common/initpri1_part_d2.c @@ -3,8 +3,10 @@ extern int i; +CDTOR_LINKAGE void d2() __attribute__((destructor (700))); +CDTOR_LINKAGE void d2() { if (--i != 2) __builtin_abort (); diff --git a/gcc/testsuite/c-c++-common/initpri1_part_d3.c b/gcc/testsuite/c-c++-common/initpri1_part_d3.c index 1242d411b07..ae290fa4594 100644 --- a/gcc/testsuite/c-c++-common/initpri1_part_d3.c +++ b/gcc/testsuite/c-c++-common/initpri1_part_d3.c @@ -4,8 +4,10 @@ extern int i; extern int j; +CDTOR_LINKAGE void d3() __attribute__((destructor (600))); +CDTOR_LINKAGE void d3() { if (j != 2) __builtin_abort ();