From owner-dev-commits-src-main@freebsd.org Sun Mar 14 20:00:55 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2EE2D5B0B01; Sun, 14 Mar 2021 20:00:55 +0000 (UTC) (envelope-from tijl@freebsd.org) Received: from mailrelay105.isp.belgacom.be (mailrelay105.isp.belgacom.be [195.238.20.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "relay.skynet.be", Issuer "GlobalSign RSA OV SSL CA 2018" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dz9Qt2m8lz4gJc; Sun, 14 Mar 2021 20:00:54 +0000 (UTC) (envelope-from tijl@freebsd.org) IronPort-SDR: 0Znml6+TqDqWxkPSz4oIHGk4aIzFH9yoTxxaFv86OVqplqXnQik3jYWlrZMAcI8alm1t1SpafP smFc2Rv6ZQrVcQCCOzsNOgt/onQAxSrrM5CJNeEsjCiT0Irwy5x3BHYlsVW5FFJUvJf60OlYxS nQNsvVX1doRUqyCQo9ZBZmOwll7yr0Zo/HV+2E3qNHFuZAMxkK9yRQX4FCjaj0I6l4GtIcPjeR 8uYxlVspkFGrsM1dIdgQjgvTSBTJ31iGbVXNvCFh6PopAbkJipJ2ysy/GzNjNQlS5l2UC85IZ5 zCs= X-IPAS-Result: =?us-ascii?q?A2AgAAC1ak5g/wSs8lFaGgEBAQEBAQEBAQEDAQEBARIBA?= =?us-ascii?q?QEBAgIBAQEBQAeBNQQBAQEBCwEBgwoVVgFQGoRBiQSGKIIbNwGKcIl8hTWBf?= =?us-ascii?q?AsBAQEBAQEBAQEzCgQBAYRNAoF1JjUIDgIDAQEBAwIDAQEBAQYBAQEBAQEFB?= =?us-ascii?q?AGGGDkNQwEQAQQBgV4ig2sBBSNJCgMQCw4KAgImAgJXBhOCcYMLC6xdgTKJW?= =?us-ascii?q?IEDBoEPKgGNQkKCDIQsPoFReBcEFoFHgxaCYASCQAaBO4FMgSiQGqlggwyJS?= =?us-ascii?q?pJlMaQVLYYSmgWSLYZWA4IMTTAIgyRQGQ2OVYhNhUZAAy8LLQIGAQkBAQMJg?= =?us-ascii?q?xWHY4NxAQE?= IronPort-PHdr: A9a23:xB8UAxXE9eygHZstPDMnnpeJ4gLV8Kw2UjF92vIco4ILSbyq+tHYB Gea288FpGHAUYiT0f9Yke2e6/mmBTVRp8/b7ztdIdRlbFwssY0uhQsuAcqIWwXQDcXBSGgEJ vlET0Jv5HqhMEJYS47UblzWpWCuv3ZJQk2sfQV6Kf7oFYHMks+5y/69+4HJYwVPmTGxfa5+I A+5oAnMssQam5ZuJrgzxxfGoHZFf/ldyH91K16Ugxvy/Nq78oR58yRXtfIh9spAXrv/cq8lU 7FWDykoPn4s6sHzuhbNUQWA5n0HUmULiRVIGBTK7Av7XpjqrCT3sPd21TSAMs33SbA0Ximi7 7tuRRT1hioLKyI1/WfKgcF2kalVog+upwZnzoDaYI+bKudwcKDfctMUSmVOQslfWjddAoOld YYDE/YNMfpaooT7ulAArQG+BQ6pBO731DFKg3v21rAk3uQmFgHGxxIvH9cUv3TSt9X+KaAfU fy0zKnKyTXOdPNY2S3j54fWbx0vvP+CUah3ccrLxkkiDgXIhUifpoL5JT2azPgNs3SF4Op6U +Kik3AqpQF+rzagxMoglpfEiI0Ux13a+yt0wYY7KMC2RUB0YNOpEZ9duz2YOodrTM0vTGFlt SIkx7MIt5O2cigExZYhyhXCZfKHdI2I7QjiVOaXOTp4imhld6yhiBmp6kiv1/fwVs6u0FZFq CdOj9rCtmgV2hHQ98SLUOVx80i/1TqVygze6P9ILVo7mKfdNpUv2KQ/loAJvkTGBiL2nUL2g 7KIeUg84eio7vjnYq3hpp+BK494kgH+Pboqmsy4Gek4MRIBX2ya+eS5yrLj50r5TK9Wjv03k KnZtIrWKtgcpq6+GA9azIMj5Ay5Dze9ytgYmmMHLF1ddBKGiYjmJU3OLej7APuimVigjjhmy +7cMrH8AJjBMGLPnbj5cbZ48UFcyQ4zzd5F55JTD7EMOO7zWk7ztNzcFRI5PRa0zPj5B9pmz YMRRHiDAqiDMKPdqVOI/P4gI/GQZI8JvzbwM/sl5//1gnIil18dZ7em0oUMZ3CjA/tqOUKZY WDjgt0ZC2cFohI+TPD2iF2FSTNTaGi9X7gm6TE/FY2rFonDRpqzj7Ofxyi7BYBZanpBClCWH nfib5+EVOsUaCKOPs9hlSQJWqW/RI8/zB2hqAj6y79iLurV5i0Yrovv1MNv5+LPjB0y8CZ7D 8Wb02yWQWF0hH0HSCEt06BkvENx0FCD0bJ3g/ZAD9xc++tJUhsmNZ7b1+F1Fs79WhzYctiVT 1amR9CmATAtTtIq2tMOeFx9FMm7gh/Z2yqqB6QYl7KRBJMq7K3TxGPxKNtnx3bBzqkhgEEsQ tFTOm2+mq5/6w/TCpbSk0WDi6mmbLgT3CnI9GeGzGqOoF1YXxBqUaXeRn0faFHWosrn6UzZV L+hFK4rMgxbyc6NMqFKcMHmjU1aRPf/P9TTe3++m2a1BRuTyLOMdpTldHsG0yXGFUcIiQcT/ WyJNVt2OiD0j2PbDSB0BBrGZU/28OI2/H+6S2ca1QyHRXZNkb2v9UhGq+abTqYvObZMkyAms DhxFVCml4bKCtiEjyR7cah2Wv97501IgzGK/zdhN4CtevgxzmUVdB566huG6g== IronPort-HdrOrdr: A9a23:lX+GJa+Idjmz89phO0Ruk+Hadb1zdoIgy1knxilNYDZSddGVkN 3roeQD2XbP+VQscVwDufTFAqmPRnvA6YV4iLN6AZ6OVBTr0VHEEKhM4YfuyDXrGWnf24dmpN xdWodkDtmYNzRHpOP7+hT9L9E73NKc+rupjuu29QYIcShOa7t8qzt/EBqRCEdsRAJLQaM+Do f03LsjmxOFWVA6Kvu2HWMEWe+rnaypqLvDbQQdDxAqrCmi5AnI1JfCCBST0hoTVDlCqI1SjV TtqADy6qW9v/zT8Ha1vFP71JhOncuk990rPqOxo/IIITbhgBvAXuRccoCF1QpanMifrH4Brf nwhSEBGPle0Fv6Q0GShi3M9mDboUsTwk6n43e9uFPCj+vFdAsXYvAx/b5xQ1/840okgcFk3M twrgSknqsSNxPPmyz53cHBU1VBtmfcmwtarccjy39YWuIlGcVshL1a51peGJMYFCL17+kcYY 5TMP0= X-IronPort-Anti-Spam-Filtered: true Received: from 4.172-242-81.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([81.242.172.4]) by relay.proximus.be with ESMTP; 14 Mar 2021 21:00:51 +0100 Received: from localhost (localhost [127.0.0.1]) by kalimero.tijl.coosemans.org (8.16.1/8.16.1) with ESMTP id 12EK0oWN004071; Sun, 14 Mar 2021 21:00:51 +0100 (CET) (envelope-from tijl@FreeBSD.org) Date: Sun, 14 Mar 2021 21:00:49 +0100 From: =?UTF-8?B?VMSzbA==?= Coosemans To: Dimitry Andric Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , gerald@FreeBSD.org, kib@FreeBSD.org Subject: Re: git: 9097e3cbcac4 - main - Partially revert libcxxrt changes to avoid _Unwind_Exception change Message-ID: <20210314210039.2da1b9ba@FreeBSD.org> In-Reply-To: References: <202103131354.12DDsnKR065154@gitrepo.freebsd.org> <20210313183812.77b74819@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4Dz9Qt2m8lz4gJc X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Mar 2021 20:00:55 -0000 On Sun, 14 Mar 2021 01:15:11 +0100 Dimitry Andric wrote: > On 13 Mar 2021, at 18:38, T=C4=B3l Coosemans wrote: >> On Sat, 13 Mar 2021 13:54:49 GMT Dimitry Andric wrote:= =20 >>> The branch main has been updated by dim: >>>=20 >>> URL: https://cgit.FreeBSD.org/src/commit/?id=3D9097e3cbcac455eb0dedd097= d8d5548c72568d0a >>>=20 >>> commit 9097e3cbcac455eb0dedd097d8d5548c72568d0a >>> Author: Dimitry Andric >>> AuthorDate: 2021-03-13 13:54:24 +0000 >>> Commit: Dimitry Andric >>> CommitDate: 2021-03-13 13:54:24 +0000 >>>=20 >>> Partially revert libcxxrt changes to avoid _Unwind_Exception change = =20 > ... >>> --- a/contrib/libcxxrt/unwind-itanium.h >>> +++ b/contrib/libcxxrt/unwind-itanium.h >>> @@ -79,12 +79,9 @@ struct _Unwind_Exception >>> { >>> uint64_t exception_class; >>> _Unwind_Exception_Cleanup_Fn exception_cleanup; >>> - uintptr_t private_1; >>> - uintptr_t private_2; >>> -#if __SIZEOF_POINTER__ =3D=3D 4 >>> - uint32_t reserved[3]; >>> -#endif >>> - } __attribute__((__aligned__)); >>> + unsigned long private_1; >>> + unsigned long private_2; >>> + } ; =20 >>=20 >> Shouldn't these definitions be the same as the ones in GCC? =20 >=20 > If you want to keep the ABI compatible with what it was, no. Otherwise, > you could consider it. But for what gain? Hmm, the ABI must have been broken by the switch to libcxxrt years ago. In that case there's ABI breakage no matter which version you choose. Maybe kib can help decide which is the lesser evil. In any case I do think the definitions in GCC should match the ones in base. Sometimes libraries compiled with GCC are combined with libraries compiled with Clang in one process. So, code compiled with GCC unwind.h should work with base system libgcc_s and code compiled with libcxxrt unwind.h should work with GCC libgcc_s. Maybe the GCC ports can be patched to match the base system but I'm not sure upstream would accept such a patch, especially since upstream libcxxrt has already become compatible.