From nobody Wed Mar 09 22:55:05 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D501B1A07A28; Wed, 9 Mar 2022 22:55:07 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KDSFl4pDtz4Vkr; Wed, 9 Mar 2022 22:55:07 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646866507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=HXNBBC9l1nARa4ie0t+YBleOrGxL/Tb4TWLQ8IrdlHI=; b=A7DVD0QTYg9PLguR6JzLztOI1urZ6C/MTh004CmgKFJJaW+uElByKX0eNNN6wXi8w02kcG 0XGBIj7XICS68MEMIQVAWQFEzKP5Iyk00lhYMA8xzX6ZFTSbHuNshMP7bZQmwHjLXDesG3 +ZqMLV5BPIQow0e3yIjI5Wnzed0IVBJEx8yRgMS5BarQuW441/SwFvSXLDk+XJkNHEGr8T 5XPODi9NA9vBF1D+FjwdLK+CdgWlZM36NtND2OdyGbiUVJIbwXWL4WDv05OMz6tjp7Nwni 0HpuIKxvxzWuNHUzgDUaS9n65cMfLM/p7xMn7EP4T0fhRVWQf/ogOiaT63ylzQ== Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "R3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 697D18266; Wed, 9 Mar 2022 22:55:07 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (longrow.home.andric.com [192.168.0.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 47FE73908D; Wed, 9 Mar 2022 23:55:06 +0100 (CET) Content-Type: multipart/signed; boundary="Apple-Mail=_82E6CE75-5504-418D-840E-F6896A321539"; protocol="application/pgp-signature"; micalg=pgp-sha1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 15.0 \(3693.60.0.1.1\)) Subject: Re: git: 7ecd99fa424d - main - Build compiler-rt against libunwind, not libcxxrt From: Dimitry Andric In-Reply-To: <1129443B-EFC8-4F02-B87E-37CA04A0AD64@FreeBSD.org> Date: Wed, 9 Mar 2022 23:55:05 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: <4CAF0FAE-3D29-42CD-97F9-057C3A3FEA8A@FreeBSD.org> References: <202203092130.229LUKFS011484@gitrepo.freebsd.org> <1eb62898-4f0a-504f-26a8-ee01c46093a6@FreeBSD.org> <1129443B-EFC8-4F02-B87E-37CA04A0AD64@FreeBSD.org> To: John Baldwin X-Mailer: Apple Mail (2.3693.60.0.1.1) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646866507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=HXNBBC9l1nARa4ie0t+YBleOrGxL/Tb4TWLQ8IrdlHI=; b=ro4ia8ROpResPZiu2+SkPKViXo4Y5xK2vOLFzMihRWP5+fFbe+vaKZpszSLvmlPZcREzlK 67nQWkVs/zTdF46nDHHWb/N09SlzY1HytTBBANu15TcJC+tDYp5QSSYgnu/NQ27w/AMiTG CxXFabxbAiH7d2PAdGucGnJgSsw4AwBWZoFLuigX7q4czCfRMwMUemE2CH+XT5cCdaH6Yz SY8KlcM5aR9HKkmN5Ayg+0anB2W5z09M/LsmxQ0vXqkd0VIUYiiDv0N0eyAFmNo2+Ds3tB /fbekX9MYnV5ipfkiMHLDbYJ9ctFj2+Siu++DYN/uQVafWJcL+PaYjScFPegNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646866507; a=rsa-sha256; cv=none; b=GG5+Y0xSoGK7wJ6yo+kMWvDivqSHEnsnOOGNPuvMD+BJaCchARcvLWYuyumbCvqc663eUI e9OJXMOLKdcU94jIzFkkRA8CGatpFTG4FtI55zSYxbnaIrDGajgjj4BYtWKGbe5/2foX1I 4Ly5waXpxr3Yd1+uHJA549lt3uYz72CcWOOKFkaRaoTnO1DIDlTsa6imZ44POirQn3PY/U UdSFx0EABmK2V103t3pRZrSp9HdpKx/vFiAYlQHVqO/2/LXpwd9L6l5VUT5qgwvVWa4O2l V8tTJkbardoDjBaVS4YFK1xnrt58ZVJwBpafA5hi69FjLpzk8ZRqu2AISEjWyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --Apple-Mail=_82E6CE75-5504-418D-840E-F6896A321539 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 9 Mar 2022, at 23:50, Dimitry Andric wrote: >=20 > On 9 Mar 2022, at 22:45, John Baldwin wrote: >>=20 >> On 3/9/22 1:30 PM, Dimitry Andric wrote: >>> The branch main has been updated by dim: >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D7ecd99fa424df001028c5cddc52d25b2= 9232f1af >>> commit 7ecd99fa424df001028c5cddc52d25b29232f1af >>> Author: Dimitry Andric >>> AuthorDate: 2022-03-09 21:23:35 +0000 >>> Commit: Dimitry Andric >>> CommitDate: 2022-03-09 21:23:35 +0000 >>> Build compiler-rt against libunwind, not libcxxrt >>> Parts of compiler-rt are also built for libgcc_eh and = libgcc_s, and >>> these were already pointing to the libunwind unwind.h. For the = sake of >>> consistency, also build compiler-rt itself against the libunwind >>> unwind.h, not the libcxxrt one. >>=20 >> Do we even need the explicit -I at all now that we install unwind.h = into /usr/include? >=20 > That depends on the build order; if libcompiler_rt is built before = libunwind's headers are installed into ${WORLDTMP}, it might look at the = wrong file? >=20 > I guess this is just a 'better safe than sorry' approach. That said, = for libcxxrt we used to have the unwind headers only in the C++ include = path, so maybe this was a way to get that to work? Btw, I was triggered by Conrad's comment in = contrib/llvm-project/compiler-rt/lib/builtins/gcc_personality_v0.c = (added in https://cgit.freebsd.org/src/commit/?id=3Dc8b5e3de39bcf): /* * XXX On FreeBSD, this file is compiled into three libraries: * - libcompiler_rt * - libgcc_eh * - libgcc_s * * In the former, the include path points to the = contrib/libcxxrt/unwind-arm.h * copy of unwind.h. In the latter, the include path points to the * contrib/libunwind/include/unwind.h header (LLVM libunwind). * * Neither (seemingly redundant) variant of unwind.h needs the = redefinitions * provided in the "helpful" header below, and libcxxrt's unwind-arm.h = provides * *no* useful distinguishing macros, so just forcibly disable the = helper * header on FreeBSD. */ So at least there is no more inconsistency now! Whether commit = c8b5e3de39bcf can be reverted is another matter, though. -Dimitry --Apple-Mail=_82E6CE75-5504-418D-840E-F6896A321539 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.2 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCYikwSQAKCRCwXqMKLiCW ozCsAKDcWnF8uiZlGa34aZURx+Ay5wMmrQCdGSlchOQxOP4TgmZUte7HG3P02Ro= =LHes -----END PGP SIGNATURE----- --Apple-Mail=_82E6CE75-5504-418D-840E-F6896A321539--