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/mips/elfinterp.c | |
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/mips/elfinterp.c')
-rw-r--r-- | ldso/ldso/mips/elfinterp.c | 2 |
1 files changed, 1 insertions, 1 deletions
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: |