diff options
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 9 | ||||
| -rw-r--r-- | nptl/allocatestack.c | 5 | ||||
| -rw-r--r-- | nptl/init.c | 4 | ||||
| -rw-r--r-- | nptl/sysdeps/i386/tls.h | 3 | ||||
| -rw-r--r-- | nptl/sysdeps/x86_64/tls.h | 3 |
5 files changed, 18 insertions, 6 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index b6584d36a0..9d40cca747 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,14 @@ +2002-12-06 Roland McGrath <roland@redhat.com> + + * allocatestack.c (__stack_user): Use uninitialized defn. + * init.c (__pthread_initialize_minimal): Initialize it here. + 2002-12-05 Roland McGrath <roland@redhat.com> + * sysdeps/i386/tls.h (TLS_INIT_TP): Make it return zero or an error + string. + * sysdeps/x86_64/tls.h (TLS_INIT_TP): Likewise. + * sysdeps/unix/sysv/linux/i386/createthread.c (create_thread): Add missing & here too. diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c index 00ce920f8a..3e057e9c7b 100644 --- a/nptl/allocatestack.c +++ b/nptl/allocatestack.c @@ -68,8 +68,9 @@ static LIST_HEAD (stack_cache); /* List of the stacks in use. */ static LIST_HEAD (stack_used); -/* List of the threads with user provided stacks in use. */ -LIST_HEAD (__stack_user); +/* List of the threads with user provided stacks in use. No need to + initialize this, since it's done in __pthread_initialize_minimal. */ +list_t __stack_user __attribute__ ((nocommon)); hidden_def (__stack_user) /* Number of threads running. */ diff --git a/nptl/init.c b/nptl/init.c index 395ede7033..d9c315c1da 100644 --- a/nptl/init.c +++ b/nptl/init.c @@ -123,8 +123,8 @@ __pthread_initialize_minimal (void) THREAD_SETMEM (pd, cpuclock_offset, GL(dl_cpuclock_offset)); #endif - /* Add the main thread to the list of all running threads. No need - to get the lock we are alone so far. */ + /* Initialize the list of all running threads with the main thread. */ + INIT_LIST_HEAD (__stack_user); list_add (&pd->header.data.list, &__stack_user); diff --git a/nptl/sysdeps/i386/tls.h b/nptl/sysdeps/i386/tls.h index 34783649b2..a4bbf3445a 100644 --- a/nptl/sysdeps/i386/tls.h +++ b/nptl/sysdeps/i386/tls.h @@ -204,7 +204,8 @@ union user_desc_init which is necessary since we have changed it. */ \ TLS_SET_GS (_segdescr.desc.entry_number * 8 + 3); \ \ - _result; }) + _result == 0 ? NULL \ + : "set_thread_area failed when setting up thread-local storage"; }) /* Return the address of the dtv for the current thread. */ diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h index af3d202d5b..af4ad17abd 100644 --- a/nptl/sysdeps/x86_64/tls.h +++ b/nptl/sysdeps/x86_64/tls.h @@ -165,7 +165,8 @@ union user_desc_init "S" (_descr) \ : "memory", "cc", "r11", "cx"); \ \ - _result ? -1 : 0; }) + _result ? "cannot set %fs base address for thread-local storage" : 0; \ + }) /* Return the address of the dtv for the current thread. */ |