fixinc.dgux: Use modified _int_varargs.h

From-SVN: r27231

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 72b5b27fa57e7db1e53fd5732b3c97696f314a06..a3f885a496a16768d7f890cb555c340792ef7d0e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -2,6 +2,7 @@ Fri May 28 03:47:03 1999  Eric Raskin (ehr@listworks.com)
 
        * i386/t-dgux (EXTRA_PARTS): Add crti.o
        (crti.o): Add build rule and dependencies.
+       * fixinc/fixinc.dgux:  Use modified _int_varargs.h
 
 Fri May 28 03:41:02 1999  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
 

diff --git a/gcc/fixinc/fixinc.dgux b/gcc/fixinc/fixinc.dgux
index afdd0cd5935b8b1c1975a8ecc5fd233e8ce35577..23f63da086036314ac159cde2eec15cf4eeabdcd 100755 (executable)
--- a/gcc/fixinc/fixinc.dgux
+++ b/gcc/fixinc/fixinc.dgux
@@ -142,24 +142,56 @@ if [ -r ${INPUT}/$file ]; then
 #ifndef __INT_VARARGS_H
 #define __INT_VARARGS_H
 
-#if defined(__m88k__) && defined (__DGUX__)
-#ifndef __GNUC_VA_LIST
-#define __GNUC_VA_LIST
-typedef struct
-{
-  int  __va_arg;               /* argument number */
-  int *__va_stk;               /* start of args passed on stack */
-  int *__va_reg;               /* start of args passed in regs */
-} __gnuc_va_list;
-#endif /* not __GNUC_VA_LIST */
-#endif /* 88k && dgux */
-
-#ifndef _VA_LIST_
+#ifndef ___int_features_h
+#include <sys/_int_features.h>
+#endif
+
+#if !(defined(_VA_LIST) || defined(_VA_LIST_))
+#define _VA_LIST
 #define _VA_LIST_
-typedef __gnuc_va_list va_list;
-#endif /* _VA_LIST_ */
 
-#endif /* __INT_VARARGS_H */
+#ifdef __LINT__
+
+#ifdef __STDC__
+typedef void * va_list;
+#else
+typedef char * va_list;
+#endif
+
+#else
+#if _M88K_ANY
+
+#if defined(__DCC__)
+
+typedef struct {
+       int     next_arg;
+       int     *mem_ptr;
+       int     *reg_ptr;
+} va_list;
+
+#else  /* ! defined(__DCC__) */
+
+typedef struct {
+       int  __va_arg;          /* argument number */
+       int *__va_stk;          /* start of args passed on stack */
+       int *__va_reg;          /* start of args passed in regs */
+} va_list;
+
+#endif  /* ! defined(__DCC__) */
+
+#elif _IX86_ANY
+
+#if defined(__GNUC__) || defined(__STDC__)
+typedef void * va_list;
+#else
+typedef char * va_list;
+#endif
+
+#endif  /*  _IX86_ANY */
+
+#endif /* __LINT__ */
+#endif /*  !(defined(_VA_LIST) || defined(_VA_LIST_)) */
+#endif /*  #ifndef __INT_VARARGS_H  */
 
 EOF
   chmod a+r ${LIB}/$file