about summary refs log tree commit diff
path: root/linuxthreads
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-05-23 17:37:21 +0000
committerUlrich Drepper <drepper@redhat.com>2005-05-23 17:37:21 +0000
commitc179df4e9301ba09589aef60a038e259df70b5b9 (patch)
tree245814951fbffe0e37fc4a8b62955318423bbcaf /linuxthreads
parentceef26a28a2a22ef010ac57f501cc3f0a4271cff (diff)
downloadglibc-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 'linuxthreads')
-rw-r--r--linuxthreads/ChangeLog6
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h6
2 files changed, 9 insertions, 3 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 93f7e97c05..b37a40c3e7 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/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/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
index ea0c1f9f37..2f7c546a4c 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>, 2003.
 
@@ -82,8 +82,8 @@
 #  define CENABLE	bl __libc_enable_asynccancel@local
 #  define CDISABLE	bl __libc_disable_asynccancel@local
 # else
-#  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)
 # endif
 
 # ifdef HAVE_TLS_SUPPORT