From de5cc86bc0c01dc849ce8b72a0407595ed3f8217 Mon Sep 17 00:00:00 2001 From: Will Newton Date: Mon, 6 Sep 2010 15:59:21 +0100 Subject: ldso: Fix compilation for x86_64 without TLS support. Add an #ifdef to avoid using TLS structures when TLS is not enabled. Signed-off-by: Will Newton Signed-off-by: Carmelo Amoroso --- ldso/ldso/x86_64/elfinterp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ldso/ldso/x86_64/elfinterp.c b/ldso/ldso/x86_64/elfinterp.c index baf024d11..fce2ec7be 100644 --- a/ldso/ldso/x86_64/elfinterp.c +++ b/ldso/ldso/x86_64/elfinterp.c @@ -220,6 +220,7 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope, *reloc_addr = map->l_addr + rpnt->r_addend; break; */ +#if defined USE_TLS && USE_TLS case R_X86_64_DTPMOD64: *reloc_addr = tls_tpnt->l_tls_modid; break; @@ -236,6 +237,7 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope, CHECK_STATIC_TLS ((struct link_map *) tls_tpnt); *reloc_addr = symbol_addr - tls_tpnt->l_tls_offset + rpnt->r_addend; break; +#endif case R_X86_64_32: *(unsigned int *) reloc_addr = symbol_addr + rpnt->r_addend; /* XXX: should check for overflow eh ? */ -- cgit v1.2.3