From 7432d613cd1fefc833800c7af9538d8d81d5c6b2 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sun, 21 Dec 2014 05:27:31 -0800 Subject: [PATCH] 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". --- ChangeLog | 7 +++++++ sysdeps/i386/dl-machine.h | 2 +- sysdeps/x86_64/dl-machine.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index eaaff71555..de45fe45bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-12-21 H.J. Lu + + * 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 * manual/search.texi: (Array Sort Function): Clarify stable sorting diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index c10b1e5637..94a6d38377 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 8316f13a06..5e1bb07b90 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\