Add types to all of the global symbols in this asm code, partially necessary

so that vmstat can find symbols, also just a good thing to do.

1 files changed, 40 insertions, 2 deletions

diff --git a/sys/arch/powerpc/powerpc/locore.S b/sys/arch/powerpc/powerpc/locore.S
index 2ee811ca8c9..b044a011d4c 100644
--- a/sys/arch/powerpc/powerpc/locore.S
+++ b/sys/arch/powerpc/powerpc/locore.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.S,v 1.11 2000/06/05 11:03:03 art Exp $	*/
+/*	$OpenBSD: locore.S,v 1.12 2000/06/15 03:16:39 rahnds Exp $	*/
 /*	$NetBSD: locore.S,v 1.2 1996/10/16 19:33:09 ws Exp $	*/
 
 /*
@@ -48,12 +48,15 @@
  * Globals
  */
 	.globl	_C_LABEL(esym),_C_LABEL(proc0paddr)
+	.type	_C_LABEL(esym),@object
+	.type	_C_LABEL(proc0paddr),@object
 	.data
 _C_LABEL(esym):		.long	0	/* end of symbol table */
 _C_LABEL(proc0paddr):	.long	0	/* proc0 p_addr */
 idle_u:			.long	0	/* fake uarea during idle after exit */
 
 	.globl _C_LABEL(where)
+	.type  _C_LABEL(where),@object
 _C_LABEL(where):	.long	0
 
 /*
@@ -70,6 +73,7 @@ _ENTRY(_ASM_LABEL(start))
  * r7 - length
  */
 	.globl	start
+	.type start,@function
 start:
 #ifdef SUPPORT_PPC1BUG
 	mr 	0,5
@@ -347,6 +351,7 @@ switch_return:
 	.data
 intstk:	.space	INTSTK			/* interrupt stack */
 	.global _C_LABEL(intr_depth)
+	.type  _C_LABEL(intr_depth),@object
 _C_LABEL(intr_depth):
 	.long	-1			/* in-use marker */
 #define	SPILLSTK 1024			/* 1K spill stack */
@@ -358,6 +363,8 @@ _C_LABEL(intr_depth):
  */
 	.text
 	.globl	_C_LABEL(trapcode),_C_LABEL(trapsize)
+	.type	_C_LABEL(trapcode),@function
+	.type	_C_LABEL(trapsize),@object
 _C_LABEL(trapcode):
 	mtsprg	1,1			/* save SP */
 	stmw	28,tempsave(0)		/* free r28-r31 */
@@ -380,6 +387,8 @@ _C_LABEL(trapsize) =	.-_C_LABEL(trapcode)
  * and standard pagetable spills
  */
 	.globl	_C_LABEL(dsitrap),_C_LABEL(dsisize)
+	.type	_C_LABEL(dsitrap),@function
+	.type	_C_LABEL(dsisize),@object
 _C_LABEL(dsitrap):
 	stmw	28,disisave(0)		/* free r28-r31 */
 	mfcr	29			/* save CR */
@@ -420,6 +429,8 @@ _C_LABEL(dsisize) =	.-_C_LABEL(dsitrap)
  * Similar to the above for ISI
  */
 	.globl	_C_LABEL(isitrap),_C_LABEL(isisize)
+	.type	_C_LABEL(isitrap),@function
+	.type	_C_LABEL(isisize),@object
 _C_LABEL(isitrap):
 	stmw	28,disisave(0)		/* free r28-r31 */
 	mflr	28			/* save LR */
@@ -447,6 +458,8 @@ _C_LABEL(isisize) =	.-_C_LABEL(isitrap)
  * This one for the external interrupt handler.
  */
 	.globl	_C_LABEL(extint),_C_LABEL(extsize)
+	.type	_C_LABEL(extint),@function
+	.type	_C_LABEL(extsize),@object
 _C_LABEL(extint):
 	mtsprg	1,1			/* save SP */
 	stmw	28,tempsave(0)		/* free r28-r31 */
@@ -468,6 +481,8 @@ _C_LABEL(extsize) =	.-_C_LABEL(extint)
  * And this one for the decrementer interrupt handler.
  */
 	.globl	_C_LABEL(decrint),_C_LABEL(decrsize)
+	.type	_C_LABEL(decrint),@function
+	.type	_C_LABEL(decrsize),@object
 _C_LABEL(decrint):
 	mtsprg	1,1			/* save SP */
 	stmw	28,tempsave(0)		/* free r28-r31 */
@@ -502,6 +517,8 @@ _C_LABEL(decrsize) =	.-_C_LABEL(decrint)
 #define	tlbld	.long	0x7c0007a4+0x800*
 
 	.globl	_C_LABEL(tlbimiss),_C_LABEL(tlbimsize)
+	.type	_C_LABEL(tlbimiss),@function
+	.type	_C_LABEL(tlbimsize),@object
 _C_LABEL(tlbimiss):
 	mfspr	2,HASH1			/* get first pointer */
 	li	1,8
