diff options
| author | Hans-Peter Nilsson <hp@axis.com> | 2009-07-28 23:45:22 +0000 |
|---|---|---|
| committer | Hans-Peter Nilsson <hp@axis.com> | 2009-07-28 23:45:22 +0000 |
| commit | bcb1508bab0159b043b708e1f943b281a97afb07 (patch) | |
| tree | 9b37b10cb345d8f37953bec37480b74404a57fb5 /bfd/elf64-mmix.c | |
| parent | db57fa7bd868538e375011d707210503b974dfa6 (diff) | |
| download | binutils-redhat-bcb1508bab0159b043b708e1f943b281a97afb07.tar.gz | |
* elf64-mmix.c (mmix_elf_relax_section): Revert 2009-05-27
change. Add note to head comment.
Diffstat (limited to 'bfd/elf64-mmix.c')
| -rw-r--r-- | bfd/elf64-mmix.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/bfd/elf64-mmix.c b/bfd/elf64-mmix.c index 9669fdb669..f9ce5d23fd 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 |