svn commit: trunk/uClibc/libc/sysdeps/linux: alpha ia64 powerpc

psm at uclibc.org psm at uclibc.org
Fri Mar 10 08:50:28 UTC 2006


Author: psm
Date: 2006-03-10 00:50:27 -0800 (Fri, 10 Mar 2006)
New Revision: 14510

Log:
Remove duplicate hidden __curbrk (ppc), make use of the hidden versions

Modified:
   trunk/uClibc/libc/sysdeps/linux/alpha/brk.S
   trunk/uClibc/libc/sysdeps/linux/ia64/brk.S
   trunk/uClibc/libc/sysdeps/linux/powerpc/brk.S


Changeset:
Modified: trunk/uClibc/libc/sysdeps/linux/alpha/brk.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/alpha/brk.S	2006-03-10 08:46:36 UTC (rev 14509)
+++ trunk/uClibc/libc/sysdeps/linux/alpha/brk.S	2006-03-10 08:50:27 UTC (rev 14510)
@@ -68,7 +68,7 @@
 
 	/* Update __curbrk and return cleanly.  */
 	mov	$31, $0
-$ok:	stq	$16, __curbrk
+$ok:	stq	$16, HIDDEN_JUMPTARGET(__curbrk)
 	addq	$30, 8, $30
 	ret
 

Modified: trunk/uClibc/libc/sysdeps/linux/ia64/brk.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/ia64/brk.S	2006-03-10 08:46:36 UTC (rev 14509)
+++ trunk/uClibc/libc/sysdeps/linux/ia64/brk.S	2006-03-10 08:50:27 UTC (rev 14510)
@@ -31,14 +31,15 @@
 	.align	8
 __curbrk:
 	data8	0
+libc_hidden_data_def(__curbrk)
 
 weak_alias (__curbrk, ___brk_addr)
 
-LEAF(__brk)
+LEAF(brk)
 	.regstk 1, 0, 0, 0
 	DO_CALL(__NR_brk)
 	cmp.ltu	p6, p0 = ret0, in0
-	addl r9 = @ltoff(__curbrk), gp
+	addl r9 = @ltoff(HIDDEN_JUMPTARGET(__curbrk)), gp
 	;;
 	ld8 r9 = [r9]
 (p6) 	mov ret0 = ENOMEM
@@ -47,6 +48,5 @@
 	st8 [r9] = ret0
 	mov ret0 = 0
 	ret
-END(__brk)
-
-weak_alias (__brk, brk)
+END(brk)
+libc_hidden_def(brk)

Modified: trunk/uClibc/libc/sysdeps/linux/powerpc/brk.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/powerpc/brk.S	2006-03-10 08:46:36 UTC (rev 14509)
+++ trunk/uClibc/libc/sysdeps/linux/powerpc/brk.S	2006-03-10 08:50:27 UTC (rev 14510)
@@ -52,12 +52,12 @@
 	mflr    r4
 	bl      _GLOBAL_OFFSET_TABLE_ at local-4
 	mflr    r5
-	lwz     r5,__curbrk at got(r5)
+	lwz     r5,HIDDEN_JUMPTARGET(__curbrk)@got(r5)
 	mtlr    r4
 	stw     r3,0(r5)
 #else
-	lis     r4,__curbrk at ha
-	stw     r3,__curbrk at l(r4)
+	lis     r4,HIDDEN_JUMPTARGET(__curbrk)@ha
+	stw     r3,HIDDEN_JUMPTARGET(__curbrk)@l(r4)
 #endif
 	cmplw   r6,r3
 	addi    r1,r1,16
@@ -70,6 +70,4 @@
 	.size brk,.-brk
 
 libc_hidden_def(brk)
-/* won't help too much, HIDDEN_JUMPTARGET should be used here as well, now the reloc remains */
-libc_hidden_data_def(__curbrk)
 #endif	




More information about the uClibc-cvs mailing list