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

Set EI_OSABI to ELFOSABI_GNU for local IFUNC symbols

Browse Source 
Since the backend elf_add_symbol_hook isn't called on local symbols,
the EI_OSABI field isn't to ELFOSABI_GNU where are local IFUNC symbols.
This patch changes the x86 backends to set has_gnu_symbols if there are
relocations against IFUNC symbols.  Other backends with IFUNC support
may need a similar change.

This patch also changes the type of has_gnu_symbols from bfd_boolean to
enum elf_gnu_symbols.

bfd/

	PR ld/18815
	* elf-bfd.h (elf_gnu_symbols): New enum.
	(elf_obj_tdata): Use elf_gnu_symbols on has_gnu_symbols.
	* elf-s390-common.c (elf_s390_add_symbol_hook): Set
	has_gnu_symbols to elf_gnu_symbol_any.
	* elf32-arm.c (elf32_arm_add_symbol_hook): Likewise.
	* elf32-m68k.c (elf_m68k_add_symbol_hook): Likewise.
	* elf32-ppc.c (ppc_elf_add_symbol_hook): Likewise.
	* elf32-sparc.c (elf32_sparc_add_symbol_hook): Likewise.
	* elf64-ppc.c (ppc64_elf_add_symbol_hook): Likewise.
	* elf64-sparc.c (elf64_sparc_add_symbol_hook): Likewise.
	* lfxx-aarch64.c (_bfd_aarch64_elf_add_symbol_hook): Likewise.
	* elf32-i386.c (elf_i386_check_relocs): Update has_gnu_symbols
	if there are relocations against IFUNC symbols.
	(elf_i386_add_symbol_hook): Don't check STT_GNU_IFUNC here.
	* elf64-x86-64. (elf_x86_64_check_relocs): Update has_gnu_symbols
	if there are relocations against IFUNC symbols.
	(elf_x86_64_add_symbol_hook): Don't check STT_GNU_IFUNC here.

ld/testsuite/

	PR ld/18815
	* ld-i386/i386.exp: Run pr18815.
	* ld-x86-64/x86-64.exp: Likewise.
	* ld-i386/pr18815.d: New file.
	* ld-i386/pr18815.s: Likewise.
	* ld-x86-64/pr18815.d: Likewise.
	* ld-x86-64/pr18815.s: Likewise.
This commit is contained in:
H.J. Lu
2015-08-12 13:31:29 -07:00
parent 4dafcdeb13
commit 13a2df29c9
17 changed files with 85 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bfd/elf-bfd.h
View File

@ -1641,6 +1641,18 @@ struct output_elf_obj_tdata
bfd_boolean flags_init; bfd_boolean flags_init;
}; };
/* Indicate if the bfd contains symbols that have the STT_GNU_IFUNC
symbol type or STB_GNU_UNIQUE binding. Used to set the osabi
field in the ELF header structure. */
enum elf_gnu_symbols
{
elf_gnu_symbol_none = 0,
elf_gnu_symbol_any = 1 << 0,
elf_gnu_symbol_ifunc = (elf_gnu_symbol_any | 1 << 1),
elf_gnu_symbol_unique = (elf_gnu_symbol_any | 1 << 2),
elf_gnu_symbol_all = (elf_gnu_symbol_ifunc | elf_gnu_symbol_unique)
};
/* Some private data is stashed away for future use using the tdata pointer /* Some private data is stashed away for future use using the tdata pointer
in the bfd structure. */ in the bfd structure. */
@ -1751,10 +1763,7 @@ struct elf_obj_tdata
symbols. */ symbols. */
bfd_boolean bad_symtab; bfd_boolean bad_symtab;
/* True if the bfd contains symbols that have the STT_GNU_IFUNC enum elf_gnu_symbols has_gnu_symbols;
symbol type or STB_GNU_UNIQUE binding. Used to set the osabi
field in the ELF header structure. */
bfd_boolean has_gnu_symbols;
/* Information grabbed from an elf core file. */ /* Information grabbed from an elf core file. */
struct core_elf_obj_tdata *core; struct core_elf_obj_tdata *core;

2
bfd/elf-s390-common.c
View File

@ -238,7 +238,7 @@ elf_s390_add_symbol_hook (bfd *abfd,
|| ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE) || ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE)
&& (abfd->flags & DYNAMIC) == 0 && (abfd->flags & DYNAMIC) == 0
&& bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour) && bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour)
elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE; elf_tdata (info->output_bfd)->has_gnu_symbols = elf_gnu_symbol_any;
return TRUE; return TRUE;
} }

