Keep .plt section and DT_PLTGOT for prelink

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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 89188511f922e7982174ac9a80a8e48a8f76bb45..49303b3e1bb57894059f7f327e859a6087ff8a8b 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,16 @@
+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

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index f3aee96822f659383c04f06100cff179eec136f2..92e7f72ad59ad8f41f07c7e859967f2c4bae9f8c 100644 (file)
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -2351,16 +2351,16 @@ elf_i386_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
          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
@@ -3119,11 +3119,18 @@ elf_i386_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
 
       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)

diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index f7aea98d6bf9f9aba0722b05829f784216d60836..fb22602ed56152c97312e139e79ecbd770bbb577 100644 (file)
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -2571,14 +2571,16 @@ elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
          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;
@@ -3464,12 +3466,19 @@ elf_x86_64_size_dynamic_sections (bfd *output_bfd,
 
       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)))

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 812549c7e971dbc49f96542652a26acd1c19e6ad..2031bc82936eb0a0e6e0bc6b71a89104ec91fa4d 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+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.

diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index a26cffd3abc94fea0ae2b7276eea102fa09ae3b6..61f959984613875c97369f2e7da066fc8fd8242a 100644 (file)
--- a/ld/testsuite/ld-i386/i386.exp
+++ b/ld/testsuite/ld-i386/i386.exp
@@ -525,3 +525,4 @@ if { !([istarget "i?86-*-linux*"]
 
 # Linux only tests
 run_dump_test "pltgot-1"
+run_dump_test "pltgot-2"

diff --git a/ld/testsuite/ld-i386/pltgot-1.d b/ld/testsuite/ld-i386/pltgot-1.d
index 66296354f54eb18a78c88ccfbee443e25ae6d729..165ae33750a5b8e7fd4b2d7f91595c66796952d4 100644 (file)
--- a/ld/testsuite/ld-i386/pltgot-1.d
+++ b/ld/testsuite/ld-i386/pltgot-1.d
@@ -2,7 +2,8 @@
 #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

diff --git a/ld/testsuite/ld-i386/pltgot-2.d b/ld/testsuite/ld-i386/pltgot-2.d
new file mode 100644 (file)
index 0000000..3b87898
--- /dev/null
+++ b/ld/testsuite/ld-i386/pltgot-2.d
@@ -0,0 +1,9 @@
+#source: pltgot-1.s
+#ld: -shared -melf_i386
+#readelf: -d --wide
+#as: --32
+
+#failif
+#...
+ +0x[0-9a-f]+ +\(PLTREL.*
+#...

diff --git a/ld/testsuite/ld-x86-64/pltgot-1.d b/ld/testsuite/ld-x86-64/pltgot-1.d
index 9a6c2fd647394d40a67324a91a1fe5e21af9f893..17d4f438c630a1ab6832c2bd23e7fc46e6b16005 100644 (file)
--- a/ld/testsuite/ld-x86-64/pltgot-1.d
+++ b/ld/testsuite/ld-x86-64/pltgot-1.d
@@ -2,7 +2,8 @@
 #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

diff --git a/ld/testsuite/ld-x86-64/pltgot-2.d b/ld/testsuite/ld-x86-64/pltgot-2.d
new file mode 100644 (file)
index 0000000..086d6dd
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pltgot-2.d
@@ -0,0 +1,9 @@
+#source: pltgot-1.s
+#ld: -shared -melf_x86_64
+#readelf: -d --wide
+#as: --64
+
+#failif
+#...
+ +0x[0-9a-f]+ +\(PLTREL.*
+#...

diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index 8281dc43f1f7b761718896e7fd4dc3749650f794..3669446aaf3e4ef96b05f2247ba6beec8ce0ad02 100644 (file)
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -574,3 +574,4 @@ if { ![istarget "x86_64-*-linux*"]} {
 # Linux only tests
 run_dump_test "pr17618"
 run_dump_test "pltgot-1"
+run_dump_test "pltgot-2"