From patchwork Mon Sep 30 17:26:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Scheiner X-Patchwork-Id: 1991111 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=web.de header.i=frank.scheiner@web.de header.a=rsa-sha256 header.s=s29768273 header.b=O2nfM9df; 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 4XHSg963hbz1xsc for ; Tue, 1 Oct 2024 03:27:01 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 85192386544E for ; Mon, 30 Sep 2024 17:26:59 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout.web.de (mout.web.de [217.72.192.78]) by sourceware.org (Postfix) with ESMTPS id 1B5C8384F027 for ; Mon, 30 Sep 2024 17:26:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1B5C8384F027 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=web.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=web.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1B5C8384F027 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=217.72.192.78 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727717199; cv=none; b=mKRU3YX/Ill8/7Iy9u6DfFhMjKypkQCx+DtCHR6YQK7ZEz7JFA4oZVrV0ODfRBdEQDNp8j8lPiKJowaouSaQrJNeofEhIsANU0l8pZr9rdOXqb1hzlny1+R3jLKCML5h9kuEFjB0aJJO+HQQDZyGp3jC0j003CBKu+iHMK5gh6s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727717199; c=relaxed/simple; bh=uauZW2CoTKPu6brLcQItZ8vWQnAA0K2/l39Zwx2W6FQ=; h=DKIM-Signature:Message-ID:Date:MIME-Version:From:Subject:To; b=tnAh0sR8wJg1zv9CDSfOUlajXRmPt0OlJJ0gkbKl6MMoOhxlRIwEIVvvicFgwNsaYcTcDCj3URPgteu4efmTA72MMEG7Qy9hQKZ3VHwHURR6a8eM94tJOEIsPRahrwg7ev1In9zAgzkvbVYKyGfU9ljb3rvqF26FiKpdN/N+qtI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1727717180; x=1728321980; i=frank.scheiner@web.de; bh=cc7NSJ4Tg+afLt/a21G8FP4KrkwI01AkOyqSZsnNgDQ=; h=X-UI-Sender-Class:Message-ID:Date:MIME-Version:From:Subject:To: Cc:Content-Type:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=O2nfM9dfWE2RpyChOfBfqok5hSsKWNGcnpi+Dt3H/eVAmhSCcfAHsLcVqCwUGgPN tNk+Jaso0B+n7xQrm6HgPOJ5zzvYdRt5iRBBhxr9gG0NbbtWtVtAN0KFSzGD2Wy7A skbrJ6DHCYdphTk+9rSdZsMEX1vHLvf1nsgbDCWrkK58kouNaH68wRu229PNNSe3I rx5RtY5jy8xs+d4vOVXGwAVaBNx8Zx1DB/ZfqOYMSwcy+RI9QEdrfA64uCznghKbA n/9T5pJATAckYJs4N3/5bCqasrejALk5N91wVfgjLSf9QS7ihg9tWB98N9cErmQTl sCYzr2nj0vyszGuK7Q== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.30] ([217.247.33.52]) by smtp.web.de (mrweb105 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MPKFD-1sYOv30Zv3-00MxPC; Mon, 30 Sep 2024 19:26:20 +0200 Message-ID: <974986b1-a571-460c-91a4-b166f2076d4c@web.de> Date: Mon, 30 Sep 2024 19:26:16 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Frank Scheiner Subject: [PATCH] libstdc++: Workaround glibc header on ia64-linux To: gcc-patches@gcc.gnu.org Cc: Jonathan Wakely , jeffreyalaw@gmail.com, Joseph Myers , =?utf-8?q?Ren=C3=A9_Rebe?= Content-Language: en-US X-Provags-ID: V03:K1:1v3QqzEUnmXpue96nrvUP3otVDYoXHhrKHxsgNTwhfU4An9s31o U2ze3h+gINtdz6IiOJqeYZlLDgpqQipUWoKHTtpgYmCwSKAcZFiKbx/ifSHZDinh5WJoyhF q/dzN2rM7uDKDC3/fAmrnJ3R/lnYCux6FymPmcMgzZ57C/xQfsAYpVOSIuaSbvYM07nclZ7 v1B5ct28q3uwt/Y/FWymg== UI-OutboundReport: notjunk:1;M01:P0:qnQXo0UGT98=;oAMkRCer1gvnVMcvhfYgw/Kda4I VXJ/mXIkto+yt6ZLq14EzZVdjy8Ly262yxC49Bi0bFzm5DoURyKkuvf3n5AyQz3m5QxZRCQ50 Dev8qchjnBKQnJlQPnKmZ9j6qAG5qD3Pm3/B83ke8VKfnYq520WPNvFXswMoZxknY1dRwpjAg MHMwYoE6oj5YDBaKBuHuhU3iRs/XK4jCDkCqxOCoPDqiMISIDI8Af44R3qS/LePYJhTmLThoK efo9wHU3a5dw3JCJtKQ7AY1QT5Q2Y+RwB3udn1ZK52usdGS5hrbg4azfyJaDlYdnZTKoUDoNq NCm8Ql/KvfbpvibV+b0TIk3nxjWXmFrI8DtwMZT+Iix5APHuEdIqd5fhYuzOVq+5c3IrQulyl Xl/HJ82H/btOW/GdANR99Ri2AZyKd2IjECfLZxmdGOMBLXNgIM7f5u+foKbIJPT7wU84TUDtJ 3F3q56Bc/mmQmnLzvdRZ8TFnKVP3aZlD7IoM3M43oM7+3dJhfSx/mVMP/i26QI5MYA0+VpzL2 3Xk1P5HUVVXnuMpQV4bm/aY5vY5fXxPTAvZ1W0ICVKrbSW1yJz/kVAbtzzEsNYfPT0WQ6ARFc wtM2/UDuxeZIxjpOGXmL0eTeP1eeGWeph7XTvZuQSxy6XU1cU1oi+XLIf0HFse2eEpil6ACdE 7A82LBwLS4FGacS0yBXet5+Q8FpeAI3O2Vw4kQy17+OEskLUaM2K93jwqKy16UA3BGgoS2TXE p6S4p0MeNBrlqkEZqoqYh2kWWDcbguNDlfFAsBNFSZgH2Xxk86p8vUlSqAhnKo40WqyC+3EeO c1ye573bvMoqgk6m2zO/a4GQ== X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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.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 We see: ``` FAIL: 17_intro/names.cc -std=gnu++17 (test for excess errors) FAIL: 17_intro/names_pstl.cc -std=gnu++17 (test for excess errors) FAIL: experimental/names.cc -std=gnu++17 (test for excess errors) ``` ...on ia64-linux. This is due to: * /usr/include/bits/sigcontext.h:32-38: ``` 32 struct __ia64_fpreg 33 { 34 union 35 { 36 unsigned long bits[2]; 37 } u; 38 } __attribute__ ((__aligned__ (16))); ``` * /usr/include/sys/ucontext.h:39-45: ``` 39 struct __ia64_fpreg_mcontext 40 { 41 union 42 { 43 unsigned long __ctx(bits)[2]; 44 } __ctx(u); 45 } __attribute__ ((__aligned__ (16))); ``` ...from glibc 2.39 (w/ia64 support re-added). See the discussion starting on [1]. [1]: https://gcc.gnu.org/pipermail/gcc-patches/2024-June/654487.html The following patch adds a workaround for this on the libstdc++ testsuite side. Signed-off-by: Frank Scheiner --- libstdc++-v3/testsuite/17_intro/names.cc | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.45.2 diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc index 9b0ffcb50b2..b45aefe1ccf 100644 --- a/libstdc++-v3/testsuite/17_intro/names.cc +++ b/libstdc++-v3/testsuite/17_intro/names.cc @@ -265,6 +265,12 @@ #undef j #endif +#if defined (__linux__) && defined (__ia64__) +// defines __ia64_fpreg::u +// defines __ia64_fpreg_mcontext::u +#undef u +#endif + #if defined (__linux__) && defined (__powerpc__) // defines __vector128::u #undef u