Date: Tue, 7 Dec 2021 23:27:45 +0100 From: Stefan Esser <se@freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 74e014dbfab5 - main - sys/_bitset.h: Fix fall-out from commit 5e04571cf3c Message-ID: <25cb3c71-84bd-d243-8cbd-56175348826c@freebsd.org> In-Reply-To: <202112071928.1B7JSvRI041858@gitrepo.freebsd.org> References: <202112071928.1B7JSvRI041858@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------tIMOYHounKajd6RPXV3tokQH Content-Type: multipart/mixed; boundary="------------m0PvFOL5AiyZfB2rsh6Wo7Pw"; protected-headers="v1" From: Stefan Esser <se@freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Message-ID: <25cb3c71-84bd-d243-8cbd-56175348826c@freebsd.org> Subject: Re: git: 74e014dbfab5 - main - sys/_bitset.h: Fix fall-out from commit 5e04571cf3c References: <202112071928.1B7JSvRI041858@gitrepo.freebsd.org> In-Reply-To: <202112071928.1B7JSvRI041858@gitrepo.freebsd.org> --------------m0PvFOL5AiyZfB2rsh6Wo7Pw Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Am 07.12.21 um 20:28 schrieb Stefan E=C3=9Fer: > The branch main has been updated by se: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D74e014dbfab5d64acb3376ba= 77d5d61c4abf27d5 >=20 > commit 74e014dbfab5d64acb3376ba77d5d61c4abf27d5 > Author: Konstantin Belousov <kib@FreeBSD.org> > AuthorDate: 2021-12-07 19:15:30 +0000 > Commit: Stefan E=C3=9Fer <se@FreeBSD.org> > CommitDate: 2021-12-07 19:28:22 +0000 >=20 > sys/_bitset.h: Fix fall-out from commit 5e04571cf3c > =20 > The changes to the bitset macros allowed sched.h to be included int= o > userland programs without name space pollution due to BIT_* and > BITSET_* macros. > =20 > The definition of a global variable "bitset" had been overlooked. > This name space pollution caused a compile failure in print/miktex.= > =20 > This commit renames the bitset variable to __bitset with the same > mapping back to the bitset if _KERNEL or _WANT_FREEBSD_BITSET is > defined. > =20 > This fix has been suggested by kib. It has been tested to let the > build of the print/miktex port succeed and to not break buildworld.= > =20 > This commit shall be MFCed together with commit 5e04571cf3c. > =20 > Reported by: arrowd > MFC after: 1 month > --- > sys/sys/_bitset.h | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) >=20 > diff --git a/sys/sys/_bitset.h b/sys/sys/_bitset.h > index 1c167daf3f09..8ce63233389a 100644 > --- a/sys/sys/_bitset.h > +++ b/sys/sys/_bitset.h > @@ -61,11 +61,13 @@ struct _t { \ > * Define a default type that can be used while manually specifying si= ze > * to every call. > */ > -__BITSET_DEFINE(bitset, 1); > +__BITSET_DEFINE(__bitset, 1); > =20 > #if defined(_KERNEL) || defined(_WANT_FREEBSD_BITSET) > #define BITSET_DEFINE(_t, _s) __BITSET_DEFINE(_t, _s) > #define BITSET_DEFINE_VAR(_t) __BITSET_DEFINE_VAR(_t) > + > +#define bitset __bitset > #endif > =20 > #endif /* !_SYS__BITSET_H_ */ >=20 This commit caused a build failure in PowerPC64 specific kernel code. I'm testing an alternative with "make universe" and will revert this commit and replace it by one that works on all architectures as soon as the make job has finished. --------------m0PvFOL5AiyZfB2rsh6Wo7Pw-- --------------tIMOYHounKajd6RPXV3tokQH Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEo3HqZZwL7MgrcVMTR+u171r99UQFAmGv3+EFAwAAAAAACgkQR+u171r99UTb Sgf+NyXToV6+B8/UeU/LhlU7po8YPh3tV5/itBoWARGKD2c2x0ZLIDb83sF5GWZIAIF/+FBRYRWU HoOWKJII1BNYLKB3DWI42HFyd2i17ROabtq95xo8InYBsgiwG6HXWlC8jvER95bLDOesTsefFGiL X28EkWKgBy0c5r2v/4Q+rcL0OvsDzI77yffeLYOcP74+i0D37w6vDr0arSL9eVQ2TSHB1yjfmB9T vPlQ1D1YUoMIixPImSsY3L405IYA69tcyZLryjpZWE3xh0spjx6aV3PsbthEuEZe3R4H3lDlQefr 5fsc+tVhKY35TJRJIfquxe5HqMu5l4z4jOEnTsoQjg== =T9jq -----END PGP SIGNATURE----- --------------tIMOYHounKajd6RPXV3tokQH--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?25cb3c71-84bd-d243-8cbd-56175348826c>