X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Felf32-frv.c;h=83de5e67b5f30f10b2d8f85f156314074b84ae1b;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=b8d033879ddffaafc2bf07b279e00cf21c84a8f2;hpb=219d1afa89d0d53ca93a684cac341f16470f3ca0;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c index b8d033879d..83de5e67b5 100644 --- a/bfd/elf32-frv.c +++ b/bfd/elf32-frv.c @@ -1,5 +1,5 @@ /* FRV-specific support for 32-bit ELF. - Copyright (C) 2002-2018 Free Software Foundation, Inc. + Copyright (C) 2002-2020 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -25,6 +25,7 @@ #include "elf/frv.h" #include "dwarf2.h" #include "hashtab.h" +#include "libiberty.h" /* Forward declarations. */ @@ -941,7 +942,7 @@ static struct bfd_link_hash_table * frvfdpic_elf_link_hash_table_create (bfd *abfd) { struct frvfdpic_elf_link_hash_table *ret; - bfd_size_type amt = sizeof (struct frvfdpic_elf_link_hash_table); + size_t amt = sizeof (struct frvfdpic_elf_link_hash_table); ret = bfd_zmalloc (amt); if (ret == NULL) @@ -2532,7 +2533,7 @@ frv_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, const char *r_name) /* Set the howto pointer for an FRV ELF reloc. */ -static void +static bfd_boolean frv_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr, Elf_Internal_Rela *dst) @@ -2551,19 +2552,23 @@ frv_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED, break; default: - if (r_type >= (unsigned int) R_FRV_max) + if (r_type >= ARRAY_SIZE (elf32_frv_howto_table)) { /* xgettext:c-format */ - _bfd_error_handler (_("%B: invalid FRV reloc number: %d"), abfd, r_type); - r_type = 0; + _bfd_error_handler (_("%pB: unsupported relocation type %#x"), + abfd, r_type); + bfd_set_error (bfd_error_bad_value); + return FALSE; } cache_ptr->howto = & elf32_frv_howto_table [r_type]; break; } + return TRUE; } /* Set the howto pointer for an FRV ELF REL reloc. */ -static void + +static bfd_boolean frvfdpic_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr, Elf_Internal_Rela *dst) { @@ -2594,8 +2599,9 @@ frvfdpic_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, default: cache_ptr->howto = NULL; - break; + return FALSE; } + return TRUE; } /* Perform a single relocation. By default we use the standard BFD @@ -2706,7 +2712,7 @@ elf32_frv_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, const char *name; int r_type; asection *osec; - struct frvfdpic_relocs_info *picrel; + struct frvfdpic_relocs_info *picrel = NULL; bfd_vma orig_addend = rel->r_addend; r_type = ELF32_R_TYPE (rel->r_info); @@ -2730,7 +2736,7 @@ elf32_frv_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, name = bfd_elf_string_from_elf_section (input_bfd, symtab_hdr->sh_link, sym->st_name); if (name == NULL || name[0] == 0) - name = bfd_section_name (input_bfd, sec); + name = bfd_section_name (sec); } else { @@ -2800,6 +2806,9 @@ elf32_frv_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, case R_FRV_GETTLSOFF_RELAX: case R_FRV_TLSOFF_RELAX: case R_FRV_TLSMOFF: + if ((input_section->flags & SEC_ALLOC) == 0) + break; + if (h != NULL) picrel = frvfdpic_relocs_info_for_global (frvfdpic_relocs_info (info), input_bfd, h, @@ -3529,9 +3538,10 @@ elf32_frv_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, if (addend) { info->callbacks->einfo - (_("%H: R_FRV_FUNCDESC references dynamic symbol" + (_("%H: %s references dynamic symbol" " with nonzero addend\n"), - input_bfd, input_section, rel->r_offset); + input_bfd, input_section, rel->r_offset, + "R_FRV_FUNCDESC"); return FALSE; } dynindx = h->dynindx; @@ -3559,8 +3569,7 @@ elf32_frv_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, && (!h || FRVFDPIC_FUNCDESC_LOCAL (info, h))) { addend += frvfdpic_got_section (info)->output_section->vma; - if ((bfd_get_section_flags (output_bfd, - input_section->output_section) + if ((bfd_section_flags (input_section->output_section) & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD)) { bfd_vma offset; @@ -3590,8 +3599,7 @@ elf32_frv_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, picrel); } } - else if ((bfd_get_section_flags (output_bfd, - input_section->output_section) + else if ((bfd_section_flags (input_section->output_section) & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD)) { bfd_vma offset; @@ -3650,9 +3658,10 @@ elf32_frv_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, if (addend && r_type == R_FRV_FUNCDESC_VALUE) { info->callbacks->einfo - (_("%H: R_FRV_FUNCDESC_VALUE" - " references dynamic symbol with nonzero addend\n"), - input_bfd, input_section, rel->r_offset); + (_("%H: %s references dynamic symbol" + " with nonzero addend\n"), + input_bfd, input_section, rel->r_offset, + "R_FRV_FUNCDESC_VALUE"); return FALSE; } dynindx = h->dynindx; @@ -3683,8 +3692,7 @@ elf32_frv_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, if (osec) addend += osec->output_section->vma; if (IS_FDPIC (input_bfd) - && (bfd_get_section_flags (output_bfd, - input_section->output_section) + && (bfd_section_flags (input_section->output_section) & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD)) { if (_frvfdpic_osec_readonly_p (output_bfd, @@ -3724,8 +3732,7 @@ elf32_frv_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, } else { - if ((bfd_get_section_flags (output_bfd, - input_section->output_section) + if ((bfd_section_flags (input_section->output_section) & (SEC_ALLOC | SEC_LOAD)) == (SEC_ALLOC | SEC_LOAD)) { bfd_vma offset; @@ -3892,11 +3899,11 @@ elf32_frv_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED, input file basename is crt0.o only once. */ if (silence_segment_error == 1) silence_segment_error = - (strlen (input_bfd->filename) == 6 - && filename_cmp (input_bfd->filename, "crt0.o") == 0) - || (strlen (input_bfd->filename) > 6 - && filename_cmp (input_bfd->filename - + strlen (input_bfd->filename) - 7, + (strlen (bfd_get_filename (input_bfd)) == 6 + && filename_cmp (bfd_get_filename (input_bfd), "crt0.o") == 0) + || (strlen (bfd_get_filename (input_bfd)) > 6 + && filename_cmp (bfd_get_filename (input_bfd) + + strlen (bfd_get_filename (input_bfd)) - 7, "/crt0.o") == 0) ? -1 : 0; if (!silence_segment_error @@ -4184,7 +4191,7 @@ _frv_create_got_section (bfd *abfd, struct bfd_link_info *info) s = bfd_make_section_anyway_with_flags (abfd, ".got", flags); elf_hash_table (info)->sgot = s; if (s == NULL - || !bfd_set_section_alignment (abfd, s, ptralign)) + || !bfd_set_section_alignment (s, ptralign)) return FALSE; if (bed->want_got_sym) @@ -4222,14 +4229,14 @@ _frv_create_got_section (bfd *abfd, struct bfd_link_info *info) (flags | SEC_READONLY)); elf_hash_table (info)->srelgot = s; if (s == NULL - || ! bfd_set_section_alignment (abfd, s, 2)) + || !bfd_set_section_alignment (s, 2)) return FALSE; /* Machine-specific. */ s = bfd_make_section_anyway_with_flags (abfd, ".rofixup", (flags | SEC_READONLY)); if (s == NULL - || ! bfd_set_section_alignment (abfd, s, 2)) + || !bfd_set_section_alignment (s, 2)) return FALSE; frvfdpic_gotfixup_section (info) = s; @@ -4277,7 +4284,7 @@ _frv_create_got_section (bfd *abfd, struct bfd_link_info *info) s = bfd_make_section_anyway_with_flags (abfd, ".plt", pltflags); if (s == NULL - || ! bfd_set_section_alignment (abfd, s, bed->plt_alignment)) + || !bfd_set_section_alignment (s, bed->plt_alignment)) return FALSE; /* FRV-specific: remember it. */ frvfdpic_plt_section (info) = s; @@ -4297,7 +4304,7 @@ _frv_create_got_section (bfd *abfd, struct bfd_link_info *info) s = bfd_make_section_anyway_with_flags (abfd, ".rel.plt", flags | SEC_READONLY); if (s == NULL - || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align)) + || !bfd_set_section_alignment (s, bed->s->log_file_align)) return FALSE; /* FRV-specific: remember it. */ frvfdpic_pltrel_section (info) = s; @@ -4365,7 +4372,7 @@ elf32_frvfdpic_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info) ? ".rela.bss" : ".rel.bss"), flags | SEC_READONLY); if (s == NULL - || ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align)) + || !bfd_set_section_alignment (s, bed->s->log_file_align)) return FALSE; } } @@ -6129,7 +6136,7 @@ elf32_frv_check_relocs (bfd *abfd, case R_FRV_FUNCDESC_VALUE: picrel->relocsfdv++; - if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC) + if (bfd_section_flags (sec) & SEC_ALLOC) picrel->relocs32--; /* Fall through. */ @@ -6138,7 +6145,7 @@ elf32_frv_check_relocs (bfd *abfd, break; picrel->sym = 1; - if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC) + if (bfd_section_flags (sec) & SEC_ALLOC) picrel->relocs32++; break; @@ -6229,9 +6236,7 @@ elf32_frv_check_relocs (bfd *abfd, /* This relocation describes which C++ vtable entries are actually used. Record for later use during GC. */ case R_FRV_GNU_VTENTRY: - BFD_ASSERT (h != NULL); - if (h != NULL - && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend)) + if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend)) return FALSE; break; @@ -6250,10 +6255,9 @@ elf32_frv_check_relocs (bfd *abfd, default: bad_reloc: - info->callbacks->einfo - /* xgettext:c-format */ - (_("%B: unsupported relocation type %i\n"), - abfd, ELF32_R_TYPE (rel->r_info)); + /* xgettext:c-format */ + _bfd_error_handler (_("%pB: unsupported relocation type %#x"), + abfd, (unsigned int) ELF32_R_TYPE (rel->r_info)); return FALSE; } } @@ -6343,6 +6347,10 @@ frv_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) char new_opt[80]; char old_opt[80]; + /* FIXME: What should be checked when linking shared libraries? */ + if ((ibfd->flags & DYNAMIC) != 0) + return TRUE; + new_opt[0] = old_opt[0] = '\0'; new_flags = elf_elfheader (ibfd)->e_flags; old_flags = elf_elfheader (obfd)->e_flags; @@ -6504,7 +6512,7 @@ frv_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) error = TRUE; _bfd_error_handler /* xgettext:c-format */ - (_("%B: compiled with %s and linked with modules" + (_("%pB: compiled with %s and linked with modules" " that use non-pic relocations"), ibfd, (new_flags & EF_FRV_BIGPIC) ? "-fPIC" : "-fpic"); #endif @@ -6558,7 +6566,7 @@ frv_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) error = TRUE; _bfd_error_handler /* xgettext:c-format */ - (_("%B: compiled with %s and linked with modules compiled with %s"), + (_("%pB: compiled with %s and linked with modules compiled with %s"), ibfd, new_opt, old_opt); } @@ -6571,7 +6579,7 @@ frv_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) error = TRUE; _bfd_error_handler /* xgettext:c-format */ - (_("%B: uses different unknown e_flags (%#x) fields" + (_("%pB: uses different unknown e_flags (%#x) fields" " than previous modules (%#x)"), ibfd, new_partial, old_partial); } @@ -6593,11 +6601,11 @@ frv_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) error = TRUE; if (IS_FDPIC (obfd)) _bfd_error_handler - (_("%B: cannot link non-fdpic object file into fdpic executable"), + (_("%pB: cannot link non-fdpic object file into fdpic executable"), ibfd); else _bfd_error_handler - (_("%B: cannot link fdpic object file into non-fdpic executable"), + (_("%pB: cannot link fdpic object file into non-fdpic executable"), ibfd); }