diff options
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 5 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/i386/i686/pt-machine.h | 3 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/i386/pt-machine.h | 3 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/i386/tls.h | 2 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/powerpc/powerpc64/tls.h | 134 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S | 8 |
6 files changed, 149 insertions, 6 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index adfaaa8f0e..de105a6649 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,8 @@ +2003-01-31 Steven Munroe <sjmunroe@us.ibm.com> + + * sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S [SHARED]: + Conditionalize .toc section magic on this. + 2003-02-21 Roland McGrath <roland@redhat.com> * cancel.c (__pthread_perform_cleanup): Call __libc_thread_freeres diff --git a/linuxthreads/sysdeps/i386/i686/pt-machine.h b/linuxthreads/sysdeps/i386/i686/pt-machine.h index 3c28118f2e..2368c29098 100644 --- a/linuxthreads/sysdeps/i386/i686/pt-machine.h +++ b/linuxthreads/sysdeps/i386/i686/pt-machine.h @@ -33,7 +33,8 @@ extern int __compare_and_swap (long int *p, long int oldval, long int newval); /* Get some notion of the current stack. Need not be exactly the top of the stack, just something somewhere in the current frame. */ -#define CURRENT_STACK_FRAME __builtin_frame_address (0) +#define CURRENT_STACK_FRAME __stack_pointer_register__ +register char *__stack_pointer_register__ __asm__ ("%esp"); /* Spinlock implementation; required. */ diff --git a/linuxthreads/sysdeps/i386/pt-machine.h b/linuxthreads/sysdeps/i386/pt-machine.h index 79c69b549a..465ab9f919 100644 --- a/linuxthreads/sysdeps/i386/pt-machine.h +++ b/linuxthreads/sysdeps/i386/pt-machine.h @@ -32,7 +32,8 @@ extern int __compare_and_swap (long int *p, long int oldval, long int newval); /* Get some notion of the current stack. Need not be exactly the top of the stack, just something somewhere in the current frame. */ -#define CURRENT_STACK_FRAME __builtin_frame_address (0) +#define CURRENT_STACK_FRAME __stack_pointer_register__ +register char *__stack_pointer_register__ __asm__ ("%esp"); /* Spinlock implementation; required. */ diff --git a/linuxthreads/sysdeps/i386/tls.h b/linuxthreads/sysdeps/i386/tls.h index 118c9c02d1..db68e1c21c 100644 --- a/linuxthreads/sysdeps/i386/tls.h +++ b/linuxthreads/sysdeps/i386/tls.h @@ -58,7 +58,7 @@ typedef struct We need USE_TLS to be consistently defined, for ldsodefs.h conditionals. But some of the code below can cause problems in building libpthread - (e.g. useldt.h will defined FLOATING_STACKS when it shouldn't). */ + (e.g. useldt.h will define FLOATING_STACKS when it shouldn't). */ #if defined HAVE_TLS_SUPPORT \ && (defined FLOATING_STACKS || !defined IS_IN_libpthread) diff --git a/linuxthreads/sysdeps/powerpc/powerpc64/tls.h b/linuxthreads/sysdeps/powerpc/powerpc64/tls.h new file mode 100644 index 0000000000..fefb452cc2 --- /dev/null +++ b/linuxthreads/sysdeps/powerpc/powerpc64/tls.h @@ -0,0 +1,134 @@ +/* Definitions for thread-local data handling. linuxthreads/PowerPC64 version. + Copyright (C) 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#ifndef _TLS_H +#define _TLS_H + +#ifndef __ASSEMBLER__ + +# include <pt-machine.h> +# include <stddef.h> + +/* Type for the dtv. */ +typedef union dtv +{ + size_t counter; + void *pointer; +} dtv_t; + + +typedef struct +{ + dtv_t *dtv; + + /* Reserved for the thread implementation. Unused in LinuxThreads. */ + void *private; +} tcbhead_t; +#endif + + +#ifdef HAVE_TLS_SUPPORT + +/* Signal that TLS support is available. */ +# define USE_TLS 1 + +# ifndef __ASSEMBLER__ +/* Get system call information. */ +# include <sysdep.h> + +/* This is the size of the initial TCB. */ +# define TLS_INIT_TCB_SIZE sizeof (tcbhead_t) + +/* Alignment requirements for the initial TCB. */ +# define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t) + +/* This is the size of the TCB. */ +# define TLS_TCB_SIZE sizeof (tcbhead_t) + +/* Alignment requirements for the TCB. */ +# define TLS_TCB_ALIGN __alignof__ (tcbhead_t) + +/* This is the size we need before TCB. */ +# define TLS_PRE_TCB_SIZE sizeof (struct _pthread_descr_struct) + +/* the following assumes that TP (R13) is points to the end of the tcb + + 0x7000 (per the ABI). This implies that tcb address is + R13-(TLS_TCB_SIZE + 0x7000). As we define TLS_DTV_AT_TP we can + assume that the pthread_descr is allocate immediately ahead of the + tcb. This implies that the pthread_descr address is + R13-(TLS_PRE_TCB_SIZE + TLS_TCB_SIZE + 0x7000). */ +# define TLS_TCB_OFFSET 0x7000 + +/* The DTV is allocated at the TP; the TCB is placed elsewhere. */ +/* This is not really true for powerpc64. We are following alpha + where the DTV pointer is first doubleword in the TCB. */ +# define TLS_DTV_AT_TP 1 + +/* Install the dtv pointer. The pointer passed is to the element with + index -1 which contain the length. */ +# define INSTALL_DTV(TCBP, DTVP) \ + (((tcbhead_t *) (TCBP))->dtv = (DTVP) + 1) + +/* Install new dtv for current thread. */ +# define INSTALL_NEW_DTV(DTV) (THREAD_DTV() = (DTV)) + +/* Return dtv of given thread descriptor. */ +# define GET_DTV(TCBP) (((tcbhead_t *) (TCBP))->dtv) + +/* Code to initially initialize the thread pointer. This might need + special attention since 'errno' is not yet available and if the + operation can cause a failure 'errno' must not be touched. */ +# define TLS_INIT_TP(TCBP, SECONDCALL) \ + (__thread_self = (uintptr_t) (TCBP) + TLS_TCB_OFFSET + TLS_TCB_SIZE, 0) + +/* Return the address of the dtv for the current thread. */ +# define THREAD_DTV() \ + (((tcbhead_t *) (__thread_register - (TLS_TCB_OFFSET + TLS_TCB_SIZE)))->dtv) + +/* Return the thread descriptor for the current thread. */ +# undef THREAD_SELF +# define THREAD_SELF \ + ((pthread_descr) (__thread_register \ + - (TLS_TCB_OFFSET + TLS_TCB_SIZE + TLS_PRE_TCB_SIZE))) + +# undef INIT_THREAD_SELF +# define INIT_THREAD_SELF(DESCR, NR) \ + (__thread_self = (pthread_descr) (((char *)(DESCR)) \ + + (TLS_TCB_OFFSET + TLS_TCB_SIZE + TLS_PRE_TCB_SIZE))) + +/* Get the thread descriptor definition. */ +# include <linuxthreads/descr.h> + +/* Generic bits of LinuxThreads may call these macros with + DESCR set to NULL. We are expected to be able to reference + the "current" value. */ + +#define THREAD_GETMEM(descr, member) \ + ((void) sizeof (descr), THREAD_SELF->member) +#define THREAD_GETMEM_NC(descr, member) \ + ((void) sizeof (descr), THREAD_SELF->member) +#define THREAD_SETMEM(descr, member, value) \ + ((void) sizeof (descr), THREAD_SELF->member = (value)) +#define THREAD_SETMEM_NC(descr, member, value) \ + ((void) sizeof (descr), THREAD_SELF->member = (value)) + +# endif /* HAVE_TLS_SUPPORT */ +#endif /* __ASSEMBLER__ */ + +#endif /* tls.h */ diff --git a/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S b/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S index 0229a9a75c..b408e31b7b 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S +++ b/linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S @@ -25,17 +25,19 @@ The calling process is suspended until the new process exits or is replaced by a call to `execve'. Return -1 for errors, 0 to the new process, and the process ID of the new process to the old process. */ - + +#ifdef SHARED .section ".toc","aw" .LC0: .tc __libc_pthread_functions[TC],__libc_pthread_functions .section ".text" .align 2 +#endif ENTRY (__vfork) #ifdef __NR_vfork - + # ifdef SHARED ld 10,.LC0@toc(2) ld 10,0(10) @@ -53,7 +55,7 @@ ENTRY (__vfork) # endif DO_CALL (SYS_ify (vfork)); - + # ifdef __ASSUME_VFORK_SYSCALL PSEUDO_RET # else |