diff options
| author | obrien <obrien@FreeBSD.org> | 1999-10-16 07:12:34 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-10-16 07:12:34 +0000 |
| commit | 712aed4e0b57aaf42ddb91932dd4382eabb1c049 (patch) | |
| tree | 9c77323c64c1cf7e655ecc49e25e346055fbfffa /contrib/gcc/ginclude | |
| parent | 05aa33623b40b9b8e569f102782922ae27706dbf (diff) | |
| download | FreeBSD-src-712aed4e0b57aaf42ddb91932dd4382eabb1c049.zip FreeBSD-src-712aed4e0b57aaf42ddb91932dd4382eabb1c049.tar.gz | |
Fix conflicts.
Diffstat (limited to 'contrib/gcc/ginclude')
| -rw-r--r-- | contrib/gcc/ginclude/stdarg.h | 7 | ||||
| -rw-r--r-- | contrib/gcc/ginclude/varargs.h | 11 |
2 files changed, 17 insertions, 1 deletions
diff --git a/contrib/gcc/ginclude/stdarg.h b/contrib/gcc/ginclude/stdarg.h index 1a38876..e3842f7 100644 --- a/contrib/gcc/ginclude/stdarg.h +++ b/contrib/gcc/ginclude/stdarg.h @@ -61,6 +61,9 @@ #ifdef __v850__ #include "va-v850.h" #else +#if defined (_TMS320C4x) || defined (_TMS320C3x) +#include <va-c4x.h> +#else /* Define __gnuc_va_list. */ @@ -83,6 +86,9 @@ typedef void *__gnuc_va_list; #if defined(sysV68) #define __va_rounded_size(TYPE) \ (((sizeof (TYPE) + sizeof (short) - 1) / sizeof (short)) * sizeof (short)) +#elif defined(_AIX) +#define __va_rounded_size(TYPE) \ + (((sizeof (TYPE) + sizeof (long) - 1) / sizeof (long)) * sizeof (long)) #else #define __va_rounded_size(TYPE) \ (((sizeof (TYPE) + sizeof (int) - 1) / sizeof (int)) * sizeof (int)) @@ -117,6 +123,7 @@ void va_end (__gnuc_va_list); /* Defined in libgcc.a */ #endif /* _STDARG_H */ +#endif /* not TMS320C3x or TMS320C4x */ #endif /* not v850 */ #endif /* not mn10200 */ #endif /* not mn10300 */ diff --git a/contrib/gcc/ginclude/varargs.h b/contrib/gcc/ginclude/varargs.h index 2aeee5b..6519140 100644 --- a/contrib/gcc/ginclude/varargs.h +++ b/contrib/gcc/ginclude/varargs.h @@ -59,6 +59,9 @@ #ifdef __v850__ #include "va-v850.h" #else +#if defined (_TMS320C4x) || defined (_TMS320C3x) +#include <va-c4x.h> +#else #ifdef __NeXT__ @@ -92,7 +95,9 @@ #define va_alist __builtin_va_alist /* The ... causes current_function_varargs to be set in cc1. */ -#define va_dcl int __builtin_va_alist; __va_ellipsis +/* ??? We don't process attributes correctly in K&R argument context. */ +typedef int __builtin_va_alist_t __attribute__((__mode__(__word__))); +#define va_dcl __builtin_va_alist_t __builtin_va_alist; __va_ellipsis /* Define __gnuc_va_list, just as in gstdarg.h. */ @@ -112,6 +117,9 @@ typedef void *__gnuc_va_list; #if defined(sysV68) #define __va_rounded_size(TYPE) \ (((sizeof (TYPE) + sizeof (short) - 1) / sizeof (short)) * sizeof (short)) +#elif defined(_AIX) +#define __va_rounded_size(TYPE) \ + (((sizeof (TYPE) + sizeof (long) - 1) / sizeof (long)) * sizeof (long)) #else #define __va_rounded_size(TYPE) \ (((sizeof (TYPE) + sizeof (int) - 1) / sizeof (int)) * sizeof (int)) @@ -134,6 +142,7 @@ typedef void *__gnuc_va_list; /* Copy __gnuc_va_list into another variable of this type. */ #define __va_copy(dest, src) (dest) = (src) +#endif /* not TMS320C3x or TMS320C4x */ #endif /* not v850 */ #endif /* not mn10200 */ #endif /* not mn10300 */ |
