From nobody Sat Nov 30 16:51:12 2024 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 4Y0wzj3Jzrz5fJ0d; Sat, 30 Nov 2024 16:51:13 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y0wzj0sdWz4nN1; Sat, 30 Nov 2024 16:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732985473; 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=Zt1xbCw5ytC3qQEqRxTr67PY8hpk52LtKXEBn9CMCxs=; b=xc/P7KOlhBJFFillt6bG+iC6qcG8Otm9epXZ5VznmjtH3j5Qgt3f+n7QZ+PTE+PnLmmT5N C5swInrryDgsXl1n8G6gAUWd5YcD+O9WCPCsWnhjh+JT1FCmQQsDI7KmPs6YaBr+JXfBHj qVh1BpCV1TNLsG+Wre4tRMe6I8d4KNS7Zqo2ixg5sGFWfaaWYXX/hlAVDN7uThvkNCSEQA R4kXsS70d349fa5jvNLvA7bM/aHR2gPwf240LDmj5g+vAXXg/Sl9ft7IoGpoZmHzanZJFe 4Hx1WViDUnxLo5m7MVlyRvyrV6olztwZ/VGPC/O2uhuBXxlbQtym+Fs+SWVIVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732985473; 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=Zt1xbCw5ytC3qQEqRxTr67PY8hpk52LtKXEBn9CMCxs=; b=Y3SpN3A/2kjGuWtq4r96iffnhCtBC8xQ5kQNSS2vt3kjLZiDSxXufGCX3lusuGi+oRR/x0 73uy9d7be/zYdTlSzoIah9Zk0yT0BICfwuk7rqIJrsZ7YhWAnzrZkGHDjECnTAxVUQou54 hR4AhyVBXYt86wWxajV+wSKQ0qsIrU46xqtRRW4zuzlasBMlNFvm/JiMXInUAOu/IHZL4k WNN2iv3SoSi0GeaD9URyRFzu/AEq0LEZr/RYineAkghcZUMPtdfKUxtDM7OiFYhY41Cc/S JVO65dc/drilqp08JYbaMLVZIl3n8rfj91dZD0dbV/7BKh0Q2Lg18c4WtnXjBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732985473; a=rsa-sha256; cv=none; b=RlYVHv/aIYi69YG5eUgNqJEJISqP4gL4+I8Ua+7niL00stkA5MfDG+2dTu8QqFyRbvnGs+ VVorg0bOTGbj0Foul9ncK1BSoi+/turekobDLMBimWeV+8L5zAucAIGFqcmnpqB96FXs8E kjpHk/82QJj6h+Xyp7Csu7H3FUrao3fU2PkR0M0MDmb5e/fSaB21Eqd90kkcsCG1e9THSo ON7rGK0cYoF0ApxXo8DHOyw6UeoQh7DEq5cs2FkmDDB29kCSj/27Z/U+pIslwfIxRJG8Jv 6MV3+U4OgrHdy0jLwdmiZBFxiBZtVhrHSD3glcSjNMFmB1UaaSSeNuQCk2hDyA== 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 4Y0wzj0QSxzGhM; Sat, 30 Nov 2024 16:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AUGpCaU043534; Sat, 30 Nov 2024 16:51:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AUGpCP4043531; Sat, 30 Nov 2024 16:51:12 GMT (envelope-from git) Date: Sat, 30 Nov 2024 16:51:12 GMT Message-Id: <202411301651.4AUGpCP4043531@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: ef03c67b46b6 - stable/14 - stdatomic: Only use clang atomics if __clang__ is defined 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ef03c67b46b6d441b783c54bfe2d20ab4c12974a Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ef03c67b46b6d441b783c54bfe2d20ab4c12974a commit ef03c67b46b6d441b783c54bfe2d20ab4c12974a Author: John Baldwin AuthorDate: 2024-07-19 17:01:07 +0000 Commit: John Baldwin CommitDate: 2024-11-30 13:55:57 +0000 stdatomic: Only use clang atomics if __clang__ is defined GCC 14 defines __has_extension(c_atomic) but does not support __c11_atomic_*, so require __clang__ for the CLANG_ATOMICS case. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D46001 (cherry picked from commit 680f40f38343de118d5b973129683804e496faaf) --- sys/sys/stdatomic.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/sys/stdatomic.h b/sys/sys/stdatomic.h index e05606b1ead8..099097ea84a4 100644 --- a/sys/sys/stdatomic.h +++ b/sys/sys/stdatomic.h @@ -33,7 +33,8 @@ #include #include -#if __has_extension(c_atomic) || __has_extension(cxx_atomic) +#if (__has_extension(c_atomic) || __has_extension(cxx_atomic)) && \ + defined(__clang__) #define __CLANG_ATOMICS #elif __GNUC_PREREQ__(4, 7) #define __GNUC_ATOMICS