From nobody Wed Dec 22 10:06:23 2021 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 3A7C3190672B; Wed, 22 Dec 2021 10:06: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 4JJprL5WD9z4Z0D; Wed, 22 Dec 2021 10:06:26 +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 576B31B4B0; Wed, 22 Dec 2021 10:06:23 +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 1BMA6N28092612; Wed, 22 Dec 2021 10:06:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA6NG0092611; Wed, 22 Dec 2021 10:06:23 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:06:23 GMT Message-Id: <202112221006.1BMA6NG0092611@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: 3720e5486934 - stable/12 - [libcxx] Fix atomic type for mips32 on gcc to work w/out needing libatomic List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 3720e548693435acacc50b506406d7192291b7e8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167587; 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=Lg7h5FaRrUbz28VU5NwM+lsUd4Lr67VmtRH9aUKVQPE=; b=o2/q68TFAwBvpLJGQeU6ULsaLlzcGxG2WeiIwXiQtKRXbuYolJoiprBCjR+x4berBqlsPr +Hvrpoyw/RmbrdiNDzcnNSGm/OtBmcoc9sCJjx1BLL+4V2XIAB8ws+kEGuIFlFx2JYtRZj B6KT8UJalLk0CnRc6cU/UDgd70Cfw95LCZ3fOhSsTZ6Wbq+qjLYOAnueSpboqhtYozUGcO UMU59WHHkFU19pNuQo20ZbBOsp0JgBThVQUGOW7O5cZZy/d8NHsNTaLdmV6RzPBk53suwu 2ps1KKNdmndHRw2CjyZEgIsi8B78nbuQS6mWofQUA2wz/e7/8gU0Vsg1ECZeUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167587; a=rsa-sha256; cv=none; b=mXISGIPaCQO/gGg4eZTCv5LF1xqGL/3b+R8hgtWrRyrRd73lrYdjW/WZCinlfzFqVbGbXk Ekx1GjS6+ZvIpQAnyzs7Fs9CDSTF3AJNke6dBsOLw7f0EOaXXil/E8yUwF5yl74K9vymhx 59xlksa55zulUBAr2xLfQDD/eSv6a9VjY6P0Ac+FzdznDqPxgoKZmZcjDEJ0pIvt46c/GA DQQX7E5KNIa17mu5byKZhoy++jPKSdJIBdURn+NQ6NkDoVawYSNrBzeIXGIdvBT9xJtbSE yiX+m7whn/AOneuKsT/HY0rlphSJ/bcYFBwO9asAihi00r+VljT1Pm88xaquaQ== 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=3720e548693435acacc50b506406d7192291b7e8 commit 3720e548693435acacc50b506406d7192291b7e8 Author: Adrian Chadd AuthorDate: 2020-10-18 17:31:10 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 10:01:21 +0000 [libcxx] Fix atomic type for mips32 on gcc to work w/out needing libatomic When compiling this for mips32 on gcc-6.x, we'd hit issues where we don't have 64 bit atomics on mips32. gcc implements this using libatomic, which we don't currently include in our freebsd-gcc compiler packages. So for now add this work around so mips32 works. It's also fine for mips64. We can fix this later once we get libatomic included. Approved by: dim Differential Revision: https://reviews.freebsd.org/D26774 (cherry picked from commit d061adc48d54ebb91b1709b16c59e8ceca895be2) --- contrib/llvm-project/libcxx/include/atomic | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/atomic b/contrib/llvm-project/libcxx/include/atomic index 9c2898653788..2dfb6f7b8131 100644 --- a/contrib/llvm-project/libcxx/include/atomic +++ b/contrib/llvm-project/libcxx/include/atomic @@ -1480,11 +1480,11 @@ struct __cxx_atomic_impl : public _Base { : _Base(value) {} }; -#ifdef __linux__ +#if defined(__linux__) || (defined(__FreeBSD__) && defined(__mips__)) using __cxx_contention_t = int32_t; #else using __cxx_contention_t = int64_t; -#endif //__linux__ +#endif #if _LIBCPP_STD_VER >= 11