From bd7c3bed543d02fb01f69b29ea1a736e7a0f618d Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sat, 25 Sep 2004 07:55:46 +0000 Subject: Updated to fedora-glibc-20040925T0738 --- linuxthreads/ChangeLog | 7 +++++++ linuxthreads/sysdeps/i386/tls.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'linuxthreads') diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 63d3faf364..63bb29bf73 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,10 @@ +2004-09-24 Roland McGrath + + [BZ #406] + * sysdeps/i386/tls.h: Move #include "useldt.h" outside + of [__ASSUME_LDT_WORKS > 0] test. + Reported by Carlos Velasco . + 2004-09-21 Roland McGrath * Versions: Add comment about linuxthreads' frozen ABI. diff --git a/linuxthreads/sysdeps/i386/tls.h b/linuxthreads/sysdeps/i386/tls.h index 84d87db359..30a6e59963 100644 --- a/linuxthreads/sysdeps/i386/tls.h +++ b/linuxthreads/sysdeps/i386/tls.h @@ -120,10 +120,10 @@ typedef struct # define TLS_LOAD_EBX # endif +# include "useldt.h" /* For the structure. */ # if __ASSUME_LDT_WORKS > 0 # define TLS_DO_MODIFY_LDT_KERNEL_CHECK(doit) (doit) /* Nothing to check. */ # else -# include "useldt.h" /* For the structure. */ # define TLS_DO_MODIFY_LDT_KERNEL_CHECK(doit) \ (__builtin_expect (GLRO(dl_osversion) < 131939, 0) \ ? "kernel too old for thread-local storage support\n" \ -- cgit 1.4.1