From nobody Sat Jun 04 12:01:28 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 44B551B56CEE; Sat, 4 Jun 2022 12:01:29 +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 4LFddN5WRfz4cT1; Sat, 4 Jun 2022 12:01:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654344088; 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=+3RbydAug9jjzkwweoAX5Ekk8jS25/jlrhkhs8pb/2o=; b=g+X+nbnNQnc2n5kYE3z8RbQ9aZ7Thl1CDfMfNjCC+TVcErLBwE6hD+X7ehu1x31pM34COF d8y6a3quZFi4f6OjiyYi/GBO0G4Qw3N/2l0HakTrbLivNntC0qaGko855V7iaIaWeS9v/0 NFvr/chVMKchVhVnF1q/jV4Mj2p3zZEi2CIOmru+6G3E9joPdQibnBLNdsW4QtX2WCI8NI ICGEXOXZgTn6rxvKoFi2HyynnnrAGp6d+Y7j9B9YfuQkadUolqwJ2Wg9lOUSjvshrh7oYt 38a9YHQ4Sid9s+IiWiQ7IXgIFggjm+VJ2gGpmyOTpTJbRU5T323n+HiwdrTTCA== 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 5C5401D441; Sat, 4 Jun 2022 12:01:28 +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 254C1Sgt094008; Sat, 4 Jun 2022 12:01:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 254C1SQ0094007; Sat, 4 Jun 2022 12:01:28 GMT (envelope-from git) Date: Sat, 4 Jun 2022 12:01:28 GMT Message-Id: <202206041201.254C1SQ0094007@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: 41ce229505a3 - stable/13 - Apply compiler-rt fix for building with earlier versions of clang 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: 41ce229505a34e60c869dd540187d31611916df2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654344088; 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=+3RbydAug9jjzkwweoAX5Ekk8jS25/jlrhkhs8pb/2o=; b=vZo401ldXHTTwdZSWUt/iV60NK9YgrsC/63KX9o5leAtlXth8H7n899TpdXeJ7zIKKE51m BDFkIfinwZTxfahgjWhMZDpuAnbjxEX+WOo+RjS5zPhRNHcu7+l9nRwjJm0fQ4k021gZaQ iyY/GiqYMQ8VLk6wgVoQDNChRGW2aLXMr2HK8hXIkrv4f7z/tM1WapqgjUmfVJd1/V6lUJ N2rfNPxnOpNPYtWVQB/DMMUrO45pHBUc3TsaSQ794bOT8kFflfhDLGlNaYFXBiVmBJtxkn 9pjyKAEuWAAQtqZPNifuBUPmdfPsxRw3pXkCrH7Rhb098EdvhUlVVwd0+8wt6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654344088; a=rsa-sha256; cv=none; b=yyAXRasGHO1O8FixP8oGF8H+K/ydXUmtCJgnm5dYbpQ/sJdw9dQi2FNGEfYYQjirFuFrGB Frg0Acw+5vX2IrOjHjJ8UqMxdj7tPDGoXmj9k3R497wqBIMXRbE0oAu7nSPlDiJ7fo2bFa ZTLMWLdOAsYc0aGx6vVOuZqU1NLmNwBLXVKsflxWFtGZeczx150LORR8Oquy5n4mz5WA7t c/IsptsJQhyMB+BPrb+stWRdRajD6NggwDLhTCHxVajTghtpXGVhbdbgcYzEQj2IDS4T47 5uCaVAL6Sz38PsWQfqdgMXse7fBmJMViBuBLkaAflEN0btsFfftO4Hf8MYs0XQ== 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=41ce229505a34e60c869dd540187d31611916df2 commit 41ce229505a34e60c869dd540187d31611916df2 Author: Dimitry Andric AuthorDate: 2022-06-01 18:29:15 +0000 Commit: Dimitry Andric CommitDate: 2022-06-04 12:00:27 +0000 Apply compiler-rt fix for building with earlier versions of clang Merge commit 18efa420da5f from llvm git (by Brooks Davis) compiler-rt: Allow build without __c11_atomic_fetch_nand Don't build atomic fetch nand libcall functions when the required compiler builtin isn't available. Without this compiler-rt can't be built with LLVM 13 or earlier. Not building the libcall functions isn't optimal, but aligns with the usecase in FreeBSD where compiler-rt from LLVM 14 is built with an LLVM 13 clang and no LLVM 14 clang is built. Reviewed By: efriedma Differential Revision: https://reviews.llvm.org/D126710 MFC after: 3 days (cherry picked from commit cfefd16d5721f5bb89506df7d2bb9e18f60b034a) --- contrib/llvm-project/compiler-rt/lib/builtins/atomic.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c b/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c index 4c3ebb99a513..8dc2f4fc013a 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c +++ b/contrib/llvm-project/compiler-rt/lib/builtins/atomic.c @@ -363,6 +363,9 @@ OPTIMISED_CASES #define OPTIMISED_CASE(n, lockfree, type) ATOMIC_RMW(n, lockfree, type, xor, ^) OPTIMISED_CASES #undef OPTIMISED_CASE +// Allow build with clang without __c11_atomic_fetch_nand builtin (pre-14) +#if __has_builtin(__c11_atomic_fetch_nand) #define OPTIMISED_CASE(n, lockfree, type) ATOMIC_RMW_NAND(n, lockfree, type) OPTIMISED_CASES #undef OPTIMISED_CASE +#endif