--- gcc/ginclude/va-alpha.h	2018/04/24 18:23:46	1.1
+++ gcc/ginclude/va-alpha.h	2018/04/24 18:31:29	1.1.1.2
@@ -12,7 +12,7 @@
 
 typedef struct {
   char *__base;			/* Pointer to first integer register. */
-  long __offset;		/* Byte offset of args so far. */
+  int __offset;			/* Byte offset of args so far. */
 } __gnuc_va_list;
 #endif /* not __GNUC_VA_LIST */
 
@@ -45,7 +45,7 @@ typedef struct {
 
 #ifndef va_end
 
-#define va_end(__va)
+#define va_end(__va)	((void) 0)
 
 /* Values returned by __builtin_classify_type.  */
 
@@ -86,7 +86,8 @@ enum {
    of words.  */
 
 #define __va_tsize(__type)  \
-  (((sizeof (__type) + sizeof (long) - 1) / sizeof (long)) * sizeof (long))
+  (((sizeof (__type) + __extension__ sizeof (long long) - 1)   \
+    / __extension__ sizeof (long long)) * __extension__ sizeof (long long))
 
 #define va_arg(__va, __type)						\
 (*(((__va).__offset += __va_tsize (__type)),				\