From 5777d565adb19dd2133c71be65455b8551f3ea43 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 3 Sep 2003 02:53:32 +0000 Subject: Update. * sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h (PSEUDO): Also defined symbol for entry point to avoid cancellation. * sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h (PSEUDO): Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h (PSEUDO): Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h (PSEUDO): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h (PSEUDO): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h (PSEUDO): Likewise. * sysdeps/unix/sysv/linux/i386/not-cancel.h (__open_nocancel, __close_nocancel, __read_nocancel, __write_nocancel, __waitpid_nocancel): Add attribute_hidden. If not in libc.so, libpthread.so or librt.so, define to corresponding function without _nocancel suffix. * sysdeps/unix/sysv/linux/s390/not-cancel.h: New file. * sysdeps/unix/sysv/linux/powerpc/not-cancel.h: New file. * sysdeps/unix/sysv/linux/sparc/not-cancel.h: New file. --- nptl/sysdeps/unix/sysv/linux/sparc/not-cancel.h | 1 + nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h | 4 ++++ nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h | 4 ++++ 3 files changed, 9 insertions(+) create mode 100644 nptl/sysdeps/unix/sysv/linux/sparc/not-cancel.h (limited to 'nptl/sysdeps/unix/sysv/linux/sparc') diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/not-cancel.h b/nptl/sysdeps/unix/sysv/linux/sparc/not-cancel.h new file mode 100644 index 0000000000..acf1a617e3 --- /dev/null +++ b/nptl/sysdeps/unix/sysv/linux/sparc/not-cancel.h @@ -0,0 +1 @@ +#include "../i386/not-cancel.h" diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h index a342064d9d..79d0305cfb 100644 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h @@ -32,10 +32,14 @@ ENTRY(name) \ ld [%g7 + MULTIPLE_THREADS_OFFSET], %g1; \ cmp %g1, 0; \ bne 1f; \ +.type __##syscall_name##_nocancel,@function; \ +.globl __##syscall_name##_nocancel; \ +__##syscall_name##_nocancel: \ mov SYS_ify(syscall_name), %g1; \ ta 0x10; \ bcs __syscall_error_handler; \ nop; \ +.size __##syscall_name##_nocancel,.-__##syscall_name##_nocancel; \ .subsection 2; \ cfi_startproc; \ 1: save %sp, -96, %sp; \ diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h index 0835c917db..efcb7dd200 100644 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h @@ -31,10 +31,14 @@ ENTRY(name) \ ld [%g7 + MULTIPLE_THREADS_OFFSET], %g1; \ brnz,pn %g1, 1f; \ +.type __##syscall_name##_nocancel,@function; \ +.globl __##syscall_name##_nocancel; \ +__##syscall_name##_nocancel: \ mov SYS_ify(syscall_name), %g1; \ ta 0x6d; \ bcs,pn %xcc, __syscall_error_handler; \ nop; \ +.size __##syscall_name##_nocancel,.-__##syscall_name##_nocancel; \ .subsection 2; \ 1: save %sp, -192, %sp; \ CENABLE; \ -- cgit 1.4.1