* config/tc-i960.c (md_convert_frag): Add ATTRIBUTE_UNUSED to args.

	(s_endian <ignore>): Likewise.
	(md_undefined_symbol <name>): Likewise.
	(tc_crawl_symbol_chain <headers>): Likewise.
	(tc_set_bal_of_call): Likewise.
	(tc_coff_symbol_emit_hook <symbolP>): Likewise.
	(i960_handle_align <fragp>): Likewise.
	(i960_validate_fix <this_segment_type>): Likewise
	(tc_gen_reloc <section>): Likewise.
	(tc_coff_symbol_emit_hook): Only define for OBJ_COFF.
	(struct memS, struct regop): Forward declare.
	(brcnt_emit, brlab_next, cobr_fmt, ctrl_fmt, emit, get_args,
	get_cdisp, get_ispec, get_regnum, i_scan, mem_fmt, mema_to_memb,
	parse_expr, parse_ldconst, parse_memop, parse_po, parse_regop,
	reg_fmt, relax_cobr, s_leafproc, s_sysproc, shift_ok, syntax,
	targ_has_sfr, targ_has_iclass, tc_bfd_fix2rtype): Prototype.
	(md_chars_to_number, md_number_to_imm): Make static, prototype.
	(md_number_to_field): Likewise.
	(md_number_to_disp): Remove unused function.
	(md_atof): Remove declaration of atof_ieee.
	(md_apply_fix3): Correct md_number_to_imm call.

1 files changed, 96 insertions, 91 deletions

diff --git a/gas/config/tc-i960.c b/gas/config/tc-i960.c
index 41f953a914..0bbbfa698a 100644
--- a/gas/config/tc-i960.c
+++ b/gas/config/tc-i960.c
@@ -132,33 +132,59 @@ const int md_reloc_size = sizeof (struct relocation_info);
 #endif
 
 /* Local i80960 routines.  */
-
-static void brcnt_emit ();	/* Emit branch-prediction instrumentation code */
-static char *brlab_next ();	/* Return next branch local label */
-void brtab_emit ();		/* Emit br-predict instrumentation table */
-static void cobr_fmt ();	/* Generate COBR instruction */
-static void ctrl_fmt ();	/* Generate CTRL instruction */
-static char *emit ();		/* Emit (internally) binary */
-static int get_args ();		/* Break arguments out of comma-separated list */
-static void get_cdisp ();	/* Handle COBR or CTRL displacement */
-static char *get_ispec ();	/* Find index specification string */
-static int get_regnum ();	/* Translate text to register number */
-static int i_scan ();		/* Lexical scan of instruction source */
-static void mem_fmt ();		/* Generate MEMA or MEMB instruction */
-static void mema_to_memb ();	/* Convert MEMA instruction to MEMB format */
-static void parse_expr ();	/* Parse an expression */
-static int parse_ldconst ();	/* Parse and replace a 'ldconst' pseudo-op */
-static void parse_memop ();	/* Parse a memory operand */
-static void parse_po ();	/* Parse machine-dependent pseudo-op */
-static void parse_regop ();	/* Parse a register operand */
-static void reg_fmt ();		/* Generate a REG format instruction */
-static void relax_cobr ();	/* "De-optimize" cobr into compare/branch */
-static void s_leafproc ();	/* Process '.leafproc' pseudo-op */
-static void s_sysproc ();	/* Process '.sysproc' pseudo-op */
-static int shift_ok ();		/* Will a 'shlo' substiture for a 'ldconst'? */
-static void syntax ();		/* Give syntax error */
-static int targ_has_sfr ();	/* Target chip supports spec-func register? */
-static int targ_has_iclass ();	/* Target chip supports instruction set? */
+struct memS;
+struct regop;
+
+/* Emit branch-prediction instrumentation code */
+static void brcnt_emit PARAMS ((void));
+/* Return next branch local label */
+static char *brlab_next PARAMS ((void));
+/* Generate COBR instruction */
+static void cobr_fmt PARAMS ((char *[], long, struct i960_opcode *));
+/* Generate CTRL instruction */
+static void ctrl_fmt PARAMS ((char *, long, int));
+/* Emit (internally) binary */
+static char *emit PARAMS ((long));
+/* Break arguments out of comma-separated list */
+static int get_args PARAMS ((char *, char *[]));
+/* Handle COBR or CTRL displacement */
+static void get_cdisp PARAMS ((char *, char *, long, int, int, int));
+/* Find index specification string */
+static char *get_ispec PARAMS ((char *));
+/* Translate text to register number */
+static int get_regnum PARAMS ((char *));
+/* Lexical scan of instruction source */
+static int i_scan PARAMS ((char *, char *[]));
+/* Generate MEMA or MEMB instruction */
+static void mem_fmt PARAMS ((char *[], struct i960_opcode *, int));
+/* Convert MEMA instruction to MEMB format */
+static void mema_to_memb PARAMS ((char *));
+/* Parse an expression */
+static void parse_expr PARAMS ((char *, expressionS *));
+/* Parse and replace a 'ldconst' pseudo-op */
+static int parse_ldconst PARAMS ((char *[]));
+/* Parse a memory operand */
+static void parse_memop PARAMS ((struct memS *, char *, int));
+/* Parse machine-dependent pseudo-op */
+static void parse_po PARAMS ((int));
+/* Parse a register operand */
+static void parse_regop PARAMS ((struct regop *, char *, char));
+/* Generate a REG format instruction */
+static void reg_fmt PARAMS ((char *[], struct i960_opcode *));
+/* "De-optimize" cobr into compare/branch */
+static void relax_cobr PARAMS ((fragS *));
+/* Process '.leafproc' pseudo-op */
+static void s_leafproc PARAMS ((int, char *[]));
+/* Process '.sysproc' pseudo-op */
+static void s_sysproc PARAMS ((int, char *[]));
+/* Will a 'shlo' substiture for a 'ldconst'? */
+static int shift_ok PARAMS ((int));
+/* Give syntax error */
+static void syntax PARAMS ((void));
+/* Target chip supports spec-func register? */
+static int targ_has_sfr PARAMS ((int));
+/* Target chip supports instruction set? */
+static int targ_has_iclass PARAMS ((int));
 
 /* See md_parse_option() for meanings of these options */
 static char norelax;		/* True if -norelax switch seen */
