projects / external / binutils.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b1bb697)
x86-64: Properly report output type when PIC is needed
authorH.J. Lu <hjl.tools@gmail.com>
Wed, 23 Aug 2017 20:40:49 +0000 (13:40 -0700)
committerH.J. Lu <hjl.tools@gmail.com>
Wed, 23 Aug 2017 20:43:45 +0000 (13:43 -0700)
-fPIC may be needed to compile PIE or PDE objects, not just shared
object.

bfd/

* elf64-x86-64.c (elf_x86_64_need_pic): Add an argument for
bfd_link_info.  Report shared, PIE or PDE object based on
bfd_link_info.
(elf_x86_64_check_relocs): Update elf_x86_64_need_pic call.
(elf_x86_64_relocate_section): Likewise.

ld/

* testsuite/ld-x86-64/pie2.d: Updated.
* testsuite/ld-x86-64/pr19719.d: Likewise.
* testsuite/ld-x86-64/pr19807-2a.d: Likewise.
* testsuite/ld-x86-64/pr19969.d: Likewise.

bfd/ChangeLog patch | blob | history
bfd/elf64-x86-64.c patch | blob | history
ld/ChangeLog patch | blob | history
ld/testsuite/ld-x86-64/pie2.d patch | blob | history
ld/testsuite/ld-x86-64/pr19719.d patch | blob | history
ld/testsuite/ld-x86-64/pr19807-2a.d patch | blob | history
ld/testsuite/ld-x86-64/pr19969.d patch | blob | history

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index db93894..9cb390c 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,13 @@
 2017-08-23  H.J. Lu  <hongjiu.lu@intel.com>
 
+       * elf64-x86-64.c (elf_x86_64_need_pic): Add an argument for
+       bfd_link_info.  Report shared, PIE or PDE object based on
+       bfd_link_info.
+       (elf_x86_64_check_relocs): Update elf_x86_64_need_pic call.
+       (elf_x86_64_relocate_section): Likewise.
+
+2017-08-23  H.J. Lu  <hongjiu.lu@intel.com>
+
        * elf32-i386.c (elf_i386_check_relocs): Increment PLT count only
        for function symbols.
        * elf64-x86-64.c (elf_x86_64_check_relocs): Likewise.
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 3dc2c35..775c911 100644 (file)
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -1880,7 +1880,8 @@ elf_x86_64_tls_transition (struct bfd_link_info *info, bfd *abfd,
 #define check_relocs_failed    sec_flg1
 
 static bfd_boolean
-elf_x86_64_need_pic (bfd *input_bfd, asection *sec,
+elf_x86_64_need_pic (struct bfd_link_info *info,
+                    bfd *input_bfd, asection *sec,
                     struct elf_link_hash_entry *h,
                     Elf_Internal_Shdr *symtab_hdr,
                     Elf_Internal_Sym *isym,
@@ -1889,6 +1890,7 @@ elf_x86_64_need_pic (bfd *input_bfd, asection *sec,
   const char *v = "";
   const char *und = "";
   const char *pic = "";
+  const char *object;
 
   const char *name;
   if (h)
@@ -1920,10 +1922,18 @@ elf_x86_64_need_pic (bfd *input_bfd, asection *sec,
       pic = _("; recompile with -fPIC");
     }
 
+  if (bfd_link_dll (info))
+    object = _("a shared object");
+  else if (bfd_link_pie (info))
+    object = _("a PIE object");
+  else
+    object = _("a PDE object");
+
   /* xgettext:c-format */
   _bfd_error_handler (_("%B: relocation %s against %s%s`%s' can "
-                       "not be used when making a shared object%s"),
-                     input_bfd, howto->name, und, v, name, pic);
+                       "not be used when making %s%s"),
+                     input_bfd, howto->name, und, v, name,
+                     object, pic);
   bfd_set_error (bfd_error_bad_value);
   sec->check_relocs_failed = 1;
   return FALSE;
@@ -2519,7 +2529,7 @@ elf_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info,
 
        case R_X86_64_TPOFF32:
          if (!bfd_link_executable (info) && ABI_64_P (abfd))
-           return elf_x86_64_need_pic (abfd, sec, h, symtab_hdr, isym,
+           return elf_x86_64_need_pic (info, abfd, sec, h, symtab_hdr, isym,
                                        &x86_64_elf_howto_table[r_type]);
          if (eh != NULL)
            eh->has_got_reloc = 1;
@@ -2685,7 +2695,7 @@ elf_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info,
                      && !h->def_regular
                      && h->def_dynamic
                      && (sec->flags & SEC_READONLY) == 0)))
