aboutsummaryrefslogtreecommitdiff
path: root/linuxthreads/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-04-19 06:51:29 +0000
committerUlrich Drepper <drepper@redhat.com>2004-04-19 06:51:29 +0000
commit72c41589771584da6693ca8a340a19d1cd6bef06 (patch)
tree5f9c337216256e83828a1dde9814893b7e60e742 /linuxthreads/sysdeps
parente832919bd092ad265b724eb4a96d5f8ceaaafbaf (diff)
downloadglibc-72c41589771584da6693ca8a340a19d1cd6bef06.tar
glibc-72c41589771584da6693ca8a340a19d1cd6bef06.tar.gz
glibc-72c41589771584da6693ca8a340a19d1cd6bef06.tar.bz2
glibc-72c41589771584da6693ca8a340a19d1cd6bef06.zip
Update.
2004-04-18 Randolph Chung <tausq@debian.org> * sysdeps/hppa/elf/entry.h: New file. * sysdeps/hppa/machine-gmon.h: New file. * sysdeps/unix/sysv/linux/hppa/profil-counter.h: Don't use x86 version.
Diffstat (limited to 'linuxthreads/sysdeps')
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h45
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h6
2 files changed, 43 insertions, 8 deletions
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
index fb9348ba9b..06f7aed7dc 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32/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.
@@ -25,9 +25,9 @@
#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
-# undef PSEUDO
-# define PSEUDO(name, syscall_name, args) \
- .text; \
+# if !defined NOT_IN_libc || defined IS_IN_libpthread
+
+# define PSEUDO_CANCEL(name, syscall_name, args) \
L(pseudo_cancel): \
STM_##args \
stm %r12,%r15,48(%r15); \
@@ -48,7 +48,42 @@ L(pseudo_cancel): \
lm %r12,%r15,48+96(%r15); \
j L(pseudo_check); \
1: .long CENABLE-0b; \
-2: .long CDISABLE-0b; \
+2: .long CDISABLE-0b;
+
+# else /* !libc.so && !libpthread.so */
+
+# define PSEUDO_CANCEL(name, syscall_name, args) \
+L(pseudo_cancel): \
+ STM_##args \
+ stm %r11,%r15,44(%r15); \
+ lr %r14,%r15; \
+ ahi %r15,-96; \
+ st %r14,0(%r15); \
+ basr %r13,0; \
+0: l %r12,3f-0b(%r13); \
+ l %r1,1f-0b(%r13); \
+ la %r12,0(%r12,%r13); \
+ bas %r14,0(%r1,%r13); \
+ lr %r0,%r2; \
+ LM_##args \
+ DO_CALL(syscall_name, args); \
+ l %r1,2f-0b(%r13); \
+ lr %r11,%r2; \
+ lr %r2,%r0; \
+ bas %r14,0(%r1,%r13); \
+ lr %r2,%r11; \
+ lm %r11,%r15,44+96(%r15); \
+ j L(pseudo_check); \
+1: .long CENABLE@PLT-0b; \
+2: .long CDISABLE@PLT-0b; \
+3: .long _GLOBAL_OFFSET_TABLE_-0b;
+
+# endif
+
+# undef PSEUDO
+# define PSEUDO(name, syscall_name, args) \
+ .text; \
+PSEUDO_CANCEL(name, syscall_name, args) \
ENTRY(name) \
SINGLE_THREAD_P(%r1) \
jne L(pseudo_cancel); \
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 e3c2a58f46..f71ef3f689 100644
--- 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.
@@ -63,8 +63,8 @@ L(pseudo_end):
# define CDISABLE __libc_disable_asynccancel
# define __local_multiple_threads __libc_multiple_threads
# else
-# define CENABLE __librt_enable_asynccancel
-# define CDISABLE __librt_disable_asynccancel
+# define CENABLE __librt_enable_asynccancel@PLT
+# define CDISABLE __librt_disable_asynccancel@PLT
# endif
#define STM_0 /* Nothing */