From patchwork Thu Oct 3 19:59:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Scheiner X-Patchwork-Id: 1992493 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=rbn6pjWa; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4XKMwn1JqGz1xt1 for ; Fri, 4 Oct 2024 06:00:25 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 20820384646D for ; Thu, 3 Oct 2024 20:00:23 +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 [212.227.15.4]) by sourceware.org (Postfix) with ESMTPS id AC502384646D; Thu, 3 Oct 2024 19:59:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AC502384646D 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 AC502384646D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=212.227.15.4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727985587; cv=none; b=Ipnu3k1KuWAbFDhqdFBuhjEPVB2f0vFh4fQmBKRpGT5pab1Gv1OXnpLCuQulquAOa6OUfZvojHRvW7KsyT+160Rnm5P3imb6VFGT/+ASoNL8+4mN0t+qg+ZBYkeJx2Dh97+k3YwGrdUsOVMQkKOmc0jkIG5WtJrEBozw2piKmrM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727985587; c=relaxed/simple; bh=xt3m4KfITRguHi4JPSirJ/c+maM77dQiIhWhJvJjxB0=; h=DKIM-Signature:Message-ID:Date:MIME-Version:From:Subject:To; b=WmiaTCvuqICdBU4psuWSHogj2SsUMhF5CDQCjecobUWS8Kwtuo2VxBz7AYl0CJIqtMoBcg4MgbF//dlaTBZ350hAAwytO/AR+EFXbvIGsFlZltSsJWK0EtGYeU/zAD/oKpzNa2k8876MjeN507cCzhZ/c5OTrk1zYOzfkJm+dm0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1727985572; x=1728590372; i=frank.scheiner@web.de; bh=wqDTKVWQwDRYa/bMZUKhZ4WEvfLMSKIMJNLsquhT+io=; 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=rbn6pjWakJKND5hGFmWXS8plrIdCne6oxJzJYh9omVm/E3dFkhXC2m/lLTiZql5D GVLdAx75pVsF6Ao1jD6nVXk9J4E/YgFq5eu418U3MbSheOyTxys/xeX6lzTkLdl0+ yuDJSAMhsHgOlluD4aHR1knlH7ZfjQKx6hh6/Q2HABeM5PPz150U2pay3X7dxayV5 VNTRlP1p6PrX6hIDN8gvDJAwAK5k3SC88YiP4PCtszCaoj+WM2UFTIRtZUlu8fh8+ lSFEb5V+V5rJrp9hyNWVacrQkgmHACABRTngpRsPun9DDrXoXgy123xUhF3lDoFZ0 mLoIomFvNo7QX3Wfig== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.30] ([79.200.208.157]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1Mtgyp-1s1sDr0tSh-00tSzT; Thu, 03 Oct 2024 21:59:32 +0200 Message-ID: Date: Thu, 3 Oct 2024 21:59:31 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Frank Scheiner Subject: [PATCH v2] libstdc++: Workaround glibc headers on ia64-linux To: gcc-patches@gcc.gnu.org, libstdc++@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:ynDokXejW1796Tx8XICvJSVtTsm2bfBof53yzSn0YkuqckotKPk HjLnSAv5brq5neyddZQF5/ycNUbAs76MLtPS6EHu6aC4Pbon5sakj8w9wnVWR8j/rG9Fjs9 lydMwarKexTsCgTh5JDJNS4Gp5mcqBY8qqYMQOQL+2kAHjiA9iHK9Czu0fqfVDwAj2yn+pF u3NvMH5rrmMR/qOk5REBg== UI-OutboundReport: notjunk:1;M01:P0:aEZQcgXHXY8=;tTjwjtBRM7Uqr4hyy4RW7ZVreWi UnkrJmhvU9VFsNWVakGSS0tQmrO6mSGWa657B0RXO+HjPXMYJmh4Q6RTCHe0luWlmm+K/mY3s S20eQwnHvqdEgndDppMnzBhj8AWiAToE/98OVY6ANI5chcKo/XmSlerTmu6uBu18Kb/d+Mq3n +cBvXeEYR7DfKYIExAnJUFmmo6wDsxTlQzReYy/rYwz9z8X1nHT74fCx+UTt/lvfUMDBpxgJz U6tqB8YOqYMBFdfnPA1ueTTi/UwgyyIWzB2LckdN6PcVJ4hSop5Qlifye5tM1q2c0xAYxcVZe rjb0oDllFaeT69ks8w2Z5Pm6+WgC+jiOvXrwEvSV/ukqTXMGAaXtU0V7Mt9ws9EoF8+dhfT5+ 5oesXoHPXlsoUA+CBrWvpYKP3AHmqtxA6kxet0PA4CJhVThHSvRffUS7z3AxMeGD3XrQewrPC Zl1EzyrDrM7JSRsdTlKr8HWhv6BHV56RI41DTQa9eAkCcxajLjmbDPTNlJy2whyGgsN2E5Zyb V+zd8VMH5X8Ic49XLcd5XJucyAqzXN1t6WdPyfteEXjFeGuwC3HYy3N4rRjxo9tx5J6Uf7MI3 yGihQBKisEa8HrWUbPjtJ5DHIJbWNCSIQDjrt9A2yUQvNFaSjNHP0I2G1NEHmjs2PRNSNgyHt wxXwa2dLt0srK1Cfk+OY+Am/kw39kzWJqjOv1t6Z9M3fRtkIRTrGW3RGHjz1mVNckb+CP3fGf eLG1JxPjlZ4Q2aeeKxHKNSuoSp5M1PX+1eUOQR+8xc3MfQilh11xqtVV+lISbRJZ3AekDM6P9 W4KUdX1gy3o9E/9Gz4r1lpyVQM4MrxYl9LdJzGMz15gFI= X-Spam-Status: No, score=-9.3 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_H3, RCVD_IN_MSPIKE_WL, 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 --- v2: Fix typo in title. 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