From nobody Thu Mar 17 18:38:56 2022 X-Original-To: dev-commits-src-branches@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 B63511A15BEA; Thu, 17 Mar 2022 18:38:56 +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 4KKGBS3qJSz4nwk; Thu, 17 Mar 2022 18:38:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647542336; 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=+ldJNTYKUYkwXURDDgQu2ulLnqjbFanGryZBTlp2/ms=; b=f0tOYpNMOlOeOSx7UaPV/5E46LrPNs0YG/s+bZHvnquaORucPA5DVoO6Bte1AarMH8snPT DfBaFMoKocMPJ6dPFRueHKa1VlkBMwdDSXewUuJk+p3FP20M1RxEmxKk4bzez/9IkLUkNf 9BhipV3GSlCmi2dWHGNudnZvRaDJuIOYSES5LYleYzvmKr0QHTyd2F8veAO0u/gOVN6umN TtpXvdDl/DZCrcgwZjJJ537epPD+ybYgPvLKseH9UhCwOJqFcoUaCo9A535vheKRpOWDul Kph6XErmJs2ot3OoisJWY0KT9G9xqwjMux0/uqa7Z1xjwTuLzJF8l8EiwebRaA== 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 5860A7AF3; Thu, 17 Mar 2022 18:38:56 +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 22HIcuio081469; Thu, 17 Mar 2022 18:38:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22HIcub2081468; Thu, 17 Mar 2022 18:38:56 GMT (envelope-from git) Date: Thu, 17 Mar 2022 18:38:56 GMT Message-Id: <202203171838.22HIcub2081468@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: 874e27b5dd2e - releng/13.1 - Build compiler-rt against libunwind, not libcxxrt List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 874e27b5dd2e4b4057935286636d7729b04a13ae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647542336; 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=+ldJNTYKUYkwXURDDgQu2ulLnqjbFanGryZBTlp2/ms=; b=gE1dz6tQKojc9mAHaWSBFFekdvZHpcjZ4Rag3aNxjNDhlh8Da+A8Sp4BDqSsfSXqWHtixp ix9fdo+V24TN1WP88mc2Z81nrJ5wYi6ujUjWW4F7d6nSn/837cWza1+ocL4NxTQEVlVLKy zB0lWJBmZWE7VaWlvkVWLuH7VouEyVDgXFEMJkUPNlzerAbP5sOJqmGt5YTsXucWl7cjz9 64GiYRgZFvInHKybKL/Oc1a06jXlR5YMx66OEO0fEb3aKr/e7nM4MhJlM6h1QUL2zIdfQd mJsaMZ/N+/ovRuOosndlE8oz9dZwQsr0QvP3KLUxJgA7ofDVfN0NA0C9g3QxRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647542336; a=rsa-sha256; cv=none; b=NoyBbMkSpqgdmuIhTThxxuGMhm+icT+ulLJCXds6o8pxdgCCtguAA8beiBL9PunKlE9BqZ qHYUGzwIAlVDEMTfa7ARHL7DucMGvreyD+/+KPnuHAccrsgcgnrtys83Pqp46GfHTRPToV mxLYUsAuACGEvJC1pCRfzUyyHJaz59Qp3NYy6SH8erquQS2M5vzuqpJdU8jBbzn6isBTzC VDvB2EGN8I7Wjvv7jIsQX5yDKsKG/mlMtpy9WdJcC9B8/tSna70a/ZAY1Vjr0f0YozjJZQ ZJ54M6da/yOd1rCORBSk2gW7vsliFpZMyqo5Gk5cbrTDzKC77EkaElFr1UDOUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=874e27b5dd2e4b4057935286636d7729b04a13ae commit 874e27b5dd2e4b4057935286636d7729b04a13ae Author: Dimitry Andric AuthorDate: 2022-03-09 21:23:35 +0000 Commit: Dimitry Andric CommitDate: 2022-03-17 15:14:09 +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. Approved by: re (gjb) MFC after: 3 days (cherry picked from commit 7ecd99fa424df001028c5cddc52d25b29232f1af) (cherry picked from commit 4c622a8f051d8dd9fab0719b00a6eccdbd13ac62) --- 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.