about summary refs log tree commit diff
path: root/linuxthreads
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2003-06-25 03:22:03 +0000
committerRoland McGrath <roland@gnu.org>2003-06-25 03:22:03 +0000
commiteef4a9f3e1ca45870649c2b133e2097c607770e3 (patch)
treeee3a4ed68fdb080f8a8469ebf961d9f5de615800 /linuxthreads
parent1775abf061fd7a1868bb7e38fad8cb0a27f443fb (diff)
downloadglibc-eef4a9f3e1ca45870649c2b133e2097c607770e3.tar.gz
glibc-eef4a9f3e1ca45870649c2b133e2097c607770e3.tar.xz
glibc-eef4a9f3e1ca45870649c2b133e2097c607770e3.zip
* sysdeps/unix/sysv/linux/sh/sysdep-cancel.h: Support cancellation
	in librt.

	* sysdeps/unix/sysv/linux/alpha/Makefile (libpthread-routines):
Diffstat (limited to 'linuxthreads')
-rw-r--r--linuxthreads/ChangeLog7
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h7
2 files changed, 11 insertions, 3 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index b2fad82521..952c703804 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-20  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+	* sysdeps/unix/sysv/linux/sh/sysdep-cancel.h: Support cancellation
+	in librt.
+
 2003-06-21  Andreas Schwab  <schwab@suse.de>
 
 	* sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h: Support cancellation
@@ -5,7 +10,7 @@
 
 2003-06-20  Richard Henderson  <rth@redhat.com>
 
-	* sysdeps/unix/sysv/linux/alpha/Makefile (libpthread-routines): 
+	* sysdeps/unix/sysv/linux/alpha/Makefile (libpthread-routines):
 	Remove ptw-osf_sigprocmask.
 
 2003-06-18  Jakub Jelinek  <jakub@redhat.com>
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
index e6d0cca252..e7f2704b63 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h
@@ -23,7 +23,7 @@
 # include <linuxthreads/internals.h>
 #endif
 
-#if !defined NOT_IN_libc || defined IS_IN_libpthread
+#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
 
 # define _IMM12 #-12
 # define _IMM16 #-16
@@ -92,10 +92,13 @@
 #  define __local_enable_asynccancel	__pthread_enable_asynccancel
 #  define __local_disable_asynccancel	__pthread_disable_asynccancel
 #  define __local_multiple_threads	__pthread_multiple_threads
-# else
+# elif !defined NOT_IN_libc
 #  define __local_enable_asynccancel	__libc_enable_asynccancel
 #  define __local_disable_asynccancel	__libc_disable_asynccancel
 #  define __local_multiple_threads	__libc_multiple_threads
+# else
+#  define __local_enable_asynccancel	__librt_enable_asynccancel
+#  define __local_disable_asynccancel	__librt_disable_asynccancel
 # endif
 
 # define CENABLE \