about summary refs log tree commit diff
path: root/linuxthreads/sysdeps/i386/tls.h
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2004-10-19 05:12:59 +0000
committerRoland McGrath <roland@gnu.org>2004-10-19 05:12:59 +0000
commitb1b7e93272cd4a73435a01252bfdf7fc26fe4fa3 (patch)
tree8a14d0fed6260878b03f60b92ae93294ae8176d9 /linuxthreads/sysdeps/i386/tls.h
parent5f21997b9d6a49ddbed85b044e2be7b182c095a2 (diff)
downloadglibc-b1b7e93272cd4a73435a01252bfdf7fc26fe4fa3.tar.gz
glibc-b1b7e93272cd4a73435a01252bfdf7fc26fe4fa3.tar.xz
glibc-b1b7e93272cd4a73435a01252bfdf7fc26fe4fa3.zip
[BZ #406]
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.
Diffstat (limited to 'linuxthreads/sysdeps/i386/tls.h')
-rw-r--r--linuxthreads/sysdeps/i386/tls.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/linuxthreads/sysdeps/i386/tls.h b/linuxthreads/sysdeps/i386/tls.h
index b1805cb868..5306d082bb 100644
--- a/linuxthreads/sysdeps/i386/tls.h
+++ b/linuxthreads/sysdeps/i386/tls.h
@@ -113,7 +113,9 @@ typedef struct
 #   define TLS_LOAD_EBX
 #  endif
 
-#  include "useldt.h"		/* For the structure.  */
+#  if !defined IS_IN_linuxthreads && !defined DO_MODIFY_LDT
+#   include "useldt.h"		/* For the structure.  */
+#  endif
 #  if __ASSUME_LDT_WORKS > 0
 #   define TLS_DO_MODIFY_LDT_KERNEL_CHECK(doit) (doit) /* Nothing to check.  */
 #  else