From: Rich Felker <dalias@libc.org>
To: musl@lists.openwall.com
Subject: Re: [PATCH] ldso: fix GDB dynamic linker info on MIPS
Date: Sat, 30 Jan 2016 13:24:49 -0500 [thread overview]
Message-ID: <20160130182449.GC9349@brightrain.aerifal.cx> (raw)
In-Reply-To: <1454178019-24877-1-git-send-email-nbd@openwrt.org>
On Sat, Jan 30, 2016 at 07:20:19PM +0100, Felix Fietkau wrote:
> 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>
> ---
> arch/mips/reloc.h | 1 +
> src/ldso/dynlink.c | 9 ++++++++-
> 2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/arch/mips/reloc.h b/arch/mips/reloc.h
> index 9b40e3d..e9cb209 100644
> --- a/arch/mips/reloc.h
> +++ b/arch/mips/reloc.h
> @@ -25,6 +25,7 @@
>
> #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/src/ldso/dynlink.c b/src/ldso/dynlink.c
> index 93e7d67..dd85eea 100644
> --- a/src/ldso/dynlink.c
> +++ b/src/ldso/dynlink.c
> @@ -1584,11 +1584,18 @@ _Noreturn void __dls3(size_t *sp)
> load_deps(&app);
> make_global(&app);
>
> + for (i=0; app.dynv[i]; i+=2) {
> #ifndef DYNAMIC_IS_RO
> - for (i=0; app.dynv[i]; i+=2)
> if (app.dynv[i]==DT_DEBUG)
> app.dynv[i+1] = (size_t)&debug;
> #endif
> +#ifdef DT_DEBUG_INDIRECT
> + if (app.dynv[i]==DT_DEBUG_INDIRECT) {
> + size_t *ptr = (size_t *) app.dynv[i+1];
> + *ptr = (size_t)&debug;
> + }
> +#endif
> + }
>
> /* The main program must be relocated LAST since it may contin
> * copy relocations which depend on libraries' relocations. */
> --
> 2.2.2
This certainly works, but DYNAMIC_IS_RO and DT_DEBUG_INDIRECT are
probably redundant now; I can't imagine wanting one without the other.
I've also tried to replace #if/#ifdef in dynlink.c with if, in the
interest of catching warnings/errors no matter what arch we're
compiling for, so maybe we could do in internal/dynlink.h:
#ifndef DT_DEBUG_INDIRECT
#define DT_DEBUG_INDIRECT 0
#endif
then in dynlink.c:
if (!DT_DEBUG_INDIRECT && app.dynv[i]==DT_DEBUG)
...
if (DT_DEBUG_INDIRECT && app.dynv[i]==DT_DEBUG_INDIRECT)
What do you think?
Rich
prev parent reply other threads:[~2016-01-30 18:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-30 18:20 Felix Fietkau
2016-01-30 18:24 ` Rich Felker [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160130182449.GC9349@brightrain.aerifal.cx \
--to=dalias@libc.org \
--cc=musl@lists.openwall.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/musl/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).