* config/tc-alpha.h: Fix formatting.

	* config/tc-arc.c: Likewise.
	* config/tc-d10v.h: Likewise.
	* config/tc-hppa.c: Likewise.
	* config/tc-i370.c: Likewise.
	* config/tc-i386.h: Likewise.
	* config/tc-i960.h: Likewise.
	* config/tc-ia64.c: Likewise.
	* config/tc-ia64.h: Likewise.
	* config/tc-m32r.c: Likewise.
	* config/tc-m68k.c: Likewise.
	* config/tc-m88k.c: Likewise.
	* config/tc-ns32k.c: Likewise.
	* config/tc-pdp11.c: Likewise.
	* config/tc-pj.h: Likewise.
	* config/tc-s390.c: Likewise.
	* config/tc-sparc.c: Likewise.
	* config/tc-sparc.h: Likewise.
	* config/tc-tic80.c: Likewise.
	* config/tc-w65.h: Likewise.

21 files changed, 129 insertions, 106 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index f680c2e..41538a1 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,26 @@
+2001-07-23  Kazu Hirata  <kazu@hxi.com>
+
+	* config/tc-alpha.h: Fix formatting.
+	* config/tc-arc.c: Likewise.
+	* config/tc-d10v.h: Likewise.
+	* config/tc-hppa.c: Likewise.
+	* config/tc-i370.c: Likewise.
+	* config/tc-i386.h: Likewise.
+	* config/tc-i960.h: Likewise.
+	* config/tc-ia64.c: Likewise.
+	* config/tc-ia64.h: Likewise.
+	* config/tc-m32r.c: Likewise.
+	* config/tc-m68k.c: Likewise.
+	* config/tc-m88k.c: Likewise.
+	* config/tc-ns32k.c: Likewise.
+	* config/tc-pdp11.c: Likewise.
+	* config/tc-pj.h: Likewise.
+	* config/tc-s390.c: Likewise.
+	* config/tc-sparc.c: Likewise.
+	* config/tc-sparc.h: Likewise.
+	* config/tc-tic80.c: Likewise.
+	* config/tc-w65.h: Likewise.
+
 2001-07-23  Alan Modra  <amodra@bigpond.net.au>
 
 	* symbols.c (S_GET_VALUE): Don't treat O_constant and local
diff --git a/gas/config/tc-alpha.h b/gas/config/tc-alpha.h
index 2fe20b7..e0de813 100644
--- a/gas/config/tc-alpha.h
+++ b/gas/config/tc-alpha.h
@@ -64,7 +64,7 @@ extern valueT alpha_gp_value;
 
 #define md_convert_frag(b,s,f)		as_fatal ("alpha convert_frag\n")
 #define md_estimate_size_before_relax(f,s) \
-			(as_fatal("estimate_size_before_relax called"),1)
+			(as_fatal ("estimate_size_before_relax called"),1)
 #define md_operand(x)
 
 #ifdef OBJ_EVAX
