X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Felf32-sparc.c;h=27fc158395ec5c36b61b982dff8a3dfa85288082;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=e8ca810d4acb6533ba7a015d3d57bbeef1c313ed;hpb=219d1afa89d0d53ca93a684cac341f16470f3ca0;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf32-sparc.c b/bfd/elf32-sparc.c index e8ca810d4a..27fc158395 100644 --- a/bfd/elf32-sparc.c +++ b/bfd/elf32-sparc.c @@ -1,5 +1,5 @@ /* SPARC-specific support for 32-bit ELF - Copyright (C) 1993-2018 Free Software Foundation, Inc. + Copyright (C) 1993-2020 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -86,7 +86,7 @@ elf32_sparc_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) { error = TRUE; _bfd_error_handler - (_("%B: compiled for a 64 bit system and target is 32 bit"), ibfd); + (_("%pB: compiled for a 64 bit system and target is 32 bit"), ibfd); } else if ((ibfd->flags & DYNAMIC) == 0) { @@ -99,7 +99,7 @@ elf32_sparc_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) && previous_ibfd_e_flags != (unsigned long) -1) { _bfd_error_handler - (_("%B: linking little endian files with big endian files"), ibfd); + (_("%pB: linking little endian files with big endian files"), ibfd); error = TRUE; } previous_ibfd_e_flags = elf_elfheader (ibfd)->e_flags & EF_SPARC_LEDATA; @@ -117,53 +117,94 @@ elf32_sparc_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) We need to set the e_machine field appropriately. */ static void -elf32_sparc_final_write_processing (bfd *abfd, - bfd_boolean linker ATTRIBUTE_UNUSED) +sparc_final_write_processing (bfd *abfd) { switch (bfd_get_mach (abfd)) { - case bfd_mach_sparc : - case bfd_mach_sparc_sparclet : - case bfd_mach_sparc_sparclite : + case bfd_mach_sparc: + case bfd_mach_sparc_sparclet: + case bfd_mach_sparc_sparclite: break; /* nothing to do */ - case bfd_mach_sparc_v8plus : + case bfd_mach_sparc_v8plus: elf_elfheader (abfd)->e_machine = EM_SPARC32PLUS; elf_elfheader (abfd)->e_flags &=~ EF_SPARC_32PLUS_MASK; elf_elfheader (abfd)->e_flags |= EF_SPARC_32PLUS; break; - case bfd_mach_sparc_v8plusa : + case bfd_mach_sparc_v8plusa: elf_elfheader (abfd)->e_machine = EM_SPARC32PLUS; elf_elfheader (abfd)->e_flags &=~ EF_SPARC_32PLUS_MASK; elf_elfheader (abfd)->e_flags |= EF_SPARC_32PLUS | EF_SPARC_SUN_US1; break; - case bfd_mach_sparc_v8plusb : - case bfd_mach_sparc_v8plusc : - case bfd_mach_sparc_v8plusd : - case bfd_mach_sparc_v8pluse : - case bfd_mach_sparc_v8plusv : - case bfd_mach_sparc_v8plusm : - case bfd_mach_sparc_v8plusm8 : + case bfd_mach_sparc_v8plusb: + case bfd_mach_sparc_v8plusc: + case bfd_mach_sparc_v8plusd: + case bfd_mach_sparc_v8pluse: + case bfd_mach_sparc_v8plusv: + case bfd_mach_sparc_v8plusm: + case bfd_mach_sparc_v8plusm8: elf_elfheader (abfd)->e_machine = EM_SPARC32PLUS; elf_elfheader (abfd)->e_flags &=~ EF_SPARC_32PLUS_MASK; elf_elfheader (abfd)->e_flags |= EF_SPARC_32PLUS | EF_SPARC_SUN_US1 | EF_SPARC_SUN_US3; break; - case bfd_mach_sparc_sparclite_le : + case bfd_mach_sparc_sparclite_le: elf_elfheader (abfd)->e_flags |= EF_SPARC_LEDATA; break; - default : - abort (); + case 0: /* A non-sparc architecture - ignore. */ + break; + default: + _bfd_error_handler + (_("%pB: unhandled sparc machine value '%lu' detected during write processing"), + abfd, (long) bfd_get_mach (abfd)); break; } } +static bfd_boolean +elf32_sparc_final_write_processing (bfd *abfd) +{ + sparc_final_write_processing (abfd); + return _bfd_elf_final_write_processing (abfd); +} + +/* Used to decide how to sort relocs in an optimal manner for the + dynamic linker, before writing them out. */ + static enum elf_reloc_type_class -elf32_sparc_reloc_type_class (const struct bfd_link_info *info ATTRIBUTE_UNUSED, +elf32_sparc_reloc_type_class (const struct bfd_link_info *info, const asection *rel_sec ATTRIBUTE_UNUSED, const Elf_Internal_Rela *rela) { + bfd *abfd = info->output_bfd; + const struct elf_backend_data *bed = get_elf_backend_data (abfd); + struct _bfd_sparc_elf_link_hash_table *htab + = _bfd_sparc_elf_hash_table (info); + BFD_ASSERT (htab != NULL); + + if (htab->elf.dynsym != NULL + && htab->elf.dynsym->contents != NULL) + { + /* Check relocation against STT_GNU_IFUNC symbol if there are + dynamic symbols. */ + unsigned long r_symndx = htab->r_symndx (rela->r_info); + if (r_symndx != STN_UNDEF) + { + Elf_Internal_Sym sym; + if (!bed->s->swap_symbol_in (abfd, + (htab->elf.dynsym->contents + + r_symndx * bed->s->sizeof_sym), + 0, &sym)) + abort (); + + if (ELF_ST_TYPE (sym.st_info) == STT_GNU_IFUNC) + return reloc_class_ifunc; + } + } + switch ((int) ELF32_R_TYPE (rela->r_info)) { + case R_SPARC_IRELATIVE: + return reloc_class_ifunc; case R_SPARC_RELATIVE: return reloc_class_relative; case R_SPARC_JMP_SLOT: @@ -175,25 +216,6 @@ elf32_sparc_reloc_type_class (const struct bfd_link_info *info ATTRIBUTE_UNUSED, } } -/* Hook called by the linker routine which adds symbols from an object - file. */ - -static bfd_boolean -elf32_sparc_add_symbol_hook (bfd * abfd, - struct bfd_link_info * info, - Elf_Internal_Sym * sym, - const char ** namep ATTRIBUTE_UNUSED, - flagword * flagsp ATTRIBUTE_UNUSED, - asection ** secp ATTRIBUTE_UNUSED, - bfd_vma * valp ATTRIBUTE_UNUSED) -{ - if (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC - && (abfd->flags & DYNAMIC) == 0 - && bfd_get_flavour (info->output_bfd) == bfd_target_elf_flavour) - elf_tdata (info->output_bfd)->has_gnu_symbols |= elf_gnu_symbol_ifunc; - return TRUE; -} - #define TARGET_BIG_SYM sparc_elf32_vec #define TARGET_BIG_NAME "elf32-sparc" #define ELF_ARCH bfd_arch_sparc @@ -249,8 +271,6 @@ elf32_sparc_add_symbol_hook (bfd * abfd, #define elf_backend_want_dynrelro 1 #define elf_backend_rela_normal 1 -#define elf_backend_add_symbol_hook elf32_sparc_add_symbol_hook - #define elf_backend_linux_prpsinfo32_ugid16 TRUE #include "elf32-target.h" @@ -311,11 +331,11 @@ elf32_sparc_vxworks_link_hash_table_create (bfd *abfd) /* A final_write_processing hook that does both the SPARC- and VxWorks- specific handling. */ -static void -elf32_sparc_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker) +static bfd_boolean +elf32_sparc_vxworks_final_write_processing (bfd *abfd) { - elf32_sparc_final_write_processing (abfd, linker); - elf_vxworks_final_write_processing (abfd, linker); + sparc_final_write_processing (abfd); + return elf_vxworks_final_write_processing (abfd); } #undef TARGET_BIG_SYM