aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf32-spu.c7
2 files changed, 9 insertions, 3 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 218fce6..8b6d641 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,10 @@
2008-02-04 Alan Modra <amodra@bigpond.net.au>
+ * elf32-spu.c (spu_elf_relocate_section): Correct return type.
+ Return error status on unexpected relocation errors.
+
+2008-02-04 Alan Modra <amodra@bigpond.net.au>
+
PR ld/5692
* elf.c (bfd_elf_get_elf_syms): Revert 2008-01-31. Instead abort
on non-ELF input.
diff --git a/bfd/elf32-spu.c b/bfd/elf32-spu.c
index d9ba935..04de774 100644
--- a/bfd/elf32-spu.c
+++ b/bfd/elf32-spu.c
@@ -1,6 +1,6 @@
/* SPU specific support for 32-bit ELF
- Copyright 2006, 2007 Free Software Foundation, Inc.
+ Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library.
@@ -2640,7 +2640,7 @@ spu_elf_count_relocs (asection *sec, Elf_Internal_Rela *relocs)
/* Apply RELOCS to CONTENTS of INPUT_SECTION from INPUT_BFD. */
-static bfd_boolean
+static int
spu_elf_relocate_section (bfd *output_bfd,
struct bfd_link_info *info,
bfd *input_bfd,
@@ -2654,7 +2654,7 @@ spu_elf_relocate_section (bfd *output_bfd,
struct elf_link_hash_entry **sym_hashes;
Elf_Internal_Rela *rel, *relend;
struct spu_link_hash_table *htab;
- bfd_boolean ret = TRUE;
+ int ret = TRUE;
bfd_boolean emit_these_relocs = FALSE;
htab = spu_hash_table (info);
@@ -2810,6 +2810,7 @@ spu_elf_relocate_section (bfd *output_bfd,
/* fall through */
common_error:
+ ret = FALSE;
if (!((*info->callbacks->warning)
(info, msg, sym_name, input_bfd, input_section,
rel->r_offset)))