#include "libbfd.h"
#include "bfdlink.h"
-static bfd_boolean simple_dummy_warning
- PARAMS ((struct bfd_link_info *, const char *, const char *, bfd *,
- asection *, bfd_vma));
-
-static bfd_boolean simple_dummy_undefined_symbol
- PARAMS ((struct bfd_link_info *, const char *, bfd *, asection *,
- bfd_vma, bfd_boolean));
-
-static bfd_boolean simple_dummy_reloc_overflow
- PARAMS ((struct bfd_link_info *, const char *, const char *, bfd_vma,
- bfd *, asection *, bfd_vma));
-
-static bfd_boolean simple_dummy_reloc_dangerous
- PARAMS ((struct bfd_link_info *, const char *, bfd *, asection *, bfd_vma));
-
-static bfd_boolean simple_dummy_unattached_reloc
- PARAMS ((struct bfd_link_info *, const char *, bfd *, asection *, bfd_vma));
-
-static void simple_save_output_info
- PARAMS ((bfd *, asection *, PTR));
-
-static void simple_restore_output_info
- PARAMS ((bfd *, asection *, PTR));
-
-bfd_byte * bfd_simple_get_relocated_section_contents
- PARAMS ((bfd *, asection *, bfd_byte *, asymbol **));
-
static bfd_boolean
-simple_dummy_warning (link_info, warning, symbol, abfd, section, address)
- 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;
+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 (link_info, name, abfd, section, address, fatal)
- 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;
+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 (link_info, name, reloc_name, addend, abfd,
- section, address)
- struct bfd_link_info *link_info 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;
+simple_dummy_reloc_overflow (struct bfd_link_info *link_info 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 (link_info, message, abfd, section, address)
- 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;
+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 (link_info, name, abfd, section, address)
- 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;
+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 void
-simple_save_output_info (abfd, section, ptr)
- bfd *abfd ATTRIBUTE_UNUSED;
- asection *section;
- PTR ptr;
+simple_save_output_info (bfd *abfd ATTRIBUTE_UNUSED,
+ asection *section,
+ void *ptr)
{
- struct saved_output_info *output_info = (struct saved_output_info *) ptr;
+ struct saved_output_info *output_info = ptr;
output_info[section->index].offset = section->output_offset;
output_info[section->index].section = section->output_section;
section->output_offset = 0;
}
static void
-simple_restore_output_info (abfd, section, ptr)
- bfd *abfd ATTRIBUTE_UNUSED;
- asection *section;
- PTR ptr;
+simple_restore_output_info (bfd *abfd ATTRIBUTE_UNUSED,
+ asection *section,
+ void *ptr)
{
- struct saved_output_info *output_info = (struct saved_output_info *) ptr;
+ struct saved_output_info *output_info = ptr;
section->output_offset = output_info[section->index].offset;
section->output_section = output_info[section->index].section;
}
bfd_simple_relocate_secton
SYNOPSIS
- bfd_byte *bfd_simple_get_relocated_section_contents (bfd *abfd, asection *sec, bfd_byte *outbuf, asymbol **symbol_table);
+ 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
*/
bfd_byte *
-bfd_simple_get_relocated_section_contents (abfd, sec, outbuf, symbol_table)
- bfd *abfd;
- asection *sec;
- bfd_byte *outbuf;
- asymbol **symbol_table;
+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;
- PTR saved_offsets;
+ void *saved_offsets;
+ bfd_boolean saved_reloc_done = sec->reloc_done;
+
+#undef RETURN
+#define RETURN(x) \
+ do \
+ { \
+ sec->reloc_done = saved_reloc_done; \
+ return (x); \
+ } \
+ while (0)
+
+ /* Foul hack to prevent bfd_section_size aborts. The reloc_done flag
+ only controls that macro (and the related size macros), selecting
+ between _raw_size and _cooked_size. We may be called with relocation
+ done or not, so we need to save the done-flag and mark the section as
+ not relocated.
+
+ Debug sections won't change size while we're only relocating. There
+ may be trouble here someday if it tries to run relaxation
+ unexpectedly, so make sure. */
+ BFD_ASSERT (sec->_raw_size == sec->_cooked_size);
+ sec->reloc_done = 0;
if (! (sec->flags & SEC_RELOC))
{
if (contents)
bfd_get_section_contents (abfd, sec, contents, 0, size);
- return contents;
+ RETURN (contents);
}
/* In order to use bfd_get_relocated_section_contents, we need
memset (&link_info, 0, sizeof (link_info));
link_info.input_bfds = abfd;
- link_info.hash = bfd_link_hash_table_create (abfd);
+ 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;
{
data = bfd_malloc (bfd_section_size (abfd, sec));
if (data == NULL)
- return NULL;
+ RETURN (NULL);
outbuf = data;
}
{
if (data)
free (data);
- return NULL;
+ RETURN (NULL);
}
bfd_map_over_sections (abfd, simple_save_output_info, saved_offsets);
_bfd_generic_link_add_symbols (abfd, &link_info);
storage_needed = bfd_get_symtab_upper_bound (abfd);
- symbol_table = (asymbol **) bfd_malloc (storage_needed);
+ symbol_table = bfd_malloc (storage_needed);
bfd_canonicalize_symtab (abfd, symbol_table);
}
else
bfd_map_over_sections (abfd, simple_restore_output_info, saved_offsets);
free (saved_offsets);
- /* Foul hack to prevent bfd_section_size aborts. This flag only controls
- that macro (and the related size macros), selecting between _raw_size
- and _cooked_size. Debug sections won't change size while we're only
- relocating. There may be trouble here someday if it tries to run
- relaxation unexpectedly, so make sure. */
- BFD_ASSERT (sec->_raw_size == sec->_cooked_size);
- sec->reloc_done = 0;
-
- bfd_link_hash_table_free (abfd, link_info.hash);
+ _bfd_generic_link_hash_table_free (link_info.hash);
- return contents;
+ RETURN (contents);
}