triton-windows 3.3.1.post19__cp311-cp311-win_amd64.whl → 3.5.0.post21__cp311-cp311-win_amd64.whl

triton/runtime/tcc/include/_mingw.h

@@ -41,7 +41,7 @@
 #define __MSVCRT__ 1
 #undef _MSVCRT_
 #define __MINGW_IMPORT extern __declspec(dllimport)
-#define __MINGW_ATTRIB_NORETURN
+#define __MINGW_ATTRIB_NORETURN __declspec(noreturn)
 #define __MINGW_ATTRIB_CONST
 #define __MINGW_ATTRIB_DEPRECATED
 #define __MINGW_ATTRIB_MALLOC
@@ -51,7 +51,7 @@
 #define __GNUC_VA_LIST
 
 #define _CRTIMP extern
-#define __CRT_INLINE extern __inline__
+#define __CRT_INLINE static __inline__
 
 #define _CRT_ALIGN(x) __attribute__((aligned(x)))
 #define DECLSPEC_ALIGN(x) __attribute__((aligned(x)))
@@ -76,17 +76,14 @@
 #define _M_AMD64 100 /* Visual Studio */
 #define USE_MINGW_SETJMP_TWO_ARGS
 #define mingw_getsp tinyc_getbp
-#define __TRY__
 #else
 #define __stdcall __attribute__((__stdcall__))
 #define _X86_ 1
 #define _M_IX86 300 /* Visual Studio */
-#define WIN32 1
-#define _USE_32BIT_TIME_T
-#ifdef __arm__
-#define __TRY__
-#else
-#define __TRY__ void __try__(void**), *_sehrec[6]; __try__(_sehrec);
+#ifndef __MINGW_USE_VC2005_COMPAT /* time became 64, but not timeval.tv_sec */
+# ifndef _USE_32BIT_TIME_T
+#  define _USE_32BIT_TIME_T
+# endif
 #endif
 #endif
 
@@ -138,7 +135,7 @@ typedef struct localeinfo_struct _locale_tstruct,*_locale_t;
 /* for winapi */
 #define _ANONYMOUS_UNION
 #define _ANONYMOUS_STRUCT
-#define DECLSPEC_NORETURN
+#define DECLSPEC_NORETURN __declspec(noreturn)
 #define DECLARE_STDCALL_P(type) __stdcall type
 #define NOSERVICE 1
 #define NOMCX 1
@@ -166,5 +163,6 @@ typedef struct localeinfo_struct _locale_tstruct,*_locale_t;
 #define __MINGW_EXTENSION
 #define WINAPI_FAMILY_PARTITION(X) 1
 #define MINGW_HAS_SECURE_API
+#define WIN32 1
 
 #endif /* __MINGW_H */

triton/runtime/tcc/include/assert.h

@@ -54,4 +54,9 @@ extern void __cdecl _assert(const char *, const char *, unsigned);
 
 #endif
 
+#if (__STDC_VERSION__ >= 201112L) && !defined(static_assert)
+/* C11, section 7.2: The macro static_assert expands to _Static_assert. */
+#define static_assert(exp, str) _Static_assert(exp, str) 
+#endif
+
 #endif

triton/runtime/tcc/include/errno.h

