OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: Don't set eh->local_ref to 1 for linker defined symbols 

Since symbols created by HIDDEN and PROVIDE_HIDDEN assignments in
linker script may be marked as defined, but not hidden, we can't
set eh->local_ref to 1 in _bfd_x86_elf_link_symbol_references_local.

Also R_386_GOT32X should be handled as just like R_386_GOT32 when
relocating a section.  The input R_386_GOT32X relocations, which
can be relaxed, should have been converted to R_386_PC32, R_386_32
or R_386_GOTOFF.

bfd/

	PR ld/23189
	* elf32-i386.c (elf_i386_relocate_section): Handle R_386_GOT32X
	like R_386_GOT32.
	* elfxx-x86.c (_bfd_x86_elf_link_symbol_references_local): Don't
	set eh->local_ref to 1 for linker defined symbols.

ld/

	PR ld/23189
	* testsuite/ld-i386/i386.exp: Run pr23189.
	* testsuite/ld-x86-64/x86-64.exp: Likewise.
	* testsuite/ld-i386/pr23189.d: New file.
	* testsuite/ld-i386/pr23189.s: Likewise.
	* testsuite/ld-i386/pr23189.t: Likewise.
	* testsuite/ld-x86-64/pr23189.d: Likewise.
	* testsuite/ld-x86-64/pr23189.s: Likewise.
	* testsuite/ld-x86-64/pr23189.t: Likewise.
This commit is contained in:
H.J. Lu 2018-05-18 06:43:19 -07:00
parent 4bba0fb1c6
commit 011b32fd42
12 changed files with 73 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bfd/ChangeLog
View File

@ -1,3 +1,11 @@
2018-05-18 H.J. Lu <hongjiu.lu@intel.com>
PR ld/23189
* elf32-i386.c (elf_i386_relocate_section): Handle R_386_GOT32X
like R_386_GOT32.
* elfxx-x86.c (_bfd_x86_elf_link_symbol_references_local): Don't
set eh->local_ref to 1 for linker defined symbols.
2018-05-18 Alan Modra <amodra@gmail.com>
PR 23199

59
bfd/elf32-i386.c
View File

@ -2451,66 +2451,7 @@ skip_ifunc:
switch (r_type)
{
case R_386_GOT32X:
/* Avoid optimizing _DYNAMIC since ld.so may use its
link-time address. */
if (h == htab->elf.hdynamic)
goto r_386_got32;
if (bfd_link_pic (info))
{
/* It is OK to convert mov to lea and convert indirect
branch to direct branch. It is OK to convert adc,
add, and, cmp, or, sbb, sub, test, xor only when PIC
is false. */
unsigned int opcode, addend;
addend = bfd_get_32 (input_bfd, contents + rel->r_offset);
if (addend != 0)
goto r_386_got32;
opcode = bfd_get_8 (input_bfd, contents + rel->r_offset - 2);
if (opcode != 0x8b && opcode != 0xff)
goto r_386_got32;
}
/* Resolve "mov GOT[(%reg)], %reg",
"call/jmp *GOT[(%reg)]", "test %reg, foo@GOT[(%reg)]"
and "binop foo@GOT[(%reg)], %reg". */
if (h == NULL
|| (h->plt.offset == (bfd_vma) -1
&& h->got.offset == (bfd_vma) -1)
|| htab->elf.sgotplt == NULL)
abort ();
offplt = (htab->elf.sgotplt->output_section->vma
+ htab->elf.sgotplt->output_offset);
/* It is relative to .got.plt section. */
if (h->got.offset != (bfd_vma) -1)
/* Use GOT entry. Mask off the least significant bit in
GOT offset which may be set by R_386_GOT32 processing
below. */
relocation = (htab->elf.sgot->output_section->vma
+ htab->elf.sgot->output_offset
+ (h->got.offset & ~1) - offplt);
else
/* Use GOTPLT entry. */
relocation = (h->plt.offset / plt_entry_size
- htab->plt.has_plt0 + 3) * 4;
if (!bfd_link_pic (info))
{
/* If not PIC, add the .got.plt section address for
baseless addressing. */
unsigned int modrm;
modrm = bfd_get_8 (input_bfd, contents + rel->r_offset - 1);
if ((modrm & 0xc7) == 0x5)
relocation += offplt;
}
unresolved_reloc = FALSE;
break;
case R_386_GOT32:
r_386_got32:
/* Relocation is to the entry for this symbol in the global
offset table. */
if (htab->elf.sgot == NULL)

6
bfd/elfxx-x86.c
View File

@ -2047,7 +2047,11 @@ _bfd_x86_elf_link_symbol_references_local (struct bfd_link_info *info,
return TRUE;
}
eh->local_ref = 1;
/* Symbols created by HIDDEN and PROVIDE_HIDDEN assignments in linker
script aren't forced local here yet. */
if (!h->root.ldscript_def)
eh->local_ref = 1;
return FALSE;
}

