From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/9241 Path: news.gmane.org!not-for-mail From: Felix Fietkau Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH v3] ldso: fix GDB dynamic linker info on MIPS Date: Sat, 30 Jan 2016 21:14:05 +0100 Message-ID: <1454184845-96384-1-git-send-email-nbd@openwrt.org> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1454184885 5718 80.91.229.3 (30 Jan 2016 20:14:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 30 Jan 2016 20:14:45 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-9254-gllmg-musl=m.gmane.org@lists.openwall.com Sat Jan 30 21:14:30 2016 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1aPbuZ-0000Ah-Br for gllmg-musl@m.gmane.org; Sat, 30 Jan 2016 21:14:23 +0100 Original-Received: (qmail 16140 invoked by uid 550); 30 Jan 2016 20:14:21 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 16108 invoked from network); 30 Jan 2016 20:14:17 -0000 X-Mailer: git-send-email 2.2.2 Xref: news.gmane.org gmane.linux.lib.musl.general:9241 Archived-At: GDB is looking for a pointer to the ldso debug info in the data of the .rld_map section. Signed-off-by: Felix Fietkau --- arch/mips/reloc.h | 2 +- ldso/dynlink.c | 11 +++++++---- src/internal/dynlink.h | 4 ++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/arch/mips/reloc.h b/arch/mips/reloc.h index 9b40e3d..8c52df0 100644 --- a/arch/mips/reloc.h +++ b/arch/mips/reloc.h @@ -24,7 +24,7 @@ #define REL_TPOFF R_MIPS_TLS_TPREL32 #define NEED_MIPS_GOT_RELOCS 1 -#define DYNAMIC_IS_RO 1 +#define DT_DEBUG_INDIRECT DT_MIPS_RLD_MAP #define ARCH_SYM_REJECT_UND(s) (!((s)->st_other & STO_MIPS_PLT)) #define CRTJMP(pc,sp) __asm__ __volatile__( \ diff --git a/ldso/dynlink.c b/ldso/dynlink.c index f497542..87f3b7f 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. */ diff --git a/src/internal/dynlink.h b/src/internal/dynlink.h index 9c494e4..48890b2 100644 --- a/src/internal/dynlink.h +++ b/src/internal/dynlink.h @@ -83,6 +83,10 @@ struct fdpic_dummy_loadmap { #define NEED_MIPS_GOT_RELOCS 0 #endif +#ifndef DT_DEBUG_INDIRECT +#define DT_DEBUG_INDIRECT 0 +#endif + #define AUX_CNT 32 #define DYN_CNT 32 -- 2.2.2