aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog14
-rw-r--r--nptl/allocatestack.c1
-rw-r--r--nptl/events.c2
-rw-r--r--nptl/pthreadP.h13
-rw-r--r--nptl/pthread_create.c10
-rw-r--r--nptl/pthread_key_create.c6
6 files changed, 35 insertions, 11 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 187b443359..537c59878a 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,17 @@
+2002-12-02 Roland McGrath <roland@redhat.com>
+
+ * pthreadP.h (__stack_user, __nptl_create_event, __nptl_death_event):
+ Declare using hidden_proto instead of attribute_hidden, so there are
+ non-.hidden static symbols for gdb to find.
+ (__pthread_keys): Likewise.
+ * events.c (__nptl_create_event, __nptl_death_event): Add hidden_def.
+ * allocatestack.c (__stack_user): Likewise.
+ * pthread_create.c (__pthread_keys): Likewise.
+ (__nptl_threads_events, __nptl_last_event): Make these static instead
+ of hidden.
+ * pthread_key_create.c (__pthread_pthread_keys_max,
+ __pthread_pthread_key_2ndlevel_size): Renamed from __linuxthreads_*.
+
2002-12-02 Ulrich Drepper <drepper@redhat.com>
* pthread_cond_timedwait.c: Include <stdlib.h>.
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
index 2aaaaeca9c..e9e1cfd1cd 100644
--- a/nptl/allocatestack.c
+++ b/nptl/allocatestack.c
@@ -70,6 +70,7 @@ static LIST_HEAD (stack_used);
/* List of the threads with user provided stacks in use. */
LIST_HEAD (__stack_user);
+hidden_def (__stack_user)
/* Number of threads running. */
static unsigned int nptl_nthreads = 1;
diff --git a/nptl/events.c b/nptl/events.c
index 8232d0c7d7..df97e54f69 100644
--- a/nptl/events.c
+++ b/nptl/events.c
@@ -25,8 +25,10 @@ void
__nptl_create_event (void)
{
}
+hidden_def (__nptl_create_event)
void
__nptl_death_event (void)
{
}
+hidden_def (__nptl_death_event)
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index adca0514a3..c6c1e49a53 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -42,7 +42,8 @@ extern size_t __static_tls_size attribute_hidden;
extern size_t __static_tls_align attribute_hidden;
/* Thread descriptor handling. */
-extern list_t __stack_user attribute_hidden;
+extern list_t __stack_user;
+hidden_proto (__stack_user)
/* Attribute handling. */
extern struct pthread_attr *__attr_list attribute_hidden;
@@ -57,8 +58,8 @@ extern int __current_sigrtmax attribute_hidden;
extern int __concurrency_level attribute_hidden;
/* Thread-local data key handling. */
-extern struct pthread_key_struct __pthread_keys[PTHREAD_KEYS_MAX]
- attribute_hidden;
+extern struct pthread_key_struct __pthread_keys[PTHREAD_KEYS_MAX];
+hidden_proto (__pthread_keys)
/* The library can run in debugging mode where it performs a lot more
tests. */
@@ -134,8 +135,10 @@ extern int __pthread_attr_init_2_0 (pthread_attr_t *attr);
/* Event handlers for libthread_db interface. */
-extern void __nptl_create_event (void) attribute_hidden;
-extern void __nptl_death_event (void) attribute_hidden;
+extern void __nptl_create_event (void);
+extern void __nptl_death_event (void);
+hidden_proto (__nptl_create_event)
+hidden_proto (__nptl_death_event)
/* Namespace save aliases. */
diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
index 451a9b3f99..5fef400ee4 100644
--- a/nptl/pthread_create.c
+++ b/nptl/pthread_create.c
@@ -38,10 +38,10 @@ static int start_thread_debug (void *arg);
int __pthread_debug;
/* Globally enabled events. */
-td_thr_events_t __nptl_threads_events attribute_hidden;
+static td_thr_events_t __nptl_threads_events;
/* Pointer to descriptor with the last event. */
-struct pthread *__nptl_last_event attribute_hidden;
+static struct pthread *__nptl_last_event;
/* Code to allocate and deallocate a stack. */
@@ -53,8 +53,12 @@ struct pthread *__nptl_last_event attribute_hidden;
/* Table of the key information. */
-struct pthread_key_struct __pthread_keys[PTHREAD_KEYS_MAX];
+struct pthread_key_struct __pthread_keys[PTHREAD_KEYS_MAX]
+ __attribute__ ((section (".bss")));
+hidden_def (__pthread_keys)
+/* This is for libthread_db only. */
+const int __pthread_pthread_sizeof_descr = sizeof (struct pthread);
struct pthread *
__find_in_stack_list (pd)
diff --git a/nptl/pthread_key_create.c b/nptl/pthread_key_create.c
index 7a073f2d80..3a49c094d6 100644
--- a/nptl/pthread_key_create.c
+++ b/nptl/pthread_key_create.c
@@ -21,13 +21,13 @@
#include "pthreadP.h"
-/* Internal mutex for __pthread_kyes table handling. */
+/* Internal mutex for __pthread_keys table handling. */
lll_lock_t __pthread_keys_lock = LLL_LOCK_INITIALIZER;
/* For debugging purposes put the maximum number of keys in a variable. */
-const int __linuxthreads_pthread_keys_max = PTHREAD_KEYS_MAX;
-const int __linuxthreads_pthread_key_2ndlevel_size = PTHREAD_KEY_2NDLEVEL_SIZE;
+const int __pthread_pthread_keys_max = PTHREAD_KEYS_MAX;
+const int __pthread_pthread_key_2ndlevel_size = PTHREAD_KEY_2NDLEVEL_SIZE;
int