Update all uses of md_apply_fix to use md_apply_fix3. Make it a void function.

[deliverable/binutils-gdb.git] / gas / config / tc-s390.h

diff --git a/gas/config/tc-s390.h b/gas/config/tc-s390.h
index d3796d93cbaf7e7b85f8f7ae2d08ab7eb86e1bb7..1837b1ab4448eb960cc91a67334ee2fc94ffc134 100644 (file)
--- a/gas/config/tc-s390.h
+++ b/gas/config/tc-s390.h
@@ -36,22 +36,30 @@ struct fix;
    checked here.  I am not sure if some of the others are ever used with
    pcrel, but it is easier to be safe than sorry. */
 
-#define TC_RELOC_RTSYM_LOC_FIXUP(FIX)  \
-  ((FIX)->fx_addsy == NULL \
-   || (! S_IS_EXTERNAL ((FIX)->fx_addsy) \
-       && ! S_IS_WEAK ((FIX)->fx_addsy) \
-       && S_IS_DEFINED ((FIX)->fx_addsy) \
-       && ! S_IS_COMMON ((FIX)->fx_addsy)))
+#define TC_RELOC_RTSYM_LOC_FIXUP(FIX)        \
+  ((FIX)->fx_r_type != BFD_RELOC_390_GOTENT  \
+   && ((FIX)->fx_addsy == NULL               \
+       || (! S_IS_EXTERNAL ((FIX)->fx_addsy)      \
+           && ! S_IS_WEAK ((FIX)->fx_addsy)  \
+           && S_IS_DEFINED ((FIX)->fx_addsy)      \
+           && ! S_IS_COMMON ((FIX)->fx_addsy))))
+
+#define TC_FORCE_RELOCATION(FIXP) tc_s390_force_relocation(FIXP)
+extern int tc_s390_force_relocation PARAMS ((struct fix *));
 
 #define tc_fix_adjustable(X)  tc_s390_fix_adjustable(X)
 extern int tc_s390_fix_adjustable PARAMS ((struct fix *));
 
+#define TC_FIX_ADJUSTABLE(fixP) \
+  (! symbol_used_in_reloc_p ((fixP)->fx_addsy) && tc_fix_adjustable (fixP))
+
 /* The target BFD architecture.  */
 #define TARGET_ARCH bfd_arch_s390
 extern enum bfd_architecture s390_arch PARAMS ((void));
 
 /* The target BFD format.  */
 #define TARGET_FORMAT s390_target_format()
+extern const char * s390_target_format PARAMS ((void));
 
 /* Set the endianness we are using. */
 #define TARGET_BYTES_BIG_ENDIAN 1
@@ -67,7 +75,7 @@ extern int target_big_endian;
 
 /* We need to be able to make relocations involving the difference of
    two symbols.  This includes the difference of two symbols when
-   one of them is undefined (this comes up in PIC code generation). 
+   one of them is undefined (this comes up in PIC code generation).
  */
 #define UNDEFINED_DIFFERENCE_OK
 
@@ -77,9 +85,6 @@ extern int target_big_endian;
 /* We don't need to handle .word strangely.  */
 #define WORKING_DOT_WORD
 
-/* We set the fx_done field appropriately in md_apply_fix.  */
-#define TC_HANDLES_FX_DONE
-
 #define md_number_to_chars           number_to_chars_bigendian
 
 #define md_do_align(n, fill, len, max, around)                          \
@@ -95,14 +100,11 @@ if ((n) && !need_pass_2 && (fill == 0) &&                               \
 extern void s390_align_code PARAMS ((fragS *, int));
 
 #define HANDLE_ALIGN(fragP)                                            \
-if (fragP->fr_type == rs_align_code)                                   \
+if (fragP->fr_type == rs_align_code)                                   \
   s390_align_code (fragP, (fragP->fr_next->fr_address                  \
                           - fragP->fr_address                          \
                           - fragP->fr_fix));
 
-/* call md_apply_fix3 with segment instead of md_apply_fix */
-#define MD_APPLY_FIX3
-
 /* call md_pcrel_from_section, not md_pcrel_from */
 #define MD_PCREL_FROM_SECTION(FIXP, SEC) md_pcrel_from_section(FIXP, SEC)
 extern long md_pcrel_from_section PARAMS ((struct fix *, segT));