Date: Fri, 7 Oct 2022 14:50:23 -0600 From: Warner Losh <imp@bsdimp.com> To: John Baldwin <jhb@freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: ce9e720af2f8 - main - <sys/_pv_entry>: Add a fallback for __LONG_WIDTH__ for older compilers. Message-ID: <CANCZdfohv6vpbfi1XuXnLKrfF=cyEWWOXR8JQbDTYWgk7pvTKg@mail.gmail.com> In-Reply-To: <28566608-eb68-7948-77b5-5e49739d8ec5@FreeBSD.org> References: <202210072032.297KWiuG035424@gitrepo.freebsd.org> <28566608-eb68-7948-77b5-5e49739d8ec5@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] Hey John, On Fri, Oct 7, 2022 at 2:43 PM John Baldwin <jhb@freebsd.org> wrote: > On 10/7/22 1:32 PM, John Baldwin wrote: > > The branch main has been updated by jhb: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=ce9e720af2f8fa378e36134bab8a82ebf67c159d > > > > commit ce9e720af2f8fa378e36134bab8a82ebf67c159d > > Author: John Baldwin <jhb@FreeBSD.org> > > AuthorDate: 2022-10-07 19:44:31 +0000 > > Commit: John Baldwin <jhb@FreeBSD.org> > > CommitDate: 2022-10-07 19:44:31 +0000 > > > > <sys/_pv_entry>: Add a fallback for __LONG_WIDTH__ for older > compilers. > > > > clang only includes a __LONG_WIDTH__ builtin in clang 14 and later. > > --- > > sys/sys/_pv_entry.h | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/sys/sys/_pv_entry.h b/sys/sys/_pv_entry.h > > index 411643cf49ec..3cd0d9c687f6 100644 > > --- a/sys/sys/_pv_entry.h > > +++ b/sys/sys/_pv_entry.h > > @@ -77,6 +77,11 @@ typedef struct pv_entry { > > #error Unsupported page size > > #endif > > > > +/* Support clang < 14 */ > > +#ifndef __LONG_WIDTH__ > > +#define __LONG_WIDTH__ (__CHAR_BIT__ * __SIZEOF_LONG__) > > +#endif > > + > > This was the smallest change to fix CI breakage. However, we may want to > do > this differently. We could perhaps add this fallback for __LONG_WIDTH__ to > <sys/cdefs.h>, or we could change sys/_pv_entry.h to use the expanded form > always (or pick a different spelling?) > I'm inclined to move those 5 lines to sys/cdefs.h since that file generally tries to provide either a FreeBSD-specific spelling of compiler-specific things, or provides the standard thing when that's not available. __LONG_WIDTH__ is trending towards standardization, imho, so it may make sense to standardize FreeBSD's uses there as well. Warner [-- Attachment #2 --] <div dir="ltr"><div dir="ltr">Hey John,<br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Oct 7, 2022 at 2:43 PM John Baldwin <<a href="mailto:jhb@freebsd.org">jhb@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On 10/7/22 1:32 PM, John Baldwin wrote:<br> > The branch main has been updated by jhb:<br> > <br> > URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=ce9e720af2f8fa378e36134bab8a82ebf67c159d" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=ce9e720af2f8fa378e36134bab8a82ebf67c159d</a><br>; > <br> > commit ce9e720af2f8fa378e36134bab8a82ebf67c159d<br> > Author: John Baldwin <jhb@FreeBSD.org><br> > AuthorDate: 2022-10-07 19:44:31 +0000<br> > Commit: John Baldwin <jhb@FreeBSD.org><br> > CommitDate: 2022-10-07 19:44:31 +0000<br> > <br> > <sys/_pv_entry>: Add a fallback for __LONG_WIDTH__ for older compilers.<br> > <br> > clang only includes a __LONG_WIDTH__ builtin in clang 14 and later.<br> > ---<br> > sys/sys/_pv_entry.h | 5 +++++<br> > 1 file changed, 5 insertions(+)<br> > <br> > diff --git a/sys/sys/_pv_entry.h b/sys/sys/_pv_entry.h<br> > index 411643cf49ec..3cd0d9c687f6 100644<br> > --- a/sys/sys/_pv_entry.h<br> > +++ b/sys/sys/_pv_entry.h<br> > @@ -77,6 +77,11 @@ typedef struct pv_entry {<br> > #error Unsupported page size<br> > #endif<br> > <br> > +/* Support clang < 14 */<br> > +#ifndef __LONG_WIDTH__<br> > +#define __LONG_WIDTH__ (__CHAR_BIT__ * __SIZEOF_LONG__)<br> > +#endif<br> > +<br> <br> This was the smallest change to fix CI breakage. However, we may want to do<br> this differently. We could perhaps add this fallback for __LONG_WIDTH__ to<br> <sys/cdefs.h>, or we could change sys/_pv_entry.h to use the expanded form<br> always (or pick a different spelling?)<br></blockquote><div><br></div><div>I'm inclined to move those 5 lines to sys/cdefs.h since that file generally tries to provide</div><div>either a FreeBSD-specific spelling of compiler-specific things, or provides the standard</div><div>thing when that's not available. __LONG_WIDTH__ is trending towards standardization,</div><div>imho, so it may make sense to standardize FreeBSD's uses there as well.</div><div><br></div><div>Warner</div></div></div>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfohv6vpbfi1XuXnLKrfF=cyEWWOXR8JQbDTYWgk7pvTKg>