diff options
| author |   miod <miod@openbsd.org> | 2004-06-07 20:44:18 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2004-06-07 20:44:18 +0000 |
| commit | 84f7a24ecd1f15b913c94d9bc9d4fe5c451b7b2e (patch) | |
| tree | 66de3ac77244bdc1266d0da94a26d03be6e4edf9 | |
| parent | dig gpio ioctls (diff) | |
| download | wireguard-openbsd-84f7a24ecd1f15b913c94d9bc9d4fe5c451b7b2e.tar.xz wireguard-openbsd-84f7a24ecd1f15b913c94d9bc9d4fe5c451b7b2e.zip | |
Correctly handle an unaligned long long parameter on stack in varargs functions;
makes some rare situations in the a.out ar working again.
| -rw-r--r-- | sys/arch/m88k/include/va-m88k.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/arch/m88k/include/va-m88k.h b/sys/arch/m88k/include/va-m88k.h index e076b50299c..ff418f05ecd 100644 --- a/sys/arch/m88k/include/va-m88k.h +++ b/sys/arch/m88k/include/va-m88k.h @@ -1,4 +1,4 @@ -/* $OpenBSD: va-m88k.h,v 1.2 2004/05/19 21:40:30 miod Exp $ */ +/* $OpenBSD: va-m88k.h,v 1.3 2004/06/07 20:44:18 miod Exp $ */ /* Define __gnuc_va_list. */ @@ -21,6 +21,8 @@ typedef struct __va_list_tag { __extension__ ({ \ (AP) = (struct __va_list_tag *)__builtin_alloca(sizeof(__gnuc_va_list)); \ __builtin_memcpy ((AP), __builtin_saveregs (), sizeof(__gnuc_va_list)); \ + if ((AP)->__va_arg > 8) \ + (AP)->__va_stk += ((AP)->__va_arg - 8); \ }) #ifdef _STDARG_H /* stdarg.h support */ @@ -64,6 +66,10 @@ __extension__(*({ \ __ptr = (TYPE *) (void *) ((AP)->__va_reg + \ (AP)->__va_arg - __va_size(TYPE)); \ } else { \ + if (((unsigned int)((AP)->__va_stk) & 4) != 0 && \ + __alignof__(*(TYPE *)0) > 4) { \ + (AP)->__va_stk++; \ +} \ __ptr = (TYPE *) (AP)->__va_stk; \ (AP)->__va_stk += __va_size(TYPE); \ } \ |