OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix CFI annotations in pthread_cond_timedwait for i486+

This commit is contained in:
Andreas Schwab 2013-11-26 12:22:58 +01:00
parent be2f900916
commit caecf2a0ce
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
NEWS
View File

@ -15,13 +15,13 @@ Version 2.19
15089, 15218, 15268, 15277, 15308, 15362, 15374, 15400, 15425, 15427,
15483, 15522, 15531, 15532, 15601, 15608, 15609, 15610, 15632, 15640,
15670, 15672, 15680, 15681, 15723, 15734, 15735, 15736, 15748, 15749,
15754, 15760, 15763, 15764, 15797, 15799, 15825, 15844, 15847, 15849,
15855, 15856, 15857, 15859, 15867, 15886, 15887, 15890, 15892, 15893,
15895, 15897, 15901, 15905, 15909, 15915, 15917, 15919, 15921, 15923,
15939, 15941, 15948, 15963, 15966, 15985, 15988, 15997, 16032, 16034,
16036, 16037, 16038, 16041, 16055, 16071, 16072, 16074, 16077, 16078,
16103, 16112, 16143, 16144, 16146, 16150, 16151, 16153, 16167, 16172,
16195, 16214, 16245, 16271, 16274, 16283, 16289.
15754, 15760, 15763, 15764, 15797, 15799, 15825, 15843, 15844, 15847,
15849, 15855, 15856, 15857, 15859, 15867, 15886, 15887, 15890, 15892,
15893, 15895, 15897, 15901, 15905, 15909, 15915, 15917, 15919, 15921,
15923, 15939, 15941, 15948, 15963, 15966, 15985, 15988, 15997, 16032,
16034, 16036, 16037, 16038, 16041, 16055, 16071, 16072, 16074, 16077,
16078, 16103, 16112, 16143, 16144, 16146, 16150, 16151, 16153, 16167,
16172, 16195, 16214, 16245, 16271, 16274, 16283, 16289.
* The public headers no longer use __unused nor __block. This change is to
support compiling programs that are derived from BSD sources and use

7
nptl/ChangeLog
View File

@ -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

3
nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
View File

@ -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