about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2012-06-23 12:17:44 +0200
committerThomas Schwinge <thomas@codesourcery.com>2012-06-23 12:17:44 +0200
commit4b2c8da708024ca9f7a6f86bdb46cb8c0d6df275 (patch)
treef7ef8c1c73dc6780817a4b2c5da65ec35e52bcd3 /nptl
parent58f902b8d8cd47e8f4f2fcd64721a6289400422e (diff)
downloadglibc-4b2c8da708024ca9f7a6f86bdb46cb8c0d6df275.tar.gz
glibc-4b2c8da708024ca9f7a6f86bdb46cb8c0d6df275.tar.xz
glibc-4b2c8da708024ca9f7a6f86bdb46cb8c0d6df275.zip
SH: __lll_robust_timedlock_wait: Simplify CFI directives.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog5
-rw-r--r--nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S10
2 files changed, 9 insertions, 6 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index f53c2f2824..b5d0d7103c 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 7a192a9cc5..d2624dd990 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