diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-04-20 04:28:00 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-04-20 04:28:00 +0000 |
| commit | d3b520289178bbe9c252c0a2784a529b89951945 (patch) | |
| tree | bbfda740b0fc0d4c64d817f7a24eb4be8ff269a5 /nptl | |
| parent | a5dd0a6caf0a45a945dadaa48a831e2215351e61 (diff) | |
| download | glibc-d3b520289178bbe9c252c0a2784a529b89951945.tar.gz glibc-d3b520289178bbe9c252c0a2784a529b89951945.tar.xz glibc-d3b520289178bbe9c252c0a2784a529b89951945.zip | |
Update.
2004-04-20 Jakub Jelinek <jakub@redhat.com> * stdio-common/vfscanf.c (_IO_vfscanf): When skipping whitespace, do input_error () instead of conv_error () and don't look at errno. Don't eat any whitespace before %% if skip_space == 0. * stdio-common/tst-sscanf.c (int_tests): New array. (main): Run int_tests. See ChangeLog.14 for earlier changes.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 7 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S | 20 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S | 13 |
3 files changed, 27 insertions, 13 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 0629811622..501791c661 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2004-04-19 Kaz Kojima <kkojima@rr.iij4u.or.jp> + + * sysdeps/unix/sysv/linux/sh/sem_timedwait.S: Add frame info. + Use HIDDEN_JUMPTARGET to jump to __pthread_unwind. + * sysdeps/unix/sysv/linux/sh/sem_wait.S: Remove unneeded frame + info. Use HIDDEN_JUMPTARGET to jump to __pthread_unwind. + 2004-04-19 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/timer_routines.c: Make sure helper diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S b/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S index 4832d4f358..dbeda87a6c 100644 --- a/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S +++ b/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -33,6 +33,7 @@ .globl sem_timedwait .type sem_timedwait,@function .align 5 + cfi_startproc sem_timedwait: /* First check for cancellation. */ stc gbr, r0 @@ -59,11 +60,22 @@ sem_timedwait: 1: /* Check whether the timeout value is valid. */ mov.l r8, @-r15 + cfi_adjust_cfa_offset(4) + cfi_rel_offset (r8, 0) mov.l r9, @-r15 + cfi_adjust_cfa_offset(4) + cfi_rel_offset (r9, 0) mov.l r10, @-r15 + cfi_adjust_cfa_offset(4) + cfi_rel_offset (r10, 0) mov.l r12, @-r15 + cfi_adjust_cfa_offset(4) + cfi_rel_offset (r12, 0) sts.l pr, @-r15 + cfi_adjust_cfa_offset(4) + cfi_rel_offset (pr, 0) add #-8, r15 + cfi_adjust_cfa_offset(8) mov r4, r8 mov r5, r9 @@ -193,8 +205,10 @@ sem_timedwait: stc gbr, r0 mov.w .Lclbuf, r1 mov.l .Lunwind, r2 - jmp @r2 + braf r2 mov.l @(r0,r1), r4 +.Lunwindb: + cfi_endproc .L1k: .word 1000 @@ -221,5 +235,5 @@ sem_timedwait: .Ldisable0: .long __pthread_disable_asynccancel-.Ldisable0b .Lunwind: - .long __pthread_unwind + .long HIDDEN_JUMPTARGET (__pthread_unwind)-.Lunwindb .size sem_timedwait,.-sem_timedwait diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S b/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S index 28f78b015e..d51f12aa54 100644 --- a/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S +++ b/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S @@ -121,18 +121,10 @@ __new_sem_wait: mov #-1, r0 9: lds.l @r15+, pr - cfi_adjust_cfa_offset (-4) - cfi_restore (pr) mov.l @r15+, r12 - cfi_adjust_cfa_offset (-4) - cfi_restore (r12) mov.l @r15+, r10 - cfi_adjust_cfa_offset (-4) - cfi_restore (r10) rts mov.l @r15+, r8 - cfi_adjust_cfa_offset (-4) - cfi_restore (r8) 5: /* Canceled. */ stc gbr, r0 @@ -144,8 +136,9 @@ __new_sem_wait: stc gbr, r0 mov.w .Lclbuf, r1 mov.l .Lunwind, r2 - jmp @r2 + braf r2 mov.l @(r0,r1), r4 +.Lunwindb: cfi_endproc .Lchand: @@ -169,6 +162,6 @@ __new_sem_wait: .Ldisable0: .long __pthread_disable_asynccancel-.Ldisable0b .Lunwind: - .long __pthread_unwind + .long HIDDEN_JUMPTARGET (__pthread_unwind)-.Lunwindb .size __new_sem_wait,.-__new_sem_wait versioned_symbol(libpthread, __new_sem_wait, sem_wait, GLIBC_2_1) |