projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dwarf2.c stash->sec_info_ptr and stash->sec
[deliverable/binutils-gdb.git]
/
bfd
/
elf32-iq2000.c
diff --git
a/bfd/elf32-iq2000.c
b/bfd/elf32-iq2000.c
index b29b9cbb2275352c5d6c4b7be8193430e2a8dd78..e95f1a56eacd332f50762d41769e60ba83771710 100644
(file)
--- a/
bfd/elf32-iq2000.c
+++ b/
bfd/elf32-iq2000.c
@@
-1,5
+1,5
@@
/* IQ2000-specific support for 32-bit ELF.
/* IQ2000-specific support for 32-bit ELF.
- Copyright (C) 2003-201
8
Free Software Foundation, Inc.
+ Copyright (C) 2003-201
9
Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library.
This file is part of BFD, the Binary File Descriptor library.
@@
-22,6
+22,7
@@
#include "libbfd.h"
#include "elf-bfd.h"
#include "elf/iq2000.h"
#include "libbfd.h"
#include "elf-bfd.h"
#include "elf/iq2000.h"
+#include "libiberty.h"
/* Forward declarations. */
/* Forward declarations. */
@@
-416,7
+417,7
@@
iq2000_final_link_relocate (reloc_howto_type * howto,
\f
/* Set the howto pointer for a IQ2000 ELF reloc. */
\f
/* Set the howto pointer for a IQ2000 ELF reloc. */
-static
void
+static
bfd_boolean
iq2000_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED,
arelent * cache_ptr,
Elf_Internal_Rela * dst)
iq2000_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED,
arelent * cache_ptr,
Elf_Internal_Rela * dst)
@@
-435,15
+436,18
@@
iq2000_info_to_howto_rela (bfd * abfd ATTRIBUTE_UNUSED,
break;
default:
break;
default:
- if (r_type >=
(unsigned int) R_IQ2000_max
)
+ if (r_type >=
ARRAY_SIZE (iq2000_elf_howto_table)
)
{
/* xgettext:c-format */
{
/* xgettext:c-format */
- _bfd_error_handler (_("%B: invalid IQ2000 reloc number: %d"), abfd, r_type);
- r_type = 0;
+ _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
+ abfd, r_type);
+ bfd_set_error (bfd_error_bad_value);
+ return FALSE;
}
cache_ptr->howto = & iq2000_elf_howto_table [r_type];
break;
}
}
cache_ptr->howto = & iq2000_elf_howto_table [r_type];
break;
}
+ return TRUE;
}
/* Look through the relocs for a section during the first phase.
}
/* Look through the relocs for a section during the first phase.
@@
-497,9
+501,7
@@
iq2000_elf_check_relocs (bfd *abfd,
/* This relocation describes which C++ vtable entries
are actually used. Record for later use during GC. */
case R_IQ2000_GNU_VTENTRY:
/* This relocation describes which C++ vtable entries
are actually used. Record for later use during GC. */
case R_IQ2000_GNU_VTENTRY:
- BFD_ASSERT (h != NULL);
- if (h != NULL
- && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+ if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
return FALSE;
break;
return FALSE;
break;
@@
-623,7
+625,7
@@
iq2000_elf_relocate_section (bfd * output_bfd ATTRIBUTE_UNUSED,
name = bfd_elf_string_from_elf_section
(input_bfd, symtab_hdr->sh_link, sym->st_name);
name = bfd_elf_string_from_elf_section
(input_bfd, symtab_hdr->sh_link, sym->st_name);
- name =
(name == NULL) ? bfd_section_name (input_bfd,
osec) : name;
+ name =
name == NULL ? bfd_section_name (
osec) : name;
}
else
{
}
else
{
@@
-825,7
+827,7
@@
iq2000_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
error = TRUE;
_bfd_error_handler
/* xgettext:c-format */
error = TRUE;
_bfd_error_handler
/* xgettext:c-format */
- (_("%B: compiled with %s and linked with modules compiled with %s"),
+ (_("%
p
B: compiled with %s and linked with modules compiled with %s"),
ibfd, new_opt, old_opt);
}
ibfd, new_opt, old_opt);
}
@@
-839,7
+841,7
@@
iq2000_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
_bfd_error_handler
/* xgettext:c-format */
_bfd_error_handler
/* xgettext:c-format */
- (_("%B: uses different e_flags (%#x) fields than previous modules (%#x)"),
+ (_("%
p
B: uses different e_flags (%#x) fields than previous modules (%#x)"),
ibfd, new_flags, old_flags);
}
}
ibfd, new_flags, old_flags);
}
}
This page took
0.025932 seconds
and
4
git commands to generate.