This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.26.9000-608-g9ba7e81
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 20 Oct 2017 10:37:09 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.26.9000-608-g9ba7e81
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 9ba7e81028b3313d9aeb97a98d2e37626694d442 (commit)
from 4027a4fda011c4431bdc3a063963de0b6fd6c07e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9ba7e81028b3313d9aeb97a98d2e37626694d442
commit 9ba7e81028b3313d9aeb97a98d2e37626694d442
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Oct 20 03:36:34 2017 -0700
m68k: Update elf_machine_load_address for static PIE
When --enable-static-pie is used to configure glibc, we need to use
_dl_relocate_static_pie to compute load address in static PIE.
* sysdeps/m68k/dl-machine.h (elf_machine_load_address): Use
_dl_relocate_static_pie instead of _dl_start to compute load
address in static PIE.
diff --git a/ChangeLog b/ChangeLog
index 138eea5..e5e89ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2017-10-20 H.J. Lu <hongjiu.lu@intel.com>
+ * sysdeps/m68k/dl-machine.h (elf_machine_load_address): Use
+ _dl_relocate_static_pie instead of _dl_start to compute load
+ address in static PIE.
+
+2017-10-20 H.J. Lu <hongjiu.lu@intel.com>
+
* sysdeps/m68k/start.S (_start): Check PIC instead of SHARED.
2017-10-20 Mike FABIAN <mfabian@redhat.com>
diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h
index fd8fb00..33a5f76 100644
--- a/sysdeps/m68k/dl-machine.h
+++ b/sysdeps/m68k/dl-machine.h
@@ -51,9 +51,15 @@ static inline Elf32_Addr
elf_machine_load_address (void)
{
Elf32_Addr addr;
+#ifdef SHARED
asm (PCREL_OP ("lea", "_dl_start", "%0", "%0", "%%pc") "\n\t"
"sub.l _dl_start@GOT.w(%%a5), %0"
: "=a" (addr));
+#else
+ asm (PCREL_OP ("lea", "_dl_relocate_static_pie", "%0", "%0", "%%pc") "\n\t"
+ "sub.l _dl_relocate_static_pie@GOT.w(%%a5), %0"
+ : "=a" (addr));
+#endif
return addr;
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
sysdeps/m68k/dl-machine.h | 6 ++++++
2 files changed, 12 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources