svn commit: branches/uClibc-nptl/ldso/ldso
sjhill at uclibc.org
sjhill at uclibc.org
Sun Nov 6 05:53:53 UTC 2005
Author: sjhill
Date: 2005-11-05 21:53:51 -0800 (Sat, 05 Nov 2005)
New Revision: 12172
Log:
Code clean-ups and re-organization.
Modified:
branches/uClibc-nptl/ldso/ldso/dl-elf.c
branches/uClibc-nptl/ldso/ldso/ldso.c
Changeset:
Modified: branches/uClibc-nptl/ldso/ldso/dl-elf.c
===================================================================
--- branches/uClibc-nptl/ldso/ldso/dl-elf.c 2005-11-06 05:46:27 UTC (rev 12171)
+++ branches/uClibc-nptl/ldso/ldso/dl-elf.c 2005-11-06 05:53:51 UTC (rev 12172)
@@ -752,7 +752,6 @@
#endif
if (tpnt->dynamic_info[DT_RELOC_TABLE_ADDR] &&
!(tpnt->init_flag & RELOCS_DONE)) {
- tpnt->init_flag |= RELOCS_DONE;
reloc_addr = tpnt->dynamic_info[DT_RELOC_TABLE_ADDR];
relative_count = tpnt->dynamic_info[DT_RELCONT_IDX];
if (relative_count) { /* Optimize the XX_RELATIVE relocations if possible */
@@ -763,6 +762,7 @@
goof += _dl_parse_relocation_information(rpnt,
reloc_addr,
reloc_size);
+ tpnt->init_flag |= RELOCS_DONE;
}
if (tpnt->dynamic_info[DT_BIND_NOW])
now_flag = RTLD_NOW;
@@ -770,7 +770,6 @@
(!(tpnt->init_flag & JMP_RELOCS_DONE) ||
(now_flag && !(tpnt->rtld_flags & now_flag)))) {
tpnt->rtld_flags |= now_flag;
- tpnt->init_flag |= JMP_RELOCS_DONE;
if (!(tpnt->rtld_flags & RTLD_NOW)) {
_dl_parse_lazy_relocation_information(rpnt,
tpnt->dynamic_info[DT_JMPREL],
@@ -780,10 +779,11 @@
tpnt->dynamic_info[DT_JMPREL],
tpnt->dynamic_info[DT_PLTRELSZ]);
}
+ tpnt->init_flag |= JMP_RELOCS_DONE;
}
-#ifdef USE_TLS
- /* Add object to slot information data if necessasy. */
+#if USE_TLS
+ /* Add object to slot information data if necessasy. */
if (tpnt->l_tls_blocksize != 0 && tls_init_tp_called)
_dl_add_to_slotinfo ((struct link_map *) tpnt);
#endif
Modified: branches/uClibc-nptl/ldso/ldso/ldso.c
===================================================================
--- branches/uClibc-nptl/ldso/ldso/ldso.c 2005-11-06 05:46:27 UTC (rev 12171)
+++ branches/uClibc-nptl/ldso/ldso/ldso.c 2005-11-06 05:53:51 UTC (rev 12172)
@@ -137,6 +137,10 @@
unsigned long *_dl_envp; /* The environment address */
ElfW(Addr) relro_addr = 0;
size_t relro_size = 0;
+#if USE_TLS
+ void *tcbp = NULL;
+#endif
+
/* Wahoo!!! We managed to make a function call! Get malloc
* setup so we can use _dl_dprintf() to print debug noise
@@ -249,71 +253,7 @@
"app_tpnt->loadaddr=%x\n", app_tpnt->loadaddr);
}
-#if USE_TLS
/*
- * Adjust the address of the TLS initialization image in case
- * the executable is actually an ET_DYN object.
- */
- if (app_tpnt->l_tls_initimage != NULL)
- app_tpnt->l_tls_initimage =
- (char *) app_tpnt->l_tls_initimage + app_tpnt->loadaddr;
-#endif
-
- /*
- * This adds another loop, but we have to catch the stupid user who
- * tries to run a binary with TLS data and the linker does not support
- * it. Otherwise, we fill in the TLS data for the application like we
- * are supposed to.
- */
- {
- int i;
- ElfW(Phdr) *ppnt = (ElfW(Phdr) *) auxvt[AT_PHDR].a_un.a_val;
-
- for (i = 0; i < auxvt[AT_PHNUM].a_un.a_val; i++, ppnt++)
- if (ppnt->p_type == PT_TLS) {
-#if USE_TLS
- if (ppnt->p_memsz > 0) {
- /*
- * Note that in the case the dynamic linker we duplicate
- * work here since we read the PT_TLS entry already in
- * _dl_start_final. But the result is repeatable so do
- * not check for this special but unimportant case.
- */
- app_tpnt->l_tls_blocksize = ppnt->p_memsz;
- app_tpnt->l_tls_align = ppnt->p_align;
- if (ppnt->p_align == 0)
- app_tpnt->l_tls_firstbyte_offset = 0;
- else
- app_tpnt->l_tls_firstbyte_offset =
- (ppnt->p_vaddr & (ppnt->p_align - 1));
- app_tpnt->l_tls_initimage_size = ppnt->p_filesz;
- app_tpnt->l_tls_initimage = (void *) ppnt->p_vaddr;
-
- /* This image gets the ID one. */
- _dl_tls_max_dtv_idx = app_tpnt->l_tls_modid = 1;
- }
- break;
-#else
- _dl_debug_early("Program uses unsupported TLS data!!!\n");
- _dl_exit(1);
-#endif
- }
- }
-
-#if USE_TLS
- /* We do not initialize any of the TLS functionality unless any of the
- * initial modules uses TLS. This makes dynamic loading of modules with
- * TLS impossible, but to support it requires either eagerly doing setup
- * now or lazily doing it later. Doing it now makes us incompatible with
- * an old kernel that can't perform TLS_INIT_TP, even if no TLS is ever
- * used. Trying to do it lazily is too hairy to try when there could be
- * multiple threads (from a non-TLS-using libpthread). */
- bool was_tls_init_tp_called = tls_init_tp_called;
- if (tcbp == NULL)
- tcbp = init_tls ();
-#endif
-
- /*
* This is used by gdb to locate the chain of shared libraries that are
* currently loaded.
*/
@@ -389,10 +329,46 @@
_dl_debug_early("Lib Loader: (%x) %s\n", tpnt->loadaddr, tpnt->libname);
}
+
+ /* Discover any TLS sections if the target supports them. */
+ if (ppnt->p_type == PT_TLS) {
+#if USE_TLS
+ if (ppnt->p_memsz > 0) {
+ app_tpnt->l_tls_blocksize = ppnt->p_memsz;
+ app_tpnt->l_tls_align = ppnt->p_align;
+ if (ppnt->p_align == 0)
+ app_tpnt->l_tls_firstbyte_offset = 0;
+ else
+ app_tpnt->l_tls_firstbyte_offset =
+ (ppnt->p_vaddr & (ppnt->p_align - 1));
+ app_tpnt->l_tls_initimage_size = ppnt->p_filesz;
+ app_tpnt->l_tls_initimage = (void *) ppnt->p_vaddr;
+
+ /* This image gets the ID one. */
+ _dl_tls_max_dtv_idx = app_tpnt->l_tls_modid = 1;
+
+ }
+ _dl_debug_early("Found TLS header for appplication program\n");
+ break;
+#else
+ _dl_dprintf(_dl_debug_file, "Program uses unsupported TLS data!\n");
+ _dl_exit(1);
+#endif
+ }
}
app_tpnt->relro_addr = relro_addr;
app_tpnt->relro_size = relro_size;
+#if USE_TLS
+ /*
+ * Adjust the address of the TLS initialization image in
+ * case the executable is actually an ET_DYN object.
+ */
+ if (app_tpnt->l_tls_initimage != NULL)
+ app_tpnt->l_tls_initimage =
+ (char *) app_tpnt->l_tls_initimage + app_tpnt->loadaddr;
+#endif
+
#ifdef __SUPPORT_LD_DEBUG__
_dl_debug = _dl_getenv("LD_DEBUG", envp);
if (_dl_debug) {
@@ -779,6 +755,19 @@
}
#endif
+#if USE_TLS
+ /* We do not initialize any of the TLS functionality unless any of the
+ * initial modules uses TLS. This makes dynamic loading of modules with
+ * TLS impossible, but to support it requires either eagerly doing setup
+ * now or lazily doing it later. Doing it now makes us incompatible with
+ * an old kernel that can't perform TLS_INIT_TP, even if no TLS is ever
+ * used. Trying to do it lazily is too hairy to try when there could be
+ * multiple threads (from a non-TLS-using libpthread). */
+ bool was_tls_init_tp_called = tls_init_tp_called;
+ if (tcbp == NULL)
+ tcbp = init_tls ();
+#endif
+
_dl_debug_early("Beginning relocation fixups\n");
#ifdef __mips__
@@ -884,8 +873,10 @@
{
const char *lossage = TLS_INIT_TP (tcbp, USE___THREAD);
if (__builtin_expect (lossage != NULL, 0))
- _dl_fatal_printf ("cannot set up thread-local storage: %s\n",
- lossage);
+ {
+ _dl_debug_early("cannot set up thread-local storage: %s\n", lossage);
+ _dl_exit(30);
+ }
}
#endif
@@ -982,21 +973,20 @@
size_t delta;
size_t rounded = 0;
- if (_dl_memalign_function) {
-#if 1
- _dl_debug_early("Calling libc version\n");
-#endif
+ if (_dl_memalign_function)
return (*_dl_memalign_function) (__boundary, __size);
- }
- _dl_debug_early("allocating aligned memory\n");
while (rounded < __boundary) {
rounded = (1 << i++);
}
+
delta = (((size_t) _dl_malloc_addr + __size) % rounded);
+
if ((result = _dl_malloc(rounded - delta)) == NULL)
return result;
+
result = _dl_malloc(__size);
+
return result;
}
#endif
More information about the uClibc-cvs
mailing list