Re: git: 1384a0b940e8 - main - kern/subr_unit.c: fix non-debug build

On Fri, Aug 18, 2023 at 08:39:54AM -0700, Cy Schubert wrote:
> In message <ZN-G2RGztwlgAuGj@kib.kiev.ua>, Konstantin Belousov writes:
> > On Fri, Aug 18, 2023 at 07:43:45AM -0700, Cy Schubert wrote:
> > > In message <202308181337.37IDbMwl051912@gitrepo.freebsd.org>, Konstantin 
> > > Belous
> > > ov writes:
> > > > The branch main has been updated by kib:
> > > >
> > > > URL: https://cgit.FreeBSD.org/src/commit/?id=1384a0b940e87876d36d50ad5858
> > 1c24
> > > > dc642714
> > > >
> > > > commit 1384a0b940e87876d36d50ad58581c24dc642714
> > > > Author:     Konstantin Belousov <kib@FreeBSD.org>
> > > > AuthorDate: 2023-08-18 13:36:06 +0000
> > > > Commit:     Konstantin Belousov <kib@FreeBSD.org>
> > > > CommitDate: 2023-08-18 13:37:16 +0000
> > > >
> > > >     kern/subr_unit.c: fix non-debug build
> > > >     
> > > >     Sponsored by:   The FreeBSD Foundation
> > > >     MFC after:      1 week
> > > > ---
> > > >  sys/kern/subr_unit.c | 2 +-
> > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c
> > > > index 3d45a0c1c5cb..7a23f216d98e 100644
> > > > --- a/sys/kern/subr_unit.c
> > > > +++ b/sys/kern/subr_unit.c
> > > > @@ -353,7 +353,7 @@ check_unrhdr(struct unrhdr *uh, int line)
> > > >  	struct unr *up;
> > > >  	struct unrb *ub;
> > > >  	int w;
> > > > -	u_int y, z;
> > > > +	u_int y __diagused, z __diagused;
> > > 
> > > It still doesn't like it.
> > How do you build it?
> > Is it kernel?  If yes, which kernel config?
> 
> It's not in kernel. It's in tests.

I see.  Could you quickly check if this patch is enough?
I just started buildworld.

commit 5e2dee9953a68344bdf1090b672bd9b04ae8f09f
Author: Konstantin Belousov <kib@FreeBSD.org>
Date:   Fri Aug 18 18:42:59 2023 +0300

    subr_unit.c: another attempt to fix the build
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week

diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c
index 7a23f216d98e..6826678104d6 100644
--- a/sys/kern/subr_unit.c
+++ b/sys/kern/subr_unit.c
@@ -340,6 +340,10 @@ free_iter_unr(void *handle)
 }
 
 #if defined(DIAGNOSTIC) || !defined(_KERNEL)
+#ifndef __diagused
+#define	__diagused
+#endif
+
 /*
  * Consistency check function.
  *