From: Marcus Shawcroft <marcus.shawcroft@linaro.org>
To: libc-ports <libc-ports@sourceware.org>
Subject: [COMMITTED] AArch64 have elf_machine_dynamic() find _DYNAMIC via _GLOBAL_OFFSET_TABLE_
Date: Fri, 28 Jun 2013 10:39:00 -0000 [thread overview]
Message-ID: <CABXK9nfhHHnm+4LLnrtW-=Py69WvwcF3BWt-kf-TNHsPvqa5ig@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 511 bytes --]
Hi,
This patch fixes the AArch64 implementation of elf_machine_dynamic() to find
_DYNAMIC via _GLOBAL_OFFSET_TABLE_ as discussed here:
http://sourceware.org/ml/libc-ports/2013-06/msg00057.html
The corresponding change in ld required to correctly build ld.so was
committed to binutils here:
http://sourceware.org/ml/binutils/2013-06/msg00248.html
/Marcus
2013-06-28 Marcus Shawcroft <marcus.shawcroft@linaro.org>
* sysdeps/aarch64/dl-machine.h (elf_machine_dynamic): De-reference
_GLOBAL_OFFSET_TABLE_.
[-- Attachment #2: fix-elf_machine_dynamic.diff --]
[-- Type: application/octet-stream, Size: 581 bytes --]
diff --git a/ports/sysdeps/aarch64/dl-machine.h b/ports/sysdeps/aarch64/dl-machine.h
index c91b0c4..01125ee 100644
--- a/ports/sysdeps/aarch64/dl-machine.h
+++ b/ports/sysdeps/aarch64/dl-machine.h
@@ -36,8 +36,8 @@ elf_machine_matches_host (const ElfW(Ehdr) *ehdr)
static inline ElfW(Addr) __attribute__ ((unused))
elf_machine_dynamic (void)
{
- ElfW(Addr) addr = (ElfW(Addr)) &_DYNAMIC;
- return addr;
+ extern const ElfW(Addr) _GLOBAL_OFFSET_TABLE_[] attribute_hidden;
+ return _GLOBAL_OFFSET_TABLE_[0];
}
/* Return the run-time load address of the shared object. */
reply other threads:[~2013-06-28 10:39 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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='CABXK9nfhHHnm+4LLnrtW-=Py69WvwcF3BWt-kf-TNHsPvqa5ig@mail.gmail.com' \
--to=marcus.shawcroft@linaro.org \
--cc=libc-ports@sourceware.org \
/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.
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 read-only IMAP folder(s) and NNTP newsgroup(s).