x86-64: Clear the R_X86_64_converted_reloc_bit bit

We need to clear the R_X86_64_converted_reloc_bit bit after setting it
to avoid leaking it out by --emit-relocs.

bfd/

	PR ld/23324
	* elf64-x86-64.c (elf_x86_64_relocate_section): Clear the
	R_X86_64_converted_reloc_bit bit.

ld/

	PR ld/23324
	* testsuite/ld-x86-64/pr23324.s: New file.
	* testsuite/ld-x86-64/pr23324a.d: Likewise.
	* testsuite/ld-x86-64/pr23324b.d: Likewise.

(cherry picked from commit b638b5d57fafc84a8dc0ff91d7579a3c24aad90c)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 8a69c093369ca2f96f18dbc169f00edc7534b35b..2c1c75cb334250fede439e0867b27e984fad9e00 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2018-07-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/23324
+       * elf64-x86-64.c (elf_x86_64_relocate_section): Clear the
+       R_X86_64_converted_reloc_bit bit.
+
 2018-05-28  H.J. Lu  <hongjiu.lu@intel.com>
 
        * elf32-i386.c (elf_i386_lazy_plt): Add plt_tlsdesc_entry,

diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 619f4024bf56b19c561d096e98bdb52c4b926e3c..823901d54bfee3a6f3d30657128266ab1557ac26 100644 (file)
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -2432,8 +2432,13 @@ elf_x86_64_relocate_section (bfd *output_bfd,
          continue;
        }
 
+      r_symndx = htab->r_sym (rel->r_info);
       converted_reloc = (r_type & R_X86_64_converted_reloc_bit) != 0;
-      r_type &= ~R_X86_64_converted_reloc_bit;
+      if (converted_reloc)
+       {
+         r_type &= ~R_X86_64_converted_reloc_bit;
+         rel->r_info = htab->r_info (r_symndx, r_type);
+       }
 
       if (r_type >= (int) R_X86_64_standard)
        return _bfd_unrecognized_reloc (input_bfd, input_section, r_type);
@@ -2444,7 +2449,6 @@ elf_x86_64_relocate_section (bfd *output_bfd,
       else
        howto = (x86_64_elf_howto_table
                 + ARRAY_SIZE (x86_64_elf_howto_table) - 1);
-      r_symndx = htab->r_sym (rel->r_info);
       h = NULL;
       sym = NULL;
       sec = NULL;

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 7749da98753efac1c3e634559436b4cd755eeaed..ec0be6c93cfd255e798ac1782486f7e2b890dd07 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2018-07-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/23324
+       * testsuite/ld-x86-64/pr23324.s: New file.
+       * testsuite/ld-x86-64/pr23324a.d: Likewise.
+       * testsuite/ld-x86-64/pr23324b.d: Likewise.
+
 2018-06-26  Alan Modra  <amodra@gmail.com>
 
        * testsuite/ld-bootstrap/bootstrap.exp: Use parentheses rather

diff --git a/ld/testsuite/ld-x86-64/pr23324.s b/ld/testsuite/ld-x86-64/pr23324.s
new file mode 100644 (file)
index 0000000..3bad019
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr23324.s
@@ -0,0 +1,6 @@
+       .text
+       .globl  _start
+       .type   _start,@function
+_start:
+       movq    _start@GOTPCREL(%rip), %rsi
+       ret

diff --git a/ld/testsuite/ld-x86-64/pr23324a.d b/ld/testsuite/ld-x86-64/pr23324a.d
new file mode 100644 (file)
index 0000000..72a4742
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr23324a.d
@@ -0,0 +1,8 @@
+#source: pr23324.s
+#as: --64 -mrelax-relocations=yes
+#ld: -q -melf_x86_64 -pie
+#readelf: -r --wide
+
+Relocation section '.rela.text' at offset 0x[0-9a-f]+ contains 1 entry:
+ +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend
+[0-9a-f]+ +[0-9a-f]+ +R_X86_64_PC32 +[0-9a-f]+ +_start - 4

diff --git a/ld/testsuite/ld-x86-64/pr23324b.d b/ld/testsuite/ld-x86-64/pr23324b.d
new file mode 100644 (file)
index 0000000..ad58d86
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr23324b.d
@@ -0,0 +1,8 @@
+#source: pr23324.s
+#as: --x32 -mrelax-relocations=yes
+#ld: -q -melf32_x86_64 -pie
+#readelf: -r --wide
+
+Relocation section '.rela.text' at offset 0x[0-9a-f]+ contains 1 entry:
+ +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend
+[0-9a-f]+ +[0-9a-f]+ +R_X86_64_PC32 +[0-9a-f]+ +_start - 4

diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index f128bd3c21ecdcc860ea1a833497db321a33d17c..e0f2a79be9e5f336bad78b887c59c4eccd81b73e 100644 (file)
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -383,6 +383,8 @@ run_dump_test "pr22782a"
 run_dump_test "pr22782b"
 run_dump_test "pr23189"
 run_dump_test "pr23194"
+run_dump_test "pr23324a"
+run_dump_test "pr23324b"
 
 if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
     return