The current version of <sys/cpuset.h> cannot be compiled by Clang due to the use of __builtin* functions. Their presence here was a dubious optimization anyway, so their usage has been converted to standard library functions. A popcnt (population count of 1 bits in a word) function is provided here because there isn't one in the standard library or elsewhere in the Cygwin DLL.
The "#include <sys/cdefs>" here to define __inline can be removed since both of the new includes sub-include it. Addresses: https://cygwin.com/pipermail/cygwin/2023-July/253927.html Fixes: 9cc910dd33a5 (Cygwin: Make <sys/cpuset.h> safe for c89 compilations) Signed-off-by: Mark Geisert <m...@maxrnd.com> --- winsup/cygwin/include/sys/cpuset.h | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/winsup/cygwin/include/sys/cpuset.h b/winsup/cygwin/include/sys/cpuset.h index 0c95134ff..f76e788d5 100644 --- a/winsup/cygwin/include/sys/cpuset.h +++ b/winsup/cygwin/include/sys/cpuset.h @@ -9,7 +9,8 @@ details. */ #ifndef _SYS_CPUSET_H_ #define _SYS_CPUSET_H_ -#include <sys/cdefs.h> +#include <stdlib.h> +#include <string.h> #ifdef __cplusplus extern "C" { @@ -31,6 +32,23 @@ typedef struct #if __GNU_VISIBLE int __sched_getaffinity_sys (pid_t, size_t, cpu_set_t *); +/* Modern CPUs have popcnt* instructions but the need here is not worth + * worrying about builtins or inline assembler for different compilers. */ +static inline int +__maskpopcnt (__cpu_mask mask) +{ + int res = 0; + unsigned long ulmask = (unsigned long) mask; + + while (ulmask != 0) + { + if (ulmask & 1) + ++res; + ulmask >>= 1; + } + return res; +} + /* These macros alloc or free dynamically-sized cpu sets of size 'num' cpus. Allocations are padded such that full-word operations can be done easily. */ #define CPU_ALLOC_SIZE(num) __cpuset_alloc_size (num) @@ -44,14 +62,14 @@ __cpuset_alloc_size (int num) static __inline cpu_set_t * __cpuset_alloc (int num) { - return (cpu_set_t *) __builtin_malloc (CPU_ALLOC_SIZE(num)); + return (cpu_set_t *) malloc (CPU_ALLOC_SIZE(num)); } #define CPU_FREE(set) __cpuset_free (set) static __inline void __cpuset_free (cpu_set_t *set) { - __builtin_free (set); + free (set); } /* These _S macros operate on dynamically-sized cpu sets of size 'siz' bytes */ @@ -59,7 +77,7 @@ __cpuset_free (cpu_set_t *set) static __inline void __cpuset_zero_s (size_t siz, cpu_set_t *set) { - (void) __builtin_memset (set, 0, siz); + (void) memset (set, 0, siz); } #define CPU_SET_S(cpu, siz, set) __cpuset_set_s (cpu, siz, set) @@ -94,7 +112,7 @@ __cpuset_count_s (size_t siz, cpu_set_t *set) { int i, res = 0; for (i = 0; i < siz / sizeof (__cpu_mask); i++) - res += __builtin_popcountl ((set)->__bits[i]); + res += __maskpopcnt ((set)->__bits[i]); return res; } -- 2.39.0