This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.15-1210-g4b2c8da
- From: tschwinge at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 23 Jun 2012 10:20:26 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-1210-g4b2c8da
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 4b2c8da708024ca9f7a6f86bdb46cb8c0d6df275 (commit)
from 58f902b8d8cd47e8f4f2fcd64721a6289400422e (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4b2c8da708024ca9f7a6f86bdb46cb8c0d6df275
commit 4b2c8da708024ca9f7a6f86bdb46cb8c0d6df275
Author: Thomas Schwinge <thomas@codesourcery.com>
Date: Sat Jun 23 12:17:44 2012 +0200
SH: __lll_robust_timedlock_wait: Simplify CFI directives.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index f53c2f2..b5d0d71 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-23 Thomas Schwinge <thomas@codesourcery.com>
+
+ * sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S
+ (__lll_robust_timedlock_wait): Simplify CFI directives.
+
2012-06-20 Siddhesh Poyarekar <siddhesh@redhat.com>
[BZ #12416]
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S b/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S
index 7a192a9..d2624dd 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S
@@ -139,6 +139,8 @@ __lll_robust_timedlock_wait:
cmp/hs r0, r1
bt 3f
+ cfi_remember_state
+
mov.l r11, @-r15
cfi_adjust_cfa_offset(4)
cfi_rel_offset (r11, 0)
@@ -258,13 +260,9 @@ __lll_robust_timedlock_wait:
8:
bra 6b
mov #ETIMEDOUT, r0
+
+ cfi_restore_state
3:
- /* Restore initial state for invalid timeout case. */
- cfi_restore (r8)
- cfi_restore (r9)
- cfi_restore (r10)
- cfi_restore (r11)
- cfi_def_cfa_offset (0)
rts
mov #EINVAL, r0
cfi_endproc
-----------------------------------------------------------------------
Summary of changes:
nptl/ChangeLog | 5 +++++
.../unix/sysv/linux/sh/lowlevelrobustlock.S | 10 ++++------
2 files changed, 9 insertions(+), 6 deletions(-)
hooks/post-receive
--
GNU C Library master sources