diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2010-04-12 06:18:10 -0700 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2010-04-12 06:18:10 -0700 |
| commit | 6cc4f58c6382c850ce97f32f56d1a3ff00ca4585 (patch) | |
| tree | 19a2f25da5db93c2cb620c0da3c38d3bffd0b784 /ldso/ldso/arm | |
| parent | c58dd2b2aabda615aa333cdbb023defbf00b30a3 (diff) | |
| parent | e90c33f951efc032ca23f48326343a83c0b54b10 (diff) | |
Merge remote branch 'origin/master' into nptl
Conflicts:
libc/unistd/confstr.c
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'ldso/ldso/arm')
| -rw-r--r-- | ldso/ldso/arm/elfinterp.c | 2 |
1 files changed, 1 insertions, 1 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; |