public inbox for
help / color / mirror / Atom feed
From: Sebastian Huber <>
Subject: [newlib-cygwin] sys/_bitset.h: Fix fall-out from commit 5e04571cf3c
Date: Fri, 24 Jun 2022 05:43:29 +0000 (GMT)	[thread overview]
Message-ID: <> (raw);h=c78c56c06dad8a9fe51382366266a5700614f2e9

commit c78c56c06dad8a9fe51382366266a5700614f2e9
Author: Stefan Eßer <>
Date:   Tue Dec 7 20:29:26 2021 +0100

    sys/_bitset.h: Fix fall-out from commit 5e04571cf3c
    There is a reference to malloc() in #define __BITSET_ALLOC. Even
    though this macro is only defined but not used, it causes the lang/gcc
    ports to fail. The gcc ports "poison" a number of functions including
    malloc() and prevent their use (including in macro definitions).
    This commit moved the declaration of __BITSET_ALLOC into the
    conditional block that depends on _KERNEL or _WANT_FREEBSD_BITSET
    being defined.
    There is no use of __BITSET_ALLOC in the FreeBSD sources, and userland
    programs that want to use BITSEC_ALLOC will define _WANT_FREEBSD_BITSET
    This patch has been tested by building lang/gcc11 and a successful
    make buildworld.
    This commit shall be MFCed together with commit 5e04571cf3c.
    MFC after:      1 month

 newlib/libc/sys/rtems/include/sys/bitset.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/newlib/libc/sys/rtems/include/sys/bitset.h b/newlib/libc/sys/rtems/include/sys/bitset.h
index 00bdc23f9..c9448a73a 100644
--- a/newlib/libc/sys/rtems/include/sys/bitset.h
+++ b/newlib/libc/sys/rtems/include/sys/bitset.h
@@ -311,12 +311,12 @@
 #define	__BITSET_SIZE(_s)	(__bitset_words((_s)) * sizeof(long))
+#if defined(_KERNEL) || defined(_WANT_FREEBSD_BITSET)
  * Dynamically allocate a bitset.
 #define __BITSET_ALLOC(_s, mt, mf) malloc(__BITSET_SIZE((_s)), mt, (mf))
-#if defined(_KERNEL) || defined(_WANT_FREEBSD_BITSET)
 #define	BIT_AND(_s, d, s)			__BIT_AND(_s, d, s)
 #define	BIT_AND2(_s, d, s1, s2)			__BIT_AND2(_s, d, s1, s2)
 #define	BIT_ANDNOT(_s, d, s)			__BIT_ANDNOT(_s, d, s)
@@ -358,6 +358,6 @@
 #define	BITSET_FSET(n)				__BITSET_FSET(n)
 #define	BITSET_SIZE(_s)				__BITSET_SIZE(_s)
+#endif /* defined(_KERNEL) || defined(_WANT_FREEBSD_BITSET) */
 #endif /* !_SYS_BITSET_H_ */

             reply	other threads:[~2022-06-24  5:43 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-24  5:43 Sebastian Huber [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-06-24  5:43 Sebastian Huber
2022-06-24  5:43 Sebastian Huber

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \

* 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).