5 files changed, 22 insertions, 16 deletions
diff --git a/sys/arch/alpha/alpha/debug.s b/sys/arch/alpha/alpha/debug.s
index 7d58f5d8918..a7724d0aa92 100644
--- a/sys/arch/alpha/alpha/debug.s
+++ b/sys/arch/alpha/alpha/debug.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: debug.s,v 1.3 2006/04/13 14:37:26 brad Exp $ */
+/* $OpenBSD: debug.s,v 1.4 2008/01/13 20:59:52 kettenis Exp $ */
 /* $NetBSD: debug.s,v 1.5 1999/06/18 18:11:56 thorpej Exp $ */
 
 /*-
@@ -38,12 +38,19 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if defined (MULTIPROCESSOR)
+.file	5 __FILE__
+.loc	5 __LINE__
+#else
+.file	4 __FILE__
+.loc	4 __LINE__
+#endif
+
 /*
  * Debugger glue.
  */
 
 	.text
-inc6:	.stabs	__FILE__,132,0,0,inc6; .loc	1 __LINE__
 
 /*
  * Debugger stack.
diff --git a/sys/arch/alpha/alpha/locore.s b/sys/arch/alpha/alpha/locore.s
index fe7453cec66..095e8008450 100644
--- a/sys/arch/alpha/alpha/locore.s
+++ b/sys/arch/alpha/alpha/locore.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.s,v 1.31 2007/10/10 15:53:51 art Exp $ */
+/* $OpenBSD: locore.s,v 1.32 2008/01/13 20:59:52 kettenis Exp $ */
 /* $NetBSD: locore.s,v 1.94 2001/04/26 03:10:44 ross Exp $ */
 
 /*-
@@ -65,16 +65,12 @@
  * rights to redistribute these changes.
  */
 
-.file 1 __FILE__
-
-.stabs	__FILE__,100,0,0,kernel_text
+.file	1 __FILE__
 
 #include <machine/asm.h>
 
 #include "assym.h"
 
-.stabs	__FILE__,132,0,0,kernel_text
-
 #if defined(MULTIPROCESSOR)
 
 /*
@@ -260,7 +256,6 @@ Lstart1: LDGP(pv)
 /**************************************************************************/
 
 	.text
-.stabs	__FILE__,132,0,0,backtolocore1	/* done with includes */
 .loc	1 __LINE__
 backtolocore1:
 /**************************************************************************/
diff --git a/sys/arch/alpha/alpha/multiproc.s b/sys/arch/alpha/alpha/multiproc.s
index 8949621308f..28d6dee6ed8 100644
--- a/sys/arch/alpha/alpha/multiproc.s
+++ b/sys/arch/alpha/alpha/multiproc.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: multiproc.s,v 1.2 2000/11/08 19:16:59 ericj Exp $ */
+/* $OpenBSD: multiproc.s,v 1.3 2008/01/13 20:59:52 kettenis Exp $ */
 /* $NetBSD: multiproc.s,v 1.5 1999/12/16 20:17:23 thorpej Exp $ */
 
 /*-
@@ -38,14 +38,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-__KERNEL_RCSID(5, "$NetBSD: multiproc.s,v 1.5 1999/12/16 20:17:23 thorpej Exp $")
+.file	4 __FILE__
+.loc	4 __LINE__
 
 /*
  * Multiprocessor glue code.
  */
 
 	.text
-inc5:	.stabs	__FILE__,132,0,0,inc5; .loc	1 __LINE__
 
 /*
  * cpu_spinup_trampoline:
diff --git a/sys/arch/alpha/alpha/pal.s b/sys/arch/alpha/alpha/pal.s
index 535098c07a5..e01ef267e8f 100644
--- a/sys/arch/alpha/alpha/pal.s
+++ b/sys/arch/alpha/alpha/pal.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: pal.s,v 1.6 2000/11/08 19:16:59 ericj Exp $ */
+/* $OpenBSD: pal.s,v 1.7 2008/01/13 20:59:52 kettenis Exp $ */
 /* $NetBSD: pal.s,v 1.14 1999/12/02 22:08:04 thorpej Exp $ */
 
 /*
@@ -28,6 +28,9 @@
  * rights to redistribute these changes.
  */
 
+.file	3 __FILE__
+.loc	3 __LINE__
+
 /*
  * The various OSF PALcode routines.
  *
@@ -40,7 +43,6 @@
  * and Richard T. Witek.
  */
 
-inc2:	.stabs	__FILE__,132,0,0,inc2; .loc	1 __LINE__
 /*
  * alpha_amask: read architecture features (XXX INSTRUCTION, NOT PALcode OP)
  *
diff --git a/sys/arch/alpha/alpha/prom_disp.s b/sys/arch/alpha/alpha/prom_disp.s
index d3686cb2387..81bbb5a3fa3 100644
--- a/sys/arch/alpha/alpha/prom_disp.s
+++ b/sys/arch/alpha/alpha/prom_disp.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: prom_disp.s,v 1.6 2000/11/08 19:16:59 ericj Exp $ */
+/* $OpenBSD: prom_disp.s,v 1.7 2008/01/13 20:59:52 kettenis Exp $ */
 /* $NetBSD: prom_disp.s,v 1.8 1997/11/03 04:22:03 ross Exp $ */
 
 /*
@@ -28,6 +28,9 @@
  * rights to redistribute these changes.
  */
 
+.file	2 __FILE__
+.loc	2 __LINE__
+
 #ifndef _LOCORE
 #include <machine/asm.h>
 #endif
@@ -38,7 +41,6 @@
 	.text
 	.align	4
 
-inc3:	.stabs	__FILE__,132,0,0,inc3; .loc	1 __LINE__
 /*
  * Dispatcher routine.  Implements prom's calling machinery, saves our
  * callee-saved registers as required by C.