summaryrefslogtreecommitdiff
path: root/bfd/reloc.c
diff options
context:
space:
mode:
authorBen Elliston <bje@au.ibm.com>2005-01-31 23:13:34 +0000
committerBen Elliston <bje@au.ibm.com>2005-01-31 23:13:34 +0000
commit0441df2ad167b1afd220a38c74f580038104e3df (patch)
tree5a301bc38266b9d66fc158cedfa1195822ed3c2e /bfd/reloc.c
parentec81b797125aa9cb9dc840739fd4dcaab5174a43 (diff)
downloadgdb-0441df2ad167b1afd220a38c74f580038104e3df.tar.gz
* aout-arm.c, aout-target.h, aoutx.h, archive.c, armnetbsd.c,
bfd-in.h, bfdio.c, coff-alpha.c, coff-arm.c, coff-h8300.c, coff-i860.c, coff-mcore.c, coff-or32.c, coff-ppc.c, coff-sh.c, coff-sparc.c, coffcode.h, coffgen.c, cofflink.c, cpu-cris.c, cpu-h8500.c, cpu-ns32k.c, ecoff.c, ecofflink.c, elf.c, elf32-dlx.c, elf32-fr30.c, elf32-frv.c, elf32-hppa.c, elf32-i860.c, elf32-ip2k.c, elf32-m32r.c, elf32-sh.c, elf32-v850.c, elf64-mips.c, elf64-sparc.c, elflink.c, i386aout.c, i386msdos.c, i386os9k.c, ieee.c, mach-o.c, nlm32-sparc.c, oasys.c, opncls.c, pdp11.c, pe-mips.c, peXXigen.c, pef.c, peicode.h, reloc.c, riscix.c, section.c, simple.c, som.c, sparclynx.c, targets.c, vms-misc.c, vms-tir.c, xsym.c, doc/chew.c, hosts/delta68.h, hosts/vaxbsd.h: Remove #if 0'd code throughout. Similarly, collapse #if 1'd code.
Diffstat (limited to 'bfd/reloc.c')
-rw-r--r--bfd/reloc.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/bfd/reloc.c b/bfd/reloc.c
index 49d79388896..f3049355c52 100644
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -715,7 +715,6 @@ bfd_perform_relocation (bfd *abfd,
&& strcmp (abfd->xvec->name, "coff-Intel-little") != 0
&& strcmp (abfd->xvec->name, "coff-Intel-big") != 0)
{
-#if 1
/* For m68k-coff, the addend was being subtracted twice during
relocation with -r. Removing the line below this comment
fixes that problem; see PR 2953.
@@ -786,7 +785,6 @@ space consuming. For each target:
right
*/
relocation -= reloc_entry->addend;
-#endif
reloc_entry->addend = 0;
}
else
@@ -1100,10 +1098,10 @@ bfd_install_relocation (bfd *abfd,
&& strcmp (abfd->xvec->name, "coff-Intel-little") != 0
&& strcmp (abfd->xvec->name, "coff-Intel-big") != 0)
{
-#if 1
-/* For m68k-coff, the addend was being subtracted twice during
- relocation with -r. Removing the line below this comment
- fixes that problem; see PR 2953.
+
+ /* For m68k-coff, the addend was being subtracted twice during
+ relocation with -r. Removing the line below this comment
+ fixes that problem; see PR 2953.
However, Ian wrote the following, regarding removing the line below,
which explains why it is still enabled: --djm
@@ -1170,7 +1168,6 @@ space consuming. For each target:
7) if they are different you have to figure out which version is
right. */
relocation -= reloc_entry->addend;
-#endif
reloc_entry->addend = 0;
}
else