diff options
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux')
11 files changed, 30 insertions, 28 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h index 0dead61c6a..8142455781 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2002. @@ -99,30 +99,30 @@ L(ENDFDE): \ .previous -#ifdef SHARED +# ifdef SHARED /* NUL-terminated augmentation string. Note "z" means there is an augmentation value later on. */ -# define AUGMENTATION_STRING .string "zR" -# define AUGMENTATION_PARAM \ +# define AUGMENTATION_STRING .string "zR" +# define AUGMENTATION_PARAM \ /* Augmentation value length. */ \ .uleb128 1; \ /* Encoding: DW_EH_PE_pcrel + DW_EH_PE_sdata4. */ \ .byte 0x1b; -# define AUGMENTATION_PARAM_FDE \ +# define AUGMENTATION_PARAM_FDE \ /* No augmentation data. */ \ .uleb128 0; -# define START_SYMBOL_REF(name) \ +# define START_SYMBOL_REF(name) \ /* PC-relative start address of the code. */ \ .long L(name##START)-. -#else +# else /* No augmentation. */ -# define AUGMENTATION_STRING .ascii "\0" -# define AUGMENTATION_PARAM /* nothing */ -# define AUGMENTATION_PARAM_FDE /* nothing */ -# define START_SYMBOL_REF(name) \ +# define AUGMENTATION_STRING .ascii "\0" +# define AUGMENTATION_PARAM /* nothing */ +# define AUGMENTATION_PARAM_FDE /* nothing */ +# define START_SYMBOL_REF(name) \ /* Absolute start address of the code. */ \ .long L(name##START) -#endif +# endif /* Callframe description for syscalls without parameters. This is very simple. The only place the stack pointer is changed is when the old @@ -373,7 +373,7 @@ #elif !defined __ASSEMBLER__ -/* This code should never be used but we define it anyhow. */ # define SINGLE_THREAD_P (1) +# define NO_CANCELLATION 1 #endif diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h index 619f28c4aa..63aaa96eb0 100644 --- a/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h @@ -216,7 +216,7 @@ __GC_##name: \ #elif !defined __ASSEMBLER__ -/* This code should never be used but we define it anyhow. */ # define SINGLE_THREAD_P (1) +# define NO_CANCELLATION 1 #endif diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h index ead89ba931..2bee000730 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h @@ -26,7 +26,9 @@ #include <atomic.h> -#define __NR_futex 221 +#ifndef __NR_futex +# define __NR_futex 221 +#endif #define FUTEX_WAIT 0 #define FUTEX_WAKE 1 #define FUTEX_REQUEUE 3 diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h index 41e6af4749..7f5ba4aeef 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h @@ -1,5 +1,5 @@ /* Cancellable system call stubs. Linux/PowerPC version. - 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 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>, 2003. @@ -109,7 +109,7 @@ #elif !defined __ASSEMBLER__ -/* This code should never be used but we define it anyhow. */ # define SINGLE_THREAD_P (1) +# define NO_CANCELLATION 1 #endif diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h index c7fe41dea9..aa993b9a58 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h @@ -1,5 +1,5 @@ /* Cancellable system call stubs. Linux/PowerPC64 version. - 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 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>, 2003. @@ -109,7 +109,7 @@ #elif !defined __ASSEMBLER__ -/* This code should never be used but we define it anyhow. */ # define SINGLE_THREAD_P (1) +# define NO_CANCELLATION 1 #endif diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h index bbbd30b71f..09dac2c90b 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h +++ b/nptl/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. @@ -109,7 +109,7 @@ L(pseudo_end): #elif !defined __ASSEMBLER__ -/* This code should never be used but we define it anyhow. */ # define SINGLE_THREAD_P (1) +# define NO_CANCELLATION 1 #endif diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h index 2daf5944e4..f8eb6a9ebc 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h +++ b/nptl/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. @@ -122,7 +122,7 @@ extern int __local_multiple_threads attribute_hidden; #elif !defined __ASSEMBLER__ -/* This code should never be used but we define it anyhow. */ # define SINGLE_THREAD_P (1) +# define NO_CANCELLATION 1 #endif diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h index 581046c007..fc3c2340b6 100644 --- a/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h @@ -241,7 +241,7 @@ #elif !defined __ASSEMBLER__ -/* This code should never be used but we define it anyhow. */ # define SINGLE_THREAD_P (1) +# define NO_CANCELLATION 1 #endif 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 193f21013c..5edf4b3772 100644 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h @@ -107,7 +107,7 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2) \ #elif !defined __ASSEMBLER__ -/* This code should never be used but we define it anyhow. */ # define SINGLE_THREAD_P (1) +# define NO_CANCELLATION 1 #endif 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 cc2c2e95eb..d8c65aeffd 100644 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h @@ -101,7 +101,7 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2) \ #elif !defined __ASSEMBLER__ -/* This code should never be used but we define it anyhow. */ # define SINGLE_THREAD_P (1) +# define NO_CANCELLATION 1 #endif diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h index f8d726ddd8..d47c1b80dc 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2002. @@ -132,7 +132,7 @@ extern int __local_multiple_threads attribute_hidden; #elif !defined __ASSEMBLER__ -/* This code should never be used but we define it anyhow. */ # define SINGLE_THREAD_P (1) +# define NO_CANCELLATION 1 #endif |