aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog7
-rw-r--r--bfd/elf32-mep.c19
2 files changed, 8 insertions, 18 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 51ef196..4dc878e 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -3,6 +3,13 @@
* elf32-i386.c (elf_backend_post_process_headers): Undef for
Solaris 2.
+2015-04-30 Nick Clifton <nickc@redhat.com>
+
+ PR 18317
+ * elf32-mep.c (MEPREL): Use bfd_elf_generic_reloc instead of
+ mep_reloc.
+ (mep_reloc): Delete unused function.
+
2015-04-29 Nick Clifton <nickc@redhat.com>
PR 17099
diff --git a/bfd/elf32-mep.c b/bfd/elf32-mep.c
index 4032d2a..c791884 100644
--- a/bfd/elf32-mep.c
+++ b/bfd/elf32-mep.c
@@ -30,15 +30,12 @@
/* Private relocation functions. */
#define MEPREL(type, size, bits, right, left, pcrel, overflow, mask) \
- {(unsigned)type, right, size, bits, pcrel, left, overflow, mep_reloc, #type, FALSE, 0, mask, 0 }
+ {(unsigned)type, right, size, bits, pcrel, left, overflow, bfd_elf_generic_reloc, #type, FALSE, 0, mask, 0 }
#define N complain_overflow_dont
#define S complain_overflow_signed
#define U complain_overflow_unsigned
-static bfd_reloc_status_type mep_reloc (bfd *, arelent *, struct bfd_symbol *,
- void *, asection *, bfd *, char **);
-
static reloc_howto_type mep_elf_howto_table [] =
{
/* type, size, bits, leftshift, rightshift, pcrel, OD/OS/OU, mask. */
@@ -75,20 +72,6 @@ static reloc_howto_type mep_elf_howto_table [] =
#undef N
#undef S
#undef U
-
-static bfd_reloc_status_type
-mep_reloc
- (bfd * abfd ATTRIBUTE_UNUSED,
- arelent * reloc_entry ATTRIBUTE_UNUSED,
- struct bfd_symbol * symbol ATTRIBUTE_UNUSED,
- void * data ATTRIBUTE_UNUSED,
- asection * input_section ATTRIBUTE_UNUSED,
- bfd * output_bfd ATTRIBUTE_UNUSED,
- char ** error_message ATTRIBUTE_UNUSED)
-{
- return bfd_reloc_ok;
-}
-
#define BFD_RELOC_MEP_NONE BFD_RELOC_NONE