aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2014-12-21 05:27:31 -0800
committerH.J. Lu <hjl.tools@gmail.com>2014-12-21 05:27:31 -0800
commit7432d613cd1fefc833800c7af9538d8d81d5c6b2 (patch)
treeee06c598355904c564b1cde715ad280eaeec35cd
parent98fe149e34b48d0c4d69105315cc7c61be8276ec (diff)
downloadglibc-7432d613cd1fefc833800c7af9538d8d81d5c6b2.zip
glibc-7432d613cd1fefc833800c7af9538d8d81d5c6b2.tar.gz
glibc-7432d613cd1fefc833800c7af9538d8d81d5c6b2.tar.bz2
Remove @PLT from "call _dl_init@PLT" in _dl_start_user
_dl_start_user in ld.so calls the local function _dl_init. There is no need to go through PLT. * sysdeps/i386/dl-machine.h (_dl_start_user): Remove @PLT from "call _dl_init@PLT". * sysdeps/x86_64/dl-machine.h (_dl_start_user): Likewise. from "call _dl_init@PLT".
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/i386/dl-machine.h2
-rw-r--r--sysdeps/x86_64/dl-machine.h2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index eaaff71..de45fe4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-12-21 H.J. Lu <hongjiu.lu@intel.com>
+
+ * sysdeps/i386/dl-machine.h (_dl_start_user): Remove @PLT
+ from "call _dl_init@PLT".
+ * sysdeps/x86_64/dl-machine.h (_dl_start_user): Likewise.
+ from "call _dl_init@PLT".
+
2014-12-21 Anders Kaseorg <andersk@mit.edu>
* manual/search.texi: (Array Sort Function): Clarify stable sorting
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index c10b1e5..94a6d38 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -221,7 +221,7 @@ _dl_start_user:\n\
# Clear %ebp, so that even constructors have terminated backchain.\n\
xorl %ebp, %ebp\n\
# Call the function to run the initializers.\n\
- call _dl_init@PLT\n\
+ call _dl_init\n\
# Pass our finalizer function to the user in %edx, as per ELF ABI.\n\
leal _dl_fini@GOTOFF(%ebx), %edx\n\
# Restore %esp _start expects.\n\
diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h
index 8316f13..5e1bb07 100644
--- a/sysdeps/x86_64/dl-machine.h
+++ b/sysdeps/x86_64/dl-machine.h
@@ -156,7 +156,7 @@ _dl_start_user:\n\
# Clear %rbp to mark outermost frame obviously even for constructors.\n\
xorl %ebp, %ebp\n\
# Call the function to run the initializers.\n\
- call _dl_init@PLT\n\
+ call _dl_init\n\
# Pass our finalizer function to the user in %rdx, as per ELF ABI.\n\
leaq _dl_fini(%rip), %rdx\n\
# And make sure %rsp points to argc stored on the stack.\n\