diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-09-25 11:28:41 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-09-25 11:28:41 +0000 |
| commit | 1b16f19afcb6c9fbe68024b8edd7d737756fa275 (patch) | |
| tree | 730ca2f98a556379fdee3a1fb69ae09ca21a0d4a | |
| parent | 037c97bbc906f56a3d98090e855ff49fbffea423 (diff) | |
linuxthreads fix from Roland.
| -rw-r--r-- | linuxthreads/ChangeLog | 6 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/i386/i686/pt-machine.h | 6 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/i386/useldt.h | 7 |
3 files changed, 11 insertions, 8 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 63bb29bf73..2515af95f9 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,9 @@ +2004-09-25 Roland McGrath <roland@redhat.com> + + [BZ #406] + * sysdeps/i386/i686/pt-machine.h: Don't #include "../useldt.h" if + [_TLS_H], since sysdeps/i386/tls.h includes it after including us. + 2004-09-24 Roland McGrath <roland@redhat.com> [BZ #406] diff --git a/linuxthreads/sysdeps/i386/i686/pt-machine.h b/linuxthreads/sysdeps/i386/i686/pt-machine.h index 1c75bf9807..7b4ff92383 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-2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1996-2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Richard Henderson <rth@tamu.edu>. @@ -69,7 +69,9 @@ __compare_and_swap (long int *p, long int oldval, long int newval) } #endif -#if __ASSUME_LDT_WORKS > 0 +/* If tls.h was included, it will include useldt.h after defining USE_TLS. + We don't want to include it here first when tls.h includes us. */ +#if __ASSUME_LDT_WORKS > 0 && !defined _TLS_H #include "../useldt.h" #endif diff --git a/linuxthreads/sysdeps/i386/useldt.h b/linuxthreads/sysdeps/i386/useldt.h index 9a898ede74..4ac82f1ab0 100644 --- a/linuxthreads/sysdeps/i386/useldt.h +++ b/linuxthreads/sysdeps/i386/useldt.h @@ -1,6 +1,6 @@ /* Special definitions for ix86 machine using segment register based thread descriptor. - Copyright (C) 1998, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 1998, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>. @@ -19,9 +19,6 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __USELDT_H -#define __USELDT_H 1 - #ifndef __ASSEMBLER__ #include <stddef.h> /* For offsetof. */ #include <stdlib.h> /* For abort(). */ @@ -315,5 +312,3 @@ extern int __have_no_set_thread_area; /* Maximum size of the stack if the rlimit is unlimited. */ #define ARCH_STACK_MAX_SIZE 8*1024*1024 #endif - -#endif |