summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2004-09-26 08:45:22 +0000
committerJakub Jelinek <jakub@redhat.com>2004-09-26 08:45:22 +0000
commitefaf80c5d05102f75864847140bfb8b2bdbd4523 (patch)
tree9bbd4e18555c6a8779c9afbbe2141bd5f592bc87
parent959f4c054789f1ce232bea8d226859262ed1bcbb (diff)
-rw-r--r--fedora/glibc.spec.in9
-rw-r--r--linuxthreads/sysdeps/i386/i686/pt-machine.h4
-rw-r--r--linuxthreads/sysdeps/i386/tls.h4
3 files changed, 12 insertions, 5 deletions
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index cfdcbbf227..b2cb49a67f 100644
--- 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 7b4ff92383..6048bc448f 100644
--- 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 30a6e59963..c1f47ca864 100644
--- 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