aboutsummaryrefslogtreecommitdiff
path: root/bfd/bout.c
diff options
context:
space:
mode:
authorNathan Sidwell <nathan@codesourcery.com>2009-05-27 13:31:24 +0000
committerNathan Sidwell <nathan@codesourcery.com>2009-05-27 13:31:24 +0000
commitc8a1f2548b56bc210c8bcb067e91de8132f56d67 (patch)
treed765705e9894e818c3ef4e0895ecd402ced6541c /bfd/bout.c
parent07fc31c9c913c27ac64af66c32689db4a63827e2 (diff)
downloadgdb-c8a1f2548b56bc210c8bcb067e91de8132f56d67.zip
gdb-c8a1f2548b56bc210c8bcb067e91de8132f56d67.tar.gz
gdb-c8a1f2548b56bc210c8bcb067e91de8132f56d67.tar.bz2
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/bout.c')
-rw-r--r--bfd/bout.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/bfd/bout.c b/bfd/bout.c
index f4800d5..485371d 100644
--- a/bfd/bout.c
+++ b/bfd/bout.c
@@ -1145,6 +1145,10 @@ b_out_bfd_relax_section (bfd *abfd,
arelent **reloc_vector = NULL;
long reloc_size = bfd_get_reloc_upper_bound (input_bfd, input_section);
+ if (link_info->relocatable)
+ (*link_info->callbacks->einfo)
+ (_("%P%F: --relax and -r may not be used together\n"));
+
if (reloc_size < 0)
return FALSE;