From 052bcf13afb067cafac5e7f4fc21fbad2b34b11f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 27 Nov 2013 09:55:51 +0100 Subject: Fix for SIGBUS error on MIPS64 with N64 ABI When accessing errno, a per thread variable, from _stdio_init a SIGBUS error happens. This change fixes the wrong relocation and debug output. Signed-off-by: Waldemar Brodkorb Signed-off-by: Bernhard Reutner-Fischer --- ldso/ldso/mips/elfinterp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ldso') diff --git a/ldso/ldso/mips/elfinterp.c b/ldso/ldso/mips/elfinterp.c index e57a99fbe..a90e1636b 100644 --- a/ldso/ldso/mips/elfinterp.c +++ b/ldso/ldso/mips/elfinterp.c @@ -259,11 +259,11 @@ int _dl_parse_relocation_information(struct dyn_elf *xpnt, case R_MIPS_TLS_TPREL32: case R_MIPS_TLS_TPREL64: CHECK_STATIC_TLS((struct link_map *)tls_tpnt); - *(ElfW(Word) *)reloc_addr += + *(ElfW(Addr) *)reloc_addr += TLS_TPREL_VALUE (tls_tpnt, symbol_addr); #ifdef __SUPPORT_LD_DEBUG__ _dl_dprintf(2, "TLS_TPREL : %s, %x, %x\n", - symname, old_val, *((unsigned int *)reloc_addr)); + symname, old_val, *((unsigned long *)reloc_addr)); #endif break; } -- cgit v1.2.3