GNU C Library master sources branch master updated. glibc-2.18-563-gcaecf2a

[schwab at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  caecf2a0ce760f03a7f5ffd63c9001cc1cfc2fbf (commit)
      from  be2f9009164c4836fbe44b3484739622188edf51 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=caecf2a0ce760f03a7f5ffd63c9001cc1cfc2fbf

commit caecf2a0ce760f03a7f5ffd63c9001cc1cfc2fbf
Author: Andreas Schwab <schwab@suse.de>
Date:   Tue Nov 26 12:22:58 2013 +0100

    Fix CFI annotations in pthread_cond_timedwait for i486+

diff --git a/NEWS b/NEWS
index 59ae1c2..4386b61 100644
--- 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 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

-----------------------------------------------------------------------

Summary of changes:
 NEWS                                               |   14 +++++++-------
 nptl/ChangeLog                                     |    7 +++++++
 .../sysv/linux/i386/i486/pthread_cond_timedwait.S  |    3 +--
 3 files changed, 15 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources