* config/tc-s390.c (s390_force_relocation): Removed.

	* config/tc-s390.h: Remove double declaration of
	TC_FORCE_RELOCATION.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index a0e312dbaadb7faac7a0c147ff01ebb8c0225439..756f94a9f2aa4035c13366df204779ad41d22693 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-23  Andreas Jaeger  <aj@suse.de>
+
+       * config/tc-s390.c (s390_force_relocation): Removed.
+
+       * config/tc-s390.h: Remove double declaration of
+       TC_FORCE_RELOCATION.
+
 2001-07-22  H.J. Lu <hjl@gnu.org>
 
        * config/tc-mips.c (s_mips_end): Remove unused variables.

diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
index 4f012778f512757f878ddd7bef5e6bde7a24225d..3eb85dde557b6283e1c3ae730866e8a6421bc28f 100644 (file)
--- a/gas/config/tc-s390.c
+++ b/gas/config/tc-s390.c
@@ -1895,15 +1895,3 @@ tc_gen_reloc (seg, fixp)
 
   return reloc;
 }
-
-int
-s390_force_relocation (fixp)
-     struct fix * fixp;
-{
-  if (   fixp->fx_r_type == BFD_RELOC_VTABLE_INHERIT
-      || fixp->fx_r_type == BFD_RELOC_VTABLE_ENTRY)
-    return 1;
-
-  return 0;
-}
-

diff --git a/gas/config/tc-s390.h b/gas/config/tc-s390.h
index 089c1f0721823b090d7c2f985dba8d01a9fb1f6e..ad201c38fb1bd164e9a24d3e789ff54619ba1ac4 100644 (file)
--- a/gas/config/tc-s390.h
+++ b/gas/config/tc-s390.h
@@ -73,7 +73,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
 
@@ -101,7 +101,7 @@ 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));
@@ -117,6 +117,3 @@ extern long md_pcrel_from_section PARAMS ((struct fix *, segT));
 
 extern void s390_md_end PARAMS ((void));
 #define md_end() s390_md_end ()
-
-# define TC_FORCE_RELOCATION(fixp) s390_force_relocation (fixp)
-extern int s390_force_relocation PARAMS ((struct fix *));