From 0441df2ad167b1afd220a38c74f580038104e3df Mon Sep 17 00:00:00 2001
From: Ben Elliston <bje@au.ibm.com>
Date: Mon, 31 Jan 2005 23:13:34 +0000
Subject: 	* 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.

---
 bfd/coff-or32.c | 53 +++++++++++++++++------------------------------------
 1 file changed, 17 insertions(+), 36 deletions(-)

(limited to 'bfd/coff-or32.c')

diff --git a/bfd/coff-or32.c b/bfd/coff-or32.c
index af30afdb7f0..6e02b90c8a5 100644
--- a/bfd/coff-or32.c
+++ b/bfd/coff-or32.c
@@ -148,23 +148,14 @@ or32_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
         signed_value = 0;
 
       signed_value += sym_value + reloc_entry->addend;
-#if 0
-      if ((signed_value & ~0x3ffff) == 0)
-        {                     /* Absolute jmp/call.  */
-          insn |= (1<<24);    /* Make it absolute.  */
-          /* FIXME: Should we change r_type to R_IABS.  */
-        }
-      else
-#endif
-        {
-          /* Relative jmp/call, so subtract from the value the
-             address of the place we're coming from.  */
-          signed_value -= (reloc_entry->address
-                           + input_section->output_section->vma
-                           + input_section->output_offset);
-          if (signed_value > 0x7ffffff || signed_value < -0x8000000)
-            return bfd_reloc_overflow;
-        }
+      /* Relative jmp/call, so subtract from the value the
+	 address of the place we're coming from.  */
+      signed_value -= (reloc_entry->address
+		       + input_section->output_section->vma
+		       + input_section->output_offset);
+      if (signed_value > 0x7ffffff || signed_value < -0x8000000)
+	return bfd_reloc_overflow;
+
       signed_value >>= 2;
       insn = INSERT_JUMPTARG (insn, signed_value);
       bfd_put_32 (abfd, insn, hit_data);
@@ -465,25 +456,15 @@ coff_or32_relocate_section (output_bfd, info, input_bfd, input_section,
           /* Determine the destination of the jump.  */
           signed_value += val;
 
-#if 0
-          if ((signed_value & ~0x3ffff) == 0)
-            {
-              /* We can use an absolute jump.  */
-              insn |= (1 << 24);
-            }
-          else
-#endif
-            {
-              /* Make the destination PC relative.  */
-              signed_value -= (input_section->output_section->vma
-                               + input_section->output_offset
-                               + (rel->r_vaddr - input_section->vma));
-              if (signed_value > 0x7ffffff || signed_value < - 0x8000000)
-                {
-                  overflow = TRUE;
-                  signed_value = 0;
-                }
-            }
+	  /* Make the destination PC relative.  */
+	  signed_value -= (input_section->output_section->vma
+			   + input_section->output_offset
+			   + (rel->r_vaddr - input_section->vma));
+	  if (signed_value > 0x7ffffff || signed_value < - 0x8000000)
+	    {
+	      overflow = TRUE;
+	      signed_value = 0;
+	    }
 
           /* Put the adjusted value back into the instruction.  */
           signed_value >>= 2;
-- 
cgit v1.2.1