From nobody Wed Dec 22 10:06:40 2021 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 6AE131907026; Wed, 22 Dec 2021 10:06:50 +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 4JJprk45q7z4YyB; Wed, 22 Dec 2021 10:06:46 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A97C11B4B4; Wed, 22 Dec 2021 10:06:40 +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 1BMA6e5j092994; Wed, 22 Dec 2021 10:06:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA6eIH092993; Wed, 22 Dec 2021 10:06:40 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:06:40 GMT Message-Id: <202112221006.1BMA6eIH092993@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: 8ae4c8aadfbd - stable/12 - [libcxx] Fix atomic type for arm (pre v6) to work w/out needing libatomic 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/12 X-Git-Reftype: branch X-Git-Commit: 8ae4c8aadfbd1ec3484dcd06336417c77ab1d2e0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167607; 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=o4ojanVJ18rF9Gojw/VkjitmsNa5kIDc3gEKLk3zRBU=; b=bEWrJ6YQBonfn9cBSHIkH1/9Dfu2+IyBig5g0FyKa/c/+Vs8QxBJHFIFOhiBkL+bxVVbb2 w5AX5+Pa49I1peAcCNcIOyuYHiODjPFSgN2siONq+GTbcbStP4+kAhSe5WWexCZ/DPDmk1 ddl/6XjuCDuRG8O0UhrowD8bLGsl1ip7B7WO/Jflhem71371zjiwieX6x1TuNVfT5kIXCb Yo+78mtKHQOp3hEoaFrbcy0SbTp4y1TwHDDhzv1zp3k9g2carWl/sYlVa16j2f/XSHkmu0 R2yrVKUG1KX7SnONJLokc2eZCR5y3GHelHcxvWSpQG8/QHKOEbc1J+LCLofNNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167607; a=rsa-sha256; cv=none; b=J9+t/zbsv/UkxzXYf7sdHwW59tbfFO+ciS13CAW9Z+RUv8QYUtJeVRAbzWBPUiHwjgLOsg iOCsGLo2QzwTx771zsvZbP39XPy1RfWZKUhPmP+KTw4iErKNQc1jTS9UC80ECU9Mnyny1V dEBOYIMKual80Vu1zF+4hSQ1Mmw1onslEiDFIZvb9RtA8f0XAdO6aed5R3m6WcdFrIZa6p XuQngzFB+VOH5slWRQDeRpI2zotbYxZ5G4VXYjprCfbmmlUqQWtM4U3aM2PEN1GuLvVMPm n/+n1YMhtKu4Tg4GfSrTuEmQTqa4rDSovpX/Yl3Y2c43f5SnmHmL5nKX2Ajz1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8ae4c8aadfbd1ec3484dcd06336417c77ab1d2e0 commit 8ae4c8aadfbd1ec3484dcd06336417c77ab1d2e0 Author: Dimitry Andric AuthorDate: 2021-12-17 22:08:17 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 10:01:32 +0000 [libcxx] Fix atomic type for arm (pre v6) to work w/out needing libatomic Similar to d061adc48d54e, avoid using a 64 bit type for libc++'s __cxx_contention_t on arm (pre v6), as this architecture lacks support for 64 bit atomics. --- contrib/llvm-project/libcxx/include/atomic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/llvm-project/libcxx/include/atomic b/contrib/llvm-project/libcxx/include/atomic index 2dfb6f7b8131..5ab48f55ddd3 100644 --- a/contrib/llvm-project/libcxx/include/atomic +++ b/contrib/llvm-project/libcxx/include/atomic @@ -1480,7 +1480,7 @@ struct __cxx_atomic_impl : public _Base { : _Base(value) {} }; -#if defined(__linux__) || (defined(__FreeBSD__) && defined(__mips__)) +#if defined(__linux__) || (defined(__FreeBSD__) && ((defined(__arm__) && __ARM_ARCH < 6) || defined(__mips__))) using __cxx_contention_t = int32_t; #else using __cxx_contention_t = int64_t;