From patchwork Fri Feb 17 06:17:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 58353 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp725593wrn; Thu, 16 Feb 2023 22:19:28 -0800 (PST) X-Google-Smtp-Source: AK7set8oCi1uDWgXKOGhWfYjdH5YZL35eYYECKFjzDj/WAwXlUGU6SbRU3beq3k0rnQmLmLbVPHJ X-Received: by 2002:aa7:c983:0:b0:49b:7416:e3ff with SMTP id c3-20020aa7c983000000b0049b7416e3ffmr7678546edt.5.1676614767997; Thu, 16 Feb 2023 22:19:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676614767; cv=none; d=google.com; s=arc-20160816; b=d/jjN9Jd6i5QIS+EkPDyeNlu2Sei5/HDMI0zlKFd6JgcMCwF4iMuqGALDKxp6iPH1b zFLhG4QpzfSL7YpUiZE4SbvA90yu+mpn9Pl+NTNr4kV25UWuUG5YT7gEiRMbBhyX7V9m Kyz64r1DYFzWNfPM+SO85Gj5ryy7lBMtz7MLmHmmeLNoMM6u10a+ePGaBxqw0GBFojfH IKSCPLZsNeu03I4GgCYzS/dXmSVrjJz9d059MEHLHHoEjGcxcvaYv7CDK+DMHS/bmJE0 La6mn+3jHaOhCnAueJOUP7pLGionrJHKMDOoFHoRShw0gTku9M6OsmtENmUvLrKMA+cU GTsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:mime-version :user-agent:message-id:date:organization:subject:to:dmarc-filter :delivered-to:dkim-signature:dkim-filter; bh=5bfvmLx7qan6RIbUUu3H1C+EbAtiZoXJRgUB99mPcIY=; b=FDKivPAcVRi1fC1LnCdBG5dbfvF3LcJJpDJoNUWvMJIqawBLHOeEzTxP2wdoxOq03N c3n1vca8uKGZJpjMsZpM6QI6ocKI0ntRuTLCYBx/kVVtMgx2rgSXQf+VSf5j10VVupMF tvleleN9Deb238KXjHPqzalycbg94el+cb2gd3AAduVNPKRiTDMAJGCeAytBgarr9qlF xaI+icGU2guQ8a3K4s5JE/2sojvhpNk6ZvDCTYvkKkLNCF7lt7U1Ws7575wd5aKGEIkj TdpaBrp1HJXOgL/hDihRO7G3n0rUsDjjXbcGenl9V2Saq072rOHhXmD7qbfeMxzPnX9A nFbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=wcc8KEOk; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id u4-20020a056402064400b004ad6d76c2e2si2891706edx.190.2023.02.16.22.19.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Feb 2023 22:19:27 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=wcc8KEOk; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 17BE63858412 for ; Fri, 17 Feb 2023 06:19:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 17BE63858412 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676614757; bh=5bfvmLx7qan6RIbUUu3H1C+EbAtiZoXJRgUB99mPcIY=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=wcc8KEOkRYaNQZCI7FWS0Lv2nPYAM2uN+YICT7aWXEiLMX0TMLLuHdEoyu90qU4wt agjpRLyU/zQcGbwKnpobTkMonHdPLR3QoXfG3V25WBx+d0zX1SF7YvteCpp8ZkZgKE kDYT1gGwQV4yDt/WlDZ+PQeqdjV7p5fGxdup/K6w= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTPS id 0506E3858D33; Fri, 17 Feb 2023 06:18:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0506E3858D33 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id C897A116B6D; Fri, 17 Feb 2023 01:18:32 -0500 (EST) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 4Skvr3G1biTL; Fri, 17 Feb 2023 01:18:32 -0500 (EST) Received: from free.home (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPS id 8B14A116B6C; Fri, 17 Feb 2023 01:18:32 -0500 (EST) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 31H6HiEJ088818 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Fri, 17 Feb 2023 03:17:44 -0300 To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: [libstdc++] [testsuite] intro/names.cc: undef func on vxw7krn Organization: Free thinker, does not speak for AdaCore Date: Fri, 17 Feb 2023 03:17:43 -0300 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alexandre Oliva via Gcc-patches From: Alexandre Oliva Reply-To: Alexandre Oliva Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758058006584843376?= X-GMAIL-MSGID: =?utf-8?q?1758058006584843376?= The '#define func' added in 2021, to test that system headers don't violate the user namespace, exposes such a bug in the vxworks sysLib.h header, so add yet another such annotated workaround. Regstrapped on x86_64-linux-gnu. Tested on arm-vxworks7 (gcc-12) and arm-eabi (trunk). Ok to install? for libstdc++-v3/ChangeLog * testsuite/17_intro/names.cc: Undef func on vxworks >= 7 in kernel mode. --- libstdc++-v3/testsuite/17_intro/names.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc index d3e0db9bab6b9..c2d67ebe01276 100644 --- a/libstdc++-v3/testsuite/17_intro/names.cc +++ b/libstdc++-v3/testsuite/17_intro/names.cc @@ -329,6 +329,8 @@ #undef d #undef e #undef f +// in sysLib.h, func appears as a formal parameter name +#undef func #endif // __RTP__ #endif // VxWorks Major >= 7