@@ -558,6 +575,8 @@ _C_LABEL(tlbimiss):
 _C_LABEL(tlbimsize) =	.-_C_LABEL(tlbimiss)
 
 	.globl	_C_LABEL(tlbdlmiss),_C_LABEL(tlbdlmsize)
+	.type	_C_LABEL(tlbdlmiss),@function
+	.type	_C_LABEL(tlbdlmsize),@object
 _C_LABEL(tlbdlmiss):
 	mfspr	2,HASH1			/* get first pointer */
 	li	1,8
@@ -609,6 +628,8 @@ _C_LABEL(tlbdlmiss):
 _C_LABEL(tlbdlmsize) =	.-_C_LABEL(tlbdlmiss)
 
 	.globl	_C_LABEL(tlbdsmiss),_C_LABEL(tlbdsmsize)
+	.type	_C_LABEL(tlbdsmiss),@function
+	.type	_C_LABEL(tlbdsmsize),@object
 _C_LABEL(tlbdsmiss):
 	mfspr	2,HASH1			/* get first pointer */
 	li	1,8
@@ -690,6 +711,8 @@ _C_LABEL(tlbdsmsize) =	.-_C_LABEL(tlbdsmiss)
 .lcomm	ipkdbstk,INTSTK			/* ipkdb stack */
 
 	.globl	_C_LABEL(ipkdblow),_C_LABEL(ipkdbsize)
+	.type	_C_LABEL(ipkdblow),@function
+	.type	_C_LABEL(ipkdbsize),@object
 _C_LABEL(ipkdblow):
 	mtsprg	1,1			/* save SP */
 	stmw	28,ipkdbsave(0)		/* free r28-r31 */
@@ -850,6 +873,7 @@ trapexit:
  * Mostly similar to the above.
  */
 	.globl	_C_LABEL(fork_trampoline)
+	.type	_C_LABEL(fork_trampoline),@function
 _C_LABEL(fork_trampoline):
 	xor	3,3,3
 	bl	_C_LABEL(lcsplx)
@@ -979,6 +1003,7 @@ s_isitrap:
 	isync
 
 	.globl	_C_LABEL(extint_call)
+	.type	_C_LABEL(extint_call),@function
 extintr:
 	INTRENTER
 _C_LABEL(extint_call):
@@ -1065,6 +1090,7 @@ decrintr:
  * Deliberate entry to ipkdbtrap
  */
 	.globl	_C_LABEL(ipkdb_trap)
+	.type	_C_LABEL(ipkdb_trap),@function
 _C_LABEL(ipkdb_trap):
 	
 	mtsprg	2,2
@@ -1118,6 +1144,7 @@ _C_LABEL(ipkdbfault):
  * int ipkdbfbyte(unsigned char *p)
  */
 	.globl	_C_LABEL(ipkdbfbyte)
+	.type	_C_LABEL(ipkdbfbyte),@function
 _C_LABEL(ipkdbfbyte):
 	li	9,EXC_DSI		/* establish new fault routine */
 	lwz	5,0(9)
@@ -1144,6 +1171,7 @@ _C_LABEL(ipkdbfbyte):
  * int ipkdbsbyte(unsigned char *p, int c)
  */
 	.globl	_C_LABEL(ipkdbsbyte)
+	.type	_C_LABEL(ipkdbsbyte),@function
 _C_LABEL(ipkdbsbyte):
 	li	9,EXC_DSI		/* establish new fault routine */
 	lwz	5,0(9)
@@ -1181,6 +1209,7 @@ _C_LABEL(ipkdbsbyte):
  * registers.
  */
 	.globl	_C_LABEL(setfault)
+	.type	_C_LABEL(setfault),@function
 _C_LABEL(setfault):
 	mflr	0
 	mfcr	12
@@ -1203,6 +1232,8 @@ _C_LABEL(setfault):
  * All other registers are unchanged.
  */
 	.globl	_C_LABEL(sigcode),_C_LABEL(esigcode)
+	.type	_C_LABEL(sigcode),@function
+	.type	_C_LABEL(esigcode),@function
 _C_LABEL(sigcode):
 	addi	1,1,-16			/* reserved space for callee */
 	blrl
@@ -1215,6 +1246,10 @@ _C_LABEL(esigcode):
 
 
 
+	.globl   _C_LABEL(intrnames)
+	.type   _C_LABEL(intrnames),@object
+	.globl   _C_LABEL(eintrnames)
+	.type   _C_LABEL(eintrnames),@object
 _C_LABEL(intrnames):
 	.string "irq0" "irq1" "irq2" "irq3"
 	.string "irq4" "irq5" "irq6" "irq7"
@@ -1235,7 +1270,10 @@ _C_LABEL(intrnames):
 	.string "clock" 
 _C_LABEL(eintrnames):
 	.align 4
-	.globl _C_LABEL(intrcnt)
+	.globl   _C_LABEL(intrcnt)
+	.type   _C_LABEL(intrcnt),@object
+	.globl   _C_LABEL(eintrcnt)
+	.type   _C_LABEL(eintrcnt),@object
 _C_LABEL(intrcnt):
 	.long 0,0,0,0
 	.long 0,0,0,0