diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2010-04-12 09:43:08 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2010-04-12 10:02:19 +0200 |
| commit | ed15ebd5148bfdd3fda358e1cc8da621f8eede29 (patch) | |
| tree | e005ced792d7a44af84860b371cf283cc7090ed6 | |
| parent | 62174f7330a4578faf2df6c108c0ee6ee5270325 (diff) | |
silence warning about undefined preprocessor token
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
| -rw-r--r-- | ldso/ldso/arm/elfinterp.c | 2 | ||||
| -rw-r--r-- | ldso/ldso/i386/elfinterp.c | 2 | ||||
| -rw-r--r-- | ldso/ldso/mips/elfinterp.c | 2 | ||||
| -rw-r--r-- | ldso/ldso/sh/elfinterp.c | 4 | ||||
| -rw-r--r-- | 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 bf7426790..9bbf92c8c 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 649c207f9..a01c1d020 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 149fc5674..b6e0932c7 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 10b944380..715eadc15 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 75e77772c..56335cb5c 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; |