about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--linuxthreads/ChangeLog9
-rw-r--r--linuxthreads/descr.h2
-rw-r--r--linuxthreads/internals.h2
-rw-r--r--linuxthreads/pthread.c3
-rw-r--r--localedata/ChangeLog5
-rw-r--r--nptl/ChangeLog4
-rw-r--r--nptl/sysdeps/i386/Makefile2
-rw-r--r--sysdeps/i386/Makefile2
9 files changed, 29 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c911e0734..4ba2bcb282 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/i386/Makefile (stack-align-test-flags): Add
+	-malign-double -mpreferred-stack-boundary=4.
+
 2003-09-17  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/posix/utimes.c (__utimes): Truncate instead of round.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index ed71daa201..cd5eb8e61f 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* descr.h (manager_thread): Rename to...
+	(__pthread_manager_threadp): ... this.
+	* pthread.c (manager_thread): Define to __pthread_manager_threadp.
+	(__pthread_manager_threadp): New variable.
+	* internals.h (__manager_thread): Define to
+	__pthread_manager_threadp if USE_TLS.
+
 2003-09-15  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/i386/Makefile (CFLAGS-cancel.c, CFLAGS-manager.c,
diff --git a/linuxthreads/descr.h b/linuxthreads/descr.h
index 0b9efd220d..bea8b912f7 100644
--- a/linuxthreads/descr.h
+++ b/linuxthreads/descr.h
@@ -217,7 +217,7 @@ extern char *__pthread_manager_thread_tos;
 /* Descriptor of the manager thread */
 
 extern struct _pthread_descr_struct __pthread_manager_thread;
-extern pthread_descr manager_thread attribute_hidden;
+extern pthread_descr __pthread_manager_threadp attribute_hidden;
 
 /* Indicate whether at least one thread has a user-defined stack (if 1),
    or all threads have stacks supplied by LinuxThreads (if 0). */
diff --git a/linuxthreads/internals.h b/linuxthreads/internals.h
index 90649335bb..ba6f476b73 100644
--- a/linuxthreads/internals.h
+++ b/linuxthreads/internals.h
@@ -526,7 +526,7 @@ weak_extern (__pthread_thread_self)
 #ifndef USE_TLS
 # define __manager_thread (&__pthread_manager_thread)
 #else
-# define __manager_thread manager_thread
+# define __manager_thread __pthread_manager_threadp
 #endif
 
 extern inline __attribute__((always_inline)) pthread_descr
diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c
index d44f890eba..a6a2edac81 100644
--- a/linuxthreads/pthread.c
+++ b/linuxthreads/pthread.c
@@ -55,7 +55,8 @@ extern struct __res_state _res;
 #ifdef USE_TLS
 
 /* We need only a few variables.  */
-pthread_descr manager_thread attribute_hidden;
+#define manager_thread __pthread_manager_threadp
+pthread_descr __pthread_manager_threadp attribute_hidden;
 
 #else
 
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index a12ff53d90..dbe894167a 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-17  Ulrich Drepper  <drepper@redhat.com>
+
+	* locales/lo_LA: Fix duplicated collation entries.
+	Patch by Anousak Souphavanh <anousak@muanglao.com>.
+
 2003-09-01  Petter Reinholdtsen  <pere@hungry.com>
 
 	* locales/iw_IL: Add comment stating why there are two locales for
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 90c7b26e6d..1edbb9842b 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-17  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/i386/Makefile (CFLAGS-tst-align.c): Remove.
+
 2003-09-15  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/i386/Makefile (CFLAGS-pthread_create.c,
diff --git a/nptl/sysdeps/i386/Makefile b/nptl/sysdeps/i386/Makefile
index fac6d8db50..693fb0569f 100644
--- a/nptl/sysdeps/i386/Makefile
+++ b/nptl/sysdeps/i386/Makefile
@@ -21,7 +21,5 @@ gen-as-const-headers += tcb-offsets.sym
 endif
 
 ifeq ($(subdir),nptl)
-CFLAGS-tst-align.c += -malign-double
 CFLAGS-pthread_create.c += -mpreferred-stack-boundary=4
-CFLAGS-tst-align.c += -mpreferred-stack-boundary=4
 endif
diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile
index 56027703ce..fb14806029 100644
--- a/sysdeps/i386/Makefile
+++ b/sysdeps/i386/Makefile
@@ -35,6 +35,8 @@ else
 sysdep-CFLAGS += -mpreferred-stack-boundary=2
 # Likewise, any function which calls user callbacks
 uses-callbacks += -mpreferred-stack-boundary=4
+# Likewise, any stack alignment tests
+stack-align-test-flags += -malign-double -mpreferred-stack-boundary=4
 endif
 endif