X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fconfig%2Ftc-i960.h;h=47015ce778d27357fe8749f281ab1f38a62f128f;hb=c1f61bd2b0644fc710dcfbb378a63f0b34be8903;hp=05db36e40d5ce5744bab4e0f6c09d132de7270d1;hpb=7be1c4891a2036c31e706908d43f33f7f59ae5a9;p=deliverable%2Fbinutils-gdb.git

diff --git a/gas/config/tc-i960.h b/gas/config/tc-i960.h
index 05db36e40d..47015ce778 100644
--- a/gas/config/tc-i960.h
+++ b/gas/config/tc-i960.h
@@ -1,13 +1,11 @@
 /* tc-i960.h - Basic 80960 instruction formats.
-   Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003
-   Free Software Foundation, Inc.
+   Copyright (C) 1989-2016 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2,
+   published by the Free Software Foundation; either version 3,
    or (at your option) any later version.
 
    GAS is distributed in the hope that it will be useful, but
@@ -131,7 +129,7 @@ struct relocation_info
 /* reloc_callj() may replace a 'call' with a 'calls' or a
    'bal', in which cases it modifies *fixP as appropriate.
    In the case of a 'calls', no further work is required.  */
-extern int reloc_callj PARAMS ((struct fix *));
+extern int reloc_callj (struct fix *);
 
 #define TC_FORCE_RELOCATION_ABS(FIX)		\
   (TC_FORCE_RELOCATION (FIX)			\
@@ -139,7 +137,6 @@ extern int reloc_callj PARAMS ((struct fix *));
 
 #define TC_FORCE_RELOCATION_LOCAL(FIX)		\
   (!(FIX)->fx_pcrel				\
-   || (FIX)->fx_plt				\
    || TC_FORCE_RELOCATION (FIX)		\
    || reloc_callj (FIX))
 
@@ -148,15 +145,9 @@ extern int reloc_callj PARAMS ((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 PARAMS ((struct fix *, segT));
+extern int i960_validate_fix (struct fix *, segT);
 #define TC_VALIDATE_FIX(FIX,SEGTYPE,LABEL) \
 	if (!i960_validate_fix (FIX, SEGTYPE)) goto LABEL
 
@@ -170,14 +161,14 @@ extern int i960_validate_fix PARAMS ((struct fix *, segT));
 #define MD_APPLY_SYM_VALUE(FIX) 0
 #endif
 
-extern void brtab_emit PARAMS ((void));
+extern void brtab_emit (void);
 #define md_end()	brtab_emit ()
 
-extern void tc_set_bal_of_call PARAMS ((symbolS *, symbolS *));
+extern void tc_set_bal_of_call (symbolS *, symbolS *);
 
-extern struct symbol *tc_get_bal_of_call PARAMS ((symbolS *));
+extern struct symbol *tc_get_bal_of_call (symbolS *);
 
-extern void i960_handle_align PARAMS ((struct frag *));
+extern void i960_handle_align (struct frag *);
 #define HANDLE_ALIGN(FRAG)	i960_handle_align (FRAG)
 #define NO_RELOC -1