diff options
author | Ulrich Drepper <drepper@redhat.com> | 2005-05-23 17:37:21 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2005-05-23 17:37:21 +0000 |
commit | c179df4e9301ba09589aef60a038e259df70b5b9 (patch) | |
tree | 245814951fbffe0e37fc4a8b62955318423bbcaf /nptl | |
parent | ceef26a28a2a22ef010ac57f501cc3f0a4271cff (diff) | |
download | glibc-c179df4e9301ba09589aef60a038e259df70b5b9.tar.gz glibc-c179df4e9301ba09589aef60a038e259df70b5b9.tar.xz glibc-c179df4e9301ba09589aef60a038e259df70b5b9.zip |
[BZ #961]
2005-05-22 Dmitry V. Levin <ldv@altlinux.org> [BZ #961] * io/sys/sendfile.h: Remove __nonnull from sendfile and sendfile64 declarations.
Diffstat (limited to 'nptl')
-rw-r--r-- | nptl/ChangeLog | 6 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index ab0f680adb..b5ec0e44d1 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,9 @@ +2005-05-23 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h + [IS_IN_librt] (CENABLE, CDISABLE): Use JUMPTARGET instead of + __librt_*_asynccancel@local. + 2005-05-17 Alan Modra <amodra@bigpond.net.au> * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: Delete diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h index c61b3a66bb..393c171eef 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h @@ -1,5 +1,5 @@ /* Cancellable system call stubs. Linux/PowerPC version. - Copyright (C) 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>, 2003. @@ -91,8 +91,8 @@ # define CENABLE bl __libc_enable_asynccancel@local # define CDISABLE bl __libc_disable_asynccancel@local # elif defined IS_IN_librt -# define CENABLE bl __librt_enable_asynccancel@local -# define CDISABLE bl __librt_disable_asynccancel@local +# define CENABLE bl JUMPTARGET(__librt_enable_asynccancel) +# define CDISABLE bl JUMPTARGET(__librt_disable_asynccancel) # else # error Unsupported library # endif |