From a49b3a18e463cbe8c94c41501e386e7f4c61609e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Thu, 5 Aug 2010 13:21:33 +0300 Subject: nptl: fix x86 assembly PIC relocations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Bernhard Reutner-Fischer --- .../nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S | 2 +- libpthread/nptl/sysdeps/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 8a0c3fbf6..ac7983c49 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@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 006fc510c..abc963f07 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@PLT hlt .LENDCODE: cfi_endproc -- cgit v1.2.3