Re: bin/38044: netbsd-4 won't build cleanly with -DLOCKDEBUG

["Greg A. Woods" <woods%planix.ca@localhost>]

The following reply was made to PR bin/38044; it has been noted by GNATS.

From: "Greg A. Woods" <woods%planix.ca@localhost>
To: NetBSD GNATS <gnats-bugs%NetBSD.org@localhost>
Cc: 
Subject: Re: bin/38044: netbsd-4 won't build cleanly with -DLOCKDEBUG
Date: Fri, 22 Feb 2008 16:28:44 -0500

 At Sat, 16 Feb 2008 21:20:00 +0000 (UTC), Me-planix.com wrote:
 Subject: bin/38044: netbsd-4 won't build cleanly with -DLOCKDEBUG
 > 
 > Index: Makefile
 > ===================================================================
 > RCS file: /cvs/master/m-NetBSD/main/src/usr.bin/pmap/Makefile,v
 > retrieving revision 1.2
 > diff -u -c -r1.2 Makefile
 > cvs diff: conflicting specifications of output style
 > *** Makefile 8 Jan 2003 20:25:12 -0000       1.2
 > --- Makefile 16 Feb 2008 20:57:35 -0000
 > ***************
 > *** 8,10 ****
 > --- 8,12 ----
 >   DPADD=             ${LIBKVM}
 >   
 >   .include <bsd.prog.mk>
 > + 
 > + CFLAGS:=   ${CFLAGS:S/-DLOCKDEBUG//}
 > 
 > 
 
 The following change, which after application makes the code now seem to
 mimic similar code in sys/arch/include/alpha/lock.h (which is the only
 platform I had previously built entirely with LOCKDEBUG, albeit in
 netbsd-1-6).
 
 I think this is the right change in any case.  I couldn't find any other
 implementations of these fucntions anywhere else for this architecture,
 and everything in userland seems to compile and work properly now too.
 
 Index: sys/arch/x86/include/lock.h
 ===================================================================
 RCS file: /cvs/master/m-NetBSD/main/src/sys/arch/x86/include/lock.h,v
 retrieving revision 1.11
 diff -u -r1.11 lock.h
 --- sys/arch/x86/include/lock.h        28 Dec 2005 19:09:30 -0000      1.11
 +++ sys/arch/x86/include/lock.h        18 Feb 2008 21:17:40 -0000
 @@ -49,15 +49,6 @@
  
  #include <machine/cpufunc.h>
  
 -#ifdef LOCKDEBUG
 -
 -extern void __cpu_simple_lock_init(__cpu_simple_lock_t *);
 -extern void __cpu_simple_lock(__cpu_simple_lock_t *);
 -extern int __cpu_simple_lock_try(__cpu_simple_lock_t *);
 -extern void __cpu_simple_unlock(__cpu_simple_lock_t *);
 -
 -#else
 -
  #include <machine/atomic.h>
  
  static __inline void __cpu_simple_lock_init(__cpu_simple_lock_t *)
 @@ -109,8 +100,6 @@
        *lockp = __SIMPLELOCK_UNLOCKED;
  }
  
 -#endif /* !LOCKDEBUG */
 -
  #ifdef _KERNEL
  #define       SPINLOCK_SPIN_HOOK      x86_pause()
  #endif
 
 
 -- 
                                                Greg A. Woods
                                                Planix, Inc.
 
 <woods%planix.com@localhost>     +1 416 489-5852 x122     
http://www.planix.com/