diff --git a/gas/config/tc-arc.c b/gas/config/tc-arc.c
index 45f54ac..285cdf6 100644
--- a/gas/config/tc-arc.c
+++ b/gas/config/tc-arc.c
@@ -1703,7 +1703,7 @@ md_operand (expressionP)
 	while (ext_oper)
 	  {
 	    l = strlen (ext_oper->operand.name);
-	    if (!strncmp (p, ext_oper->operand.name, l) && !isalnum(*(p + l)))
+	    if (!strncmp (p, ext_oper->operand.name, l) && !isalnum (*(p + l)))
 	      {
 		input_line_pointer += l + 1;
 		expressionP->X_op = O_register;
diff --git a/gas/config/tc-d10v.h b/gas/config/tc-d10v.h
index 4ab5460..019ab43 100644
--- a/gas/config/tc-d10v.h
+++ b/gas/config/tc-d10v.h
@@ -51,11 +51,11 @@ long md_pcrel_from_section PARAMS ((fixS *, segT));
 #define md_number_to_chars           number_to_chars_bigendian
 
 int d10v_cleanup PARAMS ((void));
-#define md_after_pass_hook()	     d10v_cleanup()
-#define md_cleanup()		     d10v_cleanup()
-#define md_do_align(a,b,c,d,e)	     d10v_cleanup()
+#define md_after_pass_hook()	     d10v_cleanup ()
+#define md_cleanup()		     d10v_cleanup ()
+#define md_do_align(a,b,c,d,e)	     d10v_cleanup ()
 #define tc_frob_label(sym) do {\
-  d10v_cleanup(); \
+  d10v_cleanup (); \
   symbol_set_frag (sym, frag_now);					\
   S_SET_VALUE (sym, (valueT) frag_now_fix ());				\
 } while (0)
diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c
index c4d7f7f..cb9b9fb 100644
--- a/gas/config/tc-hppa.c
+++ b/gas/config/tc-hppa.c
@@ -1689,12 +1689,12 @@ pa_ip (str)
 	      while (*s == ' ' || *s == '\t')
 		s = s + 1;
 
-	      if (!strncasecmp(s, "%sar", 4))
+	      if (!strncasecmp (s, "%sar", 4))
 	        {
 		  s += 4;
 		  continue;
 		}
-	      else if (!strncasecmp(s, "%cr11", 5))
+	      else if (!strncasecmp (s, "%cr11", 5))
 	        {
 		  s += 5;
 		  continue;
@@ -1949,7 +1949,7 @@ pa_ip (str)
 		/* Handle load cache hint completer.  */
 		case 'c':
 		  cmpltr = 0;
-		  if (!strncmp(s, ",sl", 3))
+		  if (!strncmp (s, ",sl", 3))
 		    {
 		      s += 3;
 		      cmpltr = 2;
@@ -1959,12 +1959,12 @@ pa_ip (str)
 		/* Handle store cache hint completer.  */
 		case 'C':
 		  cmpltr = 0;
-		  if (!strncmp(s, ",sl", 3))
+		  if (!strncmp (s, ",sl", 3))
 		    {
 		      s += 3;
 		      cmpltr = 2;
 		    }
-		  else if (!strncmp(s, ",bc", 3))
+		  else if (!strncmp (s, ",bc", 3))
 		    {
 		      s += 3;
 		      cmpltr = 1;
@@ -1974,7 +1974,7 @@ pa_ip (str)
 		/* Handle load and clear cache hint completer.  */
 		case 'd':
 		  cmpltr = 0;
-		  if (!strncmp(s, ",co", 3))
+		  if (!strncmp (s, ",co", 3))
 		    {
 		      s += 3;
 		      cmpltr = 1;
@@ -1983,7 +1983,7 @@ pa_ip (str)
 
 		/* Handle load ordering completer.  */
 		case 'o':
-		  if (strncmp(s, ",o", 2) != 0)
+		  if (strncmp (s, ",o", 2) != 0)
 		    break;
 		  s += 2;
 		  continue;
@@ -2252,13 +2252,13 @@ pa_ip (str)
 		      else if (*s == 'l')
 			lr = 0;
 		      else
-			as_bad(_("Invalid left/right combination completer"));
+			as_bad (_("Invalid left/right combination completer"));
 
 		      s++;
 		      INSERT_FIELD_AND_CONTINUE (opcode, lr, 13);
 		    }
 		  else
-		    as_bad(_("Invalid left/right combination completer"));
+		    as_bad (_("Invalid left/right combination completer"));
 		  break;
 
 		/* Handle saturation at 24:25.  */
@@ -2307,14 +2307,14 @@ pa_ip (str)
 			      perm = 3;
 			      break;
 			    default:
-			      as_bad(_("Invalid permutation completer"));
+			      as_bad (_("Invalid permutation completer"));
 			    }
 			  opcode |= perm << permloc[i];
 			}
 		      continue;
 		    }
 		  else
-		    as_bad(_("Invalid permutation completer"));
+		    as_bad (_("Invalid permutation completer"));
 		  break;
 
 		default:
diff --git a/gas/config/tc-i370.c b/gas/config/tc-i370.c
index 41ee4f8..bb6e01a 100644
--- a/gas/config/tc-i370.c
+++ b/gas/config/tc-i370.c
@@ -347,7 +347,7 @@ register_name (expressionP)
   /* if its alpha, look to see if it's in the register table */
   if (!isalpha (name[0]))
     {
-      reg_number = get_single_number();
+      reg_number = get_single_number ();
       c = get_symbol_end ();
     }
   else
@@ -1117,7 +1117,7 @@ i370_elf_rdata (sect)
 
 /* Pseudo op to make file scope bss items */
 static void
-i370_elf_lcomm(unused)
+i370_elf_lcomm (unused)
      int unused;
 {
   register char *name;
@@ -1326,13 +1326,13 @@ add_to_lit_pool (expressionS *exx, char *name, int sz)
 
   /* start a new pool, if necessary */
   if (8 == sz && NULL == longlong_poolP)
-    longlong_poolP = symbol_make_empty();
+    longlong_poolP = symbol_make_empty ();
   else if (4 == sz && NULL == word_poolP)
-    word_poolP = symbol_make_empty();
+    word_poolP = symbol_make_empty ();
   else if (2 == sz && NULL == short_poolP)
-    short_poolP = symbol_make_empty();
+    short_poolP = symbol_make_empty ();
   else if (1 == sz && NULL == byte_poolP)
-    byte_poolP = symbol_make_empty();
+    byte_poolP = symbol_make_empty ();
 
   /* Check if this literal value is already in the pool: */
   /* hack alert -- we should probably be checking expressions
@@ -1361,7 +1361,7 @@ add_to_lit_pool (expressionS *exx, char *name, int sz)
     {
       if (next_literal_pool_place > MAX_LITERAL_POOL_SIZE)
         {
-          as_bad("Literal Pool Overflow");
+          as_bad ("Literal Pool Overflow");
         }
 
       literals[next_literal_pool_place].exp = *exx;
@@ -1435,7 +1435,7 @@ symbol_locate (symbolP, name, segment, valu, frag)
 
   S_SET_SEGMENT (symbolP, segment);
   S_SET_VALUE (symbolP, valu);
-  symbol_clear_list_pointers(symbolP);
+  symbol_clear_list_pointers (symbolP);
 
   symbol_set_frag (symbolP, frag);
 
@@ -1489,11 +1489,11 @@ i370_addr_offset (expressionS *exx)
   lab = input_line_pointer;
   while (*lab && (',' != *lab) && ('(' != *lab))
     {
-      if (isdigit(*lab))
+      if (isdigit (*lab))
 	{
 	  all_digits = 1;
 	}
-      else if (isalpha(*lab))
+      else if (isalpha (*lab))
 	{
 	  if (!all_digits)
 	    {
@@ -1652,7 +1652,7 @@ i370_addr_cons (expressionS *exp)
 	      save = input_line_pointer;
 	      while (*save)
 		{
-		  if (isxdigit(*save))
+		  if (isxdigit (*save))
 		    hex_len++;
 		  save++;
 		}
@@ -1797,7 +1797,7 @@ i370_ltorg (ignore)
 	       */
 	      if (literals[lit_count].sym_name)
 		{
-		  symbolS * symP = symbol_make_empty();
+		  symbolS * symP = symbol_make_empty ();
 		  symbol_locate (symP, literals[lit_count].sym_name, now_seg,
 				 (valueT) frag_now_fix (), frag_now);
 		  symbol_table_insert (symP);
@@ -2917,7 +2917,7 @@ md_apply_fix3 (fixp, valuep, seg)
         default:
           fprintf (stderr,
         	  "Gas failure, reloc value %d\n", fixp->fx_r_type);
-          fflush(stderr);
+          fflush (stderr);
           abort ();
         }
     }
diff --git a/gas/config/tc-i386.h b/gas/config/tc-i386.h
index 71e0c88..cea225b 100644
--- a/gas/config/tc-i386.h
+++ b/gas/config/tc-i386.h
@@ -121,7 +121,7 @@ extern const char *i386_target_format PARAMS ((void));
 #define TC_COUNT_RELOC(x) ((x)->fx_addsy || (x)->fx_r_type==7)
 #define TC_COFF_FIX2RTYPE(fixP) tc_coff_fix2rtype(fixP)
 extern short tc_coff_fix2rtype PARAMS ((struct fix *));
-#define TC_COFF_SIZEMACHDEP(frag) tc_coff_sizemachdep(frag)
+#define TC_COFF_SIZEMACHDEP(frag) tc_coff_sizemachdep (frag)
 extern int tc_coff_sizemachdep PARAMS ((fragS *frag));
 
 #ifdef TE_GO32
diff --git a/gas/config/tc-i960.h b/gas/config/tc-i960.h
index 8cedab2..dfc0a4d 100644
--- a/gas/config/tc-i960.h
+++ b/gas/config/tc-i960.h
@@ -63,8 +63,8 @@
 #define OBJ_COFF_SECTION_HEADER_HAS_ALIGNMENT
 #define OBJ_COFF_MAX_AUXENTRIES			(2)
 #define TC_COUNT_RELOC(FIXP)			(!(FIXP)->fx_done)
-#define TC_COFF_FIX2RTYPE(FIXP)			tc_coff_fix2rtype(FIXP)
-#define TC_COFF_SIZEMACHDEP(FRAGP)		tc_coff_sizemachdep(FRAGP)
+#define TC_COFF_FIX2RTYPE(FIXP)			tc_coff_fix2rtype (FIXP)
+#define TC_COFF_SIZEMACHDEP(FRAGP)		tc_coff_sizemachdep (FRAGP)
 #define TC_COFF_SET_MACHINE(HDRS)		tc_headers_hook (HDRS)
 extern void tc_headers_hook ();
 extern short tc_coff_fix2rtype ();
diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index 4cac5bc..9973b59 100644
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -876,8 +876,8 @@ static int generate_unwind_image PARAMS ((const char *));
       }									   \
     _prefix_len = strlen (_prefix), _suffix_len = strlen (_suffix);	   \
     _result = alloca (_prefix_len + _suffix_len + 1);		   	   \
-    memcpy(_result, _prefix, _prefix_len);				   \
-    memcpy(_result + _prefix_len, _suffix, _suffix_len);		   \
+    memcpy (_result, _prefix, _prefix_len);				   \
+    memcpy (_result + _prefix_len, _suffix, _suffix_len);		   \
     _result[_prefix_len + _suffix_len] = '\0';				   \
     result = _result;							   \
   }									   \
@@ -2769,7 +2769,7 @@ fixup_unw_records (list)
    info.  */
 
 static int
-setup_unwind_header(int size, unsigned char **mem)
+setup_unwind_header (int size, unsigned char **mem)
 {
   int x, extra = 0;
 
@@ -2816,7 +2816,7 @@ output_unw_records (list, ptr)
   if (size > 0 || unwind.force_unwind_entry)
     {
       unwind.force_unwind_entry = 0;
-      extra = setup_unwind_header(size, &mem);
+      extra = setup_unwind_header (size, &mem);
 
       vbyte_mem_ptr = mem + 8;
       process_unw_records (list, output_vbyte_mem);
@@ -7719,8 +7719,8 @@ dep->name, idesc->name, (rsrc_write?"write":"read"), note)
 	    {
 	      int p1 = CURR_SLOT.opnd[0].X_add_number - REG_P;
 	      int p2 = CURR_SLOT.opnd[1].X_add_number - REG_P;
-	      int or_andcm = strstr(idesc->name, "or.andcm") != NULL;
-	      int and_orcm = strstr(idesc->name, "and.orcm") != NULL;
+	      int or_andcm = strstr (idesc->name, "or.andcm") != NULL;
+	      int and_orcm = strstr (idesc->name, "and.orcm") != NULL;
 
 	      if ((idesc->operands[0] == IA64_OPND_P1
 		   || idesc->operands[0] == IA64_OPND_P2)
@@ -7841,8 +7841,8 @@ dep->name, idesc->name, (rsrc_write?"write":"read"), note)
 	    {
 	      int p1 = CURR_SLOT.opnd[0].X_add_number - REG_P;
 	      int p2 = CURR_SLOT.opnd[1].X_add_number - REG_P;
-	      int or_andcm = strstr(idesc->name, "or.andcm") != NULL;
-	      int and_orcm = strstr(idesc->name, "and.orcm") != NULL;
+	      int or_andcm = strstr (idesc->name, "or.andcm") != NULL;
+	      int and_orcm = strstr (idesc->name, "and.orcm") != NULL;
 
 	      if ((idesc->operands[0] == IA64_OPND_P1
 		   || idesc->operands[0] == IA64_OPND_P2)
@@ -8304,8 +8304,8 @@ dep->name, idesc->name, (rsrc_write?"write":"read"), note)
 	    {
               int p1 = CURR_SLOT.opnd[0].X_add_number - REG_P;
               int p2 = CURR_SLOT.opnd[1].X_add_number - REG_P;
-	      int or_andcm = strstr(idesc->name, "or.andcm") != NULL;
-	      int and_orcm = strstr(idesc->name, "and.orcm") != NULL;
+	      int or_andcm = strstr (idesc->name, "or.andcm") != NULL;
+	      int and_orcm = strstr (idesc->name, "and.orcm") != NULL;
 
 	      if (p1 == 63
 		  && (idesc->operands[0] == IA64_OPND_P1
diff --git a/gas/config/tc-ia64.h b/gas/config/tc-ia64.h
index fc58726..eaeca1c 100644
--- a/gas/config/tc-ia64.h
+++ b/gas/config/tc-ia64.h
@@ -99,9 +99,9 @@ extern void ia64_handle_align PARAMS ((fragS *f));
 #define TC_FORCE_RELOCATION(f)		ia64_force_relocation (f)
 #define tc_fix_adjustable(f)		ia64_fix_adjustable (f)
 #define md_convert_frag(b,s,f)		as_fatal ("ia64_convert_frag")
-#define md_create_long_jump(p,f,t,fr,s)	as_fatal("ia64_create_long_jump")
+#define md_create_long_jump(p,f,t,fr,s)	as_fatal ("ia64_create_long_jump")
 #define md_create_short_jump(p,f,t,fr,s) \
-					as_fatal("ia64_create_short_jump")
+					as_fatal ("ia64_create_short_jump")
 #define md_estimate_size_before_relax(f,s) \
 			(as_fatal ("ia64_estimate_size_before_relax"), 1)
 #define md_elf_section_flags		ia64_elf_section_flags
diff --git a/gas/config/tc-m32r.c b/gas/config/tc-m32r.c
index 272889a..af53e6e 100644
--- a/gas/config/tc-m32r.c
+++ b/gas/config/tc-m32r.c
@@ -555,7 +555,7 @@ md_begin ()
 
   allow_m32rx (enable_m32rx);
 
-  gas_cgen_initialize_saved_fixups_array();
+  gas_cgen_initialize_saved_fixups_array ();
 }
 
 #define OPERAND_IS_COND_BIT(operand, indices, index) \
diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index 4bbffea..9f6b500 100644
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -257,9 +257,9 @@ insop (w, opcode)
      const struct m68k_incant *opcode;
 {
   int z;
-  for(z=the_ins.numo;z>opcode->m_codenum;--z)
+  for (z = the_ins.numo; z > opcode->m_codenum; --z)
     the_ins.opcode[z]=the_ins.opcode[z-1];
-  for(z=0;z<the_ins.nrel;z++)
+  for (z = 0;z < the_ins.nrel; z++)
     the_ins.reloc[z].n+=2;
   for (z = 0; z < the_ins.nfrag; z++)
     the_ins.fragb[z].fragoff++;
@@ -5912,7 +5912,7 @@ build_mri_control_operand (qual, cc, leftstart, leftstop, rightstart,
       *s++ = 'm';
       *s++ = 'p';
       if (qual != '\0')
-	*s++ = tolower(qual);
+	*s++ = tolower (qual);
       *s++ = ' ';
       memcpy (s, leftstart, leftstop - leftstart);
       s += leftstop - leftstart;
@@ -5930,7 +5930,7 @@ build_mri_control_operand (qual, cc, leftstart, leftstop, rightstart,
   *s++ = cc >> 8;
   *s++ = cc & 0xff;
   if (extent != '\0')
-    *s++ = tolower(extent);
+    *s++ = tolower (extent);
   *s++ = ' ';
   strcpy (s, truelab);
   mri_assemble (buf);
@@ -6180,7 +6180,7 @@ s_mri_else (qual)
   mri_control_stack->else_seen = 1;
 
   buf = (char *) xmalloc (20 + strlen (mri_control_stack->bottom));
-  q[0] = tolower(qual);
+  q[0] = tolower (qual);
   q[1] = '\0';
   sprintf (buf, "bra%s %s", q, mri_control_stack->bottom);
   mri_assemble (buf);
@@ -6253,7 +6253,7 @@ s_mri_break (extent)
     }
 
   buf = (char *) xmalloc (20 + strlen (n->bottom));
-  ex[0] = tolower(extent);
+  ex[0] = tolower (extent);
   ex[1] = '\0';
   sprintf (buf, "bra%s %s", ex, n->bottom);
   mri_assemble (buf);
@@ -6292,7 +6292,7 @@ s_mri_next (extent)
     }
 
   buf = (char *) xmalloc (20 + strlen (n->next));
-  ex[0] = tolower(extent);
+  ex[0] = tolower (extent);
   ex[1] = '\0';
   sprintf (buf, "bra%s %s", ex, n->next);
   mri_assemble (buf);
@@ -6476,7 +6476,7 @@ s_mri_for (qual)
   *s++ = 'v';
   *s++ = 'e';
   if (qual != '\0')
-    *s++ = tolower(qual);
+    *s++ = tolower (qual);
   *s++ = ' ';
   memcpy (s, initstart, initstop - initstart);
   s += initstop - initstart;
@@ -6494,7 +6494,7 @@ s_mri_for (qual)
   *s++ = 'm';
   *s++ = 'p';
   if (qual != '\0')
-    *s++ = tolower(qual);
+    *s++ = tolower (qual);
   *s++ = ' ';
   memcpy (s, endstart, endstop - endstart);
   s += endstop - endstart;
@@ -6505,7 +6505,7 @@ s_mri_for (qual)
   mri_assemble (buf);
 
   /* bcc bottom */
-  ex[0] = tolower(extent);
+  ex[0] = tolower (extent);
   ex[1] = '\0';
   if (up)
     sprintf (buf, "blt%s %s", ex, n->bottom);
@@ -6521,7 +6521,7 @@ s_mri_for (qual)
     strcpy (s, "sub");
   s += 3;
   if (qual != '\0')
-    *s++ = tolower(qual);
+    *s++ = tolower (qual);
   *s++ = ' ';
   memcpy (s, bystart, bystop - bystart);
   s += bystop - bystart;
diff --git a/gas/config/tc-m88k.c b/gas/config/tc-m88k.c
index 1f1692d..c12142e 100644
--- a/gas/config/tc-m88k.c
+++ b/gas/config/tc-m88k.c
@@ -884,7 +884,7 @@ get_o6 (param, valp)
 
   *valp = val;
 
-  return(param);
+  return (param);
 }
 
 #define hexval(z) \
diff --git a/gas/config/tc-ns32k.c b/gas/config/tc-ns32k.c
index dfc9b50..ca6cb8f 100644
--- a/gas/config/tc-ns32k.c
+++ b/gas/config/tc-ns32k.c
@@ -1299,7 +1299,7 @@ convert_iif ()
 	    case 3:
 	    case 4:
 	      /* The final size in objectmemory is known.  */
-	      memP = frag_more(size);
+	      memP = frag_more (size);
 	      j = iif.iifP[i].bit_fixP;
 
 	      switch (type)
@@ -1449,7 +1449,7 @@ convert_iif ()
 		    /* Size is unknown until link time so have to
                        allow 4 bytes.  */
 		    size = 4;
-		    memP = frag_more(size);
+		    memP = frag_more (size);
 		    fix_new_ns32k_exp (frag_now,
 				       (long) (memP - frag_now->fr_literal),
 				       size,
@@ -1474,7 +1474,7 @@ convert_iif ()
 		      {
 			/* Size is not important.  This gets fixed by
 			   relax, but we assume 0 in what follows.  */
-			memP = frag_more(4); /* Max size.  */
+			memP = frag_more (4); /* Max size.  */
 			size = 0;
 
 			{
diff --git a/gas/config/tc-pdp11.c b/gas/config/tc-pdp11.c
index 7f319be..3af7dc8 100644
--- a/gas/config/tc-pdp11.c
+++ b/gas/config/tc-pdp11.c
@@ -1157,7 +1157,7 @@ struct option md_longopts[] =
   { NULL, no_argument, NULL, 0 }
 };
 
-size_t md_longopts_size = sizeof(md_longopts);
+size_t md_longopts_size = sizeof (md_longopts);
 
 /*
  * md_parse_option
diff --git a/gas/config/tc-pj.h b/gas/config/tc-pj.h
index 1dae6e1..52d33d2 100644
--- a/gas/config/tc-pj.h
+++ b/gas/config/tc-pj.h
@@ -46,7 +46,7 @@ arelent *tc_gen_reloc PARAMS((asection *section, struct fix *fixp));
 	((FIXP)->fx_where + (FIXP)->fx_frag->fr_address - 1)
 
 #define TC_CONS_FIX_NEW(FRAG, WHERE, NBYTES, EXP) \
-	pj_cons_fix_new_pj(FRAG, WHERE, NBYTES, EXP)
+	pj_cons_fix_new_pj (FRAG, WHERE, NBYTES, EXP)
 
 /* Always leave vtable relocs untouched in the output.  */
 #define TC_FORCE_RELOCATION(FIX)                                  	\
diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
index 3eb85dd..21d4c0d 100644
--- a/gas/config/tc-s390.c
+++ b/gas/config/tc-s390.c
@@ -196,7 +196,7 @@ static const struct pd_reg pre_defined_registers[] =
 
 };
 
-#define REG_NAME_CNT (sizeof(pre_defined_registers) / sizeof(struct pd_reg))
+#define REG_NAME_CNT (sizeof (pre_defined_registers) / sizeof (struct pd_reg))
 
 /* Given NAME, find the register number associated with that name, return
    the integer value associated with the given name or -1 on failure.  */
@@ -304,7 +304,7 @@ CONST char *md_shortopts = "A:m:kVQ:";
 struct option md_longopts[] = {
   {NULL, no_argument, NULL, 0}
 };
-size_t md_longopts_size = sizeof(md_longopts);
+size_t md_longopts_size = sizeof (md_longopts);
 
 /* Initialize the default opcode arch and word size from the default
    architecture name.  */
@@ -314,12 +314,12 @@ init_default_arch ()
   if (current_arch_requested)
     return;
 
-  if (strcmp(default_arch, "s390") == 0)
+  if (strcmp (default_arch, "s390") == 0)
     {
       s390_arch_size = 32;
       current_architecture = S390_OPCODE_ESA;
     }
-  else if (strcmp(default_arch, "s390x") == 0)
+  else if (strcmp (default_arch, "s390x") == 0)
     {
       s390_arch_size = 64;
       current_architecture = S390_OPCODE_ESAME;
@@ -484,7 +484,7 @@ s390_align_code (fragP, count)
   /* We use nop pattern 0x0707.  */
   if (count > 0)
     {
-      memset(fragP->fr_literal + fragP->fr_fix, 0x07, count);
+      memset (fragP->fr_literal + fragP->fr_fix, 0x07, count);
       fragP->fr_var = count;
     }
 }
@@ -618,13 +618,13 @@ s390_elf_suffix (str_p, exp_p)
     return ELF_SUFFIX_NONE;
 
   ident = str;
-  while (isalnum(*str))
+  while (isalnum (*str))
     str++;
   len = str - ident;
 
   for (ptr = &mapping[0]; ptr->length > 0; ptr++)
     if (len == ptr->length &&
-	strncasecmp(ident, ptr->string, ptr->length) == 0)
+	strncasecmp (ident, ptr->string, ptr->length) == 0)
       {
 	if (exp_p->X_add_number != 0)
 	  as_warn (_("identifier+constant@%s means identifier@%s+constant"),
@@ -710,7 +710,7 @@ s390_exp_compare(exp1, exp2)
       return exp1->X_add_number == exp2->X_add_number;
 
     case O_big:
-      as_bad(_("Can't handle O_big in s390_exp_compare")); 
+      as_bad (_("Can't handle O_big in s390_exp_compare")); 
 
     case O_symbol:     /* X_add_symbol & X_add_number must be equal.  */
     case O_symbol_rva:
@@ -767,10 +767,10 @@ s390_lit_suffix (str_p, exp_p, suffix)
  
   /* We look for a suffix of the form "@lit1", "@lit2", "@lit4" or "@lit8".  */
   ident = str;
-  while (isalnum(*str))
+  while (isalnum (*str))
     str++;
   len = str - ident;
-  if (len != 4 || strncasecmp(ident, "lit", 3) != 0 ||
+  if (len != 4 || strncasecmp (ident, "lit", 3) != 0 ||
       (ident[3]!='1' && ident[3]!='2' && ident[3]!='4' && ident[3]!='8'))
     return suffix;      /* no modification */
   nbytes = ident[3] - '0';
@@ -838,7 +838,7 @@ s390_lit_suffix (str_p, exp_p, suffix)
 	}
       else
 	{
-	  lpe = (struct s390_lpe *) xmalloc(sizeof(struct s390_lpe));
+	  lpe = (struct s390_lpe *) xmalloc(sizeof (struct s390_lpe));
 	}
 
       lpe->ex = *exp_p;
@@ -849,7 +849,7 @@ s390_lit_suffix (str_p, exp_p, suffix)
 	    lpe->floatnum = generic_floating_point_number;
 	  else if (exp_p->X_add_number <= 4)
 	    memcpy (lpe->bignum, generic_bignum,
-		    exp_p->X_add_number*sizeof(LITTLENUM_TYPE));
+		    exp_p->X_add_number*sizeof (LITTLENUM_TYPE));
 	  else
 	    as_bad (_("Big number is too big"));
 	}
@@ -859,12 +859,12 @@ s390_lit_suffix (str_p, exp_p, suffix)
       /* Literal pool name defined ?  */
       if (lp_sym == NULL)
 	{
-	  sprintf(tmp_name, ".L\001%i", lp_count);
+	  sprintf (tmp_name, ".L\001%i", lp_count);
 	  lp_sym = symbol_make(tmp_name);
 	}
 
       /* Make name for literal pool entry.  */
-      sprintf(tmp_name, ".L\001%i\002%i", lp_count, lpe_count);
+      sprintf (tmp_name, ".L\001%i\002%i", lp_count, lpe_count);
       lpe_count++;
       lpe->sym = symbol_make(tmp_name);
 
@@ -941,7 +941,7 @@ s390_elf_cons (nbytes)
 	      if (size > nbytes)
 		as_bad (_("%s relocations do not fit in %d bytes"),
 			reloc_howto->name, nbytes);
-	      where = frag_more(nbytes);
+	      where = frag_more (nbytes);
 	      md_number_to_chars (where, 0, size);
 	      fix_new_exp (frag_now, where - frag_now->fr_literal, 
 			   size, &exp, reloc_howto->pc_relative, reloc);
@@ -1046,9 +1046,9 @@ md_gather_operands (str, insn, opcode)
 	  else
 	    {
 	      if ((operand->flags & S390_OPERAND_INDEX) && ex.X_add_number == 0)
-		as_warn("index register specified but zero");
+		as_warn ("index register specified but zero");
 	      if ((operand->flags & S390_OPERAND_BASE) && ex.X_add_number == 0)
-		as_warn("base register specified but zero");
+		as_warn ("base register specified but zero");
 	      s390_insert_operand (insn, operand, ex.X_add_number, NULL, 0);
 	    }
 	}
@@ -1119,7 +1119,7 @@ md_gather_operands (str, insn, opcode)
 	      if (opindex_ptr[1] != '\0')
 		{
 		  if (*str++ != ',')
-		    as_bad(_("syntax error; expected ,"));
+		    as_bad (_("syntax error; expected ,"));
 		}
 	    }
 	  else
@@ -1171,7 +1171,7 @@ md_gather_operands (str, insn, opcode)
 	  if (opindex_ptr[1] != '\0')
 	    {
 	      if (*str++ != ',')
-		as_bad(_("syntax error; expected ,"));
+		as_bad (_("syntax error; expected ,"));
 	    }
 	}
     }
@@ -1183,7 +1183,7 @@ md_gather_operands (str, insn, opcode)
     {
       char *linefeed;
 
-      if ((linefeed = strchr(str, '\n')) != NULL)
+      if ((linefeed = strchr (str, '\n')) != NULL)
 	*linefeed = '\0';
       as_bad (_("junk at end of line: `%s'"), str);
       if (linefeed != NULL)
@@ -1264,11 +1264,11 @@ md_assemble (str)
     }
   else if (!(opcode->architecture & current_arch_mask))
     {
-      as_bad("Opcode %s not available in this architecture", str);
+      as_bad ("Opcode %s not available in this architecture", str);
       return;
     }
 
-  memcpy (insn, opcode->opcode, sizeof(insn));
+  memcpy (insn, opcode->opcode, sizeof (insn));
   md_gather_operands (s, insn, opcode);
 }
 
