actually iterate over the elements. Fix typo p_type -> p_vaddr.
* include/pthread.h: Don't declare __pthread_initialize_minimal as
weak here; we declare it weak or strong in the one place we use it.
* sysdeps/generic/libc-start.c: ... which is here.
Don't make the decl weak if [USE_TLS], since static programs need TLS
setup even when single-threaded.
2002-08-04 Roland McGrath <roland@redhat.com>
+ * sysdeps/generic/libc-tls.c (__libc_setup_tls): Make the phdr loop
+ actually iterate over the elements. Fix typo p_type -> p_vaddr.
+
+ * include/pthread.h: Don't declare __pthread_initialize_minimal as
+ weak here; we declare it weak or strong in the one place we use it.
+ * sysdeps/generic/libc-start.c: ... which is here.
+ Don't make the decl weak if [USE_TLS], since static programs need TLS
+ setup even when single-threaded.
+
* stdlib/isomac.c (fmt): Add -DNOT_IN_libc to the compiler command.
* elf/Makefile (test-srcs): Add $(modules-names) to it.
/* This function is called to initialize the pthread library. */
extern void __pthread_initialize (void) __attribute__ ((weak));
-
-extern void __pthread_initialize_minimal (void) __attribute__ ((weak));
extern void *__libc_stack_end;
#ifndef SHARED
-extern void __pthread_initialize_minimal (void) __attribute__ ((weak));
+# include <tls.h>
+extern void __pthread_initialize_minimal (void)
+# if !(USE_TLS - 0)
+ __attribute__ ((weak))
+# endif
+ ;
#endif
we need to setup errno. If there is no thread library and we
handle TLS the function is defined in the libc to initialized the
TLS handling. */
-# ifndef TLS
+# if !(USE_TLS - 0)
if (__pthread_initialize_minimal)
# endif
__pthread_initialize_minimal ();
size_t max_align = tcbalign;
size_t loadaddr = ~0ul;
size_t tcb_offset;
+ ElfW(Phdr) *phdr;
/* Look through the TLS segment if there is any. */
if (_dl_phdr != NULL)
- {
- ElfW(Phdr) *phdr = _dl_phdr;
- size_t phnum = _dl_phnum;
-
- while (phnum-- > 0)
+ for (phdr = _dl_phdr; phdr < &_dl_phdr[_dl_phnum]; ++phdr)
+ {
if (phdr->p_type == PT_TLS)
{
/* Remember the values we need. */
/* We have to find the load address which is not easy.
Look for the load segment with the lowest address. */
if (phdr->p_vaddr < loadaddr)
- loadaddr = phdr->p_type;
+ loadaddr = phdr->p_vaddr;
}
}