From nobody Wed Jun 1 18:29:43 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 CC40D1B68E57; Wed, 1 Jun 2022 18:29:43 +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 4LCyNl5LD3z4SPM; Wed, 1 Jun 2022 18:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654108183; 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=IKJvc+qsPsLIK4AS1Kog3BZU7g5KWPp4uL/u0hsz14I=; b=KwZ4SQ90Mt04Uxa3T7o9KCE7A6SRclhSyawMvInkUH6uRPU+Q7UE46NflQ2P+xqj85I8st A89sVWpSagWsG6RcwbPcoPOfTddTXxu5C3LG+PXSCO4hKDSPbpyATqzcccgFCm8ImriwTt ImKivmAhKNA4s76hsfEUSaUcSzepZkpCw6mc5p/wi+5/TwPbXH36mDq/HFFyR9wyjI8SoS P5BgD4s73v2bBYPDzXFqa9zqDvt9DsMxsMuMrSfAIm/jgp2GaOiV36ZL54hv1AzzvLtPKM RnK1V2EmDa1jPIYWz8naUFylm2umEM3bLmxZULT2vuhF9CMppkoc1rg/KQ9zng== 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 9791E24EC1; Wed, 1 Jun 2022 18:29:43 +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 251IThIQ061206; Wed, 1 Jun 2022 18:29:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 251IThlC061205; Wed, 1 Jun 2022 18:29:43 GMT (envelope-from git) Date: Wed, 1 Jun 2022 18:29:43 GMT Message-Id: <202206011829.251IThlC061205@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: cfefd16d5721 - main - Apply compiler-rt fix for building with earlier versions of clang 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: cfefd16d5721f5bb89506df7d2bb9e18f60b034a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654108183; 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=IKJvc+qsPsLIK4AS1Kog3BZU7g5KWPp4uL/u0hsz14I=; b=B1GGxJP2TWcpwdae7HNGY7zZ4rB+6mDj7dCWJhaoMtNQPa9L9Drf17/BB5XfMztlc5XnwR V8ufp1ut/XYM6pEdqNy5AAGJQtAZY8WKZHx5DZUbqxMJME1YnCOvNisby574Vvs1DDssRv P8QPBj/5lggp20dB6SYmj602SmJxFuhQ4fU6l49y48L2zPA3XNo9Wx85fuRWGLFEuxSNbT QhBH3wmgMKbjKOWJIuvZB3BSpcxqMzOJo+d4cmcK9mllB6uhY/P84xDsfSJrJARt+0S6pO xUJnX2yXxUEOug2yb5lQpvWjca0tBIYtYROcOcKQ/ZH5uAmKM93TOhdGCVSldw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654108183; a=rsa-sha256; cv=none; b=R5GT7G+fiG6zv3Y89IjU01X0iM8A5kGLj8Oo+PpJIQXXfYwTbu7KuKnc9tu6g0O05HokqH IY5nbDqOov6N+MGkln3ELleZZOhiBcRvB70tmVkS1pGCV/E/2ISbfWbbsbT3CY5kJyhV3m JEb4eQ1hEcDWVs0MefH8tmMy0uyeQyg3CWIvL2yvxOKnBZ7kGvd45uwx2uKXqzL4tHoM1A dIj0Cb9SDruPJTCCmBqKAP59+I5OKqvYV6Au+pL0TveZRyfSa89os1igeK2bITlBxTv8YN 5/1nfEIb2C5R5s5CgsuTBM3/RH3BVm+BhNIZ65WvdZkaHPmTGN5wu3Liw/wEaw== 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=cfefd16d5721f5bb89506df7d2bb9e18f60b034a commit cfefd16d5721f5bb89506df7d2bb9e18f60b034a Author: Dimitry Andric AuthorDate: 2022-06-01 18:29:15 +0000 Commit: Dimitry Andric CommitDate: 2022-06-01 18:29:15 +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 --- 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