about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2005-05-23 17:00:31 +0000
committerJakub Jelinek <jakub@redhat.com>2005-05-23 17:00:31 +0000
commit20e33a2a2a0fff6daf56da95d08dc6d9c842d45f (patch)
treea1c9b9c0848606ffba15af4a89d452edcd02ea47
parent1e099837ad6208f3d8276fd4d049a23cbdd911d7 (diff)
downloadglibc-20e33a2a2a0fff6daf56da95d08dc6d9c842d45f.tar.gz
glibc-20e33a2a2a0fff6daf56da95d08dc6d9c842d45f.tar.xz
glibc-20e33a2a2a0fff6daf56da95d08dc6d9c842d45f.zip
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
	[IS_IN_librt] (CENABLE, CDISABLE): Use JUMPTARGET instead of
	bl __librt_*_asynccancel@local.

	* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
	[IS_IN_librt] (CENABLE, CDISABLE): Use JUMPTARGET instead of
	bl __librt_*_asynccancel@local.
-rw-r--r--linuxthreads/ChangeLog6
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h6
-rw-r--r--nptl/ChangeLog6
-rw-r--r--nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h6
4 files changed, 18 insertions, 6 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 35f21921db..3c5ca9cbd4 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
+	bl __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..42519cd94a 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	JUMPTARGET(__librt_enable_asynccancel)
+#  define CDISABLE	JUMPTARGET(__librt_disable_asynccancel)
 # endif
 
 # ifdef HAVE_TLS_SUPPORT
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 82d01308fc..2f429d4910 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
+	bl __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..1027dac4d8 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	JUMPTARGET(__librt_enable_asynccancel)
+#  define CDISABLE	JUMPTARGET(__librt_disable_asynccancel)
 # else
 #  error Unsupported library
 # endif