12
ld/ChangeLog
View File

@ -1,3 +1,15 @@
2018-05-18 H.J. Lu <hongjiu.lu@intel.com>
PR ld/23189
* testsuite/ld-i386/i386.exp: Run pr23189.
* testsuite/ld-x86-64/x86-64.exp: Likewise.
* testsuite/ld-i386/pr23189.d: New file.
* testsuite/ld-i386/pr23189.s: Likewise.
* testsuite/ld-i386/pr23189.t: Likewise.
* testsuite/ld-x86-64/pr23189.d: Likewise.
* testsuite/ld-x86-64/pr23189.s: Likewise.
* testsuite/ld-x86-64/pr23189.t: Likewise.
2018-05-15 Alan Modra <amodra@gmail.com>
* testsuite/ld-elf/notes.exp: Restore LDFLAGS.

1
ld/testsuite/ld-i386/i386.exp
View File

@ -479,6 +479,7 @@ run_dump_test "pr18815"
run_dump_test "pr19939a"
run_dump_test "pr19939b"
run_dump_test "tlsdesc2"
run_dump_test "pr23189"
proc undefined_weak {cflags ldflags} {
set testname "Undefined weak symbol"

7
ld/testsuite/ld-i386/pr23189.d Normal file
View File

@ -0,0 +1,7 @@
#as: --32 -mrelax-relocations=yes
#ld: -shared -melf_i386 -T pr23189.t
#readelf: -r --wide
Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 1 entry:
Offset Info Type Sym. Value Symbol's Name
[0-9a-f]+ +[0-9a-f]+ +R_386_RELATIVE +

5
ld/testsuite/ld-i386/pr23189.s Normal file
View File

@ -0,0 +1,5 @@
.globl _start
.type _start, @function
_start:
movl __hidden_sym@GOT(%eax), %eax
.size _start, .-_start

11
ld/testsuite/ld-i386/pr23189.t Normal file
View File

@ -0,0 +1,11 @@
EXTERN(_start)
ENTRY(_start)
SECTIONS
{
.text :
{
HIDDEN (__hidden_sym = .);
*(.text*)
}
}

7
ld/testsuite/ld-x86-64/pr23189.d Normal file
View File

@ -0,0 +1,7 @@
#as: --64 -mrelax-relocations=yes
#ld: -shared -melf_x86_64 -T pr23189.t
#readelf: -r --wide
Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entry:
Offset Info Type Symbol's Value Symbol's Name \+ Addend
[0-9a-f]+ +[0-9a-f]+ +R_X86_64_RELATIVE +[0-9a-f]+

5
ld/testsuite/ld-x86-64/pr23189.s Normal file
View File

@ -0,0 +1,5 @@
.globl _start
.type _start, @function
_start:
movq __hidden_sym@GOTPCREL(%rip), %rax
.size _start, .-_start

11
ld/testsuite/ld-x86-64/pr23189.t Normal file
View File

@ -0,0 +1,11 @@
EXTERN(_start)
ENTRY(_start)
SECTIONS
{
.text :
{
HIDDEN (__hidden_sym = .);
*(.text*)
}
}

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

@ -606,6 +606,7 @@ run_dump_test "pr20253-5b"
run_dump_test "tlsdesc2"
run_dump_test "pr22048"
run_dump_test "pr22929"
run_dump_test "pr23189"
proc undefined_weak {cflags ldflags} {
set testname "Undefined weak symbol"