diff --git a/gas/as.c b/gas/as.c
index 556b726..5a8d1c8 100644
--- a/gas/as.c
+++ b/gas/as.c
@@ -60,6 +60,10 @@ extern PTR sbrk ();
 #endif
 #endif
 
+#ifndef PARAMS
+#define PARAMS(a) a
+#endif
+
 static void show_usage PARAMS ((FILE *));
 static void parse_args PARAMS ((int *, char ***));
 static void dump_statistics PARAMS ((void));
@@ -227,8 +231,8 @@ print_version_id ()
 }
 
 static void
-show_usage (stream)
-     FILE *stream;
+show_usage (
+     FILE *stream)
 {
   fprintf (stream, _("Usage: %s [option...] [asmfile...]\n"), myname);
 
@@ -348,9 +352,9 @@ Options:\n\
    md_parse_option definitions in config/tc-*.c.  */
 
 static void
-parse_args (pargc, pargv)
-     int *pargc;
-     char ***pargv;
+parse_args (
+     int *pargc,
+     char ***pargv)
 {
   int old_argc, new_argc;
   char **old_argv, **new_argv;
@@ -792,9 +796,9 @@ static long start_time;
 int main PARAMS ((int, char **));
 
 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (
+     int argc,
+     char **argv)
 {
   int macro_alternate;
   int macro_strip_at;
@@ -999,9 +1003,9 @@ dump_statistics ()
    may be a catenation of many 'physical' input files.  */
 
 static void
-perform_an_assembly_pass (argc, argv)
-     int argc;
-     char **argv;
+perform_an_assembly_pass (
+     int argc,
+     char **argv)
 {
   int saw_a_file = 0;
 #ifdef BFD_ASSEMBLER
diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index db5e376..ffb46db 100644
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -34,6 +34,10 @@
 #include "elf/m68k.h"
 #endif
 
+#ifndef PARAMS
+#define PARAMS(a) a
+#endif
+
 #ifndef TE_AMIGA
 #define TE_AMIGA 0
 #endif
@@ -42,8 +46,6 @@
 #define OBJ_AMIGAHUNK 0
 #endif
 
-#define FLAG_SMALL_CODE (0 && flag_small_code)
-
 /* This string holds the chars that always start a comment.  If the
    pre-processor is disabled, these aren't very useful.  The macro
    tc_comment_chars points to this.  We use this, rather than the
@@ -90,6 +92,8 @@ static int flag_long_jumps;	/* -S option */
 static int flag_keep_pcrel;	/* --pcrel option.  */
 static int flag_small_code;	/* -sc option */
 
+#define FLAG_SMALL_CODE (0 && flag_small_code)
+
 #ifdef REGISTER_PREFIX_OPTIONAL
 int flag_reg_prefix_optional = REGISTER_PREFIX_OPTIONAL;
 #else
@@ -1078,8 +1082,8 @@ static struct hash_control *op_hash;
 /* Assemble an m68k instruction.  */
 
 static void
-m68k_ip (instring)
-     char *instring;
+m68k_ip (
+     char *instring)
 {
   register char *p;
   register struct m68k_op *opP;
@@ -3311,9 +3315,9 @@ install_gen_operand (mode, val)
  */
 
 static char *
-crack_operand (str, opP)
-     register char *str;
-     register struct m68k_op *opP;
+crack_operand (
+     register char *str,
+     register struct m68k_op *opP)
 {
   register int parens;
   register int c;
@@ -3641,8 +3645,8 @@ int m68k_aout_machtype = 2;
 #endif
 
 void
-md_assemble (str)
-     char *str;
+md_assemble (
+     char *str)
 {
   const char *er;
   short *fromP;
@@ -4168,8 +4172,8 @@ m68k_init_after_args ()
 /* This is called when a label is defined.  */
 
 void
-m68k_frob_label (sym)
-     symbolS *sym;
+m68k_frob_label (
+     symbolS *sym)
 {
   struct label_line *n;
 
@@ -4195,8 +4199,8 @@ m68k_flush_pending_output ()
    odd location.  */
 
 void
-m68k_frob_symbol (sym)
-     symbolS *sym;
+m68k_frob_symbol (
+     symbolS *sym)
 {
   if (S_GET_SEGMENT (sym) == reg_section
       && (int) S_GET_VALUE (sym) < 0)
@@ -4226,8 +4230,8 @@ m68k_frob_symbol (sym)
    pseudo-op.  */
 
 void
-m68k_mri_mode_change (on)
-     int on;
+m68k_mri_mode_change (
+     int on)
 {
   if (on)
     {
@@ -4270,10 +4274,10 @@ m68k_mri_mode_change (on)
    returned, or NULL on OK.  */
 
 char *
-md_atof (type, litP, sizeP)
-     char type;
-     char *litP;
-     int *sizeP;
+md_atof (
+     char type,
+     char *litP,
+     int *sizeP)
 {
   int prec;
   LITTLENUM_TYPE words[MAX_LITTLENUMS];
@@ -4324,19 +4328,19 @@ md_atof (type, litP, sizeP)
 }
 
 void
-md_number_to_chars (buf, val, n)
-     char *buf;
-     valueT val;
-     int n;
+md_number_to_chars (
+     char *buf,
+     valueT val,
+     int n)
 {
   number_to_chars_bigendian (buf, val, n);
 }
 
 void
-md_apply_fix3 (fixP, valP, seg)
-     fixS *fixP;
-     valueT *valP;
-     segT seg ATTRIBUTE_UNUSED;
+md_apply_fix3 (
+     fixS *fixP,
+     valueT *valP,
+     segT seg ATTRIBUTE_UNUSED)
 {
   offsetT val = *valP;
   addressT upper_limit;
@@ -4449,8 +4453,8 @@ md_apply_fix3 (fixP, valP, seg)
    MAGIC here. ..
    */
 static void
-md_convert_frag_1 (fragP)
-     register fragS *fragP;
+md_convert_frag_1 (
+     register fragS *fragP)
 {
   long disp;
   fixS *fixP;
@@ -4756,9 +4760,9 @@ md_convert_frag (abfd, sec, fragP)
    the frag list to be relaxed
    */
 int
-md_estimate_size_before_relax (fragP, segment)
-     register fragS *fragP;
-     segT segment;
+md_estimate_size_before_relax (
+     register fragS *fragP,
+     segT segment)
 {
   /* Handle SZ_UNDEF first, it can be changed to BYTE or SHORT.  */
   switch (fragP->fr_subtype)
diff --git a/gas/read.c b/gas/read.c
index 99c6a2e..980106c 100644
--- a/gas/read.c
+++ b/gas/read.c
@@ -501,9 +501,9 @@ static char *scrub_string;
 static char *scrub_string_end;
 
 static int
-scrub_from_string (buf, buflen)
-     char *buf;
-     int buflen;
+scrub_from_string (
+     char *buf,
+     int buflen)
 {
   int copy;
 
@@ -518,8 +518,8 @@ scrub_from_string (buf, buflen)
 /* We read the file, putting things into a web that represents what we
    have been reading.  */
 void
-read_a_source_file (name)
-     char *name;
+read_a_source_file (
+     char *name)
 {
   register char c;
   register char *s;		/* String of symbol, '\0' appended.  */
diff --git a/gas/tc.h b/gas/tc.h
index b0079a5..38e9577 100644
--- a/gas/tc.h
+++ b/gas/tc.h
@@ -26,7 +26,7 @@ extern const pseudo_typeS md_pseudo_table[];
 
 extern const int md_reloc_size;	/* Size of a relocation record */
 
-char *md_atof PARAMS ((int what_statement_type, char *literalP, int *sizeP));
+char *md_atof PARAMS ((char what_statement_type, char *literalP, int *sizeP));
 #ifndef md_estimate_size_before_relax
 int md_estimate_size_before_relax PARAMS ((fragS * fragP, segT segment));
 #endif
diff --git a/gas/write.c b/gas/write.c
index a5a151f..f6b2046 100644
--- a/gas/write.c
+++ b/gas/write.c
@@ -543,15 +543,15 @@ remove_subsegs (head, seg, root, last)
 
 #ifdef BFD_ASSEMBLER
 static void
-cvt_frag_to_fill (sec, fragP)
-     segT sec ATTRIBUTE_UNUSED;
-     fragS *fragP;
+cvt_frag_to_fill (
+     segT sec ATTRIBUTE_UNUSED,
+     fragS *fragP)
 #else
 static void
-cvt_frag_to_fill (headersP, sec, fragP)
-     object_headers *headersP;
-     segT sec;
-     fragS *fragP;
+cvt_frag_to_fill (
+     object_headers *headersP,
+     segT sec,
+     fragS *fragP)
 #endif
 {
   switch (fragP->fr_type)