X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Felf32-m68k.c;h=868435a444252e7826c139adb096160ec29a331b;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=8d0eab06f208b6bd389894f2898aaa93c61c58cb;hpb=827041555ac443bd57340060f3e034fd7b199dd8;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c index 8d0eab06f2..868435a444 100644 --- a/bfd/elf32-m68k.c +++ b/bfd/elf32-m68k.c @@ -1,5 +1,5 @@ /* Motorola 68k series support for 32-bit ELF - Copyright (C) 1993-2019 Free Software Foundation, Inc. + Copyright (C) 1993-2020 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -25,6 +25,8 @@ #include "elf-bfd.h" #include "elf/m68k.h" #include "opcode/m68k.h" +#include "cpu-m68k.h" +#include "elf32-m68k.h" static bfd_boolean elf_m68k_discard_copies (struct elf_link_hash_entry *, void *); @@ -969,7 +971,7 @@ static struct bfd_link_hash_table * elf_m68k_link_hash_table_create (bfd *abfd) { struct elf_m68k_link_hash_table *ret; - bfd_size_type amt = sizeof (struct elf_m68k_link_hash_table); + size_t amt = sizeof (struct elf_m68k_link_hash_table); ret = (struct elf_m68k_link_hash_table *) bfd_zmalloc (amt); if (ret == (struct elf_m68k_link_hash_table *) NULL) @@ -1053,9 +1055,8 @@ elf32_m68k_object_p (bfd *abfd) /* Somewhat reverse of elf32_m68k_object_p, this sets the e_flag field based on the machine number. */ -static void -elf_m68k_final_write_processing (bfd *abfd, - bfd_boolean linker ATTRIBUTE_UNUSED) +static bfd_boolean +elf_m68k_final_write_processing (bfd *abfd) { int mach = bfd_get_mach (abfd); unsigned long e_flags = elf_elfheader (abfd)->e_flags; @@ -1108,6 +1109,7 @@ elf_m68k_final_write_processing (bfd *abfd, } elf_elfheader (abfd)->e_flags = e_flags; } + return _bfd_elf_final_write_processing (abfd); } /* Keep m68k-specific flags in the ELF header. */ @@ -1132,9 +1134,11 @@ elf32_m68k_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) flagword in_isa; const bfd_arch_info_type *arch_info; - if ( bfd_get_flavour (ibfd) != bfd_target_elf_flavour + if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour || bfd_get_flavour (obfd) != bfd_target_elf_flavour) - return FALSE; + /* PR 24523: For non-ELF files do not try to merge any private + data, but also do not prevent the link from succeeding. */ + return TRUE; /* Get the merged machine. This checks for incompatibility between Coldfire & non-Coldfire flags, incompability between different @@ -1517,14 +1521,18 @@ elf_m68k_get_got_entry (struct elf_m68k_got *got, } entry_.key_ = *key; - ptr = htab_find_slot (got->entries, &entry_, (howto != SEARCH - ? INSERT : NO_INSERT)); + ptr = htab_find_slot (got->entries, &entry_, + (howto == SEARCH || howto == MUST_FIND ? NO_INSERT + : INSERT)); if (ptr == NULL) { if (howto == SEARCH) /* Entry not found. */ return NULL; + if (howto == MUST_FIND) + abort (); + /* We're out of memory. */ bfd_set_error (bfd_error_no_memory); return NULL; @@ -1533,7 +1541,10 @@ elf_m68k_get_got_entry (struct elf_m68k_got *got, if (*ptr == NULL) /* We didn't find the entry and we're asked to create a new one. */ { - BFD_ASSERT (howto != MUST_FIND && howto != SEARCH); + if (howto == MUST_FIND) + abort (); + + BFD_ASSERT (howto != SEARCH); entry = bfd_alloc (elf_hash_table (info)->dynobj, sizeof (*entry)); if (entry == NULL) @@ -1748,14 +1759,18 @@ elf_m68k_get_bfd2got_entry (struct elf_m68k_multi_got *multi_got, } entry_.bfd = abfd; - ptr = htab_find_slot (multi_got->bfd2got, &entry_, (howto != SEARCH - ? INSERT : NO_INSERT)); + ptr = htab_find_slot (multi_got->bfd2got, &entry_, + (howto == SEARCH || howto == MUST_FIND ? NO_INSERT + : INSERT)); if (ptr == NULL) { if (howto == SEARCH) /* Entry not found. */ return NULL; + if (howto == MUST_FIND) + abort (); + /* We're out of memory. */ bfd_set_error (bfd_error_no_memory); return NULL; @@ -1764,7 +1779,10 @@ elf_m68k_get_bfd2got_entry (struct elf_m68k_multi_got *multi_got, if (*ptr == NULL) /* Entry was not found. Create new one. */ { - BFD_ASSERT (howto != MUST_FIND && howto != SEARCH); + if (howto == MUST_FIND) + abort (); + + BFD_ASSERT (howto != SEARCH); entry = ((struct elf_m68k_bfd2got_entry *) bfd_alloc (elf_hash_table (info)->dynobj, sizeof (*entry))); @@ -2801,9 +2819,7 @@ elf_m68k_check_relocs (bfd *abfd, /* This relocation describes which C++ vtable entries are actually used. Record for later use during GC. */ case R_68K_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; @@ -3090,7 +3106,7 @@ elf_m68k_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, /* It's OK to base decisions on the section name, because none of the dynobj section names depend upon the input files. */ - name = bfd_get_section_name (dynobj, s); + name = bfd_section_name (s); if (strcmp (name, ".plt") == 0) { @@ -3562,12 +3578,9 @@ elf_m68k_relocate_section (bfd *output_bfd, BFD_ASSERT (sgot != NULL); if (got == NULL) - { - got = elf_m68k_get_bfd2got_entry (elf_m68k_multi_got (info), - input_bfd, MUST_FIND, - NULL)->got; - BFD_ASSERT (got != NULL); - } + got = elf_m68k_get_bfd2got_entry (elf_m68k_multi_got (info), + input_bfd, MUST_FIND, + NULL)->got; /* Get GOT offset for this symbol. */ elf_m68k_init_got_entry_key (&key_, h, input_bfd, r_symndx, @@ -3927,7 +3940,7 @@ elf_m68k_relocate_section (bfd *output_bfd, name = (bfd_elf_string_from_elf_section (input_bfd, symtab_hdr->sh_link, sym->st_name)); if (name == NULL || *name == '\0') - name = bfd_section_name (input_bfd, sec); + name = bfd_section_name (sec); } _bfd_error_handler @@ -3962,7 +3975,7 @@ elf_m68k_relocate_section (bfd *output_bfd, if (name == NULL) return FALSE; if (*name == '\0') - name = bfd_section_name (input_bfd, sec); + name = bfd_section_name (sec); } if (r == bfd_reloc_overflow) @@ -4435,18 +4448,16 @@ bfd_m68k_elf32_create_embedded_relocs (bfd *abfd, struct bfd_link_info *info, strncpy ((char *) p + 4, targetsec->output_section->name, 8); } - if (isymbuf != NULL && symtab_hdr->contents != (unsigned char *) isymbuf) + if (symtab_hdr->contents != (unsigned char *) isymbuf) free (isymbuf); - if (internal_relocs != NULL - && elf_section_data (datasec)->relocs != internal_relocs) + if (elf_section_data (datasec)->relocs != internal_relocs) free (internal_relocs); return TRUE; -error_return: - if (isymbuf != NULL && symtab_hdr->contents != (unsigned char *) isymbuf) + error_return: + if (symtab_hdr->contents != (unsigned char *) isymbuf) free (isymbuf); - if (internal_relocs != NULL - && elf_section_data (datasec)->relocs != internal_relocs) + if (elf_section_data (datasec)->relocs != internal_relocs) free (internal_relocs); return FALSE; }