diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4897a1e93518..2f50e07c6075 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-30  Jakub Jelinek  <jakub@redhat.com>
+
+	* config/rs6000/sysv4.h (RS6000_VARARGS_AREA): Only return non-zero
+	if DEFAULT_ABI == ABI_V4.
+
 2005-06-30  Steven Bosscher  <stevenb@suse.de>
 
 	* coretypes.h (tls_model): Add TLS_MODEL_NONE as 0.
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
index 4e3a50ff3084..c95c9527dada 100644
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
@@ -252,7 +252,9 @@ do {									\
 /* Size of the V.4 varargs area if needed.  */
 /* Override rs6000.h definition.  */
 #undef	RS6000_VARARGS_AREA
-#define RS6000_VARARGS_AREA (current_function_stdarg ? RS6000_VARARGS_SIZE : 0)
+#define RS6000_VARARGS_AREA \
+  ((DEFAULT_ABI == ABI_V4 && current_function_stdarg)		\
+   ? RS6000_VARARGS_SIZE : 0)
 
 /* Override default big endianism definitions in rs6000.h.  */
 #undef	BYTES_BIG_ENDIAN