This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
S390 gas has two declarations for TC_FORCE_RELOCATION
- To: binutils at sources dot redhat dot com
- Subject: S390 gas has two declarations for TC_FORCE_RELOCATION
- From: Andreas Jaeger <aj at suse dot de>
- Date: Mon, 23 Jul 2001 11:54:05 +0200
- Cc: Martin Schwidefsky <schwidefsky at de dot ibm dot com>
gas/config/tc-s390.h has two declarations for TC_FORCE_RELOCATION, cvs
annotate shows:
1.4 (amodra 06-Jun-01): #define TC_FORCE_RELOCATION(FIXP) \
1.4 (amodra 06-Jun-01): ((FIXP)->fx_r_type == BFD_RELOC_VTABLE_INHERIT \
1.4 (amodra 06-Jun-01): || (FIXP)->fx_r_type == BFD_RELOC_VTABLE_ENTRY)
1.4 (amodra 06-Jun-01):
1.3 (nickc 26-Mar-01): # define TC_FORCE_RELOCATION(fixp) s390_force_relocation (fixp)
1.3 (nickc 26-Mar-01): extern int s390_force_relocation PARAMS ((struct fix *));
I do assume that the first (newer) definition is correct and that
Martin's patch from http://sources.redhat.com/ml/binutils/2001-06/msg00063.html:
2001-06-05 Martin Schwidefsky <schwidefsky@de.ibm.com>
* config/tc-s390.h (TC_FORCE_RELOCATION): Always emit relocations
BFD_RELOC_VTABLE_INHERIT and BFD_RELOC_VTABLE_ENTRY.
is broken - and it seems that patch was never needed (see
s390_force_relocation which is not needed anymore).
Ok to commit the appended patch?
Andreas
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.
============================================================
Index: gas/config/tc-s390.h
--- gas/config/tc-s390.h 2001/06/06 12:06:56 1.4
+++ gas/config/tc-s390.h 2001/07/23 09:51:28
@@ -117,6 +117,3 @@ extern long md_pcrel_from_section PARAMS
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 *));
============================================================
Index: gas/config/tc-s390.c
--- gas/config/tc-s390.c 2001/03/26 19:38:33 1.3
+++ gas/config/tc-s390.c 2001/07/23 09:53:38
@@ -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;
-}
-
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.inka.de
http://www.suse.de/~aj