* Add support for marker type relocations. These mark areas

[deliverable/binutils-gdb.git] / gas / write.c

diff --git a/gas/write.c b/gas/write.c
index 0b074d59b24c05de7ffbddc9f8f160dbe8402626..e2e1c3dffed68163895a5f8811640fc76ad404dd 100644 (file)
--- a/gas/write.c
+++ b/gas/write.c
@@ -632,8 +632,7 @@ write_relocs (abfd, sec, xxx)
          continue;
        }
       data = fixp->fx_frag->fr_literal + fixp->fx_where;
-      /* @@ Assumes max size of reloc is 4. */
-      if (fixp->fx_where + 4
+      if (fixp->fx_where + fixp->fx_size
          > fixp->fx_frag->fr_fix + fixp->fx_frag->fr_offset)
        abort ();
       /* Pass bogus address so that when bfd_perform_relocation adds
@@ -686,7 +685,7 @@ write_relocs (abfd, sec, xxx)
           assert(i <= n);
        }
       data = fixp->fx_frag->fr_literal + fixp->fx_where;
-      if (fixp->fx_where + 4
+      if (fixp->fx_where + fixp->fx_size
          > fixp->fx_frag->fr_fix + fixp->fx_frag->fr_offset)
        abort ();
       for (j = 0; reloc[j]; j++)
@@ -2011,7 +2010,7 @@ fixup_segment (fixP, this_segment_type)
              }                 /* if there's an add_symbol */
          }                     /* if pcrel */
 
-       if (!fixP->fx_bit_fixP)
+       if (!fixP->fx_bit_fixP && size > 0)
          {
            valueT mask = 0;
            /* set all bits to one */