@@ -14,7 +14,7 @@ extern "C" {
 
 #ifndef _CRT_ERRNO_DEFINED
 #define _CRT_ERRNO_DEFINED
-  _CRTIMP extern int *__cdecl _errno(void);
+  _CRTIMP int *__cdecl _errno(void);
 #define errno (*_errno())
 
   errno_t __cdecl _set_errno(int _Value);

triton/runtime/tcc/include/float.h

@@ -38,19 +38,37 @@
 #define LDBL_MAX_EXP 16384
 #define LDBL_MAX 1.18973149535723176502e+4932L
 #define LDBL_MAX_10_EXP 4932
+#define DECIMAL_DIG 21
+
+#elif defined __aarch64__ || defined __riscv
+/*
+ * Use values from:
+ * gcc -dM -E -xc /dev/null | grep LDBL | sed -e "s/__//g"
+ */
+#define LDBL_MANT_DIG 113
+#define LDBL_DIG 33
+#define LDBL_EPSILON 1.92592994438723585305597794258492732e-34L
+#define LDBL_MIN_EXP (-16381)
+#define LDBL_MIN 3.36210314311209350626267781732175260e-4932L
+#define LDBL_MIN_10_EXP (-4931)
+#define LDBL_MAX_EXP 16384
+#define LDBL_MAX 1.18973149535723176508575932662800702e+4932L
+#define LDBL_MAX_10_EXP 4932
+#define DECIMAL_DIG 36
 
 #else
 
 /* same as IEEE double */
 #define LDBL_MANT_DIG 53
 #define LDBL_DIG 15
-#define LDBL_EPSILON 2.2204460492503131e-16
+#define LDBL_EPSILON 2.2204460492503131e-16L
 #define LDBL_MIN_EXP (-1021)
-#define LDBL_MIN 2.2250738585072014e-308
+#define LDBL_MIN 2.2250738585072014e-308L
 #define LDBL_MIN_10_EXP (-307)
 #define LDBL_MAX_EXP 1024
-#define LDBL_MAX 1.7976931348623157e+308
+#define LDBL_MAX 1.7976931348623157e+308L
 #define LDBL_MAX_10_EXP 308
+#define DECIMAL_DIG 17
 
 #endif
 

triton/runtime/tcc/include/iso646.h

@@ -0,0 +1,36 @@
+/**
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file is part of the TinyCC package.
+ * No warranty is given; refer to the file DISCLAIMER within this package.
+ */
+
+/*
+ * ISO C Standard:  7.9  Alternative spellings  <iso646.h>
+ */
+
+#ifndef _ISO646_H_
+#define _ISO646_H_
+
+#define and     &&
+#define and_eq  &=
+#define bitand  &
+#define bitor   |
+#define compl   ~
+#define not     !
+#define not_eq  !=
+#define or      ||
+#define or_eq   |=
+#define xor     ^
+#define xor_eq  ^=
+
+#endif /* _ISO646_H_ */
+
+
+
+
+
+
+
+
+
+

triton/runtime/tcc/include/limits.h

@@ -23,8 +23,13 @@
 #define SCHAR_MAX 127
 #define UCHAR_MAX 0xff
 
+#ifndef __CHAR_UNSIGNED__
 #define CHAR_MIN SCHAR_MIN
 #define CHAR_MAX SCHAR_MAX
+#else
+#define CHAR_MIN 0
+#define CHAR_MAX UCHAR_MAX
+#endif
 
 #define MB_LEN_MAX 5
 #define SHRT_MIN (-32768)

triton/runtime/tcc/include/malloc.h

@@ -62,8 +62,8 @@ extern "C" {
   void *__cdecl malloc(size_t _Size);
   void *__cdecl realloc(void *_Memory,size_t _NewSize);
   _CRTIMP void *__cdecl _recalloc(void *_Memory,size_t _Count,size_t _Size);
-  /*	_CRTIMP void __cdecl _aligned_free(void *_Memory);
-  _CRTIMP void *__cdecl _aligned_malloc(size_t _Size,size_t _Alignment); */
+  _CRTIMP void __cdecl _aligned_free(void *_Memory);
+  _CRTIMP void *__cdecl _aligned_malloc(size_t _Size,size_t _Alignment);
   _CRTIMP void *__cdecl _aligned_offset_malloc(size_t _Size,size_t _Alignment,size_t _Offset);
   _CRTIMP void *__cdecl _aligned_realloc(void *_Memory,size_t _Size,size_t _Alignment);
   _CRTIMP void *__cdecl _aligned_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment);

triton/runtime/tcc/include/math.h

@@ -197,81 +197,6 @@ extern "C" {
    int __cdecl _fpclassf(float _X);
 #endif
 
-#ifndef __cplusplus
-  __CRT_INLINE long double __cdecl fabsl (long double x)
-  {
-    long double res;
-    __asm__ ("fabs;" : "=t" (res) : "0" (x));
-    return res;
-  }
-#define _hypotl(x,y) ((long double)_hypot((double)(x),(double)(y)))
-#define _matherrl _matherr
-  __CRT_INLINE long double _chgsignl(long double _Number) { return _chgsign((double)(_Number)); }
-  __CRT_INLINE long double _copysignl(long double _Number,long double _Sign) { return _copysign((double)(_Number),(double)(_Sign)); }
-  __CRT_INLINE float frexpf(float _X,int *_Y) { return ((float)frexp((double)_X,_Y)); }
-
-#if !defined (__ia64__)
-  __CRT_INLINE float __cdecl fabsf (float x)
-  {
-    float res;
-    __asm__ ("fabs;" : "=t" (res) : "0" (x));
-    return res;
-  }
-
-  __CRT_INLINE float __cdecl ldexpf (float x, int expn) { return (float) ldexp (x, expn); }
-#endif
-#else
-  // cplusplus
-  __CRT_INLINE long double __cdecl fabsl (long double x)
-  {
-    long double res;
-    __asm__ ("fabs;" : "=t" (res) : "0" (x));
-    return res;
-  }
-  __CRT_INLINE long double modfl(long double _X,long double *_Y) {
-    double _Di,_Df = modf((double)_X,&_Di);
-    *_Y = (long double)_Di;
-    return (_Df);
-  }
-  __CRT_INLINE long double _chgsignl(long double _Number) { return _chgsign(static_cast<double>(_Number)); }
-  __CRT_INLINE long double _copysignl(long double _Number,long double _Sign) { return _copysign(static_cast<double>(_Number),static_cast<double>(_Sign)); }
-  __CRT_INLINE float frexpf(float _X,int *_Y) { return ((float)frexp((double)_X,_Y)); }
-#ifndef __ia64__
-  __CRT_INLINE float __cdecl fabsf (float x)
-  {
-    float res;
-    __asm__ ("fabs;" : "=t" (res) : "0" (x));
-    return res;
-  }
-  __CRT_INLINE float __cdecl ldexpf (float x, int expn) { return (float) ldexp (x, expn); }
-#ifndef __x86_64
-  __CRT_INLINE float acosf(float _X) { return ((float)acos((double)_X)); }
-  __CRT_INLINE float asinf(float _X) { return ((float)asin((double)_X)); }
-  __CRT_INLINE float atanf(float _X) { return ((float)atan((double)_X)); }
-  __CRT_INLINE float atan2f(float _X,float _Y) { return ((float)atan2((double)_X,(double)_Y)); }
-  __CRT_INLINE float ceilf(float _X) { return ((float)ceil((double)_X)); }
-  __CRT_INLINE float cosf(float _X) { return ((float)cos((double)_X)); }
-  __CRT_INLINE float coshf(float _X) { return ((float)cosh((double)_X)); }
-  __CRT_INLINE float expf(float _X) { return ((float)exp((double)_X)); }
-  __CRT_INLINE float floorf(float _X) { return ((float)floor((double)_X)); }
-  __CRT_INLINE float fmodf(float _X,float _Y) { return ((float)fmod((double)_X,(double)_Y)); }
-  __CRT_INLINE float logf(float _X) { return ((float)log((double)_X)); }
-  __CRT_INLINE float log10f(float _X) { return ((float)log10((double)_X)); }
-  __CRT_INLINE float modff(float _X,float *_Y) {
-    double _Di,_Df = modf((double)_X,&_Di);
-    *_Y = (float)_Di;
-    return ((float)_Df);
-  }
-  __CRT_INLINE float powf(float _X,float _Y) { return ((float)pow((double)_X,(double)_Y)); }
-  __CRT_INLINE float sinf(float _X) { return ((float)sin((double)_X)); }
-  __CRT_INLINE float sinhf(float _X) { return ((float)sinh((double)_X)); }
-  __CRT_INLINE float sqrtf(float _X) { return ((float)sqrt((double)_X)); }
-  __CRT_INLINE float tanf(float _X) { return ((float)tan((double)_X)); }
-  __CRT_INLINE float tanhf(float _X) { return ((float)tanh((double)_X)); }
-#endif
-#endif
-#endif
-
 #ifndef	NO_OLDNAMES
 #define matherr _matherr
 
@@ -315,10 +240,13 @@ extern "C" {
   extern int __cdecl __fpclassify (double);
   extern int __cdecl __fpclassifyl (long double);
 
-/* Implemented at tcc/tcc_libm.h */
+/* Implemented at tcc/tcc_libm.h
 #define fpclassify(x) (sizeof (x) == sizeof (float) ? __fpclassifyf (x)	  \
   : sizeof (x) == sizeof (double) ? __fpclassify (x) \
   : __fpclassifyl (x))
+*/
+#define fpclassify(x) \
+  _Generic(x, float: __fpclassifyf, double: __fpclassify, long double: __fpclassifyl)(x)
 
   /* 7.12.3.2 */
 #define isfinite(x) ((fpclassify(x) & FP_NAN) == 0)
@@ -340,10 +268,13 @@ extern "C" {
   extern int __cdecl __signbit (double);
   extern int __cdecl __signbitl (long double);
 
-/* Implemented at tcc/tcc_libm.h */
+/* Implemented at tcc/tcc_libm.h
 #define signbit(x) (sizeof (x) == sizeof (float) ? __signbitf (x)	\
   : sizeof (x) == sizeof (double) ? __signbit (x)	\
   : __signbitl (x))
+*/
+#define signbit(x) \
+  _Generic(x, float: __signbitf, double: __signbit, long double: __signbitl)(x)
 
   extern double __cdecl exp2(double);
   extern float __cdecl exp2f(float);
@@ -367,30 +298,6 @@ extern "C" {
   extern float __cdecl logbf (float);
   extern long double __cdecl logbl (long double);
 
-  __CRT_INLINE double __cdecl logb (double x)
-  {
-    double res;
-    __asm__ ("fxtract\n\t"
-      "fstp	%%st" : "=t" (res) : "0" (x));
-    return res;
-  }
-
-  __CRT_INLINE float __cdecl logbf (float x)
-  {
-    float res;
-    __asm__ ("fxtract\n\t"
-      "fstp	%%st" : "=t" (res) : "0" (x));
-    return res;
-  }
-
-  __CRT_INLINE long double __cdecl logbl (long double x)
-  {
-    long double res;
-    __asm__ ("fxtract\n\t"
-      "fstp	%%st" : "=t" (res) : "0" (x));
-    return res;
-  }
-
   extern long double __cdecl modfl (long double, long double*);
 
   /* 7.12.6.13 */
@@ -408,8 +315,8 @@ extern "C" {
   extern float __cdecl cbrtf (float);
   extern long double __cdecl cbrtl (long double);
 
-  __CRT_INLINE float __cdecl hypotf (float x, float y)
-  { return (float) hypot (x, y);}
+  extern double __cdecl hypot (double, double);
+  extern float __cdecl hypotf (float, float);
   extern long double __cdecl hypotl (long double, long double);
 
   extern long double __cdecl powl (long double, long double);
@@ -465,112 +372,23 @@ extern "C" {
 
   /* 7.12.9.4 */
   /* round, using fpu control word settings */
-  __CRT_INLINE double __cdecl rint (double x)
-  {
-    double retval;
-    __asm__ (
-      "fldl    %1\n"
-      "frndint   \n"
-      "fstl    %0\n" : "=m" (retval) : "m" (x));
-    return retval;
-  }
-
-  __CRT_INLINE float __cdecl rintf (float x)
-  {
-    float retval;
-    __asm__ (
-      "flds    %1\n"
-      "frndint   \n"
-      "fsts    %0\n" : "=m" (retval) : "m" (x));
-    return retval;
-  }
-
-  __CRT_INLINE long double __cdecl rintl (long double x)
-  {
-    long double retval;
-    __asm__ (
-      "fldt    %1\n"
-      "frndint   \n"
-      "fstt    %0\n" : "=m" (retval) : "m" (x));
-    return retval;
-  }
-
-  /* 7.12.9.5 */
-  __CRT_INLINE long __cdecl lrint (double x) 
-  {
-    long retval;  
-    __asm__ __volatile__                         \
-      ("fldl   %1\n"                             \
-       "fistpl %0"  : "=m" (retval) : "m" (x));  \
-      return retval;
-  }
-
-  __CRT_INLINE long __cdecl lrintf (float x) 
-  {
-    long retval;
-    __asm__ __volatile__                         \
-      ("flds   %1\n"                             \
-       "fistpl %0"  : "=m" (retval) : "m" (x));  \
-      return retval;
-  }
-
-  __CRT_INLINE long __cdecl lrintl (long double x) 
-  {
-    long retval;
-    __asm__ __volatile__                         \
-      ("fldt   %1\n"                             \
-       "fistpl %0"  : "=m" (retval) : "m" (x));  \
-      return retval;
-  }
-
-  __CRT_INLINE long long __cdecl llrint (double x) 
-  {
-    long long retval;
-    __asm__ __volatile__                         \
-      ("fldl    %1\n"                            \
-       "fistpll %0"  : "=m" (retval) : "m" (x)); \
-      return retval;
-  }
-
-  __CRT_INLINE long long __cdecl llrintf (float x) 
-  {
-    long long retval;
-    __asm__ __volatile__                         \
-      ("flds   %1\n"                             \
-       "fistpll %0"  : "=m" (retval) : "m" (x)); \
-      return retval;
-  }
-
-  __CRT_INLINE long long __cdecl llrintl (long double x) 
-  {
-    long long retval;
-    __asm__ __volatile__                         \
-      ("fldt    %1\n"                            \
-       "fistpll %0"  : "=m" (retval) : "m" (x)); \
-      return retval;
-  }
+  extern double __cdecl rint (double);
+  extern float __cdecl rintf (float);
+  extern long double __cdecl rintl (long double);
+
+  extern long __cdecl lrint (double);
+  extern long __cdecl lrintf (float);
+  extern long __cdecl lrintl (long double);
+
+  extern long long __cdecl llrint (double);
+  extern long long __cdecl llrintf (float);
+  extern long long __cdecl llrintl (long double);
 
   #define FE_TONEAREST	0x0000
   #define FE_DOWNWARD	0x0400
   #define FE_UPWARD	0x0800
   #define FE_TOWARDZERO	0x0c00
 
-  __CRT_INLINE double trunc (double _x)
-  {
-    double retval;
-    unsigned short saved_cw;
-    unsigned short tmp_cw;
-    __asm__ ("fnstcw %0;" : "=m" (saved_cw)); /* save FPU control word */
-    tmp_cw = (saved_cw & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO))
-	    | FE_TOWARDZERO;
-    __asm__ ("fldcw %0;" : : "m" (tmp_cw));
-    __asm__ ("fldl  %1;"
-             "frndint;"
-             "fstl  %0;" : "=m" (retval)  : "m" (_x)); /* round towards zero */
-    __asm__ ("fldcw %0;" : : "m" (saved_cw) ); /* restore saved control word */
-    return retval;
-  }
-
   /* 7.12.9.6 */
   /* round away from zero, regardless of fpu control word settings */
   extern double __cdecl round (double);
@@ -655,70 +473,12 @@ extern "C" {
   extern long double __cdecl fmal (long double, long double, long double);
 
 
-#if 0 // gr: duplicate, see below
-  /* 7.12.14 */
-  /* 
-  *  With these functions, comparisons involving quiet NaNs set the FP
-  *  condition code to "unordered".  The IEEE floating-point spec
-  *  dictates that the result of floating-point comparisons should be
-  *  false whenever a NaN is involved, with the exception of the != op, 
-  *  which always returns true: yes, (NaN != NaN) is true).
-  */
-
-#if __GNUC__ >= 3
-
-#define isgreater(x, y) __builtin_isgreater(x, y)
-#define isgreaterequal(x, y) __builtin_isgreaterequal(x, y)
-#define isless(x, y) __builtin_isless(x, y)
-#define islessequal(x, y) __builtin_islessequal(x, y)
-#define islessgreater(x, y) __builtin_islessgreater(x, y)
-#define isunordered(x, y) __builtin_isunordered(x, y)
-
-#else
-  /*  helper  */
-  __CRT_INLINE int  __cdecl
-    __fp_unordered_compare (long double x, long double y){
-      unsigned short retval;
-      __asm__ ("fucom %%st(1);"
-	"fnstsw;": "=a" (retval) : "t" (x), "u" (y));
-      return retval;
-  }
-
-#define isgreater(x, y) ((__fp_unordered_compare(x, y) \
-  & 0x4500) == 0)
-#define isless(x, y) ((__fp_unordered_compare (y, x) \
-  & 0x4500) == 0)
-#define isgreaterequal(x, y) ((__fp_unordered_compare (x, y) \
-  & FP_INFINITE) == 0)
-#define islessequal(x, y) ((__fp_unordered_compare(y, x) \
-  & FP_INFINITE) == 0)
-#define islessgreater(x, y) ((__fp_unordered_compare(x, y) \
-  & FP_SUBNORMAL) == 0)
-#define isunordered(x, y) ((__fp_unordered_compare(x, y) \
-  & 0x4500) == 0x4500)
-
-#endif
-#endif //0
-
-
 #endif /* __STDC_VERSION__ >= 199901L */
 #endif /* __NO_ISOCEXT */
 
 #ifdef __cplusplus
 }
