From 01707e0035062e46b35977381c90da78a664751b Mon Sep 17 00:00:00 2001 From: obrien Date: Mon, 28 May 2001 09:52:21 +0000 Subject: [PATCH] One needs to introduce things with a `.file' directive before trying to do a .loc on it. BTW, the .loc needs to be in a .text section. gas 2.11.0 catches these oversights where previous versions did not. --- sys/alpha/alpha/pal.s | 5 ++++- sys/alpha/alpha/prom_disp.s | 4 +++- sys/alpha/include/asm.h | 6 ++++++ sys/boot/alpha/libalpha/pal.S | 3 ++- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/sys/alpha/alpha/pal.s b/sys/alpha/alpha/pal.s index 2b608f4fbc4c..2e5031237265 100644 --- a/sys/alpha/alpha/pal.s +++ b/sys/alpha/alpha/pal.s @@ -43,7 +43,10 @@ __KERNEL_RCSID(1, "$NetBSD: pal.s,v 1.12 1998/02/27 03:44:53 thorpej Exp $"); -inc2: .stabs __FILE__,132,0,0,inc2; .loc 1 __LINE__ +inc2: .stabs __FILE__,132,0,0,inc2 + .text + .loc 1 __LINE__ + /* * alpha_rpcc: read process cycle counter (XXX INSTRUCTION, NOT PALcode OP) */ diff --git a/sys/alpha/alpha/prom_disp.s b/sys/alpha/alpha/prom_disp.s index 23485a483b75..cd3e77494d92 100644 --- a/sys/alpha/alpha/prom_disp.s +++ b/sys/alpha/alpha/prom_disp.s @@ -39,7 +39,9 @@ __KERNEL_RCSID(2, "$NetBSD: prom_disp.s,v 1.8 1997/11/03 04:22:03 ross Exp $"); .text .align 4 -inc3: .stabs __FILE__,132,0,0,inc3; .loc 1 __LINE__ +inc3: .stabs __FILE__,132,0,0,inc3 + .text + .loc 1 __LINE__ /* * Dispatcher routine. Implements prom's calling machinery, saves our * callee-saved registers as required by C. diff --git a/sys/alpha/include/asm.h b/sys/alpha/include/asm.h index 5b626ef256db..b6cc41ef8382 100644 --- a/sys/alpha/include/asm.h +++ b/sys/alpha/include/asm.h @@ -226,6 +226,12 @@ * */ + /* + * for `.loc' uses + */ + + .file 1 __FILE__ + /* * MCOUNT */ diff --git a/sys/boot/alpha/libalpha/pal.S b/sys/boot/alpha/libalpha/pal.S index d411318b54ae..79f9306aa5da 100644 --- a/sys/boot/alpha/libalpha/pal.S +++ b/sys/boot/alpha/libalpha/pal.S @@ -44,7 +44,8 @@ #include -inc2: .stabs __FILE__,132,0,0,inc2; .loc 1 __LINE__ +/*inc2: .stabs __FILE__,132,0,0,inc2; .loc 1 __LINE__*/ +inc2: .stabs __FILE__,132,0,0,inc2 /* * alpha_rpcc: read process cycle counter (XXX INSTRUCTION, NOT PALcode OP) */