merge sigdebug.h into machdep.c, to where all other architectures have

these (DEBUG) defines.

ok miod@

2 files changed, 6 insertions, 50 deletions

diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index 6b30d4b1b4f..c57d8ee93be 100644
--- a/sys/arch/sparc64/sparc64/machdep.c
+++ b/sys/arch/sparc64/sparc64/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.137 2012/03/23 15:51:26 guenther Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.138 2012/05/09 18:34:21 okan Exp $	*/
 /*	$NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */
 
 /*-
@@ -348,10 +348,12 @@ setregs(p, pack, stack, retval)
 }
 
 #ifdef DEBUG
-/* See sigdebug.h */
-#include <sparc64/sparc64/sigdebug.h>
-int sigdebug = 0x0;
+int sigdebug = 0;
 int sigpid = 0;
+#define SDB_FOLLOW	0x01
+#define SDB_KSTACK	0x02
+#define SDB_FPSTATE	0x04
+#define SDB_DDB		0x08
 #endif
 
 struct sigframe {
diff --git a/sys/arch/sparc64/sparc64/sigdebug.h b/sys/arch/sparc64/sparc64/sigdebug.h
deleted file mode 100644
index e2189724f1b..00000000000
--- a/sys/arch/sparc64/sparc64/sigdebug.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$OpenBSD: sigdebug.h,v 1.2 2001/08/20 20:23:53 jason Exp $	*/
-/*	$NetBSD: sigdebug.h,v 1.1 1999/01/09 23:12:36 eeh Exp $	*/
-
-/*
- * Copyright (c) 1998 Eduardo E. Horvath.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Christopher G. Demetriou
- *	for the NetBSD Project.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _SIGDEBUG_H_
-#define _SIGDEBUG_H_
-
-#ifdef DEBUG
-#define SDB_FOLLOW	0x01
-#define SDB_KSTACK	0x02
-#define SDB_FPSTATE	0x04
-#define SDB_DDB		0x08
-extern int sigdebug;
-extern int sigpid;
-#endif
-
-#endif /* _SIGDEBUG_H_ */