ia64-hpux patches from Steve Ellcey.

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

diff --git a/gas/write.c b/gas/write.c
index 67d39ab1b954f0836103254fafb5713f7746ee2a..f30e0d0bc42d4f80303908a9f7fb6fc99c386798 100644 (file)
--- a/gas/write.c
+++ b/gas/write.c
@@ -52,6 +52,10 @@
 #define TC_LINKRELAX_FIXUP(SEG) 1
 #endif
 
+#ifndef TC_FIX_ADJUSTABLE
+#define TC_FIX_ADJUSTABLE(fix) 1
+#endif
+
 #ifndef        MD_PCREL_FROM_SECTION
 #define MD_PCREL_FROM_SECTION(FIXP, SEC) md_pcrel_from(FIXP)
 #endif
@@ -895,7 +899,7 @@ write_relocs (abfd, sec, xxx)
      PTR xxx ATTRIBUTE_UNUSED;
 {
   segment_info_type *seginfo = seg_info (sec);
-  int i;
+  unsigned int i;
   unsigned int n;
   arelent **relocs;
   fixS *fixp;
@@ -1004,7 +1008,7 @@ write_relocs (abfd, sec, xxx)
        }
 
       /* If this is an undefined symbol which was equated to another
-         symbol, then use generate the reloc against the latter symbol
+         symbol, then generate the reloc against the latter symbol
          rather than the former.  */
       sym = fixp->fx_addsy;
       while (symbol_equated_p (sym)
@@ -2710,16 +2714,7 @@ fixup_segment (fixP, this_segment_type)
              else
                {
                  seg_reloc_count++;
-#ifdef TC_DONT_FIX_NON_ADJUSTABLE
-                 if (1
-#ifdef obj_fix_adjustable
-                     && obj_fix_adjustable (fixP)
-#endif
-#ifdef tc_fix_adjustable
-                     && tc_fix_adjustable (fixP)
-#endif
-                     )
-#endif
+                 if (TC_FIX_ADJUSTABLE (fixP))
                    add_number += S_GET_VALUE (add_symbolP);
                }
            }