(va_arg): Don't assume __va_rounded_size (char) has the value of 4.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@9550 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ginclude/stdarg.h b/gcc/ginclude/stdarg.h
index 0ac176e..b8d85e8 100644 (file)
--- a/gcc/ginclude/stdarg.h
+++ b/gcc/ginclude/stdarg.h
@@ -84,9 +84,9 @@ void va_end (__gnuc_va_list);         /* Defined in libgcc.a */
 /* This is for big-endian machines; small args are padded downward.  */
 #define va_arg(AP, TYPE)                                               \
  (AP = (__gnuc_va_list) ((char *) (AP) + __va_rounded_size (TYPE)),    \
-  *((TYPE *) (void *) ((char *) (AP) - ((sizeof (TYPE) < 4             \
-                                        ? sizeof (TYPE)                \
-                                        : __va_rounded_size (TYPE))))))
+  *((TYPE *) (void *) ((char *) (AP)                                   \
+                      - ((sizeof (TYPE) < __va_rounded_size (char)     \
+                          ? sizeof (TYPE) : __va_rounded_size (TYPE))))))
 #endif /* big-endian */
 #endif /* _STDARG_H */
 

diff --git a/gcc/ginclude/varargs.h b/gcc/ginclude/varargs.h
index 68e20a6..1709805 100644 (file)
--- a/gcc/ginclude/varargs.h
+++ b/gcc/ginclude/varargs.h
@@ -103,9 +103,9 @@ typedef void *__gnuc_va_list;
 /* This is for big-endian machines; small args are padded downward.  */
 #define va_arg(AP, TYPE)                                               \
  (AP = (__gnuc_va_list) ((char *) (AP) + __va_rounded_size (TYPE)),    \
-  *((TYPE *) (void *) ((char *) (AP) - ((sizeof (TYPE) < 4             \
-                                        ? sizeof (TYPE)                \
-                                        : __va_rounded_size (TYPE))))))
+  *((TYPE *) (void *) ((char *) (AP)                                   \
+                      - ((sizeof (TYPE) < __va_rounded_size (char)     \
+                          ? sizeof (TYPE) : __va_rounded_size (TYPE))))))
 #endif /* big-endian */
 
 #endif /* not h8300 */