diff options
| author | Phil Blundell <pb@futuretv.com> | 2000-11-06 19:41:20 +0000 |
|---|---|---|
| committer | Phil Blundell <pb@futuretv.com> | 2000-11-06 19:41:20 +0000 |
| commit | 2fc836e3fbe867c4e62e0fef81e0121f1507f6cb (patch) | |
| tree | 2a71ee0465f1b5e2188d27eb3a8448acc876b0f6 | |
| parent | 8e079b4fe19a20506c8b01fed2e0069960bb672b (diff) | |
| download | gdb-2fc836e3fbe867c4e62e0fef81e0121f1507f6cb.tar.gz | |
2000-11-05 Philip Blundell <philb@gnu.org>
* elf32-arm.h (elf32_arm_merge_private_bfd_data): Always permit
BFDs containing no sections to be merged, regardless of their flags.
2000-11-04 Philip Blundell <philb@gnu.org>
* elf32-arm.h (elf32_arm_relocate_section): Suppress error message
if a relocation for an undefined symbol also results in an
overflow.
| -rw-r--r-- | bfd/ChangeLog | 11 | ||||
| -rw-r--r-- | bfd/elf32-arm.h | 31 |
2 files changed, 38 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 9230b0d04a3..9e1fb765c67 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,14 @@ +2000-11-05 Philip Blundell <philb@gnu.org> + + * elf32-arm.h (elf32_arm_merge_private_bfd_data): Always permit + BFDs containing no sections to be merged, regardless of their flags. + +2000-11-04 Philip Blundell <philb@gnu.org> + + * elf32-arm.h (elf32_arm_relocate_section): Suppress error message + if a relocation for an undefined symbol also results in an + overflow. + 2000-10-31 Philip Blundell <philb@gnu.org> * elf32-arm.h (elf32_arm_merge_private_bfd_data): Only handle diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h index 72bbe780bf0..2e8a657ec81 100644 --- a/bfd/elf32-arm.h +++ b/bfd/elf32-arm.h @@ -1846,10 +1846,15 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section, switch (r) { case bfd_reloc_overflow: - if (!((*info->callbacks->reloc_overflow) - (info, name, howto->name, (bfd_vma) 0, - input_bfd, input_section, rel->r_offset))) - return false; + /* If the overflowing reloc was to an undefined symbol, + we have already printed one error message and there + is no point complaining again. */ + if ((! h || + h->root.type != bfd_link_hash_undefined) + && (!((*info->callbacks->reloc_overflow) + (info, name, howto->name, (bfd_vma) 0, + input_bfd, input_section, rel->r_offset)))) + return false; break; case bfd_reloc_undefined: @@ -1974,6 +1979,8 @@ elf32_arm_merge_private_bfd_data (ibfd, obfd) flagword out_flags; flagword in_flags; boolean flags_compatible = true; + boolean null_input_bfd = true; + asection *sec; if ( bfd_get_flavour (ibfd) != bfd_target_elf_flavour || bfd_get_flavour (obfd) != bfd_target_elf_flavour) @@ -2029,6 +2036,22 @@ elf32_arm_merge_private_bfd_data (ibfd, obfd) if (in_flags == out_flags) return true; + /* Check to see if the input BFD actually contains any sections. + If not, its flags may not have been initialised either, but it cannot + actually cause any incompatibility. */ + for (sec = ibfd->sections; sec != NULL; sec = sec->next) + { + /* Ignore synthetic glue sections. */ + if (strcmp (sec->name, ".glue_7") + && strcmp (sec->name, ".glue_7t")) + { + null_input_bfd = false; + break; + } + } + if (null_input_bfd) + return true; + /* If any of the input BFDs is non-PIC, the output is also position dependent. */ if (!(in_flags & EF_PIC)) |