[PATCH] ldso: Fix compilation for x86_64 without TLS support.

Will Newton will.newton at gmail.com
Mon Sep 6 15:02:14 UTC 2010


Add an #ifdef to avoid using TLS structures when TLS is not enabled.

Signed-off-by: Will Newton <will.newton at imgtec.com>
---
 ldso/ldso/x86_64/elfinterp.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ldso/ldso/x86_64/elfinterp.c b/ldso/ldso/x86_64/elfinterp.c
index baf024d..fce2ec7 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 ? */
-- 
1.7.2.2
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-ldso-Fix-compilation-for-x86_64-without-TLS-support.patch
Type: text/x-patch
Size: 1242 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/uclibc/attachments/20100906/e5ec9d49/attachment.bin>


More information about the uClibc mailing list