(CENABLE, CDISABLE): For librt, append @PLT.

[kopensolaris-gnu/glibc.git] / linuxthreads / sysdeps / unix / sysv / linux / s390 / s390-64 / sysdep-cancel.h

diff --git a/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
index ce4afb1..f71ef3f 100644 (file)
--- a/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.

    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
 
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
 


@@ -23,7 +23,7 @@
 # include <linuxthreads/internals.h>
 #endif
 
 # 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)                                    \
 
 # undef PSEUDO
 # define PSEUDO(name, syscall_name, args)                                    \


@@ -51,17 +51,20 @@ ENTRY(name)                                                               \
 L(pseudo_check):                                                             \
        lghi    %r4,-4095;                                                    \
        clgr    %r2,%r4;                                                      \
 L(pseudo_check):                                                             \
        lghi    %r4,-4095;                                                    \
        clgr    %r2,%r4;                                                      \

-       jnl     SYSCALL_ERROR_LABEL;                                          \
+       jgnl    SYSCALL_ERROR_LABEL;                                          \

 L(pseudo_end):
 
 # ifdef IS_IN_libpthread
 #  define CENABLE      __pthread_enable_asynccancel
 #  define CDISABLE     __pthread_disable_asynccancel
 #  define __local_multiple_threads     __pthread_multiple_threads
 L(pseudo_end):
 
 # ifdef IS_IN_libpthread
 #  define CENABLE      __pthread_enable_asynccancel
 #  define CDISABLE     __pthread_disable_asynccancel
 #  define __local_multiple_threads     __pthread_multiple_threads

-# else
+# elif !defined NOT_IN_libc

 #  define CENABLE      __libc_enable_asynccancel
 #  define CDISABLE     __libc_disable_asynccancel
 #  define __local_multiple_threads     __libc_multiple_threads
 #  define CENABLE      __libc_enable_asynccancel
 #  define CDISABLE     __libc_disable_asynccancel
 #  define __local_multiple_threads     __libc_multiple_threads

+# else
+#  define CENABLE      __librt_enable_asynccancel@PLT
+#  define CDISABLE     __librt_disable_asynccancel@PLT

 # endif
 
 #define STM_0          /* Nothing */
 # endif
 
 #define STM_0          /* Nothing */


@@ -78,14 +81,31 @@ L(pseudo_end):
 #define LM_4           lmg %r2,%r5,16+160(%r15);
 #define LM_5           lmg %r2,%r5,16+160(%r15);
 
 #define LM_4           lmg %r2,%r5,16+160(%r15);
 #define LM_5           lmg %r2,%r5,16+160(%r15);
 

-# ifndef __ASSEMBLER__
+# if !defined NOT_IN_libc || defined IS_IN_libpthread
+#  ifndef __ASSEMBLER__

 extern int __local_multiple_threads attribute_hidden;
 extern int __local_multiple_threads attribute_hidden;

-#  define SINGLE_THREAD_P \
+#   define SINGLE_THREAD_P \

   __builtin_expect (__local_multiple_threads == 0, 1)
   __builtin_expect (__local_multiple_threads == 0, 1)

-# else
-#  define SINGLE_THREAD_P \
+#  else
+#   define SINGLE_THREAD_P \

        larl    %r1,__local_multiple_threads;                                 \
        icm     %r0,15,0(%r1);
        larl    %r1,__local_multiple_threads;                                 \
        icm     %r0,15,0(%r1);

+#  endif
+
+# else
+
+#  ifndef __ASSEMBLER__
+#   define SINGLE_THREAD_P \
+  __builtin_expect (THREAD_GETMEM (THREAD_SELF,                                      \
+                                  p_header.data.multiple_threads) == 0, 1)
+#  else
+#   define SINGLE_THREAD_P \
+       ear     %r1,%a0;                                                      \
+       sllg    %r1,%r1,32;                                                   \
+       ear     %r1,%a1;                                                      \
+       icm     %r1,15,MULTIPLE_THREADS_OFFSET(%r1);
+#  endif
+

 # endif
 
 #elif !defined __ASSEMBLER__
 # endif
 
 #elif !defined __ASSEMBLER__