[git commit nptl] silence warning about undefined preprocessor token
Bernhard Reutner-Fischer
rep.dot.nop at gmail.com
Mon Apr 12 13:09:25 UTC 2010
commit: http://git.uclibc.org/uClibc/commit/?id=ed15ebd5148bfdd3fda358e1cc8da621f8eede29
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
ldso/ldso/arm/elfinterp.c | 2 +-
ldso/ldso/i386/elfinterp.c | 2 +-
ldso/ldso/mips/elfinterp.c | 2 +-
ldso/ldso/sh/elfinterp.c | 4 ++--
ldso/ldso/sparc/elfinterp.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ldso/ldso/arm/elfinterp.c b/ldso/ldso/arm/elfinterp.c
index bf74267..9bbf92c 100644
--- a/ldso/ldso/arm/elfinterp.c
+++ b/ldso/ldso/arm/elfinterp.c
@@ -276,7 +276,7 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope,
_dl_memcpy((void *) reloc_addr,
(void *) symbol_addr, symtab[symtab_index].st_size);
break;
-#if USE_TLS
+#if defined USE_TLS && USE_TLS
case R_ARM_TLS_DTPMOD32:
*reloc_addr = def_mod->l_tls_modid;
break;
diff --git a/ldso/ldso/i386/elfinterp.c b/ldso/ldso/i386/elfinterp.c
index 649c207..a01c1d0 100644
--- a/ldso/ldso/i386/elfinterp.c
+++ b/ldso/ldso/i386/elfinterp.c
@@ -228,7 +228,7 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
symtab[symtab_index].st_size);
}
break;
-#if USE_TLS
+#if defined USE_TLS && USE_TLS
case R_386_TLS_DTPMOD32:
*reloc_addr = tls_tpnt->l_tls_modid;
break;
diff --git a/ldso/ldso/mips/elfinterp.c b/ldso/ldso/mips/elfinterp.c
index 149fc56..b6e0932 100644
--- a/ldso/ldso/mips/elfinterp.c
+++ b/ldso/ldso/mips/elfinterp.c
@@ -201,7 +201,7 @@ int _dl_parse_relocation_information(struct dyn_elf *xpnt,
}
switch (reloc_type) {
-#if USE_TLS
+#if defined USE_TLS && USE_TLS
# if _MIPS_SIM == _MIPS_SIM_ABI64
case R_MIPS_TLS_DTPMOD64:
case R_MIPS_TLS_DTPREL64:
diff --git a/ldso/ldso/sh/elfinterp.c b/ldso/ldso/sh/elfinterp.c
index 10b9443..715eadc 100644
--- a/ldso/ldso/sh/elfinterp.c
+++ b/ldso/ldso/sh/elfinterp.c
@@ -192,7 +192,7 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope,
old_val = *reloc_addr;
#endif
-#if USE_TLS
+#if defined USE_TLS && USE_TLS
/* In case of a TLS reloc, tls_tpnt NULL means we have an 'anonymous'
symbol. This is the case for a static tls variable, so the lookup
module is just that one is referencing the tls variable. */
@@ -225,7 +225,7 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope,
case R_SH_RELATIVE:
*reloc_addr = (unsigned long) tpnt->loadaddr + rpnt->r_addend;
break;
-#if USE_TLS
+#if defined USE_TLS && USE_TLS
case R_SH_TLS_DTPMOD32:
*reloc_addr = tls_tpnt->l_tls_modid;
break;
diff --git a/ldso/ldso/sparc/elfinterp.c b/ldso/ldso/sparc/elfinterp.c
index 75e7777..56335cb 100644
--- a/ldso/ldso/sparc/elfinterp.c
+++ b/ldso/ldso/sparc/elfinterp.c
@@ -272,7 +272,7 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
} else
_dl_dprintf(_dl_debug_file, "no symbol_addr to copy !?\n");
break;
-#if USE_TLS
+#if defined USE_TLS && USE_TLS
case R_SPARC_TLS_DTPMOD32:
*reloc_addr = tls_tpnt->l_tls_modid;
break;
--
1.6.3.3
More information about the uClibc-cvs
mailing list