From nobody Sat Oct 31 10:06:31 2026 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 4jGtsg5l5Yz6yLSP for ; Sat, 31 Oct 2026 10:06:31 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jGtsg3xphz4cmb for ; Sat, 31 Oct 2026 10:06:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793441191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1SwGdmSoLAKcGeiiYR+0JaAVGCj5lm0CPEDYAQAYWoI=; b=vEo6nGtG/cB//UTUXkM4E3dTs/MTMf9gJAI28y7/WHWQaBS2j+n4K2KUBBURAZ17x9Iter g1JsDOGOCrWfopU3prBmi8lj4RuQSaNzZzNZrY1zOynHTz8msSF4BMFcVMafOipbZcEXC5 oiKNCu0RLlnZ2R2sPerU37BN7hAvFQZRwcFOLSaxH1gY2iUXPvVh8APwoEk9uC9Awlf9OT BGW++N7eu0ak8xgcFJLfr77qsCGrz7J2h4+BjmNksVy0va9SLENnpob4Um+euET02bHptu quiqCferVC5Qg0E1FtRKdDZdsqbTLPZk2El36d1pfUZpPOb6MqzExZkiDbI+jA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793441191; b=kv+VjIeT1aLP8P9OWAmVQEwf2X5kVVaWwk3jRbXPkK51WlfoSCBPCax1/zue6F3y/wjk3o n41wrdU9nuw/ztZx8ZuJt7zy1dkTebBWuxJhiM98RMhL6qfaqsWi6GqT3WiNyVmUpKS08R WsUEZRhEVrhIkogcMDTJ70eDljLBUn/wJ1uyeQibrUogzxabBNkywmEI4jWh0hMtXWygXY wzZeu+XBR7Qtt+NyZY34L0EpWdgEbRJpsLRKJshQqbQQCvbdqFd3zF/0FlCAq1JsSAfM6k t5JY2HLo7Dj1z6Fs9NOVa6PpBtZjENHsbQnlj/BI1wyT/VUJAOrYwQp99ue35g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793441191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1SwGdmSoLAKcGeiiYR+0JaAVGCj5lm0CPEDYAQAYWoI=; b=h3S4GIFwJf2aT8F4g+hcKBZcT6uFUQ5vo+nr7+sqZJ5qWTx0xRQw95sr+r6oAzUiYogkxF qQJkRe58nPPTBv15h2rnfGTYt53oxadDMxt4KP3UATf1K7aO2YrNvPUsHa1xLCRCmuXR86 pWZbvDBm6eZEbOjJrJ4eYcR8uv0mjDSn1XqY879peW0fJ3s627XZbYKlKmPsy0Xwah06zb 48OkHn6eQRc55mT3bKx2M/77lDAQhEz7sBDmtY2Qyce6LuVBaCXU2YH1FjK1RbJK8fWCTq lvdyC6NokS1OzU9XACTFsMEEBAQHQASJGJdQMv/oldQnIGm/SyuW2cQUeDe+tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jGtsg3XhGz189G for ; Sat, 31 Oct 2026 10:06:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a16a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Oct 2026 10:06:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Faraz Vahedi From: Faraz Vahedi Subject: git: db50099480e7 - stable/15 - libc: Reorganise memory_order enumeration constants List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kfv X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: db50099480e78dff37457514af08716e45a48124 Auto-Submitted: auto-generated Date: Sat, 31 Oct 2026 10:06:31 +0000 Message-Id: <6ae5bda7.3a16a.54224d95@gitrepo.freebsd.org> The branch stable/15 has been updated by kfv: URL: https://cgit.FreeBSD.org/src/commit/?id=db50099480e78dff37457514af08716e45a48124 commit db50099480e78dff37457514af08716e45a48124 Author: Faraz Vahedi AuthorDate: 2026-05-01 17:49:27 +0000 Commit: Faraz Vahedi CommitDate: 2026-10-31 10:03:30 +0000 libc: Reorganise memory_order enumeration constants Place the `memory_order` enumeration constants alongside the corresponding typedef under the ยง7.17.3 heading. The previous layout separated the fallback constant definitions from the enum, which could obscure their relationship. These fallbacks exist only to provide values when the compiler does not supply the builtins. The removed comment encoded implementation-specific assumptions about compiler-provided definitions and implied a relationship between Clang/GCC macros and fallback values. In practice, the fallback definitions exist solely to ensure the enumerators are defined when compiler intrinsics are absent, and do not depend on any particular numeric mapping. No functional change; this is a mere structural and clarity improvement. Signed-off-by: Faraz Vahedi Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/2185 (cherry picked from commit e17fddce8978efbc70fc473425bad59b111f4b16) --- sys/sys/stdatomic.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sys/sys/stdatomic.h b/sys/sys/stdatomic.h index e6eb46cd6ef3..135001a1f82e 100644 --- a/sys/sys/stdatomic.h +++ b/sys/sys/stdatomic.h @@ -101,9 +101,10 @@ #endif /* - * Clang and recent GCC both provide predefined macros for the memory - * orderings. If we are using a compiler that doesn't define them, use the - * clang values - these will be ignored in the fallback path. + * 7.17.3 Order and consistency. + * + * The memory_order_* constants that denote the barrier behaviour of the + * atomic operations. */ #ifndef __ATOMIC_RELAXED @@ -125,13 +126,6 @@ #define __ATOMIC_SEQ_CST 5 #endif -/* - * 7.17.3 Order and consistency. - * - * The memory_order_* constants that denote the barrier behaviour of the - * atomic operations. - */ - typedef enum { memory_order_relaxed = __ATOMIC_RELAXED, memory_order_consume = __ATOMIC_CONSUME,