diff options
| author | Andreas Schwab <schwab@suse.de> | 2013-11-26 12:22:58 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2013-12-09 13:53:41 +0100 |
| commit | caecf2a0ce760f03a7f5ffd63c9001cc1cfc2fbf (patch) | |
| tree | 1e0e60235803f844d82e0b9910bae04f96b9544b /nptl | |
| parent | be2f9009164c4836fbe44b3484739622188edf51 (diff) | |
| download | glibc-caecf2a0ce760f03a7f5ffd63c9001cc1cfc2fbf.zip glibc-caecf2a0ce760f03a7f5ffd63c9001cc1cfc2fbf.tar.gz glibc-caecf2a0ce760f03a7f5ffd63c9001cc1cfc2fbf.tar.bz2 | |
Fix CFI annotations in pthread_cond_timedwait for i486+
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 7 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 64dc17f..02e72a8 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2013-12-09 Andreas Schwab <schwab@suse.de> + + [BZ #15843] + * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S + (__pthread_cond_timedwait): Remove wrong cfi_adjust_cfa_offset + before __condvar_tw_cleanup2 label. + 2013-12-04 Ulrich Weigand <Ulrich.Weigand@de.ibm.com> * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S index a6d6bc4..b74e4b5 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S @@ -505,9 +505,9 @@ __pthread_cond_timedwait: #endif call __lll_unlock_wake jmp 11b - cfi_adjust_cfa_offset(-FRAME_SIZE) #ifndef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(-FRAME_SIZE) .Lreltmo: /* Get internal lock. */ movl $1, %edx @@ -742,7 +742,6 @@ __pthread_cond_timedwait: # endif call __lll_lock_wait jmp 106b - cfi_adjust_cfa_offset(-FRAME_SIZE) #endif .size __pthread_cond_timedwait, .-__pthread_cond_timedwait |