4a114e3e0c
bfd/ 2010-10-29 H.J. Lu <hongjiu.lu@intel.com> Cary Coutant <ccoutant@google.com> * archive.c (bfd_openr_next_archived_file): Copy BFD_COMPRESS and BFD_DECOMPRESS. * bfd.c (BFD_COMPRESS): New. (BFD_DECOMPRESS): Likewise. (BFD_FLAGS_SAVED): Likewise. (bfd_preserve_save): Replace BFD_IN_MEMORY with BFD_FLAGS_SAVED. * compress.c (bfd_uncompress_section_contents): Removed. (get_uncompressed_size): New. (decompress_contents): Likewise. (bfd_compress_section_contents): Likewise. (bfd_get_full_section_contents): Likewise. (bfd_is_section_compressed): Likewise. (bfd_init_section_decompress_status): Likewise. (bfd_init_section_compress_status): Likewise. * dwarf2.c (dwarf_debug_sections): New. (dwarf_debug_section_enum): Likewise. (read_section): Remove section_name and compressed_section_name. Add dwarf_debug_section_enum. Try compressed debug section. (read_indirect_string): Updated. (read_abbrevs): Likewise. (decode_line_info): Likewise. (read_debug_ranges): Likewise. (find_line): Updated. * ecoff.c (bfd_debug_section): Add compress_status and compressed_size. * elf.c (_bfd_elf_make_section_from_shdr): Call bfd_is_section_compressed to check if a DWARF debug section is compressed. Call bfd_init_section_compress_status or bfd_init_section_decompress_status if needed. * elflink.c (elf_link_input_bfd): Replace bfd_get_section_contents with bfd_get_full_section_contents. * merge.c (_bfd_add_merge_section): Likewise. * reloc.c (bfd_generic_get_relocated_section_contents): Likewise. * simple.c (bfd_simple_get_relocated_section_contents): Likewise. * elfxx-target.h (TARGET_BIG_SYM): Allow BFD_COMPRESS and BFD_DECOMPRESS. (TARGET_LITTLE_SYM): Likewise. * libbfd-in.h (dwarf_debug_section): New. (dwarf_debug_sections): Likewise. * libbfd.c (_bfd_generic_get_section_contents): Issue an error when getting contents on compressed/decompressed section. * section.c (COMPRESS_SECTION_NONE): New. (COMPRESS_SECTION_DONE): Likewise. (DECOMPRESS_SECTION_SIZED): Likewise. (BFD_FAKE_SECTION): Add compress_status and compressed_size. (bfd_malloc_and_get_section): Replace bfd_get_section_contents with bfd_get_full_section_contents. * bfd-in2.h: Regenerated. * libbfd.h: Likewise. binutils/ 2010-10-29 H.J. Lu <hongjiu.lu@intel.com> * addr2line.c (process_file): Set BFD_DECOMPRESS. * objcopy.c (do_debug_sections): New. (OPTION_COMPRESS_DEBUG_SECTIONS): New. (OPTION_DECOMPRESS_DEBUG_SECTIONS): Likewise. (copy_options): Add OPTION_COMPRESS_DEBUG_SECTIONS and OPTION_DECOMPRESS_DEBUG_SECTIONS. (copy_usage): Add --compress-debug-sections and --decompress-debug-sections. (copy_file): Set BFD_COMPRESS or BFD_DECOMPRESS. (copy_section): Replace bfd_get_section_contents with bfd_get_full_section_contents. (copy_main): Handle OPTION_COMPRESS_DEBUG_SECTIONS and OPTION_DECOMPRESS_DEBUG_SECTIONS. Check do_debug_sections to rename DWARF debug sections. * objdump.c (load_specific_debug_section): Replace bfd_get_section_contents with bfd_get_full_section_contents. Remove bfd_uncompress_section_contents. (dump_section): Replace bfd_get_section_contents with bfd_get_full_section_contents. (display_file): Set BFD_DECOMPRESS if needed. * readelf.c (uncompress_section_contents): Set buffer to NULL to indiate decompression failure. (load_specific_debug_section): Always call uncompress_section_contents. * doc/binutils.texi: Document --compress-debug-sections and --decompress-debug-sections. binutils/testsuite/ 2010-10-29 H.J. Lu <hongjiu.lu@intel.com> * binutils-all/compress.exp: New. * binutils-all/dw2-1.S: Likewise. * binutils-all/dw2-2.S: Likewise. * binutils-all/libdw2-compressed.out: Likewise. * binutils-all/libdw2.out: Likewise. gas/ 2010-10-29 H.J. Lu <hongjiu.lu@intel.com> * write.c (compress_debug): Optimize section flags check. gas/testsuite/ 2010-10-29 H.J. Lu <hongjiu.lu@intel.com> * elf/dwarf2-1.s: Replace .zdebug_abbrev section with .debug_abbrev section. * elf/dwarf2-2.3: Likewise. * elf/dwarf2-1.d: Pass --compress-debug-sections to assembler. Updated. * elf/dwarf2-2.d: Likewise. * gas/i386/i386.exp: Remove xfail on dw2-compress-2 and x86-64-dw2-compress-2. ld/ 2010-10-29 H.J. Lu <hongjiu.lu@intel.com> * ldfile.c (ldfile_try_open_bfd): Set BFD_DECOMPRESS after bfd_openr returns. * emultempl/elf32.em (gld${EMULATION_NAME}_try_needed): Likewise. * scripttempl/elf.sc: Include compressed DWARF debug sections. ld/testsuite/ 2010-10-29 H.J. Lu <hongjiu.lu@intel.com> * ld-elf/compress.exp: New. * ld-elf/compress1.s: Likewise. * ld-elf/compress1a.d: Likewise. * ld-elf/compress1b.d: Likewise. * ld-elf/compress1c.d: Likewise.
257 lines
8.0 KiB
C
257 lines
8.0 KiB
C
/* simple.c -- BFD simple client routines
|
|
Copyright 2002, 2003, 2004, 2005, 2007, 2008, 2009
|
|
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 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
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., 51 Franklin Street - Fifth Floor, Boston,
|
|
MA 02110-1301, USA. */
|
|
|
|
#include "sysdep.h"
|
|
#include "bfd.h"
|
|
#include "libbfd.h"
|
|
#include "bfdlink.h"
|
|
|
|
static bfd_boolean
|
|
simple_dummy_warning (struct bfd_link_info *link_info ATTRIBUTE_UNUSED,
|
|
const char *warning ATTRIBUTE_UNUSED,
|
|
const char *symbol ATTRIBUTE_UNUSED,
|
|
bfd *abfd ATTRIBUTE_UNUSED,
|
|
asection *section ATTRIBUTE_UNUSED,
|
|
bfd_vma address ATTRIBUTE_UNUSED)
|
|
{
|
|
return TRUE;
|
|
}
|
|
|
|
static bfd_boolean
|
|
simple_dummy_undefined_symbol (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,
|
|
bfd_boolean fatal ATTRIBUTE_UNUSED)
|
|
{
|
|
return TRUE;
|
|
}
|
|
|
|
static bfd_boolean
|
|
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,
|
|
const char *reloc_name ATTRIBUTE_UNUSED,
|
|
bfd_vma addend ATTRIBUTE_UNUSED,
|
|
bfd *abfd ATTRIBUTE_UNUSED,
|
|
asection *section ATTRIBUTE_UNUSED,
|
|
bfd_vma address ATTRIBUTE_UNUSED)
|
|
{
|
|
return TRUE;
|
|
}
|
|
|
|
static bfd_boolean
|
|
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
|
|
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
|
|
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,
|
|
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
|
|
{
|
|
bfd_vma offset;
|
|
asection *section;
|
|
};
|
|
|
|
static void
|
|
simple_save_output_info (bfd *abfd ATTRIBUTE_UNUSED,
|
|
asection *section,
|
|
void *ptr)
|
|
{
|
|
struct saved_output_info *output_info = (struct saved_output_info *) ptr;
|
|
output_info[section->index].offset = section->output_offset;
|
|
output_info[section->index].section = section->output_section;
|
|
if ((section->flags & SEC_DEBUGGING) != 0
|
|
|| section->output_section == NULL)
|
|
{
|
|
section->output_offset = 0;
|
|
section->output_section = section;
|
|
}
|
|
}
|
|
|
|
static void
|
|
simple_restore_output_info (bfd *abfd ATTRIBUTE_UNUSED,
|
|
asection *section,
|
|
void *ptr)
|
|
{
|
|
struct saved_output_info *output_info = (struct saved_output_info *) ptr;
|
|
section->output_offset = output_info[section->index].offset;
|
|
section->output_section = output_info[section->index].section;
|
|
}
|
|
|
|
/*
|
|
FUNCTION
|
|
bfd_simple_relocate_secton
|
|
|
|
SYNOPSIS
|
|
bfd_byte *bfd_simple_get_relocated_section_contents
|
|
(bfd *abfd, asection *sec, bfd_byte *outbuf, asymbol **symbol_table);
|
|
|
|
DESCRIPTION
|
|
Returns the relocated contents of section @var{sec}. The symbols in
|
|
@var{symbol_table} will be used, or the symbols from @var{abfd} if
|
|
@var{symbol_table} is NULL. The output offsets for debug sections will
|
|
be temporarily reset to 0. The result will be stored at @var{outbuf}
|
|
or allocated with @code{bfd_malloc} if @var{outbuf} is @code{NULL}.
|
|
|
|
Returns @code{NULL} on a fatal error; ignores errors applying
|
|
particular relocations.
|
|
*/
|
|
|
|
bfd_byte *
|
|
bfd_simple_get_relocated_section_contents (bfd *abfd,
|
|
asection *sec,
|
|
bfd_byte *outbuf,
|
|
asymbol **symbol_table)
|
|
{
|
|
struct bfd_link_info link_info;
|
|
struct bfd_link_order link_order;
|
|
struct bfd_link_callbacks callbacks;
|
|
bfd_byte *contents, *data;
|
|
int storage_needed;
|
|
void *saved_offsets;
|
|
|
|
/* 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))
|
|
{
|
|
contents = outbuf;
|
|
if (!bfd_get_full_section_contents (abfd, sec, &contents))
|
|
return NULL;
|
|
return contents;
|
|
}
|
|
|
|
/* In order to use bfd_get_relocated_section_contents, we need
|
|
to forge some data structures that it expects. */
|
|
|
|
/* 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_info.hash = _bfd_generic_link_hash_table_create (abfd);
|
|
link_info.callbacks = &callbacks;
|
|
callbacks.warning = simple_dummy_warning;
|
|
callbacks.undefined_symbol = simple_dummy_undefined_symbol;
|
|
callbacks.reloc_overflow = simple_dummy_reloc_overflow;
|
|
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;
|
|
link_order.type = bfd_indirect_link_order;
|
|
link_order.offset = 0;
|
|
link_order.size = sec->size;
|
|
link_order.u.indirect.section = sec;
|
|
|
|
data = NULL;
|
|
if (outbuf == NULL)
|
|
{
|
|
bfd_size_type amt = sec->rawsize > sec->size ? sec->rawsize : sec->size;
|
|
data = (bfd_byte *) bfd_malloc (amt);
|
|
if (data == NULL)
|
|
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)
|
|
{
|
|
if (data)
|
|
free (data);
|
|
return NULL;
|
|
}
|
|
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 = (asymbol **) bfd_malloc (storage_needed);
|
|
bfd_canonicalize_symtab (abfd, symbol_table);
|
|
}
|
|
else
|
|
storage_needed = 0;
|
|
|
|
contents = bfd_get_relocated_section_contents (abfd,
|
|
&link_info,
|
|
&link_order,
|
|
outbuf,
|
|
0,
|
|
symbol_table);
|
|
if (contents == NULL && data != NULL)
|
|
free (data);
|
|
|
|
bfd_map_over_sections (abfd, simple_restore_output_info, saved_offsets);
|
|
free (saved_offsets);
|
|
|
|
_bfd_generic_link_hash_table_free (link_info.hash);
|
|
return contents;
|
|
}
|