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 /linuxthreads/sysdeps | |
| parent | a5dd0a6caf0a45a945dadaa48a831e2215351e61 (diff) | |
| download | glibc-d3b520289178bbe9c252c0a2784a529b89951945.tar glibc-d3b520289178bbe9c252c0a2784a529b89951945.tar.gz glibc-d3b520289178bbe9c252c0a2784a529b89951945.tar.bz2 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 'linuxthreads/sysdeps')
| -rw-r--r-- | linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h | 42 |
1 files changed, 37 insertions, 5 deletions
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h index e7f2704b63..1ba48decb7 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h @@ -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 @@ -101,25 +101,57 @@ # define __local_disable_asynccancel __librt_disable_asynccancel # endif -# define CENABLE \ +# if defined IS_IN_librt && defined PIC +# define CENABLE \ + mov.l r12,@-r15; \ + mov.l 1f,r12; \ + mova 1f,r0; \ + add r0,r12; \ + mov.l 2f,r0; \ + bsrf r0; \ + nop; \ + 0: bra 3f; \ + mov r0,r2; \ + .align 2; \ + 1: .long _GLOBAL_OFFSET_TABLE_; \ + 2: .long __local_enable_asynccancel@PLT - (0b+2-.); \ + 3: mov.l @r15+,r12 + +# define CDISABLE \ + mov.l r12,@-r15; \ + mov.l 1f,r12; \ + mova 1f,r0; \ + add r0,r12; \ + mov.l 2f,r0; \ + bsrf r0; \ + mov r2,r4; \ + 0: bra 3f; \ + nop; \ + .align 2; \ + 1: .long _GLOBAL_OFFSET_TABLE_; \ + 2: .long __local_disable_asynccancel@PLT - (0b+2-.); \ + 3: mov.l @r15+,r12 +# else +# define CENABLE \ mov.l 1f,r0; \ bsrf r0; \ nop; \ 0: bra 2f; \ - nop; \ + mov r0,r2; \ .align 2; \ 1: .long __local_enable_asynccancel - 0b; \ 2: -# define CDISABLE \ +# define CDISABLE \ mov.l 1f,r0; \ bsrf r0; \ - nop; \ + mov r2,r4; \ 0: bra 2f; \ nop; \ .align 2; \ 1: .long __local_disable_asynccancel - 0b; \ 2: +# endif # ifndef __ASSEMBLER__ # if defined FLOATING_STACKS && USE___THREAD && defined PIC |