2
bfd/elf32-arm.c
View File

@ -15928,7 +15928,7 @@ elf32_arm_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
|| ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE) || ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE)
&& (abfd->flags & DYNAMIC) == 0 && (abfd->flags & DYNAMIC) == 0
&& bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour) && bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour)
elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE; elf_tdata (info->output_bfd)->has_gnu_symbols = elf_gnu_symbol_any;
if (elf32_arm_hash_table (info) == NULL) if (elf32_arm_hash_table (info) == NULL)
return FALSE; return FALSE;

10
bfd/elf32-i386.c
View File

@ -1576,6 +1576,10 @@ elf_i386_check_relocs (bfd *abfd,
/* It is referenced by a non-shared object. */ /* It is referenced by a non-shared object. */
h->ref_regular = 1; h->ref_regular = 1;
h->root.non_ir_ref = 1; h->root.non_ir_ref = 1;
if (h->type == STT_GNU_IFUNC)
elf_tdata (info->output_bfd)->has_gnu_symbols
|= elf_gnu_symbol_ifunc;
} }
if (! elf_i386_tls_transition (info, abfd, sec, NULL, if (! elf_i386_tls_transition (info, abfd, sec, NULL,
@ -5330,11 +5334,11 @@ elf_i386_add_symbol_hook (bfd * abfd,
asection ** secp ATTRIBUTE_UNUSED, asection ** secp ATTRIBUTE_UNUSED,
bfd_vma * valp ATTRIBUTE_UNUSED) bfd_vma * valp ATTRIBUTE_UNUSED)
{ {
if ((ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC if (ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE
|| ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE)
&& (abfd->flags & DYNAMIC) == 0 && (abfd->flags & DYNAMIC) == 0
&& bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour) && bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour)
elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE; elf_tdata (info->output_bfd)->has_gnu_symbols
|= elf_gnu_symbol_unique;
return TRUE; return TRUE;
} }

2
bfd/elf32-m68k.c
View File

@ -4846,7 +4846,7 @@ elf_m68k_add_symbol_hook (bfd *abfd,
|| ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE) || ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE)
&& (abfd->flags & DYNAMIC) == 0 && (abfd->flags & DYNAMIC) == 0
&& bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour) && bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour)
elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE; elf_tdata (info->output_bfd)->has_gnu_symbols = elf_gnu_symbol_any;
return TRUE; return TRUE;
} }

2
bfd/elf32-ppc.c
View File

@ -3653,7 +3653,7 @@ ppc_elf_add_symbol_hook (bfd *abfd,
|| ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE) || ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE)
&& (abfd->flags & DYNAMIC) == 0 && (abfd->flags & DYNAMIC) == 0
&& bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour) && bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour)
elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE; elf_tdata (info->output_bfd)->has_gnu_symbols = elf_gnu_symbol_any;
return TRUE; return TRUE;
} }

2
bfd/elf32-sparc.c
View File

@ -184,7 +184,7 @@ elf32_sparc_add_symbol_hook (bfd * abfd,
|| ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE) || ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE)
&& (abfd->flags & DYNAMIC) == 0 && (abfd->flags & DYNAMIC) == 0
&& bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour) && bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour)
elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE; elf_tdata (info->output_bfd)->has_gnu_symbols = elf_gnu_symbol_any;
return TRUE; return TRUE;
} }

2
bfd/elf64-ppc.c
View File

@ -4821,7 +4821,7 @@ ppc64_elf_add_symbol_hook (bfd *ibfd,
|| ELF_ST_BIND (isym->st_info) == STB_GNU_UNIQUE) || ELF_ST_BIND (isym->st_info) == STB_GNU_UNIQUE)
&& (ibfd->flags & DYNAMIC) == 0 && (ibfd->flags & DYNAMIC) == 0
&& bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour) && bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour)
elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE; elf_tdata (info->output_bfd)->has_gnu_symbols = elf_gnu_symbol_any;
if (*sec != NULL if (*sec != NULL
&& strcmp ((*sec)->name, ".opd") == 0) && strcmp ((*sec)->name, ".opd") == 0)

2
bfd/elf64-sparc.c
View File

