X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fsimple.c;h=1e320fc391754b758010dc4919fdd6e0cdb20d83;hb=40c75bc8b07abc5d5774ea1c439b69c96e7fd485;hp=fee2be089e59d9fb379ac73a477f503cc7bfb06f;hpb=1511ddaff3332b836a41f2d1c5e763719b0a4735;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/simple.c b/bfd/simple.c index fee2be089e..1e320fc391 100644 --- a/bfd/simple.c +++ b/bfd/simple.c @@ -1,13 +1,12 @@ /* simple.c -- BFD simple client routines - Copyright 2002, 2003, 2004 - Free Software Foundation, Inc. + Copyright (C) 2002-2020 Free Software Foundation, Inc. Contributed by MontaVista Software, Inc. This file is part of BFD, the Binary File Descriptor library. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,14 +16,15 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" #include "bfdlink.h" -static bfd_boolean +static void simple_dummy_warning (struct bfd_link_info *link_info ATTRIBUTE_UNUSED, const char *warning ATTRIBUTE_UNUSED, const char *symbol ATTRIBUTE_UNUSED, @@ -32,10 +32,9 @@ simple_dummy_warning (struct bfd_link_info *link_info ATTRIBUTE_UNUSED, asection *section ATTRIBUTE_UNUSED, bfd_vma address ATTRIBUTE_UNUSED) { - return TRUE; } -static bfd_boolean +static void simple_dummy_undefined_symbol (struct bfd_link_info *link_info ATTRIBUTE_UNUSED, const char *name ATTRIBUTE_UNUSED, bfd *abfd ATTRIBUTE_UNUSED, @@ -43,10 +42,9 @@ simple_dummy_undefined_symbol (struct bfd_link_info *link_info ATTRIBUTE_UNUSED, bfd_vma address ATTRIBUTE_UNUSED, bfd_boolean fatal ATTRIBUTE_UNUSED) { - return TRUE; } -static bfd_boolean +static void simple_dummy_reloc_overflow (struct bfd_link_info *link_info ATTRIBUTE_UNUSED, struct bfd_link_hash_entry *entry ATTRIBUTE_UNUSED, const char *name ATTRIBUTE_UNUSED, @@ -56,40 +54,38 @@ simple_dummy_reloc_overflow (struct bfd_link_info *link_info ATTRIBUTE_UNUSED, asection *section ATTRIBUTE_UNUSED, bfd_vma address ATTRIBUTE_UNUSED) { - return TRUE; } -static bfd_boolean +static void simple_dummy_reloc_dangerous (struct bfd_link_info *link_info ATTRIBUTE_UNUSED, const char *message ATTRIBUTE_UNUSED, bfd *abfd ATTRIBUTE_UNUSED, asection *section ATTRIBUTE_UNUSED, bfd_vma address ATTRIBUTE_UNUSED) { - return TRUE; } -static bfd_boolean +static void simple_dummy_unattached_reloc (struct bfd_link_info *link_info ATTRIBUTE_UNUSED, const char *name ATTRIBUTE_UNUSED, bfd *abfd ATTRIBUTE_UNUSED, asection *section ATTRIBUTE_UNUSED, bfd_vma address ATTRIBUTE_UNUSED) { - return TRUE; } -static bfd_boolean +static void simple_dummy_multiple_definition (struct bfd_link_info *link_info ATTRIBUTE_UNUSED, - const char *name ATTRIBUTE_UNUSED, - bfd *obfd ATTRIBUTE_UNUSED, - asection *osec ATTRIBUTE_UNUSED, - bfd_vma oval ATTRIBUTE_UNUSED, + struct bfd_link_hash_entry *h ATTRIBUTE_UNUSED, bfd *nbfd ATTRIBUTE_UNUSED, asection *nsec ATTRIBUTE_UNUSED, bfd_vma nval ATTRIBUTE_UNUSED) { - return TRUE; +} + +static void +simple_dummy_einfo (const char *fmt ATTRIBUTE_UNUSED, ...) +{ } struct saved_output_info @@ -98,14 +94,39 @@ struct saved_output_info asection *section; }; +struct saved_offsets +{ + unsigned int section_count; + struct saved_output_info *sections; +}; + +/* The sections in ABFD may already have output sections and offsets + set if we are here during linking. + + DWARF-2 specifies offsets into debug sections in many cases and + bfd_simple_get_relocated_section_contents is called to relocate + debug info for a single relocatable object file. So we want + offsets relative to that object file's sections, not offsets in the + output file. For that reason, reset a debug section->output_offset + to zero. + + If not called during linking then set section->output_section to + point back to the input section, because output_section must not be + NULL when calling the relocation routines. + + Save the original output offset and section to restore later. */ + static void simple_save_output_info (bfd *abfd ATTRIBUTE_UNUSED, asection *section, void *ptr) { - struct saved_output_info *output_info = ptr; - output_info[section->index].offset = section->output_offset; - output_info[section->index].section = section->output_section; + struct saved_offsets *saved_offsets = (struct saved_offsets *) ptr; + struct saved_output_info *output_info; + + output_info = &saved_offsets->sections[section->index]; + output_info->offset = section->output_offset; + output_info->section = section->output_section; if ((section->flags & SEC_DEBUGGING) != 0 || section->output_section == NULL) { @@ -119,9 +140,15 @@ simple_restore_output_info (bfd *abfd ATTRIBUTE_UNUSED, asection *section, void *ptr) { - struct saved_output_info *output_info = ptr; - section->output_offset = output_info[section->index].offset; - section->output_section = output_info[section->index].section; + struct saved_offsets *saved_offsets = (struct saved_offsets *) ptr; + struct saved_output_info *output_info; + + if (section->index >= saved_offsets->section_count) + return; + + output_info = &saved_offsets->sections[section->index]; + section->output_offset = output_info->offset; + section->output_section = output_info->section; } /* @@ -154,21 +181,17 @@ bfd_simple_get_relocated_section_contents (bfd *abfd, struct bfd_link_callbacks callbacks; bfd_byte *contents, *data; int storage_needed; - void *saved_offsets; + struct saved_offsets saved_offsets; + bfd *link_next; - if (! (sec->flags & SEC_RELOC)) + /* Don't apply relocation on executable and shared library. See + PR 4756. */ + if ((abfd->flags & (HAS_RELOC | EXEC_P | DYNAMIC)) != HAS_RELOC + || ! (sec->flags & SEC_RELOC)) { - bfd_size_type amt = sec->rawsize > sec->size ? sec->rawsize : sec->size; - bfd_size_type size = sec->rawsize ? sec->rawsize : sec->size; - - if (outbuf == NULL) - contents = bfd_malloc (amt); - else - contents = outbuf; - - if (contents) - bfd_get_section_contents (abfd, sec, contents, 0, size); - + contents = outbuf; + if (!bfd_get_full_section_contents (abfd, sec, &contents)) + return NULL; return contents; } @@ -177,8 +200,12 @@ bfd_simple_get_relocated_section_contents (bfd *abfd, /* Fill in the bare minimum number of fields for our purposes. */ memset (&link_info, 0, sizeof (link_info)); + link_info.output_bfd = abfd; link_info.input_bfds = abfd; + link_info.input_bfds_tail = &abfd->link.next; + link_next = abfd->link.next; + abfd->link.next = NULL; link_info.hash = _bfd_generic_link_hash_table_create (abfd); link_info.callbacks = &callbacks; callbacks.warning = simple_dummy_warning; @@ -187,6 +214,7 @@ bfd_simple_get_relocated_section_contents (bfd *abfd, callbacks.reloc_dangerous = simple_dummy_reloc_dangerous; callbacks.unattached_reloc = simple_dummy_unattached_reloc; callbacks.multiple_definition = simple_dummy_multiple_definition; + callbacks.einfo = simple_dummy_einfo; memset (&link_order, 0, sizeof (link_order)); link_order.next = NULL; @@ -198,37 +226,36 @@ bfd_simple_get_relocated_section_contents (bfd *abfd, data = NULL; if (outbuf == NULL) { - data = bfd_malloc (sec->size); + bfd_size_type amt = sec->rawsize > sec->size ? sec->rawsize : sec->size; + data = (bfd_byte *) bfd_malloc (amt); if (data == NULL) - return NULL; + { + _bfd_generic_link_hash_table_free (abfd); + abfd->link.next = link_next; + return NULL; + } outbuf = data; } - /* The sections in ABFD may already have output sections and offsets set. - Because this function is primarily for debug sections, and GCC uses the - knowledge that debug sections will generally have VMA 0 when emitting - relocations between DWARF-2 sections (which are supposed to be - section-relative offsets anyway), we need to reset the output offsets - to zero. We also need to arrange for section->output_section->vma plus - section->output_offset to equal section->vma, which we do by setting - section->output_section to point back to section. Save the original - output offset and output section to restore later. */ - saved_offsets = malloc (sizeof (struct saved_output_info) - * abfd->section_count); - if (saved_offsets == NULL) + saved_offsets.section_count = abfd->section_count; + saved_offsets.sections = malloc (sizeof (*saved_offsets.sections) + * saved_offsets.section_count); + if (saved_offsets.sections == NULL) { if (data) free (data); + _bfd_generic_link_hash_table_free (abfd); + abfd->link.next = link_next; return NULL; } - bfd_map_over_sections (abfd, simple_save_output_info, saved_offsets); + bfd_map_over_sections (abfd, simple_save_output_info, &saved_offsets); if (symbol_table == NULL) { _bfd_generic_link_add_symbols (abfd, &link_info); storage_needed = bfd_get_symtab_upper_bound (abfd); - symbol_table = bfd_malloc (storage_needed); + symbol_table = (asymbol **) bfd_malloc (storage_needed); bfd_canonicalize_symtab (abfd, symbol_table); } else @@ -243,24 +270,10 @@ bfd_simple_get_relocated_section_contents (bfd *abfd, if (contents == NULL && data != NULL) free (data); -#if 0 - /* NOTE: cagney/2003-04-05: This free, which was introduced on - 2003-03-31 to stop a memory leak, caused a memory corruption - between GDB and BFD. The problem, which is stabs specific, can - be identified by a bunch of failures in relocate.exp vis: - - gdb.base/relocate.exp: get address of static_bar - - Details of the problem can be found on the binutils@ mailing - list, see the discussion thread: "gdb.mi/mi-cli.exp failures". */ - if (storage_needed != 0) - free (symbol_table); -#endif - - bfd_map_over_sections (abfd, simple_restore_output_info, saved_offsets); - free (saved_offsets); - - _bfd_generic_link_hash_table_free (link_info.hash); + bfd_map_over_sections (abfd, simple_restore_output_info, &saved_offsets); + free (saved_offsets.sections); + _bfd_generic_link_hash_table_free (abfd); + abfd->link.next = link_next; return contents; }