diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f278189e9f2..a4561c22b4f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-04  Jakub Jelinek  <jakub@redhat.com>
+
+	* config/sparc/sparc.c (sparc_va_arg): Adjust va_list by
+	UNITS_PER_WORD for zero sized aggregates.
+
 2002-04-03  David S. Miller  <davem@redhat.com>
 
 	* gcc.c (LINK_GCC_C_SEQUENCE_SPEC): No need for a new
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 7df4df6e0fb..c9cad9ff914 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -4950,6 +4950,10 @@ sparc_va_arg (valist, type)
 	      indirect = 1;
 	      size = rsize = UNITS_PER_WORD;
 	    }
+	  /* SPARC v9 ABI states that structures up to 8 bytes in size are
+	     given one 8 byte slot.  */
+	  else if (size == 0)
+	    size = rsize = UNITS_PER_WORD;
 	  else
 	    size = rsize;
 	}