* write.c (fixup_segment): Return void. Delete seg_reloc_count

	related code.
	(TC_ADJUST_RELOC_COUNT): Delete.
	* config/tc-i960.h (TC_ADJUST_RELOC_COUNT): Delete.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6cfe4c8f239f4397b1386ffa2dd9bd7d3dc01ff0..c2234db4002c88ba4be4e320824867ccf684cd03 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-04  Alan Modra  <amodra@gmail.com>
+
+       * write.c (fixup_segment): Return void.  Delete seg_reloc_count
+       related code.
+       (TC_ADJUST_RELOC_COUNT): Delete.
+       * config/tc-i960.h (TC_ADJUST_RELOC_COUNT): Delete.
+
 2013-02-04  Alan Modra  <amodra@gmail.com>
 
        * po/POTFILES.in: Regenerate.

diff --git a/gas/config/tc-i960.h b/gas/config/tc-i960.h
index 17c509746b7f92df7072e0936ea7ec1231091567..3949b6c420bf1005f85138c9051bdef943d90c86 100644 (file)
--- a/gas/config/tc-i960.h
+++ b/gas/config/tc-i960.h
@@ -147,12 +147,6 @@ extern int reloc_callj (struct fix *);
 /* We store the bal information in the sy_tc field.  */
 #define TC_SYMFIELD_TYPE symbolS *
 
-#define TC_ADJUST_RELOC_COUNT(FIX,COUNT) \
-  { fixS *tcfixp = (FIX); \
-    for (;tcfixp;tcfixp=tcfixp->fx_next) \
-      if (tcfixp->fx_tcbit && tcfixp->fx_addsy != 0) \
-       ++(COUNT); \
-  }
 #endif
 
 extern int i960_validate_fix (struct fix *, segT);

diff --git a/gas/write.c b/gas/write.c
index 3d34b3f55eda6658cf95b23a2e38f16e957da16c..1d27db782ea118aaf4357f799ba9cf4122764ab7 100644 (file)
--- a/gas/write.c
+++ b/gas/write.c
@@ -30,10 +30,6 @@
 #include "libbfd.h"
 #include "compress-debug.h"
 
-#ifndef TC_ADJUST_RELOC_COUNT
-#define TC_ADJUST_RELOC_COUNT(FIX, COUNT)
-#endif
-
 #ifndef TC_FORCE_RELOCATION
 #define TC_FORCE_RELOCATION(FIX)               \
   (generic_force_reloc (FIX))
@@ -890,15 +886,12 @@ adjust_reloc_syms (bfd *abfd ATTRIBUTE_UNUSED,
    handled now.  (These consist of fixS where we have since discovered
    the value of a symbol, or the address of the frag involved.)
    For each one, call md_apply_fix to put the fix into the frag data.
+   Ones that we couldn't completely handle here will be output later
+   by emit_relocations.  */
 
-   Result is a count of how many relocation structs will be needed to
-   handle the remaining fixS's that we couldn't completely handle here.
-   These will be output later by emit_relocations().  */
-
-static long
+static void
 fixup_segment (fixS *fixP, segT this_segment)
 {
-  long seg_reloc_count = 0;
   valueT add_number;
   fragS *fragP;
   segT add_symbol_segment = absolute_section;
@@ -928,10 +921,8 @@ fixup_segment (fixS *fixP, segT this_segment)
            symbol_mark_used_in_reloc (fixP->fx_addsy);
            if (fixP->fx_subsy != NULL)
              symbol_mark_used_in_reloc (fixP->fx_subsy);
-           seg_reloc_count++;
          }
-      TC_ADJUST_RELOC_COUNT (fixP, seg_reloc_count);
-      return seg_reloc_count;
+      return;
     }
 
   for (; fixP; fixP = fixP->fx_next)
@@ -1073,7 +1064,6 @@ fixup_segment (fixS *fixP, segT this_segment)
 
       if (!fixP->fx_done)
        {
-         ++seg_reloc_count;
          if (fixP->fx_addsy == NULL)
            fixP->fx_addsy = abs_section_sym;
          symbol_mark_used_in_reloc (fixP->fx_addsy);
@@ -1126,9 +1116,6 @@ fixup_segment (fixS *fixP, segT this_segment)
       print_fixup (fixP);
 #endif
     }                          /* For each fixS in this segment.  */
-
-  TC_ADJUST_RELOC_COUNT (fixP, seg_reloc_count);
-  return seg_reloc_count;
 }
 
 static void