From: linzhuorong <linzhuorong@huawei.com>
To: <libc-alpha@sourceware.org>
Cc: <nixiaoming@huawei.com>, <xiaojiangfeng@huawei.com>,
linzhuorong <linzhuorong@huawei.com>
Subject: [PATCH] aarch64: fix elf_machine_dynamic compile error [BZ #29835]
Date: Fri, 2 Dec 2022 11:54:13 +0800 [thread overview]
Message-ID: <20221202035413.26894-1-linzhuorong@huawei.com> (raw)
elf_machine_dynamic compile error when compiling glibc with --enable-static-pie option turned on, static executables do not have symbol _DYNAMIC
Fixes: bca0f5cbc9257c13322b99e55235c4f21ba0bd82("aarch64: Make elf_machine_{load_address,dynamic} robust [BZ #28203]")
Signed-off-by linzhuorong <linzhuorong@huawei.com>
---
sysdeps/aarch64/dl-machine.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h
index ae8b14425a..49b1d1ea0e 100644
--- a/sysdeps/aarch64/dl-machine.h
+++ b/sysdeps/aarch64/dl-machine.h
@@ -53,8 +53,9 @@ elf_machine_load_address (void)
static inline ElfW(Addr) __attribute__ ((unused))
elf_machine_dynamic (void)
{
- extern ElfW(Dyn) _DYNAMIC[] attribute_hidden;
- return (ElfW(Addr)) _DYNAMIC - elf_machine_load_address ();
+ /* Declaring this hidden ensures that a PC-relative reference is uesed. */
+ extern const ElfW(Addr) _GLOBAL_OFFSET_TABLE_[] attribute_hidden;
+ return _GLOBAL_OFFSET_TABLE_[0];
}
/* Set up the loaded object described by L so its unrelocated PLT
--
2.12.3
next reply other threads:[~2022-12-02 3:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-02 3:54 linzhuorong [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-12-02 3:59 linzhuorong
2022-12-05 14:54 ` Szabolcs Nagy
2022-12-02 3:53 linzhuorong
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=20221202035413.26894-1-linzhuorong@huawei.com \
--to=linzhuorong@huawei.com \
--cc=libc-alpha@sourceware.org \
--cc=nixiaoming@huawei.com \
--cc=xiaojiangfeng@huawei.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.
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).