From nobody Wed Mar 09 21:30:20 2022 X-Original-To: dev-commits-src-main@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 9ADC219F7280; Wed, 9 Mar 2022 21:30:20 +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 4KDQMw3cMxz3qMg; Wed, 9 Mar 2022 21:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646861420; 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=/lSROC9y0xmr71kFLPLa6km0rkQ/IM/TR5CltazBx1w=; b=dN+FN4uH+yQoQIbaobo1aRn9SNFS7SHOCrH3Tx0S/gcfNwLYGUiZl455RvC/1TX4RPhxJw n09iVwvenCWulXoKZlQMbtKU4gSGvPIBT1//KMtqJZzMUcq07pBJmx3diyXoBy0o0MuB/Y Y+zGoIcCCOgTLCZo0maXid8mxzYIzqpy777vMBYN5E11UEc9TwZ/T5Zkbys4b1RHEfM2IA I0FzlKwz032vkolMCRXQuWl4Frqj/AT9zumPXFdSES9PSJ1dMavVXEhJ/8maa7IA+Zu25g +pxjAZuL0n0OR3CWh7TnF4AeH4stXgp0r0ErMuSfeW7WNYzcKC9NCtq3E6o1BQ== 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 5C2D71807C; Wed, 9 Mar 2022 21:30:20 +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 229LUKCE011491; Wed, 9 Mar 2022 21:30:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 229LUKFS011484; Wed, 9 Mar 2022 21:30:20 GMT (envelope-from git) Date: Wed, 9 Mar 2022 21:30:20 GMT Message-Id: <202203092130.229LUKFS011484@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 7ecd99fa424d - main - Build compiler-rt against libunwind, not libcxxrt List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 7ecd99fa424df001028c5cddc52d25b29232f1af Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646861420; 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=/lSROC9y0xmr71kFLPLa6km0rkQ/IM/TR5CltazBx1w=; b=j9Yczx2vXQ8Ebq3xEzuKA/2STXH/5LD6SFfMgWFiRN0YRqdn84CrO4D0FFafuxmoaVoCyA aEnzI7GGteX70MiXOC7Ouqj89zxCQgHUo693iIwLvDA+ox5IoUxGBBojsenAHbzsvVwGCM qFUY4FmSSFZCSi4dLn3Fk69jln4Po1nVmWM9TSEiGkMvnXREnx23v209IuiMCoYY42cNej PsTCRJFIR14NUHxYl1+Fd7Ylzs1wo+kIv/chw+iEzQt//zJOHItnQ5uhosivZgcBEucyCl oONdIJU5OLlStVWCTCYZLmGQqOHTlmlu6YWFoWZYS2d6J9+TAIlO9/91EQPCQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646861420; a=rsa-sha256; cv=none; b=LkW7JW2xpaY2J15mNCd5LqZVzqG9REoesPiryRVKr/RIItNSKU286e7inTB/JMQEbkpWAU oTT3tGY41W3pKguAZuKZsRfU4e9gNW7i6sXLT9ykpjCJZEKTViUQ8f8DANnEy/O7GoObQM 23x3p1lTMJ9O00jMWsDIOhqxnbcyImADMJ5IQjgeQ2GCNj/yGkJkkZQyAeDEY9jUEZukEP +He8DfVgW7dbXggrytuJ1QtBTXJRaiTiV5lJvkaj75QnWlXKcvrR025WUnJabVfePjZPql OlwVAfY3yeiQ1k+5JmUcmsBw8LpXP0vZFMrqdvNVrKduwEU1qTyg269YVquQvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7ecd99fa424df001028c5cddc52d25b29232f1af 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. MFC after: 3 days --- 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.