[git commit master 1/1] ldso: Fix compilation for x86_64 without TLS support.

Carmelo Amoroso carmelo.amoroso at st.com
Tue Sep 7 08:21:32 UTC 2010


commit: http://git.uclibc.org/uClibc/commit/?id=de5cc86bc0c01dc849ce8b72a0407595ed3f8217
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

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

Signed-off-by: Will Newton <will.newton at imgtec.com>
Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.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.1



More information about the uClibc-cvs mailing list