about summary refs log tree commit diff
path: root/ldso
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-30 21:14:05 +0100
committerRich Felker <dalias@aerifal.cx>2016-01-30 20:55:22 -0500
commitc18d05f0e8909ec54252b251c441b5dd903268f8 (patch)
treefcd14fe46d4ffb07c89c698404392449c05ec120 /ldso
parent831e9d9efa61566a25c1dcdbd28f55daeea4dd32 (diff)
downloadmusl-c18d05f0e8909ec54252b251c441b5dd903268f8.tar.gz
musl-c18d05f0e8909ec54252b251c441b5dd903268f8.tar.xz
musl-c18d05f0e8909ec54252b251c441b5dd903268f8.zip
ldso: fix GDB dynamic linker info on MIPS
GDB is looking for a pointer to the ldso debug info in the data of the
..rld_map section.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Diffstat (limited to 'ldso')
-rw-r--r--ldso/dynlink.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/ldso/dynlink.c b/ldso/dynlink.c
index f497542e..87f3b7f8 100644
--- a/ldso/dynlink.c
+++ b/ldso/dynlink.c
@@ -1582,11 +1582,14 @@ _Noreturn void __dls3(size_t *sp)
 	load_deps(&app);
 	make_global(&app);
 
-#ifndef DYNAMIC_IS_RO
-	for (i=0; app.dynv[i]; i+=2)
-		if (app.dynv[i]==DT_DEBUG)
+	for (i=0; app.dynv[i]; i+=2) {
+		if (!DT_DEBUG_INDIRECT && app.dynv[i]==DT_DEBUG)
 			app.dynv[i+1] = (size_t)&debug;
-#endif
+		if (DT_DEBUG_INDIRECT && app.dynv[i]==DT_DEBUG_INDIRECT) {
+			size_t *ptr = (size_t *) app.dynv[i+1];
+			*ptr = (size_t)&debug;
+		}
+	}
 
 	/* The main program must be relocated LAST since it may contin
 	 * copy relocations which depend on libraries' relocations. */