git: 7db7448a1010 - stable/13 - Also define THR_PAGE_SIZE_MIN for mips
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 13 Jun 2022 19:02:49 UTC
The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=7db7448a1010426eb258c1009878d6e8cd2c30e9 commit 7db7448a1010426eb258c1009878d6e8cd2c30e9 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2022-06-13 18:55:23 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> 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) {