From patchwork Sun Oct 13 22:22:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam James X-Patchwork-Id: 1996642 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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 4XRZdT1tL6z1xsc for ; Mon, 14 Oct 2024 09:23:39 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E5A98385B527 for ; Sun, 13 Oct 2024 22:23:36 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id EF62B3856951; Sun, 13 Oct 2024 22:23:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EF62B3856951 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org EF62B3856951 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728858198; cv=none; b=c+tpi+V9SWhg1jS1ZIdX17qw7DHJu6lK1SRmjI3+4H+FT3C+q4vB+RDTqSHPsZhPzoGmgg3rkHqmQQ3AZDze0FJ/nd/IFPW92eRPRiZ34o7Qk6LLVqPSWxPDO+ysCC5yCf9x9q/jwN5JUsrVpYsZeiD9u0OYit6VqL1f4rERZoo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728858198; c=relaxed/simple; bh=3+FO2cvuyKFHNSbiLy3IZ19K4l3JDhdTcaNWryczsSM=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=TrQ+K4RyKlWL3V6Mg84JGjbOS7o04UZ7/Q9vaDV/8vc0dLvn7oqJy6dqWV3G2dNDOcmPURzUSzj9rsofXVWwPpiB0ZwCI48cjZ9vnGrs6SbMMdPh/sKYTC5n3M04JlUf7DN5L/hiC7XH6261LDsm1N9ed4vX+QA0iLQrOcnhOVU= ARC-Authentication-Results: i=1; server2.sourceware.org From: Sam James To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Cc: Sam James Subject: [PATCH] libstdc++: testsuite: adjust name_fortify test for pre-defined _FORTIFY_SOURCE Date: Sun, 13 Oct 2024 23:22:59 +0100 Message-ID: <90a4851b08270678352f4f53f86d94af78647499.1728858179.git.sam@gentoo.org> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, 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 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 Otherwise we get failures with toolchains that have _FORTIFY_SOURCE defined already to a different value like 3. libstdc++-v3/ChangeLog: * testsuite/17_intro/names_fortify.cc: Undefine _FORTIFY_SOURCE. --- I'll commit later if no objections. libstdc++-v3/testsuite/17_intro/names_fortify.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/libstdc++-v3/testsuite/17_intro/names_fortify.cc b/libstdc++-v3/testsuite/17_intro/names_fortify.cc index c975412074be..f24af21f8a70 100644 --- a/libstdc++-v3/testsuite/17_intro/names_fortify.cc +++ b/libstdc++-v3/testsuite/17_intro/names_fortify.cc @@ -1,6 +1,7 @@ // { dg-do compile { target *-*-linux* } } // { dg-add-options no_pch } +#undef _FORTIFY_SOURCE #define _FORTIFY_SOURCE 2 // Now we can define the macros to poison uses of non-reserved names: #include "names.cc"