aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2005-05-12 21:01:42 +0000
committerH.J. Lu <hjl.tools@gmail.com>2005-05-12 21:01:42 +0000
commit8fe769244d1120985c562b9579456467d41828b4 (patch)
tree0239e087d6cbef81186c39a650379700da6ff625
parent5711a8b054c639f25447eac46087c5262e3a72dc (diff)
downloadfsf-binutils-gdb-8fe769244d1120985c562b9579456467d41828b4.zip
fsf-binutils-gdb-8fe769244d1120985c562b9579456467d41828b4.tar.gz
fsf-binutils-gdb-8fe769244d1120985c562b9579456467d41828b4.tar.bz2
2005-05-12 H.J. Lu <hongjiu.lu@intel.com>
* elf32-i386.c (elf_i386_relocate_section): Allow R_386_GOTOFF against protected function when building executable.
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf32-i386.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1bca5b8..f4b9c69 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-12 H.J. Lu <hongjiu.lu@intel.com>
+
+ * elf32-i386.c (elf_i386_relocate_section): Allow R_386_GOTOFF
+ against protected function when building executable.
+
2005-05-12 Alan Modra <amodra@bigpond.net.au>
* elf32-ppc.c (LWZU_0_X_11): Delete.
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index fe2ebc8..491fd9b 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -2368,6 +2368,7 @@ elf_i386_relocate_section (bfd *output_bfd,
for shared library since it may not be local when used
as function address. */
if (info->shared
+ && !info->executable
&& h
&& h->def_regular
&& h->type == STT_FUNC