diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2016-11-28 09:44:49 -0800 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2017-02-09 11:05:18 -0500 |
| commit | d012ea850680a2a94959f1c5136502a0f712b30a (patch) | |
| tree | 5d47645a8ca6ab7649eb3467378ec211e608b4e8 | |
| parent | b3b37f1a5559a7620e31c8053ed1b44f798f2b6d (diff) | |
| download | glibc-d012ea850680a2a94959f1c5136502a0f712b30a.tar.gz glibc-d012ea850680a2a94959f1c5136502a0f712b30a.tar.xz glibc-d012ea850680a2a94959f1c5136502a0f712b30a.zip | |
X86_64: Don't use PLT nor GOT in static archives [BZ #20750]
There is no need to use PLT nor GOT in static archives to branch to a function, regardless whether static archives is compiled with PIC or not. When static archives are used to create dynamic executable, PLT/GOT may be used. The resulting executable still works correctly. [BZ #20750] * sysdeps/x86_64/sysdep.h (JUMPTARGET): Check SHARED instead of PIC. (cherry picked from commit c9070e6305c08365c5f8b604bdca39c699d70cfa)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/x86_64/sysdep.h | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index bf89bd33bc..a9b7540017 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-11-28 H.J. Lu <hongjiu.lu@intel.com> + + [BZ #20750] + * sysdeps/x86_64/sysdep.h (JUMPTARGET): Check SHARED instead + of PIC. + 2016-12-31 Florian Weimer <fweimer@redhat.com> [BZ #18784] diff --git a/sysdeps/x86_64/sysdep.h b/sysdeps/x86_64/sysdep.h index 75ac747be8..4b67fa80c1 100644 --- a/sysdeps/x86_64/sysdep.h +++ b/sysdeps/x86_64/sysdep.h @@ -89,13 +89,14 @@ lose: \ END (name) #undef JUMPTARGET -#ifdef PIC +#ifdef SHARED # ifdef BIND_NOW # define JUMPTARGET(name) *name##@GOTPCREL(%rip) # else # define JUMPTARGET(name) name##@PLT # endif #else +/* For static archives, branch to target directly. */ # define JUMPTARGET(name) name #endif |