aboutsummaryrefslogtreecommitdiff
path: root/linuxthreads
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-10-15 06:24:26 +0000
committerUlrich Drepper <drepper@redhat.com>2003-10-15 06:24:26 +0000
commita21a20a33f5b49cfc06ed72f3164099ce226a0b9 (patch)
treeeb1717e035a4f8f86694d722a7f8d568a95c02c5 /linuxthreads
parent1769a73f0bd6e11590ed88eea4391284585216d7 (diff)
downloadglibc-a21a20a33f5b49cfc06ed72f3164099ce226a0b9.zip
glibc-a21a20a33f5b49cfc06ed72f3164099ce226a0b9.tar.gz
glibc-a21a20a33f5b49cfc06ed72f3164099ce226a0b9.tar.bz2
Update.
2003-10-15 Jakub Jelinek <jakub@redhat.com> * elf/rtld.c (print_statistics): Print also number of relative relocations.
Diffstat (limited to 'linuxthreads')
-rw-r--r--linuxthreads/ChangeLog6
-rw-r--r--linuxthreads/manager.c5
-rw-r--r--linuxthreads/pthread.c15
3 files changed, 26 insertions, 0 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index a7e0b46..3102111 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-06 Carlos O'Donell <carlos@baldric.uwo.ca>
+
+ * pthread.c (__pthread_self_stack): _STACK_GROWS_UP case added.
+ (__pthread_find_self): Likewise.
+ * manager.c (thread_segment): _STACK_GROWS_UP case added.
+
2003-10-10 Carlos O'Donell <carlos@baldric.uwo.ca>
* linuxthreads/sysdeps/unix/sysv/linux/hppa/malloc-machine.h: New file.
diff --git a/linuxthreads/manager.c b/linuxthreads/manager.c
index f8647b4..462ce4a 100644
--- a/linuxthreads/manager.c
+++ b/linuxthreads/manager.c
@@ -70,8 +70,13 @@ static pthread_descr manager_thread;
#else
static inline pthread_descr thread_segment(int seg)
{
+# ifdef _STACK_GROWS_UP
+ return (pthread_descr)(THREAD_STACK_START_ADDRESS + (seg - 1) * STACK_SIZE)
+ + 1;
+# else
return (pthread_descr)(THREAD_STACK_START_ADDRESS - (seg - 1) * STACK_SIZE)
- 1;
+# endif
}
#endif
diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c
index b395354..11d2ef7 100644
--- a/linuxthreads/pthread.c
+++ b/linuxthreads/pthread.c
@@ -893,7 +893,11 @@ pthread_descr __pthread_find_self(void)
/* __pthread_handles[0] is the initial thread, __pthread_handles[1] is
the manager threads handled specially in thread_self(), so start at 2 */
h = __pthread_handles + 2;
+# ifdef _STACK_GROWS_UP
+ while (! (sp >= (char *) h->h_descr && sp < h->h_descr->p_guardaddr)) h++;
+# else
while (! (sp <= (char *) h->h_descr && sp >= h->h_bottom)) h++;
+# endif
return h->h_descr;
}
@@ -908,12 +912,23 @@ pthread_descr __pthread_self_stack(void)
return manager_thread;
h = __pthread_handles + 2;
# ifdef USE_TLS
+# ifdef _STACK_GROWS_UP
+ while (h->h_descr == NULL
+ || ! (sp >= h->h_descr->p_stackaddr && sp < h->h_descr->p_guardaddr))
+ h++;
+# else
while (h->h_descr == NULL
|| ! (sp <= (char *) h->h_descr->p_stackaddr && sp >= h->h_bottom))
h++;
+# endif
# else
+# ifdef _STACK_GROWS_UP
+ while (! (sp >= (char *) h->h_descr && sp < h->h_descr->p_guardaddr))
+ h++;
+# else
while (! (sp <= (char *) h->h_descr && sp >= h->h_bottom))
h++;
+# endif
# endif
return h->h_descr;
}