X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=bfd%2Felf32-sparc.c;h=0de3ab367f2ecaa1720b5e1dca4717ceabf89a70;hb=d87bef3a7bc827fa36a69d2c334aa82f7d188d81;hp=f3a7f093dd87492e5baf8339b6b9a31738549c10;hpb=07d6d2b8345ef3dc82eab49635acac9ee67dbb18;p=thirdparty%2Fbinutils-gdb.git diff --git a/bfd/elf32-sparc.c b/bfd/elf32-sparc.c index f3a7f093dd8..0de3ab367f2 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-2017 Free Software Foundation, Inc. + Copyright (C) 1993-2023 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -30,13 +30,13 @@ /* Support for core dump NOTE sections. */ -static bfd_boolean +static bool elf32_sparc_grok_psinfo (bfd *abfd, Elf_Internal_Note *note) { switch (note->descsz) { default: - return FALSE; + return false; case 260: /* Solaris prpsinfo_t. */ elf_tdata (abfd)->core->program @@ -53,7 +53,7 @@ elf32_sparc_grok_psinfo (bfd *abfd, Elf_Internal_Note *note) break; } - return TRUE; + return true; } /* Functions for dealing with the e_flags field. @@ -66,27 +66,27 @@ elf32_sparc_grok_psinfo (bfd *abfd, Elf_Internal_Note *note) /* Merge backend specific data from an object file to the output object file when linking. */ -static bfd_boolean +static bool elf32_sparc_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) { bfd *obfd = info->output_bfd; - bfd_boolean error; + bool error; unsigned long ibfd_mach; /* FIXME: This should not be static. */ static unsigned long previous_ibfd_e_flags = (unsigned long) -1; if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour || bfd_get_flavour (obfd) != bfd_target_elf_flavour) - return TRUE; + return true; - error = FALSE; + error = false; ibfd_mach = bfd_get_mach (ibfd); if (bfd_mach_sparc_64bit_p (ibfd_mach)) { - error = TRUE; + 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,15 +99,15 @@ 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); - error = TRUE; + (_("%pB: linking little endian files with big endian files"), ibfd); + error = true; } previous_ibfd_e_flags = elf_elfheader (ibfd)->e_flags & EF_SPARC_LEDATA; if (error) { bfd_set_error (bfd_error_bad_value); - return FALSE; + return false; } return _bfd_sparc_elf_merge_private_bfd_data (ibfd, info); @@ -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 bool +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,9 +271,7 @@ 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 +#define elf_backend_linux_prpsinfo32_ugid16 true #include "elf32-target.h" @@ -273,7 +293,7 @@ elf32_sparc_add_symbol_hook (bfd * abfd, #undef elf_backend_strtab_flags #define elf_backend_strtab_flags SHF_STRINGS -static bfd_boolean +static bool elf32_sparc_copy_solaris_special_section_fields (const bfd *ibfd ATTRIBUTE_UNUSED, bfd *obfd ATTRIBUTE_UNUSED, const Elf_Internal_Shdr *isection ATTRIBUTE_UNUSED, @@ -281,7 +301,7 @@ elf32_sparc_copy_solaris_special_section_fields (const bfd *ibfd ATTRIBUTE_UNUSE { /* PR 19938: FIXME: Need to add code for setting the sh_info and sh_link fields of Solaris specific section types. */ - return FALSE; + return false; } #undef elf_backend_copy_special_section_fields @@ -289,33 +309,14 @@ elf32_sparc_copy_solaris_special_section_fields (const bfd *ibfd ATTRIBUTE_UNUSE #include "elf32-target.h" -/* A wrapper around _bfd_sparc_elf_link_hash_table_create that identifies - the target system as VxWorks. */ - -static struct bfd_link_hash_table * -elf32_sparc_vxworks_link_hash_table_create (bfd *abfd) -{ - struct bfd_link_hash_table *ret; - - ret = _bfd_sparc_elf_link_hash_table_create (abfd); - if (ret) - { - struct _bfd_sparc_elf_link_hash_table *htab; - - htab = (struct _bfd_sparc_elf_link_hash_table *) ret; - htab->is_vxworks = 1; - } - return ret; -} - /* 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 bool +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 @@ -326,9 +327,8 @@ elf32_sparc_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker) #undef ELF_MINPAGESIZE #define ELF_MINPAGESIZE 0x1000 -#undef bfd_elf32_bfd_link_hash_table_create -#define bfd_elf32_bfd_link_hash_table_create \ - elf32_sparc_vxworks_link_hash_table_create +#undef ELF_TARGET_OS +#define ELF_TARGET_OS is_vxworks #undef elf_backend_want_got_plt #define elf_backend_want_got_plt 1