-extern "C++" {
-  template<class _Ty> inline _Ty _Pow_int(_Ty _X,int _Y) {
-    unsigned int _N;
-    if(_Y >= 0) _N = (unsigned int)_Y;
-    else _N = (unsigned int)(-_Y);
-    for(_Ty _Z = _Ty(1);;_X *= _X) {
-      if((_N & 1)!=0) _Z *= _X;
-      if((_N >>= 1)==0) return (_Y < 0 ? _Ty(1) / _Z : _Z); 
-    }
-  }
-}
 #endif
-
 #pragma pack(pop)
 
 /* 7.12.14 */

triton/runtime/tcc/include/stdalign.h

@@ -0,0 +1,16 @@
+#ifndef _STDALIGN_H
+#define _STDALIGN_H
+
+#if __STDC_VERSION__ < 201112L && (defined(__GNUC__) || defined(__TINYC__))
+# define _Alignas(t) __attribute__((__aligned__(t)))
+# define _Alignof(t) __alignof__(t)
+#endif
+
+#define alignas _Alignas
+#define alignof _Alignof
+
+#define __alignas_is_defined 1
+#define __alignof_is_defined 1
+
+#endif /* _STDALIGN_H */
+

triton/runtime/tcc/include/stdarg.h

@@ -1,76 +1,11 @@
 #ifndef _STDARG_H
 #define _STDARG_H
 
