* config/tc-mep.c (md_pcrel_from_section): Handle any other

forced-relocation cases.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index d62da94776468171625d5c2091a32c440e01b558..89a61d013a18e346fc74fc082cdf088af9e6568b 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-26  DJ Delorie  <dj@redhat.com>
+
+       * config/tc-mep.c (md_pcrel_from_section): Handle any other
+       forced-relocation cases.
+
 2009-08-26  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * Makefile.am (TARGET_CPU_CFILES): Add config/tc-moxie.c.

diff --git a/gas/config/tc-mep.c b/gas/config/tc-mep.c
index 511d9686599b7a9a4e83292070701a60c5e1a833..78a225a3498c49f2892d3fbf21d5480d451cd16f 100644 (file)
--- a/gas/config/tc-mep.c
+++ b/gas/config/tc-mep.c
@@ -1817,6 +1817,11 @@ md_pcrel_from_section (fixS *fixP, segT sec)
        Let the linker figure it out.  */
     return 0;
 
+  /* If we've got other reasons for emitting this relocation, let the
+     linker handle pc-rel also.  */
+  if (mep_force_relocation (fixP))
+    return 0;
+
   /* Return the address of the opcode - cgen adjusts for opcode size
      itself, to be consistent with the disassembler, which must do
      so.  */