@@ -1309,7 +1309,7 @@ s390_bss (ignore)
 /* Pseudo-op handling.  */
 
 void
-s390_insn(ignore)
+s390_insn (ignore)
      int ignore ATTRIBUTE_UNUSED;
 {
   expressionS exp;
@@ -1341,7 +1341,7 @@ s390_insn(ignore)
 	  (opformat->oplen == 2 && exp.X_op < 0x10000))
 	md_number_to_chars (insn, exp.X_add_number, opformat->oplen);
       else
-	as_bad(_("Invalid .insn format\n"));
+	as_bad (_("Invalid .insn format\n"));
     }
   else if (exp.X_op == O_big)
     {
@@ -1354,14 +1354,14 @@ s390_insn(ignore)
 	  md_number_to_chars (&insn[4], generic_bignum[0], 2);
 	}
       else
-	as_bad(_("Invalid .insn format\n"));
+	as_bad (_("Invalid .insn format\n"));
     }
   else
     as_bad (_("second operand of .insn not a constant\n"));
   if (*input_line_pointer++ != ',')
     as_bad (_("missing comma after insn constant\n"));
 
-  if ((s = strchr(input_line_pointer, '\n')) != NULL)
+  if ((s = strchr (input_line_pointer, '\n')) != NULL)
     *s = '\0';
   input_line_pointer = md_gather_operands (input_line_pointer, insn, opformat);
   if (s != NULL)
