diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9e2afe11bde..a3cc8c474c4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-07  Geoff Keating  <geoffk@cygnus.com>
+
+	* config/rs6000/sol-c0.c (_start): Declare `termfunc' parameter
+	with a prototype.
+	* config/rs6000/rs6000.h (RS6000_ARG_SIZE): Use cast to suppress
+	warning.
+
 Fri Sep  8 03:26:38 2000  J"orn Rennecke <amylaar@redhat.co.uk>
 
 	* sh.md (cmpeqsi_ior_t, cmpeqsi_and_t): Remove.
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index be10201de36..fd855406a21 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -1423,8 +1423,9 @@ typedef struct rs6000_args
 #define RS6000_ARG_SIZE(MODE, TYPE, NAMED)				\
 (! (NAMED) ? 0								\
  : (MODE) != BLKmode							\
- ? (GET_MODE_SIZE (MODE) + (UNITS_PER_WORD - 1)) / UNITS_PER_WORD 	\
- : (int_size_in_bytes (TYPE) + (UNITS_PER_WORD - 1)) / UNITS_PER_WORD)
+ ? (GET_MODE_SIZE (MODE) + (UNITS_PER_WORD - 1)) / UNITS_PER_WORD	\
+ : ((unsigned HOST_WIDE_INT) int_size_in_bytes (TYPE) 			\
+    + (UNITS_PER_WORD - 1)) / UNITS_PER_WORD)
 
 /* Initialize a variable CUM of type CUMULATIVE_ARGS
    for a call to a function whose data type is FNTYPE.
diff --git a/gcc/config/rs6000/sol-c0.c b/gcc/config/rs6000/sol-c0.c
index a31876c889d..f7ccb7d7799 100644
--- a/gcc/config/rs6000/sol-c0.c
+++ b/gcc/config/rs6000/sol-c0.c
@@ -33,7 +33,7 @@ extern int atexit (void (*__func) (void));
 extern void __init (void) __attribute__ ((__longcall__));
 extern void __fini (void) __attribute__ ((__longcall__));
 extern void _start(int argc, char *argv[], char *envp[], void *auxp, 
-		   void (*termfunc)());
+		   void (*termfunc)(void));
 extern void exit(int);
 extern int main (int argc, char *argv[], char *envp[], void *auxp);
 
@@ -84,7 +84,8 @@ deregister (void)
 
 /* Start function.  */
 void
-_start(int argc, char *argv[], char *envp[], void *auxp, void (*termfunc)())
+_start(int argc, char *argv[], char *envp[], void *auxp, 
+       void (*termfunc)(void))
 {
   int ret;
   int dummy = 0;