X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Felf32-sparc.c;h=3304ec9fc16ffad08a13efa63242a5b4c4b8cae2;hb=268e4f09144c48e02f01d82ab3aab359457df214;hp=ffe1b97d23f9f6288374a8da6d4569067b7c150e;hpb=cd123cb70c845b890eed231a84e6e84c92c2ef92;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf32-sparc.c b/bfd/elf32-sparc.c index ffe1b97d23..3304ec9fc1 100644 --- a/bfd/elf32-sparc.c +++ b/bfd/elf32-sparc.c @@ -1,6 +1,5 @@ /* SPARC-specific support for 32-bit ELF - Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005, 2007 Free Software Foundation, Inc. + Copyright (C) 1993-2019 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -40,16 +39,16 @@ elf32_sparc_grok_psinfo (bfd *abfd, Elf_Internal_Note *note) return FALSE; case 260: /* Solaris prpsinfo_t. */ - elf_tdata (abfd)->core_program + elf_tdata (abfd)->core->program = _bfd_elfcore_strndup (abfd, note->descdata + 84, 16); - elf_tdata (abfd)->core_command + elf_tdata (abfd)->core->command = _bfd_elfcore_strndup (abfd, note->descdata + 100, 80); break; case 336: /* Solaris psinfo_t. */ - elf_tdata (abfd)->core_program + elf_tdata (abfd)->core->program = _bfd_elfcore_strndup (abfd, note->descdata + 88, 16); - elf_tdata (abfd)->core_command + elf_tdata (abfd)->core->command = _bfd_elfcore_strndup (abfd, note->descdata + 104, 80); break; } @@ -68,8 +67,9 @@ elf32_sparc_grok_psinfo (bfd *abfd, Elf_Internal_Note *note) object file when linking. */ static bfd_boolean -elf32_sparc_merge_private_bfd_data (bfd *ibfd, bfd *obfd) +elf32_sparc_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) { + bfd *obfd = info->output_bfd; bfd_boolean error; unsigned long ibfd_mach; /* FIXME: This should not be static. */ @@ -85,8 +85,8 @@ elf32_sparc_merge_private_bfd_data (bfd *ibfd, bfd *obfd) if (bfd_mach_sparc_64bit_p (ibfd_mach)) { error = TRUE; - (*_bfd_error_handler) - (_("%B: compiled for a 64 bit system and target is 32 bit"), ibfd); + _bfd_error_handler + (_("%pB: compiled for a 64 bit system and target is 32 bit"), ibfd); } else if ((ibfd->flags & DYNAMIC) == 0) { @@ -98,8 +98,8 @@ elf32_sparc_merge_private_bfd_data (bfd *ibfd, bfd *obfd) != previous_ibfd_e_flags) && previous_ibfd_e_flags != (unsigned long) -1) { - (*_bfd_error_handler) - (_("%B: linking little endian files with big endian files"), ibfd); + _bfd_error_handler + (_("%pB: linking little endian files with big endian files"), ibfd); error = TRUE; } previous_ibfd_e_flags = elf_elfheader (ibfd)->e_flags & EF_SPARC_LEDATA; @@ -110,15 +110,14 @@ elf32_sparc_merge_private_bfd_data (bfd *ibfd, bfd *obfd) return FALSE; } - return TRUE; + return _bfd_sparc_elf_merge_private_bfd_data (ibfd, info); } /* The final processing done just before writing out the object file. 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)) { @@ -137,6 +136,12 @@ elf32_sparc_final_write_processing (bfd *abfd, 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 : 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 @@ -151,11 +156,51 @@ elf32_sparc_final_write_processing (bfd *abfd, } } +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 Elf_Internal_Rela *rela) +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: @@ -167,9 +212,10 @@ elf32_sparc_reloc_type_class (const Elf_Internal_Rela *rela) } } -#define TARGET_BIG_SYM bfd_elf32_sparc_vec +#define TARGET_BIG_SYM sparc_elf32_vec #define TARGET_BIG_NAME "elf32-sparc" #define ELF_ARCH bfd_arch_sparc +#define ELF_TARGET_ID SPARC_ELF_DATA #define ELF_MACHINE_CODE EM_SPARC #define ELF_MACHINE_ALT1 EM_SPARC32PLUS #define ELF_MAXPAGESIZE 0x10000 @@ -208,9 +254,9 @@ elf32_sparc_reloc_type_class (const Elf_Internal_Rela *rela) #define bfd_elf32_mkobject _bfd_sparc_elf_mkobject #define elf_backend_object_p _bfd_sparc_elf_object_p #define elf_backend_gc_mark_hook _bfd_sparc_elf_gc_mark_hook -#define elf_backend_gc_sweep_hook _bfd_sparc_elf_gc_sweep_hook #define elf_backend_plt_sym_val _bfd_sparc_elf_plt_sym_val #define elf_backend_init_index_section _bfd_elf_init_1_index_section +#define elf_backend_fixup_symbol _bfd_sparc_elf_fixup_symbol #define elf_backend_can_gc_sections 1 #define elf_backend_can_refcount 1 @@ -218,8 +264,45 @@ elf32_sparc_reloc_type_class (const Elf_Internal_Rela *rela) #define elf_backend_plt_readonly 0 #define elf_backend_want_plt_sym 1 #define elf_backend_got_header_size 4 +#define elf_backend_want_dynrelro 1 #define elf_backend_rela_normal 1 +#define elf_backend_linux_prpsinfo32_ugid16 TRUE + +#include "elf32-target.h" + +/* Solaris 2. */ + +#undef TARGET_BIG_SYM +#define TARGET_BIG_SYM sparc_elf32_sol2_vec +#undef TARGET_BIG_NAME +#define TARGET_BIG_NAME "elf32-sparc-sol2" + +#undef elf32_bed +#define elf32_bed elf32_sparc_sol2_bed + +/* The 32-bit static TLS arena size is rounded to the nearest 8-byte + boundary. */ +#undef elf_backend_static_tls_alignment +#define elf_backend_static_tls_alignment 8 + +#undef elf_backend_strtab_flags +#define elf_backend_strtab_flags SHF_STRINGS + +static bfd_boolean +elf32_sparc_copy_solaris_special_section_fields (const bfd *ibfd ATTRIBUTE_UNUSED, + bfd *obfd ATTRIBUTE_UNUSED, + const Elf_Internal_Shdr *isection ATTRIBUTE_UNUSED, + Elf_Internal_Shdr *osection ATTRIBUTE_UNUSED) +{ + /* PR 19938: FIXME: Need to add code for setting the sh_info + and sh_link fields of Solaris specific section types. */ + return FALSE; +} + +#undef elf_backend_copy_special_section_fields +#define elf_backend_copy_special_section_fields elf32_sparc_copy_solaris_special_section_fields + #include "elf32-target.h" /* A wrapper around _bfd_sparc_elf_link_hash_table_create that identifies @@ -244,45 +327,50 @@ 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 -#define TARGET_BIG_SYM bfd_elf32_sparc_vxworks_vec -#undef TARGET_BIG_NAME +#undef TARGET_BIG_SYM +#define TARGET_BIG_SYM sparc_elf32_vxworks_vec +#undef TARGET_BIG_NAME #define TARGET_BIG_NAME "elf32-sparc-vxworks" -#undef ELF_MINPAGESIZE +#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_backend_want_got_plt +#undef elf_backend_want_got_plt #define elf_backend_want_got_plt 1 -#undef elf_backend_plt_readonly +#undef elf_backend_plt_readonly #define elf_backend_plt_readonly 1 -#undef elf_backend_got_header_size +#undef elf_backend_got_header_size #define elf_backend_got_header_size 12 -#undef elf_backend_add_symbol_hook +#undef elf_backend_dtrel_excludes_plt +#define elf_backend_dtrel_excludes_plt 1 +#undef elf_backend_add_symbol_hook #define elf_backend_add_symbol_hook \ elf_vxworks_add_symbol_hook -#undef elf_backend_link_output_symbol_hook +#undef elf_backend_link_output_symbol_hook #define elf_backend_link_output_symbol_hook \ elf_vxworks_link_output_symbol_hook -#undef elf_backend_emit_relocs +#undef elf_backend_emit_relocs #define elf_backend_emit_relocs \ elf_vxworks_emit_relocs -#undef elf_backend_final_write_processing +#undef elf_backend_final_write_processing #define elf_backend_final_write_processing \ elf32_sparc_vxworks_final_write_processing +#undef elf_backend_static_tls_alignment +#undef elf_backend_strtab_flags +#undef elf_backend_copy_special_section_fields -#undef elf32_bed +#undef elf32_bed #define elf32_bed sparc_elf_vxworks_bed #include "elf32-target.h"