diff options
author | Ulrich Drepper <drepper@redhat.com> | 2002-02-24 04:57:56 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2002-02-24 04:57:56 +0000 |
commit | b6a0a99693379a0ceb9146bf3c38eb313b977e4c (patch) | |
tree | 7a96d234a537b8fc0e67a812191df5b06c9db7b9 /linuxthreads/sysdeps/i386 | |
parent | 6370466d5af09a31feb376353bf0ac307774b1bf (diff) | |
download | glibc-b6a0a99693379a0ceb9146bf3c38eb313b977e4c.tar glibc-b6a0a99693379a0ceb9146bf3c38eb313b977e4c.tar.gz glibc-b6a0a99693379a0ceb9146bf3c38eb313b977e4c.tar.bz2 glibc-b6a0a99693379a0ceb9146bf3c38eb313b977e4c.zip |
Update.
* attr.c (pthread_getattr_np): Don't take thread descriptor size
into account if USE_TLS.
* manager.c (pthread_handle_create): Free TLS data structures if call
failed. Pass correct stack to clone if USE_TLS.
* sysdeps/i386/pt-machine.h: Handle multiple inclusion.
* sysdeps/i386/i686/pt-machine.h: Likewise.
* sysdeps/i386/tls.h: Unconditionally include <pt-machine.h>.
Diffstat (limited to 'linuxthreads/sysdeps/i386')
-rw-r--r-- | linuxthreads/sysdeps/i386/i686/pt-machine.h | 7 | ||||
-rw-r--r-- | linuxthreads/sysdeps/i386/pt-machine.h | 7 | ||||
-rw-r--r-- | linuxthreads/sysdeps/i386/tls.h | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/linuxthreads/sysdeps/i386/i686/pt-machine.h b/linuxthreads/sysdeps/i386/i686/pt-machine.h index c7396024bb..b38d2b7ab8 100644 --- a/linuxthreads/sysdeps/i386/i686/pt-machine.h +++ b/linuxthreads/sysdeps/i386/i686/pt-machine.h @@ -1,6 +1,6 @@ /* Machine-dependent pthreads configuration and inline functions. i686 version. - Copyright (C) 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1996-2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Richard Henderson <rth@tamu.edu>. @@ -19,6 +19,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _PT_MACHINE_H +#define _PT_MACHINE_H 1 + #ifndef PT_EI # define PT_EI extern inline #endif @@ -67,3 +70,5 @@ __compare_and_swap (long int *p, long int oldval, long int newval) /* The P4 and above really want some help to prevent overheating. */ #define BUSY_WAIT_NOP __asm__ ("rep; nop") + +#endif /* pt-machine.h */ diff --git a/linuxthreads/sysdeps/i386/pt-machine.h b/linuxthreads/sysdeps/i386/pt-machine.h index 3346bcc34d..c9aa6e7778 100644 --- a/linuxthreads/sysdeps/i386/pt-machine.h +++ b/linuxthreads/sysdeps/i386/pt-machine.h @@ -1,6 +1,6 @@ /* Machine-dependent pthreads configuration and inline functions. i386 version. - Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc. + Copyright (C) 1996-2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Richard Henderson <rth@tamu.edu>. @@ -19,6 +19,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _PT_MACHINE_H +#define _PT_MACHINE_H 1 + #ifndef PT_EI # define PT_EI extern inline #endif @@ -96,3 +99,5 @@ compare_and_swap_is_available (void) Otherwise, it's a 486 or above and it has cmpxchg. */ return changed != 0; } + +#endif /* pt-machine.h */ diff --git a/linuxthreads/sysdeps/i386/tls.h b/linuxthreads/sysdeps/i386/tls.h index d1975b2017..c1bfd1bca8 100644 --- a/linuxthreads/sysdeps/i386/tls.h +++ b/linuxthreads/sysdeps/i386/tls.h @@ -22,6 +22,8 @@ #include <stddef.h> +#include <pt-machine.h> + /* Type for the dtv. */ typedef union dtv { |