svn commit: trunk/uClibc/libc/string/arm

psm at uclibc.org psm at uclibc.org
Fri Nov 11 23:59:22 UTC 2005


Author: psm
Date: 2005-11-11 15:59:19 -0800 (Fri, 11 Nov 2005)
New Revision: 12216

Log:
Add hidden versions, add missing .size

Modified:
   trunk/uClibc/libc/string/arm/bcopy.S
   trunk/uClibc/libc/string/arm/bzero.S
   trunk/uClibc/libc/string/arm/memcmp.S
   trunk/uClibc/libc/string/arm/memcpy.S
   trunk/uClibc/libc/string/arm/memmove.S
   trunk/uClibc/libc/string/arm/memset.S
   trunk/uClibc/libc/string/arm/strcmp.S
   trunk/uClibc/libc/string/arm/strlen.S
   trunk/uClibc/libc/string/arm/strncmp.S


Changeset:
Modified: trunk/uClibc/libc/string/arm/bcopy.S
===================================================================
--- trunk/uClibc/libc/string/arm/bcopy.S	2005-11-11 22:41:52 UTC (rev 12215)
+++ trunk/uClibc/libc/string/arm/bcopy.S	2005-11-11 23:59:19 UTC (rev 12216)
@@ -39,14 +39,19 @@
 
 /* bcopy = memcpy/memmove with arguments reversed. */
 
+.global bcopy
+.set bcopy,__bcopy
 .text
-.global bcopy
-.type bcopy,%function
+.global __bcopy
+.hidden __bcopy
+.type __bcopy,%function
 .align 4
 
-bcopy:
+__bcopy:
 	/* switch the source and destination registers */
 	eor     r0, r1, r0 
 	eor     r1, r0, r1 
 	eor     r0, r1, r0 
 	b	_memcpy (PLT)
+	
+.size __bcopy,.-__bcopy

Modified: trunk/uClibc/libc/string/arm/bzero.S
===================================================================
--- trunk/uClibc/libc/string/arm/bzero.S	2005-11-11 22:41:52 UTC (rev 12215)
+++ trunk/uClibc/libc/string/arm/bzero.S	2005-11-11 23:59:19 UTC (rev 12216)
@@ -47,4 +47,6 @@
 	mov	r1, #0
 	b	memset (PLT)
 
+.size __bzero,.-__bzero
+
 .weak bzero ; bzero = __bzero

Modified: trunk/uClibc/libc/string/arm/memcmp.S
===================================================================
--- trunk/uClibc/libc/string/arm/memcmp.S	2005-11-11 22:41:52 UTC (rev 12215)
+++ trunk/uClibc/libc/string/arm/memcmp.S	2005-11-11 23:59:19 UTC (rev 12216)
@@ -30,12 +30,15 @@
  */
 
 
+.global memcmp
+.set memcmp,__memcmp
 .text
-.global memcmp
-.type memcmp,%function
+.global __memcmp
+.hidden __memcmp
+.type __memcmp,%function
 .align 4
 
-memcmp:
+__memcmp:
 	/* if ((len - 1) < 0) return 0 */
 	subs	r2, r2, #1
 	movmi	r0, #0
@@ -52,4 +55,5 @@
 	sub	r0, r2, r3
 	mov	pc, lr
 
+.size __memcmp,.-__memcmp
 .weak bcmp ; bcmp = memcmp

Modified: trunk/uClibc/libc/string/arm/memcpy.S
===================================================================
--- trunk/uClibc/libc/string/arm/memcpy.S	2005-11-11 22:41:52 UTC (rev 12215)
+++ trunk/uClibc/libc/string/arm/memcpy.S	2005-11-11 23:59:19 UTC (rev 12216)
@@ -37,12 +37,17 @@
  * by Erik Andersen <andersen at codepoet.org>
  */
 
+.global memcpy
+.set memcpy,__memcpy
 .text
-.global memcpy
-.type memcpy,%function
+.global __memcpy
+.hidden __memcpy
+.type __memcpy,%function
 .align 4
 
-memcpy:
+__memcpy:
 	stmfd	sp!, {r0, lr}
 	bl	_memcpy (PLT)
 	ldmfd	sp!, {r0, pc}
+
+.size __memcpy,.-__memcpy

Modified: trunk/uClibc/libc/string/arm/memmove.S
===================================================================
--- trunk/uClibc/libc/string/arm/memmove.S	2005-11-11 22:41:52 UTC (rev 12215)
+++ trunk/uClibc/libc/string/arm/memmove.S	2005-11-11 23:59:19 UTC (rev 12216)
@@ -37,12 +37,17 @@
  * by Erik Andersen <andersen at codepoet.org>
  */
 
