Skip to content

Commit

Permalink
SH: __lll_robust_timedlock_wait: Simplify CFI directives.
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Schwinge committed Jun 23, 2012
1 parent 58f902b commit 4b2c8da
Showing 2 changed files with 9 additions and 6 deletions.
5 changes: 5 additions & 0 deletions nptl/ChangeLog
Original file line number Diff line number Diff line change
@@ -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]
10 changes: 4 additions & 6 deletions nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 4b2c8da

Please sign in to comment.