From nobody Sat Mar 12 18:21:27 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 1D90D1A04BA8; Sat, 12 Mar 2022 18:21:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KGB2b6SwLz4qw6; Sat, 12 Mar 2022 18:21:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647109288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jsM8gZEs6sHa+KBP8hNfvyIAE2uVBzuWnP5mH90MYhg=; b=GgWA6EkkVX6s7Gr0zIbpbuu2srnheLcApnkRoYz+KmNb0luy9bBsl8o1rV37AxBs933SQZ BMVPth631iS4ex7JQV1WsExfWjd59AzqBSzF5llbR+gCzr0nALd+acS+Fs9moMZFiz7Pok GLgBBBgDVtD9dN7BSHaYi2+Ft2pWyebQhc/AQSnj7Nml/Vg+s+06xmO9XnddMZ/MIhJo5L LibTyY0c8t3tBKNfAfsmrtjV4ON9vtX/qO0KBunvQxD0TAPZjtXM+CRHiAR9hDiJZoiOxo 9pAWbj5N6ZY+Pc918zAgiqtTLsvVRBf4Red1VEgtgSRBkgV1du6YVjJ8NGJ06Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BABCB1E8E; Sat, 12 Mar 2022 18:21:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22CILRQo072933; Sat, 12 Mar 2022 18:21:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22CILRXZ072932; Sat, 12 Mar 2022 18:21:27 GMT (envelope-from git) Date: Sat, 12 Mar 2022 18:21:27 GMT Message-Id: <202203121821.22CILRXZ072932@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 4c622a8f051d - stable/13 - Build compiler-rt against libunwind, not libcxxrt 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4c622a8f051d8dd9fab0719b00a6eccdbd13ac62 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647109288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jsM8gZEs6sHa+KBP8hNfvyIAE2uVBzuWnP5mH90MYhg=; b=etugM9QVDLOCwyfR1sayuolvVbiYEYzXeyadWfyMRweADTkMr/0ZTPaTms+Q1duRWM2U/W O8stIA0nvZe5WFl3kpZEpLpCic73AJLV+0KfssQ6YbRtNPnMxcWtzRKuotLyJ+yhauCp0M Ata8AbACRyATvsxE4zwkyk0MDi5ZjKi6oBI55RoSJ9KHgsiirR0yDPIrPc75BbAC6RQoxY Q1dcjH5GbzXeiVv5lwDKLJCu9qn4C2YDAd3XV+qAAPxV8DUEqQNThhfOxkxww+JioCbMf/ 4vOpWzIQxVvQk19VgGJiT7IggtrKIKzbv7WLK5ygg21HIIIgZ3eA9qOYtNEtPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647109288; a=rsa-sha256; cv=none; b=vG66f6k84D3bUcQ+bBX9g70OGLBNQCplPPV/G0G//qZEdprBXYQR7Nytee7clRF0iiTsMw nlq7nb2jOWlVlpZKjzwsnhiEJl8JO0QQfmosFPMSBRuFgS3Jnv2+ubbvMn1Dxb5tnVsfLG ssOpkJLt8upftUAAWiDnfEjkxRT30B+D20up2hvQQf8aMfSCMOFP9GTGjSDKlwD3DCnb13 7U5AzQKfJ5+1xdJP1I18HjXHt+zfehM3h3K7dZrNKhvoJl63sETPIvWnmitA+Fjrdq6SUZ gKGDpKXbn0l4kRJ3PPEqQWlbkBknJAMYByXHf+IhY3x3wzYpUqsX61L4yS544g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4c622a8f051d8dd9fab0719b00a6eccdbd13ac62 commit 4c622a8f051d8dd9fab0719b00a6eccdbd13ac62 Author: Dimitry Andric AuthorDate: 2022-03-09 21:23:35 +0000 Commit: Dimitry Andric CommitDate: 2022-03-12 18:21:02 +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. MFC after: 3 days (cherry picked from commit 7ecd99fa424df001028c5cddc52d25b29232f1af) --- lib/libcompiler_rt/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile index b23522b7e410..0e9f58cc3fc0 100644 --- a/lib/libcompiler_rt/Makefile +++ b/lib/libcompiler_rt/Makefile @@ -11,7 +11,7 @@ WARNS?= 2 CFLAGS+= ${PICFLAG} CFLAGS+= -fvisibility=hidden CFLAGS+= -DVISIBILITY_HIDDEN -CFLAGS+= -I${SRCTOP}/contrib/libcxxrt +CFLAGS+= -I${SRCTOP}/contrib/llvm-project/libunwind/include # gcc has incompatible internal declarations for __divtc3 and __multc3, but has # no option to silence its warning, so make warnings non-fatal.