diff options
author | Nathan Sidwell <nathan@codesourcery.com> | 2009-05-27 13:31:24 +0000 |
---|---|---|
committer | Nathan Sidwell <nathan@codesourcery.com> | 2009-05-27 13:31:24 +0000 |
commit | f3de7ae6eafd7cb5a9dd7b5ff2b5a3db83ad4d07 (patch) | |
tree | 4238f04c0e4a4d83e4874f204f2b0ad5a320abf8 /bfd/reloc.c | |
parent | 2ee0ed706c54d8eebfe47173c6c27ae7741a9a19 (diff) | |
download | binutils-redhat-f3de7ae6eafd7cb5a9dd7b5ff2b5a3db83ad4d07.tar.gz |
bfd/
* elf32-ppc.c (ppc_elf_relax_section): Work with a partial
link.
* bout.c (b_out_bfd_relax_section): Reject relocatable links.
* elf32-m10300.c (mn10300_elf_relax_section): Likewise.
* elf32-avr.c (elf32_avr_relax_section): Likewise.
* elf32-frv.c (elf32_avr_relax_section): Likewise.
* elf32-xtensa.c (elf_xtensa_relax_section): Likewise.
* elf64-mmix.c (mmix_elf_relax_section): Likewise.
* elfxx-ia64.c (elfNN_ia64_relax_section): Likewise.
* elfxx-sparc.c (_bfd_sparc_elf_relax_section): Likewise.
* reloc.c (bfd_generic_relax_section): Likewise.
* reloc16.c (bfd_coff_reloc16_relax_section): Likewise.
* vms.c (vms_bfd_relax_section): Likewise.
ld/
* ldmain.c (main): Don't reject --relax -r.
* ld.texinfo (PowerPC ELF32): Document behaviour of relaxing
partial links.
ld/testsuite/
* ld-powerpc/vxworks-relax-2.s: New.
* ld-powerpc/vxworks-relax-2.rd: New.
* ld-powerpc/powerpc.exp: Add it.
Diffstat (limited to 'bfd/reloc.c')
-rw-r--r-- | bfd/reloc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bfd/reloc.c b/bfd/reloc.c index 5e10e7ed70..66fb672dba 100644 --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -5291,6 +5291,10 @@ bfd_generic_relax_section (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *link_info ATTRIBUTE_UNUSED, bfd_boolean *again) { + if (link_info->relocatable) + (*link_info->callbacks->einfo) + (_("%P%F: --relax and -r may not be used together\n")); + *again = FALSE; return TRUE; } |