2.3.3-58

diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index cfdcbbf22744751e59d01083460a85cb66e2f583..b2cb49a67fdeefb3857b50b60d722c5cf8f65ebf 100644 (file)
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 57
+%define glibcrelease 58
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64
@@ -1239,6 +1239,13 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Sun Sep 26 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-58
+- update from CVS
+  - vasprintf fix (BZ #346)
+  - gettext locking (BZ #322)
+- change linuxthreads useldt.h inclusion login again, the last
+  one failed all linuxthreads FLOATING_STACKS tests
+
 * Sat Sep 25 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-57
 - update from CVS
   - fix setuid in LD_ASSUME_KERNEL=2.2.5 libc (#133558)

diff --git a/linuxthreads/sysdeps/i386/i686/pt-machine.h b/linuxthreads/sysdeps/i386/i686/pt-machine.h
index 7b4ff923830e47e37b9c92d273d8bbcf79bd723f..6048bc448f36b6c48b6606a26965bd6eda14ef78 100644 (file)
--- a/linuxthreads/sysdeps/i386/i686/pt-machine.h
+++ b/linuxthreads/sysdeps/i386/i686/pt-machine.h
@@ -69,9 +69,7 @@ __compare_and_swap (long int *p, long int oldval, long int newval)
 }
 #endif
 
-/* 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
+#if __ASSUME_LDT_WORKS > 0
 #include "../useldt.h"
 #endif
 

diff --git a/linuxthreads/sysdeps/i386/tls.h b/linuxthreads/sysdeps/i386/tls.h
index 30a6e59963634df11c8c4daa7d2fa129c76521e9..c1f47ca864fe07643e51cb53745da36efdee04dd 100644 (file)
--- a/linuxthreads/sysdeps/i386/tls.h
+++ b/linuxthreads/sysdeps/i386/tls.h
@@ -120,7 +120,9 @@ typedef struct
 #   define TLS_LOAD_EBX
 #  endif
 
-#  include "useldt.h"          /* For the structure.  */
+#  ifndef THREAD_SELF
+#   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