diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-12-14 14:50:49 +0100 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-12-14 14:54:26 +0100 |
| commit | e018b8ba1a0110120429de34366459af0771abe2 (patch) | |
| tree | cc38652121c59fdf43e94ccc3d13b62bdc481338 /libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S | |
| parent | d181797c70183b897330a290e6f5f5d7e7812770 (diff) | |
| parent | 640220faf25659eb4c15b78cf8869251dbadbd16 (diff) | |
Merge commit 'origin/master' into prelink
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S')
| -rw-r--r-- | libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S | 4 |
1 files changed, 4 insertions, 0 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 ac7983c49..3b61367e1 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,6 +648,10 @@ __condvar_tw_cleanup: movl %esi, (%esp) .LcallUR: +#ifdef __PIC__ + call __i686.get_pc_thunk.bx + addl $_GLOBAL_OFFSET_TABLE_, %ebx +#endif call _Unwind_Resume@PLT hlt .LENDCODE: |