Module Name:    src
Committed By:   pooka
Date:           Sat Dec 19 19:09:48 UTC 2009

Modified Files:
        src/common/lib/libc/arch/sparc/string: ffs.S
        src/common/lib/libc/arch/sparc64/string: ffs.S

Log Message:
Don't export __ffstab, it's used only in this routine.  This gets
rid of one of those evil common symbols in the __ namespace.

reviewed by martin


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/sparc/string/ffs.S
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/sparc64/string/ffs.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/common/lib/libc/arch/sparc/string/ffs.S
diff -u src/common/lib/libc/arch/sparc/string/ffs.S:1.1 src/common/lib/libc/arch/sparc/string/ffs.S:1.2
--- src/common/lib/libc/arch/sparc/string/ffs.S:1.1	Tue Dec 20 19:28:50 2005
+++ src/common/lib/libc/arch/sparc/string/ffs.S	Sat Dec 19 19:09:48 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs.S,v 1.1 2005/12/20 19:28:50 christos Exp $	*/
+/*	$NetBSD: ffs.S,v 1.2 2009/12/19 19:09:48 pooka Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -40,7 +40,7 @@
 #if 0
 	.asciz "@(#)ffs.s	8.1 (Berkeley) 6/4/93"
 #else
-	RCSID("$NetBSD: ffs.S,v 1.1 2005/12/20 19:28:50 christos Exp $")
+	RCSID("$NetBSD: ffs.S,v 1.2 2009/12/19 19:09:48 pooka Exp $")
 #endif
 #endif  /* LIBC_SCCS and not lint */
 
@@ -60,9 +60,9 @@
  */
 ENTRY(ffs)
 #ifdef PIC
-	PICCY_SET(_C_LABEL(__ffstab), %o2, %o3)
+	PICCY_SET(ffstab, %o2, %o3)
 #else
-	set	_C_LABEL(__ffstab), %o2
+	set	ffstab, %o2
 #endif
 	andcc	%o0, 0xff, %o1	! get low byte
 	be,a	1f		! try again if 0
@@ -94,7 +94,7 @@
 	retl
 	 add	%o0, 24, %o0
 
-RODATA(__ffstab)
+ffstab:
 	.byte	-24,1,2,1,3,1,2,1,4,1,2,1,3,1,2,1 /* 00-0f */
 	.byte	5,1,2,1,3,1,2,1,4,1,2,1,3,1,2,1	/* 10-1f */
 	.byte	6,1,2,1,3,1,2,1,4,1,2,1,3,1,2,1	/* 20-2f */

Index: src/common/lib/libc/arch/sparc64/string/ffs.S
diff -u src/common/lib/libc/arch/sparc64/string/ffs.S:1.1 src/common/lib/libc/arch/sparc64/string/ffs.S:1.2
--- src/common/lib/libc/arch/sparc64/string/ffs.S:1.1	Tue Dec 20 19:28:50 2005
+++ src/common/lib/libc/arch/sparc64/string/ffs.S	Sat Dec 19 19:09:48 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs.S,v 1.1 2005/12/20 19:28:50 christos Exp $	*/
+/*	$NetBSD: ffs.S,v 1.2 2009/12/19 19:09:48 pooka Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -40,7 +40,7 @@
 #if 0
 	.asciz "@(#)ffs.s	8.1 (Berkeley) 6/4/93"
 #else
-	RCSID("$NetBSD: ffs.S,v 1.1 2005/12/20 19:28:50 christos Exp $")
+	RCSID("$NetBSD: ffs.S,v 1.2 2009/12/19 19:09:48 pooka Exp $")
 #endif
 #endif  /* LIBC_SCCS and not lint */
 
@@ -82,9 +82,9 @@
  */
 ENTRY(ffs)
 #ifdef PIC
-	PICCY_SET(_C_LABEL(__ffstab), %o2, %o3)
+	PICCY_SET(ffstab, %o2, %o3)
 #else
-	set	_C_LABEL(__ffstab), %o2
+	set	ffstab, %o2
 #endif
 	andcc	%o0, 0xff, %o1	! get low byte
 	be,a	1f		! try again if 0
@@ -116,7 +116,7 @@
 	retl
 	 add	%o0, 24, %o0
 
-RODATA(__ffstab)
+ffstab:
 	.byte	-24,1,2,1,3,1,2,1,4,1,2,1,3,1,2,1 /* 00-0f */
 	.byte	5,1,2,1,3,1,2,1,4,1,2,1,3,1,2,1	/* 10-1f */
 	.byte	6,1,2,1,3,1,2,1,4,1,2,1,3,1,2,1	/* 20-2f */

Reply via email to