@ -430,7 +430,7 @@ elf64_sparc_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
|| ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE) || ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE)
&& (abfd->flags & DYNAMIC) == 0 && (abfd->flags & DYNAMIC) == 0
&& bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour) && bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour)
elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE; elf_tdata (info->output_bfd)->has_gnu_symbols = elf_gnu_symbol_any;
if (ELF_ST_TYPE (sym->st_info) == STT_REGISTER) if (ELF_ST_TYPE (sym->st_info) == STT_REGISTER)
{ {

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

@ -1723,6 +1723,10 @@ elf_x86_64_check_relocs (bfd *abfd, struct bfd_link_info *info,
/* It is referenced by a non-shared object. */ /* It is referenced by a non-shared object. */
h->ref_regular = 1; h->ref_regular = 1;
h->root.non_ir_ref = 1; h->root.non_ir_ref = 1;
if (h->type == STT_GNU_IFUNC)
elf_tdata (info->output_bfd)->has_gnu_symbols
|= elf_gnu_symbol_ifunc;
} }
if (! elf_x86_64_tls_transition (info, abfd, sec, NULL, if (! elf_x86_64_tls_transition (info, abfd, sec, NULL,
@ -5873,11 +5877,11 @@ elf_x86_64_add_symbol_hook (bfd *abfd,
return TRUE; return TRUE;
} }
if ((ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC if (ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE
|| ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE)
&& (abfd->flags & DYNAMIC) == 0 && (abfd->flags & DYNAMIC) == 0
&& bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour) && bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour)
elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE; elf_tdata (info->output_bfd)->has_gnu_symbols
|= elf_gnu_symbol_unique;
return TRUE; return TRUE;
} }

2
bfd/elfxx-aarch64.c
View File

@ -494,7 +494,7 @@ _bfd_aarch64_elf_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
|| ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE) || ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE)
&& (abfd->flags & DYNAMIC) == 0 && (abfd->flags & DYNAMIC) == 0
&& bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour) && bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour)
elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE; elf_tdata (info->output_bfd)->has_gnu_symbols = elf_gnu_symbol_any;
return TRUE; return TRUE;
} }

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

@ -309,6 +309,7 @@ run_dump_test "pr14215"
run_dump_test "pr17057" run_dump_test "pr17057"
run_dump_test "pr17935-1" run_dump_test "pr17935-1"
run_dump_test "pr17935-2" run_dump_test "pr17935-2"
run_dump_test "pr18815"
# Add $PLT_CFLAGS if PLT is expected. # Add $PLT_CFLAGS if PLT is expected.
global PLT_CFLAGS global PLT_CFLAGS

9
ld/testsuite/ld-i386/pr18815.d Normal file
View File

@ -0,0 +1,9 @@
#name: PR ld/18815
#as: --32
#ld: -melf_i386
#readelf: -h
ELF Header:
#...
OS/ABI: UNIX - GNU
#pass

15
ld/testsuite/ld-i386/pr18815.s Normal file
View File

@ -0,0 +1,15 @@
.text
.type selector, %function
foo:
movl $0, %eax
ret
selector:
mov $foo, %eax
ret
.type selector, %gnu_indirect_function
.globl _start
_start:
mov $selector, %eax
call *%eax
ret
.section .note.GNU-stack,"",@progbits

9
ld/testsuite/ld-x86-64/pr18815.d Normal file
View File

@ -0,0 +1,9 @@
#name: PR ld/18815
#as: --64
#ld: -melf_x86_64
#readelf: -h
ELF Header:
#...
OS/ABI: UNIX - GNU
#pass

15
ld/testsuite/ld-x86-64/pr18815.s Normal file
View File

@ -0,0 +1,15 @@
.text
.type selector, %function
foo:
movl $0, %eax
ret
selector:
mov $foo, %eax
ret
.type selector, %gnu_indirect_function
.globl _start
_start:
mov $selector, %rax
call *%rax
ret
.section .note.GNU-stack,"",@progbits

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

@ -325,6 +325,7 @@ run_dump_test "pr17935-1"
run_dump_test "pr17935-2" run_dump_test "pr17935-2"
run_dump_test "pr18160" run_dump_test "pr18160"
run_dump_test "pr18176" run_dump_test "pr18176"
run_dump_test "pr18815"
# Add $PLT_CFLAGS if PLT is expected. # Add $PLT_CFLAGS if PLT is expected.
global PLT_CFLAGS global PLT_CFLAGS