-#ifdef __x86_64__
-#ifndef _WIN64
-
-//This should be in sync with the declaration on our lib/libtcc1.c
-/* GCC compatible definition of va_list. */
-typedef struct {
-    unsigned int gp_offset;
-    unsigned int fp_offset;
-    union {
-        unsigned int overflow_offset;
-        char *overflow_arg_area;
-    };
-    char *reg_save_area;
-} __va_list_struct;
-
-typedef __va_list_struct va_list[1];
-
-void __va_start(__va_list_struct *ap, void *fp);
-void *__va_arg(__va_list_struct *ap, int arg_type, int size, int align);
-
-#define va_start(ap, last) __va_start(ap, __builtin_frame_address(0))
-#define va_arg(ap, type)                                                \
-    (*(type *)(__va_arg(ap, __builtin_va_arg_types(type), sizeof(type), __alignof__(type))))
-#define va_copy(dest, src) (*(dest) = *(src))
-#define va_end(ap)
-
-/* avoid conflicting definition for va_list on Macs. */
-#define _VA_LIST_T
-
-#else /* _WIN64 */
-typedef char *va_list;
-#define va_start(ap,last) __builtin_va_start(ap,last)
-#define va_arg(ap, t) ((sizeof(t) > 8 || (sizeof(t) & (sizeof(t) - 1))) \
-	? **(t **)((ap += 8) - 8) : *(t  *)((ap += 8) - 8))
-#define va_copy(dest, src) ((dest) = (src))
-#define va_end(ap)
-#endif
-
-#elif __arm__
-typedef char *va_list;
-#define _tcc_alignof(type) ((int)&((struct {char c;type x;} *)0)->x)
-#define _tcc_align(addr,type) (((unsigned)addr + _tcc_alignof(type) - 1) \
-                               & ~(_tcc_alignof(type) - 1))
-#define va_start(ap,last) ap = ((char *)&(last)) + ((sizeof(last)+3)&~3)
-#define va_arg(ap,type) (ap = (void *) ((_tcc_align(ap,type)+sizeof(type)+3) \
-                        &~3), *(type *)(ap - ((sizeof(type)+3)&~3)))
-#define va_copy(dest, src) (dest) = (src)
-#define va_end(ap)
-
-#elif defined(__aarch64__)
-typedef struct {
-    void *__stack;
-    void *__gr_top;
-    void *__vr_top;
-    int   __gr_offs;
-    int   __vr_offs;
-} va_list;
-#define va_start(ap, last) __va_start(ap, last)
-#define va_arg(ap, type) __va_arg(ap, type)
-#define va_end(ap)
-#define va_copy(dest, src) ((dest) = (src))
-
-#else /* __i386__ */
-typedef char *va_list;
-/* only correct for i386 */
-#define va_start(ap,last) ap = ((char *)&(last)) + ((sizeof(last)+3)&~3)
-#define va_arg(ap,type) (ap += (sizeof(type)+3)&~3, *(type *)(ap - ((sizeof(type)+3)&~3)))
-#define va_copy(dest, src) (dest) = (src)
-#define va_end(ap)
-#endif
+typedef __builtin_va_list va_list;
+#define va_start __builtin_va_start
+#define va_arg __builtin_va_arg
+#define va_copy __builtin_va_copy
+#define va_end __builtin_va_end
 
 /* fix a buggy dependency on GCC in libio.h */
 typedef va_list __gnuc_va_list;