diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-06-25 21:30:45 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-06-25 21:30:45 +0000 |
| commit | 5043a6ad2450235873e1a14c1b0a10ba779304d1 (patch) | |
| tree | f9be4e84a0936ee1c62f8ce8be8ff1799fdbc806 /libc/nptl | |
| parent | e86ff722e7f38c0ad5dce27190e18f5e8741b626 (diff) | |
Merge changes between r19234 and r19292 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@19293 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/nptl')
| -rw-r--r-- | libc/nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/libc/nptl/ChangeLog b/libc/nptl/ChangeLog index f53c2f282..b5d0d7103 100644 --- a/libc/nptl/ChangeLog +++ b/libc/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/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S b/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S index 7a192a9cc..d2624dd99 100644 --- a/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S +++ b/libc/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 |