Since the .plt section and DT_PLTGOT are used by prelink to undo
prelinking for dynamic relocations, we must keep them even if there is
no PLT relocation. This patch reverted commit
a3747075a.
bfd/
* elf32-i386.c (elf_i386_allocate_dynrelocs): Always allocate
space for the first .plt entry.
(elf_i386_size_dynamic_sections): Always add DT_PLTGOT for .plt
section. Add DT_PLTRELSZ, DT_PLTREL and DT_JMPREL only if
there are PLT relocations.
* elf64-x86-64.c (elf_x86_64_allocate_dynrelocs): Always
allocate space for the first .plt entry.
(elf_x86_64_size_dynamic_sections): Always add DT_PLTGOT for
.plt section. Add DT_PLTRELSZ, DT_PLTREL and DT_JMPREL only if
there are PLT relocations.
ld/testsuite/
* ld-i386/i386.exp: Run pltgot-2 for Linux targets.
* ld-x86-64/x86-64.exp: Likewise.
* ld-i386/pltgot-1.d: Updated.
* ld-x86-64/pltgot-1.d: Likewise.
* ld-i386/pltgot-2.d: New file.
* ld-x86-64/pltgot-2.d: Likewise.
2015-06-24 H.J. Lu <hongjiu.lu@intel.com>
+ * elf32-i386.c (elf_i386_allocate_dynrelocs): Always allocate
+ space for the first .plt entry.
+ (elf_i386_size_dynamic_sections): Always add DT_PLTGOT for .plt
+ section. Add DT_PLTRELSZ, DT_PLTREL and DT_JMPREL only if
+ there are PLT relocations.
+ * elf64-x86-64.c (elf_x86_64_allocate_dynrelocs): Always
+ allocate space for the first .plt entry.
+ (elf_x86_64_size_dynamic_sections): Always add DT_PLTGOT for
+ .plt section. Add DT_PLTRELSZ, DT_PLTREL and DT_JMPREL only if
+ there are PLT relocations.
+
+2015-06-24 H.J. Lu <hongjiu.lu@intel.com>
+
PR ld/18591
* elf64-x86-64.c (elf_x86_64_convert_mov_to_lea): Don't convert
R_X86_64_GOTPCREL to R_X86_64_PC32 if it will cause relocation
asection *s = htab->elf.splt;
asection *got_s = htab->plt_got;
+ /* If this is the first .plt entry, make room for the special
+ first entry. The .plt section is used by prelink to undo
+ prelinking for dynamic relocations. */
+ if (s->size == 0)
+ s->size = plt_entry_size;
+
if (use_plt_got)
eh->plt_got.offset = got_s->size;
else
- {
- /* If this is the first .plt entry, make room for the
- special first entry. */
- if (s->size == 0)
- s->size = plt_entry_size;
- h->plt.offset = s->size;
- }
+ h->plt.offset = s->size;
/* If this symbol is not defined in a regular file, and we are
not generating a shared library, then set the symbol to this
if (htab->elf.splt->size != 0)
{
- if (!add_dynamic_entry (DT_PLTGOT, 0)
- || !add_dynamic_entry (DT_PLTRELSZ, 0)
- || !add_dynamic_entry (DT_PLTREL, DT_REL)
- || !add_dynamic_entry (DT_JMPREL, 0))
+ /* DT_PLTGOT is used by prelink even if there is no PLT
+ relocation. */
+ if (!add_dynamic_entry (DT_PLTGOT, 0))
return FALSE;
+
+ if (htab->elf.srelplt->size != 0)
+ {
+ if (!add_dynamic_entry (DT_PLTRELSZ, 0)
+ || !add_dynamic_entry (DT_PLTREL, DT_REL)
+ || !add_dynamic_entry (DT_JMPREL, 0))
+ return FALSE;
+ }
}
if (relocs)
asection *bnd_s = htab->plt_bnd;
asection *got_s = htab->plt_got;
+ /* If this is the first .plt entry, make room for the special
+ first entry. The .plt section is used by prelink to undo
+ prelinking for dynamic relocations. */
+ if (s->size == 0)
+ s->size = plt_entry_size;
+
if (use_plt_got)
eh->plt_got.offset = got_s->size;
else
{
- /* If this is the first .plt entry, make room for the
- special first entry. */
- if (s->size == 0)
- s->size = plt_entry_size;
h->plt.offset = s->size;
if (bnd_s)
eh->plt_bnd.offset = bnd_s->size;
if (htab->elf.splt->size != 0)
{
- if (!add_dynamic_entry (DT_PLTGOT, 0)
- || !add_dynamic_entry (DT_PLTRELSZ, 0)
- || !add_dynamic_entry (DT_PLTREL, DT_RELA)
- || !add_dynamic_entry (DT_JMPREL, 0))
+ /* DT_PLTGOT is used by prelink even if there is no PLT
+ relocation. */
+ if (!add_dynamic_entry (DT_PLTGOT, 0))
return FALSE;
+ if (htab->elf.srelplt->size != 0)
+ {
+ if (!add_dynamic_entry (DT_PLTRELSZ, 0)
+ || !add_dynamic_entry (DT_PLTREL, DT_RELA)
+ || !add_dynamic_entry (DT_JMPREL, 0))
+ return FALSE;
+ }
+
if (htab->tlsdesc_plt
&& (!add_dynamic_entry (DT_TLSDESC_PLT, 0)
|| !add_dynamic_entry (DT_TLSDESC_GOT, 0)))
+2015-06-24 H.J. Lu <hongjiu.lu@intel.com>
+
+ * ld-i386/i386.exp: Run pltgot-2 for Linux targets.
+ * ld-x86-64/x86-64.exp: Likewise.
+ * ld-i386/pltgot-1.d: Updated.
+ * ld-x86-64/pltgot-1.d: Likewise.
+ * ld-i386/pltgot-2.d: New file.
+ * ld-x86-64/pltgot-2.d: Likewise.
+
2015-06-23 Jiong Wang <jiong.wang@arm.com>
* ld-aarch64/dt_textrel.s: New testcase.
# Linux only tests
run_dump_test "pltgot-1"
+run_dump_test "pltgot-2"
#readelf: -S --wide
#as: --32
-#failif
#...
- +\[ [0-9]+\] \.plt +PROGBITS +.*
+ +\[ *[0-9]+\] \.plt +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+10 +.*
#...
+ +\[ *[0-9]+\] \.got\.plt +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+c +.*
+#pass
--- /dev/null
+#source: pltgot-1.s
+#ld: -shared -melf_i386
+#readelf: -d --wide
+#as: --32
+
+#failif
+#...
+ +0x[0-9a-f]+ +\(PLTREL.*
+#...
#readelf: -S --wide
#as: --64
-#failif
#...
- +\[ [0-9]+\] \.plt +PROGBITS +.*
+ +\[ *[0-9]+\] \.plt +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+10 +.*
#...
+ +\[ *[0-9]+\] \.got\.plt +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+18 +.*
+#pass
--- /dev/null
+#source: pltgot-1.s
+#ld: -shared -melf_x86_64
+#readelf: -d --wide
+#as: --64
+
+#failif
+#...
+ +0x[0-9a-f]+ +\(PLTREL.*
+#...
# Linux only tests
run_dump_test "pr17618"
run_dump_test "pltgot-1"
+run_dump_test "pltgot-2"
projects / external / binutils.git / commitdiff