@@ -1441,7 +1441,7 @@ s390_literals (ignore)
 	  if (size > lpe->nbytes)
 	    as_bad (_("%s relocations do not fit in %d bytes"),
 		    reloc_howto->name, lpe->nbytes);
-	  where = frag_more(lpe->nbytes);
+	  where = frag_more (lpe->nbytes);
 	  md_number_to_chars (where, 0, size);
 	  fix_new_exp (frag_now, where - frag_now->fr_literal,
 		       size, &lpe->ex, reloc_howto->pc_relative, lpe->reloc);
@@ -1454,7 +1454,7 @@ s390_literals (ignore)
 		generic_floating_point_number = lpe->floatnum;
 	      else
 		memcpy (generic_bignum, lpe->bignum,
-			lpe->ex.X_add_number*sizeof(LITTLENUM_TYPE));
+			lpe->ex.X_add_number*sizeof (LITTLENUM_TYPE));
 	    }
 	  emit_expr (&lpe->ex, lpe->nbytes);
 	}
@@ -1553,12 +1553,12 @@ md_undefined_symbol (name)
      char *name;
 {
   if (*name == '_' && *(name+1) == 'G'
-      && strcmp(name, "_GLOBAL_OFFSET_TABLE_") == 0)
+      && strcmp (name, "_GLOBAL_OFFSET_TABLE_") == 0)
    {
-     if(!GOT_symbol)
+     if (!GOT_symbol)
       {
-        if(symbol_find(name))
-          as_bad(_("GOT already in symbol table"));
+        if (symbol_find (name))
+          as_bad (_("GOT already in symbol table"));
         GOT_symbol = symbol_new (name, undefined_section,
                                  (valueT) 0, &zero_address_frag);
       }
@@ -1809,7 +1809,7 @@ md_apply_fix3 (fixp, valuep, seg)
 
 	case BFD_RELOC_32_GOTOFF:
 	  if (fixp->fx_done)
-	    md_number_to_chars (where, value, sizeof(int));
+	    md_number_to_chars (where, value, sizeof (int));
 	  break;
 
 	case BFD_RELOC_390_GOT64:
diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
index 558dc89..2482563 100644
--- a/gas/config/tc-sparc.c
+++ b/gas/config/tc-sparc.c
@@ -632,12 +632,12 @@ md_show_usage (stream)
 	continue;
       if (arch != &sparc_arch_table[0])
 	fprintf (stream, " | ");
-      if (column + strlen(arch->name) > 70)
+      if (column + strlen (arch->name) > 70)
 	{
 	  column = 0;
 	  fputc ('\n', stream);
 	}
-      column += 5 + 2 + strlen(arch->name);
+      column += 5 + 2 + strlen (arch->name);
       fprintf (stream, "-A%s", arch->name);
     }
   for (arch = &sparc_arch_table[0]; arch->name; arch++)
