From patchwork Mon Mar 15 00:40:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 1452873 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Received: from 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DzHdb27DFz9sW1 for ; Mon, 15 Mar 2021 11:40:34 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1A1DE383F850; Mon, 15 Mar 2021 00:40:27 +0000 (GMT) X-Original-To: GCC-patches@gcc.gnu.org Delivered-To: GCC-patches@gcc.gnu.org Received: from smtp001-out.apm-internet.net (smtp001-out.apm-internet.net [85.119.248.222]) by sourceware.org (Postfix) with ESMTPS id 14B503854814 for ; Mon, 15 Mar 2021 00:40:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 14B503854814 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=sandoe.co.uk Authentication-Results: sourceware.org; spf=none smtp.mailfrom=iain@sandoe.co.uk Received: (qmail 61346 invoked from network); 15 Mar 2021 00:40:22 -0000 X-APM-Out-ID: 16157688226134 X-APM-Authkey: 257869/1(257869/1) 14 Received: from unknown (HELO ?192.168.1.212?) (81.138.1.83) by smtp001.apm-internet.net with SMTP; 15 Mar 2021 00:40:22 -0000 From: Iain Sandoe Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\)) Subject: [PATCH] libstdc++, testsuite, Darwin : Adjust for names used in system headers. Message-Id: <11F9966D-6E1E-4B7E-B714-76EED90D6173@sandoe.co.uk> Date: Mon, 15 Mar 2021 00:40:22 +0000 To: libstdc++ , GCC-patches@gcc.gnu.org X-Mailer: Apple Mail (2.3273) X-Spam-Status: No, score=-14.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_COUK, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Cc: Jonathan Wakely Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hi, What is slightly odd here is that this problem shows up for installed testing, but not when the test-suite is run in-tree. However, the issue is clear (and doesn’t need to depend on figuring out why it doesn’t show in-tree). tested on powerpc-darwin9, x86_64-darwin OK for master? thanks Iain ==== For all current Darwin SDKs inttypes.h has: extern intmax_t imaxabs(intmax_t j); So we need to exclude j from the defined symbol starts. libstdc++-v3/ChangeLog: * testsuite/17_intro/names.cc: Exclude j from the list of symbol starts on Darwin platform. --- libstdc++-v3/testsuite/17_intro/names.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc index 4534d790772..624e3ed9ccf 100644 --- a/libstdc++-v3/testsuite/17_intro/names.cc +++ b/libstdc++-v3/testsuite/17_intro/names.cc @@ -197,6 +197,11 @@ #undef v #endif +#ifdef __APPLE__ +// inttypes.h: extern intmax_t imaxabs(intmax_t j); +#undef j +#endif + #ifdef __hpux__ #undef d #undef r