Thu Sep 25 19:40:12 2008 UTC ()
Pull up following revision(s) (requested by martin in ticket #945):
	sys/arch/sparc64/sparc64/locore.s: revision 1.261
Remove an unused .globl declaration


(bouyer)
diff -r1.232.2.4 -r1.232.2.5 src/sys/arch/sparc64/sparc64/locore.s
cvs diff -r1.232.2.4 -r1.232.2.5 src/sys/arch/sparc64/sparc64/locore.s (expand / switch to unified diff)

--- src/sys/arch/sparc64/sparc64/locore.s 2008/09/16 18:49:34 1.232.2.4
+++ src/sys/arch/sparc64/sparc64/locore.s 2008/09/25 19:40:12 1.232.2.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: locore.s,v 1.232.2.4 2008/09/16 18:49:34 bouyer Exp $ */ 1/* $NetBSD: locore.s,v 1.232.2.5 2008/09/25 19:40:12 bouyer Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1996-2002 Eduardo Horvath 4 * Copyright (c) 1996-2002 Eduardo Horvath
5 * Copyright (c) 1996 Paul Kranenburg 5 * Copyright (c) 1996 Paul Kranenburg
6 * Copyright (c) 1996 6 * Copyright (c) 1996
7 * The President and Fellows of Harvard College. 7 * The President and Fellows of Harvard College.
8 * All rights reserved. 8 * All rights reserved.
9 * Copyright (c) 1992, 1993 9 * Copyright (c) 1992, 1993
10 * The Regents of the University of California. 10 * The Regents of the University of California.
11 * All rights reserved. 11 * All rights reserved.
12 * 12 *
13 * This software was developed by the Computer Systems Engineering group 13 * This software was developed by the Computer Systems Engineering group
14 * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and 14 * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
@@ -4189,28 +4189,26 @@ intrcmplt: @@ -4189,28 +4189,26 @@ intrcmplt:
4189 * %l1 = return pc 4189 * %l1 = return pc
4190 * %l2 = return npc 4190 * %l2 = return npc
4191 * Internal: 4191 * Internal:
4192 * %l3 = zs device 4192 * %l3 = zs device
4193 * %l4, %l5 = temporary 4193 * %l4, %l5 = temporary
4194 * %l6 = rr3 (or temporary data) + 0x100 => need soft int 4194 * %l6 = rr3 (or temporary data) + 0x100 => need soft int
4195 * %l7 = zs soft status 4195 * %l7 = zs soft status
4196 */ 4196 */
4197zshard: 4197zshard:
4198#endif /* notyet */ 4198#endif /* notyet */
4199 4199
4200 .globl return_from_trap, rft_kernel, rft_user 4200 .globl return_from_trap, rft_kernel, rft_user
4201 .globl softtrap, slowtrap 4201 .globl softtrap, slowtrap
4202 .globl syscall 
4203 
4204 4202
4205/* 4203/*
4206 * Various return-from-trap routines (see return_from_trap). 4204 * Various return-from-trap routines (see return_from_trap).
4207 */ 4205 */
4208 4206
4209/* 4207/*
4210 * Return from trap. 4208 * Return from trap.
4211 * registers are: 4209 * registers are:
4212 * 4210 *
4213 * [%sp + CC64FSZ + STKB] => trap frame 4211 * [%sp + CC64FSZ + STKB] => trap frame
4214 * 4212 *
4215 * We must load all global, out, and trap registers from the trap frame. 4213 * We must load all global, out, and trap registers from the trap frame.
4216 * 4214 *