summaryrefslogtreecommitdiff
path: root/ldso
diff options
context:
space:
mode:
authorWill Newton <will.newton@imgtec.com>2010-09-06 15:59:21 +0100
committerCarmelo Amoroso <carmelo.amoroso@st.com>2010-09-07 10:21:32 +0200
commitde5cc86bc0c01dc849ce8b72a0407595ed3f8217 (patch)
tree21ef54b03a19eaefcd914e7588525dbab68f91bb /ldso
parent22e1466e367213304640da7697d75760a0883046 (diff)
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 <will.newton@imgtec.com> Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'ldso')
-rw-r--r--ldso/ldso/x86_64/elfinterp.c2
1 files changed, 2 insertions, 0 deletions
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 ? */