diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-10-15 16:15:59 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-10-15 17:09:23 -0400 |
| commit | 1f5e333a158f4398437287b8b64260371422194f (patch) | |
| tree | 93d3ccf85cd0e03d9d534a615af1646123e433ec /ldso/ldso/dl-elf.c | |
| parent | 21cec43543081b47f9f7d5860af44d04c92746cd (diff) | |
ldso: clean up breakage in tls merge
The TLS merge 534661b91c9849 introduced multiple style problems as well as
random breakage:
- missing _dl_free
- incomplete parametrization of _dl_lookup_hash
- restore FDPIC handling in _dl_lookup_hash
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'ldso/ldso/dl-elf.c')
| -rw-r--r-- | ldso/ldso/dl-elf.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c index e4086d5e9..e7cb138d4 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -436,8 +436,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure, maxvma = ppnt->p_vaddr + ppnt->p_memsz; } } - if (ppnt->p_type == PT_TLS) - { + if (ppnt->p_type == PT_TLS) { #if USE_TLS if (ppnt->p_memsz == 0) /* Nothing to do for an empty segment. */ @@ -735,8 +734,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure, tpnt->n_phent = epnt->e_phnum; #if USE_TLS - if (tlsppnt) - { + if (tlsppnt) { _dl_debug_early("Found TLS header for %s\n", libname); #if NO_TLS_OFFSET != 0 tpnt->l_tls_offset = NO_TLS_OFFSET; @@ -875,7 +873,7 @@ int _dl_fixup(struct dyn_elf *rpnt, int now_flag) } #if 0 -/* _dl_add_to_slotinfo is called by init_tls() for initial DSO +/* _dl_add_to_slotinfo is called by init_tls() for initial DSO or by dlopen() for dynamically loaded DSO. */ #if USE_TLS /* Add object to slot information data if necessasy. */ |