-           return elf_x86_64_need_pic (abfd, sec, h, symtab_hdr, isym,
+           return elf_x86_64_need_pic (info, abfd, sec, h, symtab_hdr, isym,
                                        &x86_64_elf_howto_table[r_type]);
          /* Fall through.  */
 
@@ -4966,7 +4976,7 @@ do_ifunc_pointer:
                }
 
              if (fail)
-               return elf_x86_64_need_pic (input_bfd, input_section,
+               return elf_x86_64_need_pic (info, input_bfd, input_section,
                                            h, NULL, NULL, howto);
            }
          /* Fall through.  */
diff --git a/ld/ChangeLog b/ld/ChangeLog
index c499de7..bd73279 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,12 @@
 2017-08-23  H.J. Lu  <hongjiu.lu@intel.com>
 
+       * testsuite/ld-x86-64/pie2.d: Updated.
+       * testsuite/ld-x86-64/pr19719.d: Likewise.
+       * testsuite/ld-x86-64/pr19807-2a.d: Likewise.
+       * testsuite/ld-x86-64/pr19969.d: Likewise.
+
+2017-08-23  H.J. Lu  <hongjiu.lu@intel.com>
+
        * testsuite/ld-i386/i386.exp: Run protected7.
        * testsuite/ld-i386/protected7.d: New file.
        * testsuite/ld-i386/protected7.s: Likewise.
diff --git a/ld/testsuite/ld-x86-64/pie2.d b/ld/testsuite/ld-x86-64/pie2.d
index ef9f58a..9532141 100644 (file)
--- a/ld/testsuite/ld-x86-64/pie2.d
+++ b/ld/testsuite/ld-x86-64/pie2.d
@@ -1,3 +1,3 @@
 #as: --64
 #ld: -pie -melf_x86_64
-#error: .*relocation R_X86_64_32 against symbol `foo' can not be used when making a shared object; recompile with -fPIC
+#error: .*relocation R_X86_64_32 against symbol `foo' can not be used when making a PIE object; recompile with -fPIC
diff --git a/ld/testsuite/ld-x86-64/pr19719.d b/ld/testsuite/ld-x86-64/pr19719.d
index b2daf0e..03cfc15 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr19719.d
+++ b/ld/testsuite/ld-x86-64/pr19719.d
@@ -1,3 +1,3 @@
 #as: --64
 #ld: -pie -melf_x86_64
-#error: .*relocation R_X86_64_32 against undefined symbol `foo' can not be used when making a shared object; recompile with -fPIC
+#error: .*relocation R_X86_64_32 against undefined symbol `foo' can not be used when making a PIE object; recompile with -fPIC
diff --git a/ld/testsuite/ld-x86-64/pr19807-2a.d b/ld/testsuite/ld-x86-64/pr19807-2a.d
index 1357d72..c99852a 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr19807-2a.d
+++ b/ld/testsuite/ld-x86-64/pr19807-2a.d
@@ -1,4 +1,4 @@
 #source: pr19807-2.s
 #as: --64
 #ld: -pie -melf_x86_64
-#error: .*relocation R_X86_64_32 against `.data' can not be used when making a shared object; recompile with -fPIC
+#error: .*relocation R_X86_64_32 against `.data' can not be used when making a PIE object; recompile with -fPIC
diff --git a/ld/testsuite/ld-x86-64/pr19969.d b/ld/testsuite/ld-x86-64/pr19969.d
index c56af2f..1aea67c 100644 (file)
--- a/ld/testsuite/ld-x86-64/pr19969.d
+++ b/ld/testsuite/ld-x86-64/pr19969.d
@@ -1,4 +1,4 @@
 #source: pr19969b.S
 #as: --64
 #ld: -melf_x86_64 tmpdir/pr19969.so
-#error: .*relocation R_X86_64_32 against symbol `foo' can not be used when making a shared object; recompile with -fPIC
+#error: .*relocation R_X86_64_32 against symbol `foo' can not be used when making a PDE object; recompile with -fPIC
Domain: System / Toolchain;