Fix CFI annotations in pthread_cond_timedwait for i486+

diff --git a/NEWS b/NEWS
index 59ae1c236ce665e64284c9dbe481ea14f8ae1fb6..4386b61421b1db7b92566ab46a805e89bc8b68fd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 64dc17f2547f729550e47eb3e9b6f27f10ea7729..02e72a8339ffdd1e86d6f2ca66a3e715b07bed83 100644 (file)
--- 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 a6d6bc460a2fd7fbf57063761791d96491a81ee2..b74e4b541935c4b59c4de4b60aeaeb5a97707c24 100644 (file)
--- 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