* 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.

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 35f21921db3d273ccf7cc0295a914ce396738bf3..3c5ca9cbd439181945c9b1a272db709d7aefb28c 100644 (file)
--- 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 ea0c1f9f37bb78d6a284330564dbbd73386e97b1..42519cd94aeba29e755e1bc4e40056752cb3147c 100644 (file)
--- 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 82d01308fcbb5196d2d9bf43461e341420dd807e..2f429d4910470dd461714a3155e92cfd5b5ccb70 100644 (file)
--- 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 c61b3a66bb6903949ce3c57f6bbe177040335d94..1027dac4d8ce81cc0d5066566d2351ad204a147d 100644 (file)
--- 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