diff options
Diffstat (limited to 'binutils-2.22/bfd/elf32-h8300.c')
| -rw-r--r-- | binutils-2.22/bfd/elf32-h8300.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/binutils-2.22/bfd/elf32-h8300.c b/binutils-2.22/bfd/elf32-h8300.c index 95d3983..388d220 100644 --- a/binutils-2.22/bfd/elf32-h8300.c +++ b/binutils-2.22/bfd/elf32-h8300.c @@ -1,6 +1,6 @@ /* BFD back-end for Renesas H8/300 ELF binaries. Copyright 1993, 1995, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2009, 2010 Free Software Foundation, Inc. + 2007, 2008, 2009, 2010, 2012 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -52,12 +52,13 @@ static bfd_boolean elf32_h8_relocate_section bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *, asection **); static bfd_reloc_status_type special - (bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **); + (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); /* This does not include any relocation information, but should be good enough for GDB or objdump to read the file. */ -static reloc_howto_type h8_elf_howto_table[] = { +static reloc_howto_type h8_elf_howto_table[] = +{ #define R_H8_NONE_X 0 HOWTO (R_H8_NONE, /* type */ 0, /* rightshift */ @@ -304,7 +305,7 @@ static bfd_reloc_status_type special (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc_entry ATTRIBUTE_UNUSED, asymbol *symbol ATTRIBUTE_UNUSED, - PTR data ATTRIBUTE_UNUSED, + void * data ATTRIBUTE_UNUSED, asection *input_section ATTRIBUTE_UNUSED, bfd *output_bfd, char **error_message ATTRIBUTE_UNUSED) @@ -460,9 +461,9 @@ elf32_h8_relocate_section (bfd *output_bfd, struct bfd_link_info *info, unresolved_reloc, warned); } - if (sec != NULL && elf_discarded_section (sec)) + if (sec != NULL && discarded_section (sec)) RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section, - rel, relend, howto, contents); + rel, 1, relend, howto, 0, contents); if (info->relocatable) continue; @@ -699,7 +700,7 @@ elf32_h8_relax_section (bfd *abfd, asection *sec, /* Get a copy of the native relocations. */ internal_relocs = (_bfd_elf_link_read_relocs - (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL, + (abfd, sec, NULL, (Elf_Internal_Rela *) NULL, link_info->keep_memory)); if (internal_relocs == NULL) goto error_return; @@ -1523,7 +1524,7 @@ elf32_h8_get_relocated_section_contents (bfd *output_bfd, bfd_size_type amt; internal_relocs = (_bfd_elf_link_read_relocs - (input_bfd, input_section, (PTR) NULL, + (input_bfd, input_section, NULL, (Elf_Internal_Rela *) NULL, FALSE)); if (internal_relocs == NULL) goto error_return; |