diff options
| author | Mark Geisert <mark@maxrnd.com> | 2023-07-09 10:59:22 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2023-07-10 11:29:41 +0300 |
| commit | df0f296f59d24fbad1fbc3cd791bf3f362116c4f (patch) | |
| tree | aae634779360b4462758badaad7f6d074e73af10 | |
| parent | 1a0530f3e0564e6c0755b57dfea0efbf58eb62f4 (diff) | |
Cygwin: Make gcc-specific code in <sys/cpuset.h> compiler-agnostic
The current version of <sys/cpuset.h> cannot be compiled by Clang due to
the use of builtin versions of malloc, free, and memset. Their presence
here was a dubious optimization anyway, so their usage has been
converted to standard library functions.
The use of __builtin_popcountl remains because Clang implements it just
like gcc does. If/when some other compiler (Rust? Go?) runs into this
issue we can deal with specialized handling then.
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 <mark@maxrnd.com>
| -rw-r--r-- | winsup/cygwin/include/sys/cpuset.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/winsup/cygwin/include/sys/cpuset.h b/winsup/cygwin/include/sys/cpuset.h index 0c95134ff..95c777cfb 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" { @@ -44,14 +45,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 +60,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) |