[git commit master 1/1] nptl: fix x86 assembly PIC relocations

Timo Teräs timo.teras at iki.fi
Thu Aug 5 16:17:52 UTC 2010


commit: http://git.uclibc.org/uClibc/commit/?id=a49b3a18e463cbe8c94c41501e386e7f4c61609e
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

Unwind_Resume needs to be called via PLT. Most calls are already proper,
this fix the remaining two problems.

Signed-off-by: Timo Teräs <timo.teras at iki.fi>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 .../sysv/linux/i386/i486/pthread_cond_timedwait.S  |    2 +-
 .../unix/sysv/linux/i386/i486/pthread_cond_wait.S  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
index 8a0c3fb..ac7983c 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
@@ -648,7 +648,7 @@ __condvar_tw_cleanup:
 
 	movl	%esi, (%esp)
 .LcallUR:
-	call	_Unwind_Resume
+	call	_Unwind_Resume at PLT
 	hlt
 .LENDCODE:
 	cfi_endproc
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
index 006fc51..abc963f 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
@@ -535,7 +535,7 @@ __condvar_w_cleanup:
 
 	movl	%esi, (%esp)
 .LcallUR:
-	call	_Unwind_Resume
+	call	_Unwind_Resume at PLT
 	hlt
 .LENDCODE:
 	cfi_endproc
-- 
1.7.1



More information about the uClibc-cvs mailing list