2003-05-05 H.J. Lu <hjl@gnu.org>

	* config/tc-mips.c (tc_gen_reloc): Add addend just once if
	howto->partial_inplace is false.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0b23d58c3c1e7926451a11313d7abf63658bed44..f5ea030db4287435c8989a9673473397accc107a 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-05  H.J. Lu <hjl@gnu.org>
+
+       * config/tc-mips.c (tc_gen_reloc): Add addend just once if
+       howto->partial_inplace is false.
+
 2003-05-05  Daniel Jacobowitz  <drow@mvista.com>
 
        * config/tc-mips.c (mips_need_elf_addend_fixup): Remove

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 59f0b3d4043916750d374af07d9948b3d41ef93d..1c5602f18a64f82636aa5d60126ed33ae37cf77c 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -13940,7 +13940,15 @@ tc_gen_reloc (section, fixp)
       && (code == BFD_RELOC_GPREL16 || code == BFD_RELOC_MIPS16_GPREL)
       && reloc->addend != 0
       && mips_need_elf_addend_fixup (fixp))
-    reloc->addend += S_GET_VALUE (fixp->fx_addsy);
+    {
+      /* If howto->partial_inplace is false, md_apply_fix3 will only
+        subtract it once.  */
+      reloc_howto_type *howto;
+
+      howto = bfd_reloc_type_lookup (stdoutput, fixp->fx_r_type);
+      if (howto->partial_inplace)
+       reloc->addend += S_GET_VALUE (fixp->fx_addsy);
+    }
 #endif
 
   /* To support a PC relative reloc when generating embedded PIC code