From: Mark Geisert <mark@maxrnd.com>
To: cygwin-patches@cygwin.com
Cc: Mark Geisert <mark@maxrnd.com>
Subject: [PATCH v2] Cygwin: Make gcc-specific code in <sys/cpuset.h> compiler-agnostic
Date: Sun, 9 Jul 2023 00:59:22 -0700 [thread overview]
Message-ID: <20230709075922.8599-1-mark@maxrnd.com> (raw)
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>
---
winsup/cygwin/include/sys/cpuset.h | 9 +++++----
1 file 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)
--
2.39.0
next reply other threads:[~2023-07-09 7:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-09 7:59 Mark Geisert [this message]
2023-07-10 8:43 ` Corinna Vinschen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230709075922.8599-1-mark@maxrnd.com \
--to=mark@maxrnd.com \
--cc=cygwin-patches@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).