+.global memmove
+.set memmove,__memmove
 .text
-.global memmove
-.type memmove,%function
+.global __memmove
+.hidden __memmove
+.type __memmove,%function
 .align 4
 
-memmove:
+__memmove:
 	stmfd	sp!, {r0, lr}
 	bl	_memcpy (PLT)
 	ldmfd	sp!, {r0, pc}
+
+.size __memmove,.-__memmove

Modified: trunk/uClibc/libc/string/arm/memset.S
===================================================================
--- trunk/uClibc/libc/string/arm/memset.S	2005-11-11 22:41:52 UTC (rev 12215)
+++ trunk/uClibc/libc/string/arm/memset.S	2005-11-11 23:59:19 UTC (rev 12216)
@@ -19,12 +19,15 @@
 
 #include <sys/syscall.h>
 
+.global memset
+.set memset,__memset
 .text
-.global memset
-.type memset,%function
+.global __memset
+.hidden __memset
+.type __memset,%function
 .align 4
 
-memset:
+__memset:
 	mov	a4, a1
 	cmp	a3, $8		@ at least 8 bytes to do?
 	blt	2f
@@ -68,4 +71,4 @@
 	strb	a2, [a4], $1
 	mov	pc, lr
 
-.size memset,.-memset
+.size __memset,.-__memset

Modified: trunk/uClibc/libc/string/arm/strcmp.S
===================================================================
--- trunk/uClibc/libc/string/arm/strcmp.S	2005-11-11 22:41:52 UTC (rev 12215)
+++ trunk/uClibc/libc/string/arm/strcmp.S	2005-11-11 23:59:19 UTC (rev 12216)
@@ -29,12 +29,15 @@
  * by Erik Andersen <andersen at codepoet.org>
  */
 
+.global strcmp
+.set strcmp,__strcmp
 .text
-.global strcmp
-.type strcmp,%function
+.global __strcmp
+.hidden __strcmp
+.type __strcmp,%function
 .align 4
 
-strcmp:
+__strcmp:
 1:
 	ldrb	r2, [r0], #1
 	ldrb	r3, [r1], #1
@@ -44,4 +47,5 @@
 	sub	r0, r2, r3
 	mov	pc, lr
 
+.size __strcmp,.-__strcmp
 .weak strcoll ; strcoll = strcmp

Modified: trunk/uClibc/libc/string/arm/strlen.S
===================================================================
--- trunk/uClibc/libc/string/arm/strlen.S	2005-11-11 22:41:52 UTC (rev 12215)
+++ trunk/uClibc/libc/string/arm/strlen.S	2005-11-11 23:59:19 UTC (rev 12216)
@@ -25,12 +25,15 @@
  * exit: r0 = len
  */
 
+.global strlen
+.set strlen,__strlen
 .text
-.global strlen
-.type strlen,%function
+.global __strlen
+.hidden __strlen
+.type __strlen,%function
 .align 4
 
-strlen:
+__strlen:
 	bic     r1, r0, $3              @ addr of word containing first byte
 	ldr     r2, [r1], $4            @ get the first word
 	ands    r3, r0, $3              @ how many bytes are duff?
@@ -76,4 +79,4 @@
 #endif
 	mov	pc,lr
 
-.size strlen,.-strlen
+.size __strlen,.-__strlen

Modified: trunk/uClibc/libc/string/arm/strncmp.S
===================================================================
--- trunk/uClibc/libc/string/arm/strncmp.S	2005-11-11 22:41:52 UTC (rev 12215)
+++ trunk/uClibc/libc/string/arm/strncmp.S	2005-11-11 23:59:19 UTC (rev 12216)
@@ -29,12 +29,15 @@
  * by Erik Andersen <andersen at codepoet.org>
  */
 
+.global strncmp
+.set strncmp,__strncmp
 .text
-.global strncmp
-.type strncmp,%function
+.global __strncmp
+.hidden __strncmp
+.type __strncmp,%function
 .align 4
 
-strncmp:
+__strncmp:
 	/* if (len == 0) return 0 */
 	cmp	r2, #0
 	moveq	r0, #0
@@ -52,3 +55,5 @@
 	beq	1b
 	sub	r0, r2, r3
 	mov	pc, lr
+
+.size __strncmp,.-__strncmp




More information about the uClibc-cvs mailing list