@@ -645,12 +645,12 @@ md_show_usage (stream)
       if (!arch->user_option_p)
 	continue;
       fprintf (stream, " | ");
-      if (column + strlen(arch->name) > 65)
+      if (column + strlen (arch->name) > 65)
 	{
 	  column = 0;
 	  fputc ('\n', stream);
 	}
-      column += 5 + 7 + strlen(arch->name);
+      column += 5 + 7 + strlen (arch->name);
       fprintf (stream, "-xarch=%s", arch->name);
     }
   fprintf (stream, _("\n\
diff --git a/gas/config/tc-sparc.h b/gas/config/tc-sparc.h
index ce19f5d..f231f1d 100644
--- a/gas/config/tc-sparc.h
+++ b/gas/config/tc-sparc.h
@@ -54,7 +54,7 @@ extern const char *sparc_target_format PARAMS ((void));
 #define md_convert_frag(b,s,f) \
   as_fatal (_("sparc convert_frag\n"))
 #define md_estimate_size_before_relax(f,s) \
-  (as_fatal(_("estimate_size_before_relax called")), 1)
+  (as_fatal (_("estimate_size_before_relax called")), 1)
 
 #define LISTING_HEADER "SPARC GAS "
 
diff --git a/gas/config/tc-tic80.c b/gas/config/tc-tic80.c
index 154a82d..244e16b 100644
--- a/gas/config/tc-tic80.c
+++ b/gas/config/tc-tic80.c
@@ -22,10 +22,10 @@
 #include "opcode/tic80.h"
 
 #define internal_error(what) \
-  as_fatal(_("internal error:%s:%d: %s\n"), __FILE__, __LINE__, what)
+  as_fatal (_("internal error:%s:%d: %s\n"), __FILE__, __LINE__, what)
 
 #define internal_error_a(what,arg) \
-  as_fatal(_("internal error:%s:%d: %s %d\n"), __FILE__, __LINE__, what, arg)
+  as_fatal (_("internal error:%s:%d: %s %d\n"), __FILE__, __LINE__, what, arg)
 
 /* Generic assembler global variables which must be defined by all
    targets.  */
diff --git a/gas/config/tc-w65.h b/gas/config/tc-w65.h
index 1b75f80..0bdfcea 100644
--- a/gas/config/tc-w65.h
+++ b/gas/config/tc-w65.h
@@ -29,14 +29,14 @@ struct internal_reloc;
 #define WORKING_DOT_WORD
 
 /* This macro translates between an internal fix and an coff reloc type */
-#define TC_COFF_FIX2RTYPE(fixP) tc_coff_fix2rtype(fixP)
+#define TC_COFF_FIX2RTYPE(fixP) tc_coff_fix2rtype (fixP)
 
 #define BFD_ARCH bfd_arch_w65
 #define COFF_MAGIC 0x6500
 
 #define IGNORE_NONSTANDARD_ESCAPES
 
-#define TC_RELOC_MANGLE(s,a,b,c) tc_reloc_mangle(a,b,c)
+#define TC_RELOC_MANGLE(s,a,b,c) tc_reloc_mangle (a,b,c)
 extern void tc_reloc_mangle
   PARAMS ((struct fix *, struct internal_reloc *, bfd_vma));
 
@@ -45,7 +45,7 @@ extern void tc_reloc_mangle
 #define NEED_FX_R_TYPE 1
 #define RELOC_32 1234
 
-#define TC_COFF_SIZEMACHDEP(frag) tc_coff_sizemachdep(frag)
+#define TC_COFF_SIZEMACHDEP(frag) tc_coff_sizemachdep (frag)
 #define TC_PARSE_CONS_EXPRESSION(EXP, NBYTES) w65_expression (EXP, NBYTES)
 #define TC_COUNT_RELOC(x) (1)
 #define TC_CONS_RELOC tc_cons_reloc