From ed0257f7d3378ec4a72e297f0dcba5159f2dd138 Mon Sep 17 00:00:00 2001 From: Marcus Shawcroft Date: Fri, 28 Jun 2013 11:27:26 +0100 Subject: [PATCH] [AArch64] Adjust elf_machine_dynamic to find _DYNAMIC via _GLOBAL_OFFSET_TABLE_ --- ports/ChangeLog.aarch64 | 5 +++++ ports/sysdeps/aarch64/dl-machine.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/ChangeLog.aarch64 b/ports/ChangeLog.aarch64 index 25424bb..2527621 100644 --- a/ports/ChangeLog.aarch64 +++ b/ports/ChangeLog.aarch64 @@ -1,5 +1,10 @@ 2013-06-28 Marcus Shawcroft + * sysdeps/aarch64/dl-machine.h (elf_machine_dynamic): De-reference + _GLOBAL_OFFSET_TABLE_. + +2013-06-28 Marcus Shawcroft + * sysdeps/unix/sysv/linux/aarch64/getcontext.S (__getcontext): Simplify oPSTATE initialization. diff --git a/ports/sysdeps/aarch64/dl-machine.h b/ports/sysdeps/aarch64/dl-machine.h index c91b0c4..71dd6b3 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. */ -- 2.7.4