s390.c (s390_va_arg): Fix alignment when retrieving non-integral types from…

s390.c (s390_va_arg): Fix alignment when retrieving non-integral types from integer register save...

	* config/s390/s390.c (s390_va_arg): Fix alignment when retrieving
	non-integral types from integer register save area slots.

From-SVN: r67894

gcc/ChangeLog

+2003-06-13  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* config/s390/s390.c (s390_va_arg): Fix alignment when retrieving 
+	non-integral types from integer register save area slots.
+
 2003-06-13  Nathanael Nerode  <neroden@gcc.gnu.org>
 
 	* config/i386/svr3dbx.h: GNU CC -> GCC; Intel 385 -> Intel 386.

gcc/config/s390/s390.c

@@ -6073,13 +6073,8 @@ s390_va_arg (valist, type)
       reg = gpr;
       n_reg = (size + UNITS_PER_WORD - 1) / UNITS_PER_WORD;
       sav_ofs = 2 * UNITS_PER_WORD;
-      if (TARGET_64BIT)
-	sav_ofs += TYPE_MODE (type) == SImode ? 4 : 
-	           TYPE_MODE (type) == HImode ? 6 : 
-	           TYPE_MODE (type) == QImode ? 7 : 0;
-      else
-	sav_ofs += TYPE_MODE (type) == HImode ? 2 : 
-	           TYPE_MODE (type) == QImode ? 3 : 0;
+      if (size < UNITS_PER_WORD)
+	sav_ofs += UNITS_PER_WORD - size;
 
       sav_scale = UNITS_PER_WORD;
       if (n_reg > 1)