From nobody Mon Jun 13 19:02:49 2022 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 43F0B846BCF; Mon, 13 Jun 2022 19:02: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 4LMLYQ0SV8z3kBj; Mon, 13 Jun 2022 19:02:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655146970; 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=2Mb33zTRy9KL+241B2tib+NBWlDKaL1dDJQJrEEF3lM=; b=OOtop1KMGY+uqCGqt+sveM+ab+QZIuE0hxJT3P6mSqz2aNBujYkzf21q4C5ShlBaxUqPQN yY8b8teV+fiDFSd/bs+YFZEtNVK4QsndYjqUXOXHJtHDKoRHBuPGfKg7yhI2sR6+V9e9PL XDTudh9gpcIZ2COUxNYGBqYu/Imad+o8S9yfeh8YdWGg+UuTuZ5otQJ8759cCfYnmvvcjZ rFUnvUn+GgP1YHoL82D396tz3x/8XvhFRCc1qdAuVD5I3bk1IqWxwsGJJapFLQXupEad3Y lMx4SShJoRmTJLXV12jzCpNK3LYHL278RoLeUFRXiSBob2QKXfneCnCu+a3ulw== 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 CD20F1B449; Mon, 13 Jun 2022 19:02:49 +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 25DJ2nme083633; Mon, 13 Jun 2022 19:02:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DJ2n4d083632; Mon, 13 Jun 2022 19:02:49 GMT (envelope-from git) Date: Mon, 13 Jun 2022 19:02:49 GMT Message-Id: <202206131902.25DJ2n4d083632@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: 7db7448a1010 - stable/13 - Also define THR_PAGE_SIZE_MIN for mips 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/13 X-Git-Reftype: branch X-Git-Commit: 7db7448a1010426eb258c1009878d6e8cd2c30e9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655146970; 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=2Mb33zTRy9KL+241B2tib+NBWlDKaL1dDJQJrEEF3lM=; b=o4U4sRKIRMz4Nx2oJ9xyHZEUbk0ryX+vDuApXEaEaTnpJkt/Fmx+vKhayHUpSrYNHo9MxK xTGFEmeT6RUxLrbGduQn37vfdTDe97XnqPvkzcDNoRCXDOz2HDnNnj0YPKiw/8tTaCohvB dhJeSdli7OaSWJxGPlG/FyeJA9WkF+ivXrB+bT/K7OrGCUN3RXEygyjP/exQ09iakyUEcm zU0htPW+pcV2K9fzBiztYOObG7eWzG/JHbcBwSfB46OaV4wH4SmEkluAeVU1DSnM12I5d1 oSjVhbGvzycYx3muB4kLSQYm+NDcUURU4UZlH47F6Kiao7EpraAJ2EjWG+Btcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655146970; a=rsa-sha256; cv=none; b=ijvUk3y/BUYY3BAqV3nJW0nSNx6QLrbcqwpyvsTAXOI3yeeq6HD1GC2H6uDrr3Kem4+EV1 TUQq9tJMi+X+9C7zSOOhAc+IwhcyMr7Ar7mUflEp7V0U9iNGFMKGSehaEVZdHHZehhRIeA UMQ93MLJvK8FqbochDdVZVpTBVQg4jztTFR6w5DyJOSY4+X2afpVH58VYWAyBHM0DSR8Yr piHMxrzjjey84Qiqj7b6JJ8k5dyQjak+2v6aHh3sqLwMgulWrtp6rJlUHM+fETXelEvFLS dSyQ+ZQxiQCnl4/ICLE78dP21sG9cR0Cf5WKj/PqeKjFQ2IwwcNGWLG4TIE+Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7db7448a1010426eb258c1009878d6e8cd2c30e9 commit 7db7448a1010426eb258c1009878d6e8cd2c30e9 Author: Dimitry Andric AuthorDate: 2022-06-13 18:55:23 +0000 Commit: Dimitry Andric CommitDate: 2022-06-13 18:55:23 +0000 Also define THR_PAGE_SIZE_MIN for mips Commit 6173c7833be4, which cherry-picked commit c7904405a8d4 ("Remove PAGE_SIZE from libthr") to stable/13 resulted in build errors on mips: /usr/src/lib/libthr/thread/thr_barrier.c:40:50: error: use of undeclared identifier 'THR_PAGE_SIZE_MIN' _Static_assert(sizeof(struct pthread_barrier) <= THR_PAGE_SIZE_MIN, ^ This is because c7904405a8d4 defined THR_PAGE_SIZE_MIN for all supported architectures in main/14-CURRENT, but that list no longer includes mips. Add a similar define for mips, so libthr can build successfully again. Direct commit to stable/13, since main no longer has mips. Fixes: 6173c7833be4 --- lib/libthr/arch/mips/include/pthread_md.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/libthr/arch/mips/include/pthread_md.h b/lib/libthr/arch/mips/include/pthread_md.h index 2fc39aff7e7b..a25d1b011de8 100644 --- a/lib/libthr/arch/mips/include/pthread_md.h +++ b/lib/libthr/arch/mips/include/pthread_md.h @@ -40,6 +40,9 @@ #define CPU_SPINWAIT +/* For use in _Static_assert to check structs will fit in a page */ +#define THR_PAGE_SIZE_MIN PAGE_SIZE + static __inline struct pthread * _get_curthread(void) {