@@ -276,7 +302,7 @@ const pseudo_typeS md_pseudo_table[] =
 #define MEMA_ABASE	0x2000
 
 /* Info from which a MEMA or MEMB format instruction can be generated */
-typedef struct
+typedef struct memS
   {
     /* (First) 32 bits of instruction */
     long opcode;
@@ -286,7 +312,6 @@ typedef struct
        displacement should be determined.  */
     char *e;
   }
-
 memS;
 
 /* The two pieces of info we need to generate a register operand */
@@ -707,7 +732,9 @@ md_number_to_chars (buf, value, n)
    md_chars_to_number:  convert from target byte order to host byte order.
 
   *************************************************************************** */
-int
+static int md_chars_to_number PARAMS ((unsigned char *, int));
+
+static int
 md_chars_to_number (val, n)
      unsigned char *val;	/* Value in target byte order */
      int n;			/* Number of bytes in the input */
@@ -747,7 +774,6 @@ md_atof (type, litP, sizeP)
   LITTLENUM_TYPE *wordP;
   int prec;
   char *t;
-  char *atof_ieee ();
 
   switch (type)
     {
@@ -798,21 +824,10 @@ md_atof (type, litP, sizeP)
    md_number_to_imm
 
   *************************************************************************** */
-void
-md_number_to_imm (buf, val, n)
-     char *buf;
-     long val;
-     int n;
-{
-  md_number_to_chars (buf, val, n);
-}
-
-/*****************************************************************************
-   md_number_to_disp
+static void md_number_to_imm PARAMS ((char *, long, int));
 
-  *************************************************************************** */
-void
-md_number_to_disp (buf, val, n)
+static void
+md_number_to_imm (buf, val, n)
      char *buf;
      long val;
      int n;
@@ -827,7 +842,9 @@ md_number_to_disp (buf, val, n)
   	previously-generated instruction.
 
   *************************************************************************** */
-void
+static void md_number_to_field PARAMS ((char *, long, bit_fixS *));
+
+static void
 md_number_to_field (instrP, val, bfixP)
      char *instrP;		/* Pointer to instruction to be fixed */
      long val;			/* Address fixup value */
@@ -1023,14 +1040,14 @@ md_show_usage (stream)
 #ifndef BFD_ASSEMBLER
 void
 md_convert_frag (headers, seg, fragP)
-     object_headers *headers;
-     segT seg;
+     object_headers *headers ATTRIBUTE_UNUSED;
+     segT seg ATTRIBUTE_UNUSED;
      fragS *fragP;
 #else
 void
 md_convert_frag (abfd, sec, fragP)
-     bfd *abfd;
-     segT sec;
+     bfd *abfd ATTRIBUTE_UNUSED;
+     segT sec ATTRIBUTE_UNUSED;
      fragS *fragP;
 #endif
 {
@@ -1212,8 +1229,7 @@ brtab_emit ()
    cobr_fmt:	generate a COBR-format instruction
 
   *************************************************************************** */
-static
-void
+static void
 cobr_fmt (arg, opcode, oP)
      /* arg[0]->opcode mnemonic, arg[1-3]->operands (ascii) */
      char *arg[];
@@ -1280,8 +1296,7 @@ cobr_fmt (arg, opcode, oP)
    ctrl_fmt:	generate a CTRL-format instruction
 
   *************************************************************************** */
-static
-void
+static void
 ctrl_fmt (targP, opcode, num_ops)
      char *targP;		/* Pointer to text of lone operand (if any) */
      long opcode;		/* Template of instruction */
@@ -1327,8 +1342,7 @@ ctrl_fmt (targP, opcode, num_ops)
   	Return pointer to where it was placed.
 
   *************************************************************************** */
-static
-char *
+static char *
 emit (instr)
      long instr;		/* Word to be output, host byte order */
 {
@@ -1432,8 +1446,7 @@ get_args (p, args)
   		address displacement is greater than 13 bits.
 
   ****************************************************************************/
-static
-void
+static void
 get_cdisp (dispP, ifmtP, instr, numbits, var_frag, callj)
      /* displacement as specified in source instruction */
      char *dispP;
@@ -1517,8 +1530,7 @@ get_cdisp (dispP, ifmtP, instr, numbits, var_frag, callj)
   	square brackets, and return a pointer to it.  Otherwise, return NULL.
 
   *************************************************************************** */
-static
-char *
+static char *
 get_ispec (textP)
      /* Pointer to memory operand from source instruction, no white space.  */
      char *textP;
@@ -1566,8 +1578,7 @@ get_ispec (textP)
   	associated register number (or -1 if not found).
 
   *************************************************************************** */
-static
-int
+static int
 get_regnum (regname)
      char *regname;		/* Suspected register name */
 {
@@ -1846,8 +1857,7 @@ parse_expr (textP, expP)
   	Returns the new number of arguments, or -1 on failure.
 
   *************************************************************************** */
-static
-int
+static int
 parse_ldconst (arg)
      char *arg[];		/* See above */
 {
@@ -1959,8 +1969,7 @@ parse_ldconst (arg)
   	the displacement.
 
   *************************************************************************** */
-static
-void
+static void
 parse_memop (memP, argP, optype)
      memS *memP;		/* Where to put the results */
      char *argP;		/* Text of the operand to be parsed */
@@ -2164,8 +2173,7 @@ parse_memop (memP, argP, optype)
   	up the rest of the input line, breaks out the individual arguments,
   	and dispatches them to the correct handler.
   *************************************************************************** */
-static
-void
+static void
 parse_po (po_num)
      int po_num;		/* Pseudo-op number:  currently S_LEAFPROC or S_SYSPROC */
 {
@@ -2220,8 +2228,7 @@ parse_po (po_num)
   	In case of illegal operand, issue a message and return some valid
   	information so instruction processing can continue.
   *************************************************************************** */
-static
-void
+static void
 parse_regop (regopP, optext, opdesc)
      struct regop *regopP;	/* Where to put description of register operand */
      char *optext;		/* Text of operand */
@@ -2431,8 +2438,7 @@ coj[] =
   { CMPI, BO },			/*      0x3f - cmpibo */
 };
 
-static
-void
+static void
 relax_cobr (fragP)
      register fragS *fragP;	/* fragP->fr_opcode is assumed to point to
 				 * the cobr instruction, which comes at the
@@ -2667,8 +2673,7 @@ s_sysproc (n_ops, args)
   	Caller calculates X by shifting original constant right 'shift' places.
 
   *************************************************************************** */
-static
-int
+static int
 shift_ok (n)
      int n;			/* The constant of interest */
 {
@@ -2706,8 +2711,7 @@ syntax ()
    Return TRUE iff the target architecture supports the specified
    special-function register (sfr).  */
 
-static
-int
+static int
 targ_has_sfr (n)
      int n;			/* Number (0-31) of sfr */
 {
@@ -2730,8 +2734,7 @@ targ_has_sfr (n)
 
    Return TRUE iff the target architecture supports the indicated
    class of instructions.  */
-static
-int
+static int
 targ_has_iclass (ic)
      /* Instruction class;  one of:
         I_BASE, I_CX, I_DEC, I_KX, I_FP, I_MIL, I_CASIM, I_CX2, I_HX, I_HX2
@@ -2768,7 +2771,7 @@ targ_has_iclass (ic)
 
 static void
 s_endian (ignore)
-     int ignore;
+     int ignore ATTRIBUTE_UNUSED;
 {
   char *name;
   char c;
@@ -2791,7 +2794,7 @@ s_endian (ignore)
 
 symbolS *
 md_undefined_symbol (name)
-     char *name;
+     char *name ATTRIBUTE_UNUSED;
 {
   return 0;
 }
@@ -2826,7 +2829,7 @@ md_apply_fix3 (fixP, valP, seg)
       fixP->fx_addnumber = val;
 #endif
 
-      md_number_to_imm (place, val, fixP->fx_size, fixP);
+      md_number_to_imm (place, val, fixP->fx_size);
     }
   else if ((int) fixP->fx_bit_fixP == 13
 	   && fixP->fx_addsy != NULL
@@ -3040,7 +3043,7 @@ tc_headers_hook (headers)
 
 void
 tc_crawl_symbol_chain (headers)
-     object_headers *headers;
+     object_headers *headers ATTRIBUTE_UNUSED;
 {
   symbolS *symbolP;
 
@@ -3098,8 +3101,8 @@ tc_crawl_symbol_chain (headers)
 
 void
 tc_set_bal_of_call (callP, balP)
-     symbolS *callP;
-     symbolS *balP;
+     symbolS *callP ATTRIBUTE_UNUSED;
+     symbolS *balP ATTRIBUTE_UNUSED;
 {
   know (TC_S_IS_CALLNAME (callP));
   know (TC_S_IS_BALNAME (balP));
@@ -3129,7 +3132,7 @@ tc_set_bal_of_call (callP, balP)
 
 symbolS *
 tc_get_bal_of_call (callP)
-     symbolS *callP;
+     symbolS *callP ATTRIBUTE_UNUSED;
 {
   symbolS *retval;
 
@@ -3149,13 +3152,13 @@ tc_get_bal_of_call (callP)
   return retval;
 }				/* _tc_get_bal_of_call() */
 
+#ifdef OBJ_COFF
 void
 tc_coff_symbol_emit_hook (symbolP)
-     symbolS *symbolP;
+     symbolS *symbolP ATTRIBUTE_UNUSED;
 {
   if (TC_S_IS_CALLNAME (symbolP))
     {
-#ifdef OBJ_COFF
       symbolS *balP = tc_get_bal_of_call (symbolP);
 
 #if 0
@@ -3170,13 +3173,13 @@ tc_coff_symbol_emit_hook (symbolP)
       S_SET_DATA_TYPE (symbolP, S_GET_DATA_TYPE (symbolP) | (DT_FCN << N_BTSHFT));
       /* fix up the bal symbol */
       S_SET_STORAGE_CLASS (balP, C_LABEL);
-#endif /* OBJ_COFF */
     }				/* only on calls */
 }
+#endif /* OBJ_COFF */
 
 void
 i960_handle_align (fragp)
-     fragS *fragp;
+     fragS *fragp ATTRIBUTE_UNUSED;
 {
   if (!linkrelax)
     return;
@@ -3204,7 +3207,7 @@ i960_handle_align (fragp)
 int
 i960_validate_fix (fixP, this_segment_type)
      fixS *fixP;
-     segT this_segment_type;
+     segT this_segment_type ATTRIBUTE_UNUSED;
 {
   if (fixP->fx_tcbit && TC_S_IS_CALLNAME (fixP->fx_addsy))
     {
@@ -3228,6 +3231,8 @@ i960_validate_fix (fixP, this_segment_type)
 
 /* From cgen.c:  */
 
+static short tc_bfd_fix2rtype PARAMS ((fixS *));
+
 static short
 tc_bfd_fix2rtype (fixP)
      fixS *fixP;
@@ -3254,7 +3259,7 @@ tc_bfd_fix2rtype (fixP)
 
 arelent *
 tc_gen_reloc (section, fixP)
-     asection *section;
+     asection *section ATTRIBUTE_UNUSED;
      fixS *fixP;
 {
   arelent * reloc;