summaryrefslogtreecommitdiff
path: root/ldso
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2011-02-03 11:14:03 +0100
committerCarmelo Amoroso <carmelo.amoroso@st.com>2011-02-03 11:16:42 +0100
commitac5e9d08f4f7aa004e48b9484c3005f0ecc0a105 (patch)
tree32d30bd157f862792fdc4193eb2372e4d8cd0df4 /ldso
parentfd3120fb9ec9fe01d458962dca510eb81d06fcc8 (diff)
parent269f901e62106e2d36acf4c2b79a9a5ec6d684ff (diff)
Merge remote branch 'origin/master' into prelink
* origin/master: arm: fix the static link problem for ARM due to undefined __tls_get_addr nios2: Name architecture correctly in endian.h header nptl/mips64: Fix build when using mips64 and ABIs other than o32 mips: avoid segmentation fault when RLD_MAP is 0 libc: fix linker script generation for libubacktrace.so stdio: fix diagnostic message Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'ldso')
-rw-r--r--ldso/ldso/mips/dl-sysdep.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ldso/ldso/mips/dl-sysdep.h b/ldso/ldso/mips/dl-sysdep.h
index c1aad6661..80c089aed 100644
--- a/ldso/ldso/mips/dl-sysdep.h
+++ b/ldso/ldso/mips/dl-sysdep.h
@@ -109,7 +109,7 @@ else if (dpnt->d_tag == DT_MIPS_SYMTABNO) \
dynamic[DT_MIPS_SYMTABNO_IDX] = dpnt->d_un.d_val; \
else if (dpnt->d_tag == DT_MIPS_PLTGOT) \
dynamic[DT_MIPS_PLTGOT_IDX] = dpnt->d_un.d_val; \
-else if (dpnt->d_tag == DT_MIPS_RLD_MAP) \
+else if ((dpnt->d_tag == DT_MIPS_RLD_MAP) && (dpnt->d_un.d_ptr)) \
*(ElfW(Addr) *)(dpnt->d_un.d_ptr) = (ElfW(Addr)) debug_addr; \
} while (0)