summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2003-06-20 23:15:54 +0000
committerAndreas Schwab <schwab@suse.de>2003-06-20 23:15:54 +0000
commita10d475d97085af84de3fc278346765ff0cfd466 (patch)
tree36853e62d52827315e551426c0045391f4184040
parent27681b99303c9c805a7b6beb185595879a6cc1ce (diff)
downloadglibc-a10d475d97085af84de3fc278346765ff0cfd466.tar.gz
glibc-a10d475d97085af84de3fc278346765ff0cfd466.tar.xz
glibc-a10d475d97085af84de3fc278346765ff0cfd466.zip
Support cancellation in librt.
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h16
1 files changed, 13 insertions, 3 deletions
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h
index c91ebb2626..bb798e40d6 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h
@@ -22,7 +22,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
 
 # undef PSEUDO
 # define PSEUDO(name, syscall_name, args)				      \
@@ -84,7 +84,7 @@
 #   define CENABLE	jbsr __pthread_enable_asynccancel
 #   define CDISABLE	jbsr __pthread_disable_asynccancel
 #  endif
-# else
+# elif !defined NOT_IN_libc
 #  ifdef PIC
 #   define CENABLE	jbsr __libc_enable_asynccancel@PLTPC
 #   define CDISABLE	jbsr __libc_disable_asynccancel@PLTPC
@@ -92,12 +92,22 @@
 #   define CENABLE	jbsr __libc_enable_asynccancel
 #   define CDISABLE	jbsr __libc_disable_asynccancel
 #  endif
+# else
+#  ifdef PIC
+#   define CENABLE	jbsr __librt_enable_asynccancel@PLTPC
+#   define CDISABLE	jbsr __librt_disable_asynccancel@PLTPC
+#  else
+#   define CENABLE	jbsr __librt_enable_asynccancel
+#   define CDISABLE	jbsr __librt_disable_asynccancel
+#  endif
 # endif
 
 # if !defined NOT_IN_libc
 #  define __local_multiple_threads __libc_multiple_threads
-# else
+# elif defined IS_IN_libpthread
 #  define __local_multiple_threads __pthread_multiple_threads
+# else
+#  define __local_multiple_threads __librt_multiple_threads
 # endif
 
 # ifndef __ASSEMBLER__