diff options
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf64-mmix.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f3f4533..5d3be83 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2009-07-29 Hans-Peter Nilsson <hp@bitrange.com> + + * elf64-mmix.c (mmix_elf_relax_section): Revert 2009-05-27 + change. Add note to head comment. + 2009-07-28 Jan Beulich <jbeulich@novell.com> * archive.c (get_extended_arelt_filename): Remove redundant diff --git a/bfd/elf64-mmix.c b/bfd/elf64-mmix.c index 9669fdb..f9ce5d2 100644 --- a/bfd/elf64-mmix.c +++ b/bfd/elf64-mmix.c @@ -2557,7 +2557,7 @@ mmix_dump_bpo_gregs (link_info, pf) when the last such reloc is done, an index-array is sorted according to the values and iterated over to produce register numbers (indexed by 0 from the first allocated register number) and offsets for use in real - relocation. + relocation. (N.B.: Relocatable runs are handled, not just punted.) PUSHJ stub accounting is also done here. @@ -2590,10 +2590,6 @@ mmix_elf_relax_section (abfd, sec, link_info, again) /* Assume nothing changes. */ *again = FALSE; - if (link_info->relocatable) - (*link_info->callbacks->einfo) - (_("%P%F: --relax and -r may not be used together\n")); - /* We don't have to do anything if this section does not have relocs, or if this is not a code section. */ if ((sec->flags & SEC_RELOC) == 0 |