espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-20 01:50:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

x86-64: Clear the R_X86_64_converted_reloc_bit bit

Browse Source 
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.
This commit is contained in:
H.J. Lu
2018-07-02 13:08:09 -07:00
parent eac61af65b
commit b638b5d57f
7 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2018-07-02 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-07-02 Jeff Muizelaar <jrmuizel@gmail.com>
Tom Tromey <tom@tromey.com>

8
bfd/elf64-x86-64.c
View File

@ -2431,8 +2431,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);
@ -2443,7 +2448,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;

7
ld/ChangeLog
View File

@ -1,3 +1,10 @@
2018-07-02 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-07-02 Thomas Preud'homme <thomas.preudhomme@arm.com>
* arm-dis.c (select_arm_features): Fix typo in heading comment. Allow

6
ld/testsuite/ld-x86-64/pr23324.s Normal file
View File

@ -0,0 +1,6 @@
.text
.globl _start
.type _start,@function
_start:
movq _start@GOTPCREL(%rip), %rsi
ret

8
ld/testsuite/ld-x86-64/pr23324a.d Normal file
View File

@ -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

8
ld/testsuite/ld-x86-64/pr23324b.d Normal file
View File

@ -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

2
ld/testsuite/ld-x86-64/x86-64.exp
View File

@ -397,6 +397,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