projects / kopensolaris-gnu / glibc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
(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 0e3daa5..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,45 +23,48 @@
 # 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)                                    \
        .text;                                                                \
 
 # undef PSEUDO
 # define PSEUDO(name, syscall_name, args)                                    \
        .text;                                                                \
-ENTRY(name)                                                                  \
-       SINGLE_THREAD_P                                                       \
-       jne     L(pseudo_cancel);                                             \
-       DO_CALL(syscall_name, args);                                          \
-       lghi    %r4,-4095;                                                    \
-       clgr    %r2,%r4;                                                      \
-       jnl     SYSCALL_ERROR_LABEL;                                          \
-       br      %r14;                                                         \
 L(pseudo_cancel):                                                            \
        STM_##args                                                            \
        stmg    %r13,%r15,104(%r15);                                          \
 L(pseudo_cancel):                                                            \
        STM_##args                                                            \
        stmg    %r13,%r15,104(%r15);                                          \
-       aghi    %r15,-192;                                                    \
+       lgr     %r14,%r15;                                                    \
+       aghi    %r15,-160;                                                    \
+       stg     %r14,0(%r15);                                                 \
        brasl   %r14,CENABLE;                                                 \
        brasl   %r14,CENABLE;                                                 \
-       lr      %r0,%r2;                                                      \
+       lgr     %r0,%r2;                                                      \
        LM_##args                                                             \
        DO_CALL(syscall_name, args);                                          \
        lgr     %r13,%r2;                                                     \
        LM_##args                                                             \
        DO_CALL(syscall_name, args);                                          \
        lgr     %r13,%r2;                                                     \
-       lr      %r2,%r0;                                                      \
+       lgr     %r2,%r0;                                                      \
        brasl   %r14,CDISABLE;                                                \
        lgr     %r2,%r13;                                                     \
        brasl   %r14,CDISABLE;                                                \
        lgr     %r2,%r13;                                                     \
-       lmg     %r13,%r15,104+192(%r15);                                      \
+       lmg     %r13,%r15,104+160(%r15);                                      \
+       j       L(pseudo_check);                                              \
+ENTRY(name)                                                                  \
+       SINGLE_THREAD_P                                                       \
+       jne     L(pseudo_cancel);                                             \
+       DO_CALL(syscall_name, args);                                          \
+L(pseudo_check):                                                             \
        lghi    %r4,-4095;                                                    \
        clgr    %r2,%r4;                                                      \
        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 */
@@ -72,20 +75,37 @@ L(pseudo_end):
 #define STM_5          stmg %r2,%r5,16(%r15);
 
 #define LM_0           /* Nothing */
 #define STM_5          stmg %r2,%r5,16(%r15);
 
 #define LM_0           /* Nothing */
-#define LM_1           lg %r2,16+192(%r15);
-#define LM_2           lmg %r2,%r3,16+192(%r15);
-#define LM_3           lmg %r2,%r4,16+192(%r15);
-#define LM_4           lmg %r2,%r5,16+192(%r15);
-#define LM_5           lmg %r2,%r5,16+192(%r15);
+#define LM_1           lg %r2,16+160(%r15);
+#define LM_2           lmg %r2,%r3,16+160(%r15);
+#define LM_3           lmg %r2,%r4,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__
GNU libc port to GNU/kOpenSolaris