diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c3c89c8ee17..740bd89b57b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-03 Rodney Brown	<RodneyBrown@mynd.com>
+
+	* pa.h (FUNCTION_ARG_ADVANCE): Warning removal.
+
 Fri May  5 10:29:21 2000  Marc Espie <espie@cvs.openbsd.org>
 
 	* config/openbsd.h (LINK_SPEC): pass correct flags to ld 
diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h
index bd6cd31464f..af0ac4f6186 100644
--- a/gcc/config/pa/pa.h
+++ b/gcc/config/pa/pa.h
@@ -727,10 +727,9 @@ struct hppa_args {int words, nargs_prototype, indirect; };
 
 #define FUNCTION_ARG_ADVANCE(CUM, MODE, TYPE, NAMED)			\
 { (CUM).nargs_prototype--;						\
-  ((((CUM).words & 01) && (TYPE) != 0					\
-    && FUNCTION_ARG_SIZE(MODE, TYPE) > 1)				\
-   && (CUM).words++),							\
-     (CUM).words += FUNCTION_ARG_SIZE(MODE, TYPE);			\
+  (CUM).words += FUNCTION_ARG_SIZE(MODE, TYPE)	 			\
+    + (((CUM).words & 01) && (TYPE) != 0				\
+	&& FUNCTION_ARG_SIZE(MODE, TYPE) > 1);				\
 }
 
 /* Determine where to put an argument to a function.