diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index de303c588e0..2a5f70a4269 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,26 @@
+Mon Aug 17 10:06:11 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+			  Jeff Law <law@cygnus.com>
+
+	* c-decl.c (init_decl_processing): Remove unneeded &.
+
+	* alpha.h (alpha_initialize_trampoline): Provide prototype.
+	
+	* except.c (set_exception_lang_code, set_exception_version_code):
+	Change parameter from `short' to `int' to avoid using a gcc
+	extension.
+
+	* except.h (set_exception_lang_code, set_exception_version_code):
+	Likewise for prototypes.
+
+	* flow.c (count_reg_references): Remove unused variables `regno'
+	and `i'.
+
+	* gcse.c (hash_scan_insn): Declare parameter `in_libcall_block'.
+
+	* prefix.c (translate_name): Cast the result of `alloca'.
+
+	* varray.h (VARRAY_FREE): Reimplement as a `do-while(0)' statement.
+
 Mon Aug 17 09:23:42 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
 
 	* config/m68k/m68k.c: Include "system.h" instead of <stdio.h>.
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index a4b87860e66..5d20c9770dd 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -3533,7 +3533,7 @@ init_decl_processing ()
 
   incomplete_decl_finalize_hook = finish_incomplete_decl;
 
-  lang_get_alias_set = &c_get_alias_set;
+  lang_get_alias_set = c_get_alias_set;
 }
 
 /* Return a definition for a builtin function named NAME and whose data type
diff --git a/gcc/config/alpha/alpha.h b/gcc/config/alpha/alpha.h
index 4e99683fbbd..a2842d84790 100644
--- a/gcc/config/alpha/alpha.h
+++ b/gcc/config/alpha/alpha.h
@@ -1291,6 +1291,7 @@ do {						\
 
 #define INITIALIZE_TRAMPOLINE(TRAMP, FNADDR, CXT) \
   alpha_initialize_trampoline (TRAMP, FNADDR, CXT, 16, 24, 8)
+extern void alpha_initialize_trampoline ();
 
 /* A C expression whose value is RTL representing the value of the return
    address for the frame COUNT steps up from the current frame.
diff --git a/gcc/except.c b/gcc/except.c
index 3450e8caba9..2d26e9ee9c1 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -1930,23 +1930,17 @@ static short language_code = 0;
 static short version_code = 0; 
 
 /* This routine will set the language code for exceptions. */
-#ifdef __STDC__
-void set_exception_lang_code (short code)
-#else
-void set_exception_lang_code (code)
-     short code;
-#endif
+void
+set_exception_lang_code (code)
+     int code;
 {
   language_code = code;
 }
 
 /* This routine will set the language version code for exceptions. */
-#ifdef __STDC__
-void set_exception_version_code (short code)
-#else
-void set_exception_version_code (code)
+void
+set_exception_version_code (code)
      short code;
-#endif
 {
   version_code = code;
 }
diff --git a/gcc/except.h b/gcc/except.h
index c08d0c58399..b498a69c7e0 100644
--- a/gcc/except.h
+++ b/gcc/except.h
@@ -149,8 +149,8 @@ extern int doing_eh				       PROTO ((int));
 
 /* Toplevel initialization for EH.  */
 
-void set_exception_lang_code                    PROTO((short));
-void set_exception_version_code                 PROTO((short));
+void set_exception_lang_code                    PROTO((int));
+void set_exception_version_code                 PROTO((int));
 
 /* A list of handlers asocciated with an exception region. HANDLER_LABEL
    is the the label that control should be transfered to if the data
diff --git a/gcc/flow.c b/gcc/flow.c
index 0e3b044a830..715555d1804 100644
--- a/gcc/flow.c
+++ b/gcc/flow.c
@@ -4066,8 +4066,6 @@ count_reg_references (x)
      rtx x;
 {
   register RTX_CODE code;
-  register int regno;
-  int i;
 
  retry:
   code = GET_CODE (x);
diff --git a/gcc/prefix.c b/gcc/prefix.c
index 1c96c58e54a..06b0610871b 100644
--- a/gcc/prefix.c
+++ b/gcc/prefix.c
@@ -255,7 +255,7 @@ translate_name (name)
        keylen++)
     ;
 
-  key = alloca (keylen + 1);
+  key = (char *) alloca (keylen + 1);
   strncpy (key, &name[1], keylen);
   key[keylen] = 0;
 
diff --git a/gcc/varray.h b/gcc/varray.h
index df3ca313e85..eb5a44e1a8b 100644
--- a/gcc/varray.h
+++ b/gcc/varray.h
@@ -124,7 +124,8 @@ extern varray_type varray_init	PROTO ((size_t, size_t, const char *));
 
 /* Free up memory allocated by the virtual array, but do not free any of the
    elements involved.  */
-#define VARRAY_FREE(vp) ((vp) && (free (vp), (vp = (varray_type)0)))
+#define VARRAY_FREE(vp) \
+  do { if (vp) { free (vp); vp = (varray_type)0; } } while (0)
 
 /* Grow/shrink the virtual array VA to N elements.  */
 extern varray_type varray_grow	PROTO((varray_type, size_t));