From: Nick Clifton <nickc@redhat.com>
Date: Thu, 18 Nov 1999 18:36:35 +0000 (+0000)
Subject: Fix processing of RVA relocs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=078c8694a9d03160f630e006a689e7d1ff559f95;p=binutils-gdb.git

Fix processing of RVA relocs
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index af1173c1476..d26847ccca9 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+1999-11-18  Nick Clifton  <nickc@cygnus.com>
+
+	* coff-mcore.c (coff_mcore_rtype_to_howto): Special case handling
+	for RVA relocs.
+	(coff_mcore_relocate_section): Initialise addend to 0.
+	Special case processing of RVA reloc.
+
 1999-11-17  Richard Henderson  <rth@cygnus.com>
 
 	* elf-bfd.h (struct elf_backend_data): Reorder collect and
diff --git a/bfd/coff-mcore.c b/bfd/coff-mcore.c
index 48f15259fc7..a644db10c1f 100644
--- a/bfd/coff-mcore.c
+++ b/bfd/coff-mcore.c
@@ -339,7 +339,7 @@ coff_mcore_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
   if (rel->r_type == IMAGE_REL_MCORE_RVA)
     * addendp -= pe_data (sec->output_section->owner)->pe_opthdr.ImageBase;
   
-  if (howto->pc_relative)
+  else if (howto->pc_relative)
     {
       * addendp = sec->vma - 2; /* XXX guess - is this right ? */
       
@@ -440,6 +440,8 @@ coff_mcore_relocate_section (output_bfd, info, input_bfd, input_section,
 	  sym = syms + symndx;
 	}
 
+      addend = 0;
+      
       /* Get the howto and initialise the addend.  */
       howto = bfd_coff_rtype_to_howto (input_bfd, input_section, rel, h,
 				       sym, & addend);
@@ -527,8 +529,16 @@ coff_mcore_relocate_section (output_bfd, info, input_bfd, input_section,
 	case IMAGE_REL_MCORE_PCREL_JSR_IMM11BY2:
 	case IMAGE_REL_MCORE_ADDR32:
 	case IMAGE_REL_MCORE_RVA:
+	  /* XXX fixme - shouldn't this be like the code for the RVA reloc ? */
 	  rstat = _bfd_relocate_contents (howto, input_bfd, val, loc);
 	  break;
+	  
+	case IMAGE_REL_MCORE_RVA:
+	  rstat = _bfd_final_link_relocate
+	    (howto, input_bfd,
+	     input_section, contents, rel->r_vaddr - input_section->vma,
+	     val, addend);
+	  break;
 	}
       
       if (info->base_file)