summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2010-08-05 13:21:33 +0300
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2010-08-05 18:17:52 +0200
commita49b3a18e463cbe8c94c41501e386e7f4c61609e (patch)
tree441059def5a0f7c126a734157a9b83ef55a78594
parent0d289184bf512efb27d805f993e6e2c76f0fe8b3 (diff)
nptl: fix x86 assembly PIC relocations
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@iki.fi> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-rw-r--r--libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S2
-rw-r--r--libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S2
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