diff options
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 9 | ||||
| -rw-r--r-- | linuxthreads/Makefile | 2 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/i386/i686/pt-machine.h | 2 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/i386/tls.h | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index bfccc57eb7..e15dc08a10 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,12 @@ +2004-10-18 Roland McGrath <roland@redhat.com> + + [BZ #406] + * Makefile (linuxthreads-CPPFLAGS): New variable; + adds -DIS_IN_linuxthreads=1. + * sysdeps/i386/tls.h: Protect "useldt.h" with + [!IS_IN_linuxthreads && !DO_MODIFY_LDT]. + * sysdeps/i386/i686/pt-machine.h: Revert last change. + 2004-10-14 Jakub Jelinek <jakub@redhat.com> * sysdeps/pthread/errno-loc.c: Don't undef #errno diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile index 5bf558334d..75e6852733 100644 --- a/linuxthreads/Makefile +++ b/linuxthreads/Makefile @@ -65,6 +65,8 @@ libpthread-static-only-routines = pthread_atfork libpthread-nonshared = pthread_atfork +linuxthreads-CPPFLAGS = -DIS_IN_linuxthreads=1 + CFLAGS-pthread_atfork.c = -DNOT_IN_libc nodelete-yes = -Wl,--enable-new-dtags,-z,nodelete diff --git a/linuxthreads/sysdeps/i386/i686/pt-machine.h b/linuxthreads/sysdeps/i386/i686/pt-machine.h index 6048bc448f..1c75bf9807 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, 2004 Free Software Foundation, Inc. + Copyright (C) 1996-2001, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Richard Henderson <rth@tamu.edu>. diff --git a/linuxthreads/sysdeps/i386/tls.h b/linuxthreads/sysdeps/i386/tls.h index c1f47ca864..d296340ad8 100644 --- a/linuxthreads/sysdeps/i386/tls.h +++ b/linuxthreads/sysdeps/i386/tls.h @@ -120,7 +120,7 @@ typedef struct # define TLS_LOAD_EBX # endif -# ifndef THREAD_SELF +# if !defined IS_IN_linuxthreads && !defined DO_MODIFY_LDT # include "useldt.h" /* For the structure. */ # endif # if __ASSUME_LDT_WORKS > 0 |