diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2009-05-27 13:31:23 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@codesourcery.com> | 2009-05-27 13:31:23 +0000 |
| commit | 51c892357c62187fa462745acca179c26ccb66b8 (patch) | |
| tree | ae42cf8c81cef0e2706c0a72c728a3d335ccc26c /bfd/elf-m10300.c | |
| parent | c912928872cf4014fb5a223607144bbd5b57db79 (diff) | |
| download | gdb-51c892357c62187fa462745acca179c26ccb66b8.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/elf-m10300.c')
| -rw-r--r-- | bfd/elf-m10300.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c index d41906ce198..d3270c5dbb8 100644 --- a/bfd/elf-m10300.c +++ b/bfd/elf-m10300.c @@ -2073,6 +2073,10 @@ mn10300_elf_relax_section (bfd *abfd, asection *section = sec; bfd_vma align_gap_adjustment; + if (link_info->relocatable) + (*link_info->callbacks->einfo) + (_("%P%F: --relax and -r may not be used together\n")); + /* Assume nothing changes. */ *again = FALSE; |