Add prototypes, fix compilation warnings, random style fixes.

15 files changed, 64 insertions, 209 deletions

diff --git a/sys/arch/mvme88k/include/board.h b/sys/arch/mvme88k/include/board.h
index 23c754c0082..f0f55c4039d 100644
--- a/sys/arch/mvme88k/include/board.h
+++ b/sys/arch/mvme88k/include/board.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: board.h,v 1.10 2001/08/12 12:03:02 heko Exp $ */
+/*	$OpenBSD: board.h,v 1.11 2001/08/26 14:31:07 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * All rights reserved.
@@ -53,13 +53,11 @@
  * it'll be unsigned in both ANSI and traditional.
  */
 #if defined(_LOCORE)
-#	define U(num)	num
+#define U(num)	num
+#elif defined(__STDC__)
+#define U(num)	num ## U
 #else
-#  if defined(__STDC__)
-#	define U(num)	num ## U
-#  else
-#	define U(num)	num/**/U
-#  endif
+#define U(num)	num/**/U
 #endif
 #define UDEFINED
 
diff --git a/sys/arch/mvme88k/include/bug.h b/sys/arch/mvme88k/include/bug.h
index fe99ff8a49c..ecc1a77212e 100644
--- a/sys/arch/mvme88k/include/bug.h
+++ b/sys/arch/mvme88k/include/bug.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bug.h,v 1.6 2001/08/12 12:03:02 heko Exp $ */
+/*	$OpenBSD: bug.h,v 1.7 2001/08/26 14:31:07 miod Exp $ */
 #ifndef __MACHINE_BUG_H__
 #define __MACHINE_BUG_H__
 #include <machine/bugio.h>
@@ -8,7 +8,7 @@ struct bugenv {
 	int	dlun;
 	int	ipl;
 	int	ctlr;
-	int	(*entry)();
+	int	(*entry) __P((void));
 	int	cfgblk;
 	char	*argstart;
 	char	*argend;
diff --git a/sys/arch/mvme88k/include/cmmu.h b/sys/arch/mvme88k/include/cmmu.h
index 580a0106c40..8b07f9418c0 100644
--- a/sys/arch/mvme88k/include/cmmu.h
+++ b/sys/arch/mvme88k/include/cmmu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmmu.h,v 1.4 2001/08/11 01:55:52 miod Exp $ */
+/*	$OpenBSD: cmmu.h,v 1.5 2001/08/26 14:31:07 miod Exp $ */
 /* 
  * Mach Operating System
  * Copyright (c) 1993-1992 Carnegie Mellon University
@@ -76,7 +76,7 @@ void show_apr(unsigned value);
 void show_sctr(unsigned value);
 #endif
 
-#if DDB
+#ifdef DDB
 void cmmu_show_translation(unsigned, unsigned, unsigned, int);
 void cmmu_cache_state(unsigned, unsigned);
 void show_cmmu_info(unsigned);
@@ -87,17 +87,11 @@ void show_cmmu_info(unsigned);
  */
 
 unsigned cmmu_cpu_number(void);
-#if !DDB
-static
-#endif /* !DDB */
 unsigned cmmu_remote_get(unsigned cpu, unsigned r, unsigned data);
 unsigned cmmu_get_idr(unsigned data);
 void cmmu_init(void);
 void cmmu_shutdown_now(void);
 void cmmu_parity_enable(void);
-#if !DDB
-static
-#endif /* !DDB */
 void setup_board_config(void);
 void setup_cmmu_config(void);
 void cmmu_dump_config(void);
diff --git a/sys/arch/mvme88k/include/cpu_number.h b/sys/arch/mvme88k/include/cpu_number.h
index 0410fef2390..6069dcaba1d 100644
--- a/sys/arch/mvme88k/include/cpu_number.h
+++ b/sys/arch/mvme88k/include/cpu_number.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu_number.h,v 1.5 2001/07/04 08:09:23 niklas Exp $	*/
+/*	$OpenBSD: cpu_number.h,v 1.6 2001/08/26 14:31:07 miod Exp $	*/
 
 /* 
  * Mach Operating System
@@ -39,7 +39,7 @@ static unsigned cpu_number __P((void));
 static __inline__ unsigned cpu_number(void)
 {
 	register unsigned cpu;
-	extern int cputyp;
+
 	if (cputyp != CPU_188 || number_cpus == 1) return 0;
 	__asm__ ("ldcr %0, cr18" : "=r" (cpu));
 	return (cpu & 3);
diff --git a/sys/arch/mvme88k/include/db_machdep.h b/sys/arch/mvme88k/include/db_machdep.h
index ba07441446e..ba53fc7d9c6 100644
--- a/sys/arch/mvme88k/include/db_machdep.h
+++ b/sys/arch/mvme88k/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.11 2001/08/12 21:34:48 miod Exp $ */
+/*	$OpenBSD: db_machdep.h,v 1.12 2001/08/26 14:31:07 miod Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -42,9 +42,9 @@
 
 #include <vm/vm_param.h>
 
-#define BKPT_SIZE        (4)                /* number of bytes in bkpt inst. */
-#define BKPT_INST       (0xF000D082U)             /* tb0, 0,r0, vector 132 */
-#define BKPT_SET(inst)  (BKPT_INST)
+#define BKPT_SIZE	(4)		/* number of bytes in bkpt inst. */
+#define BKPT_INST	(0xF000D082U)	/* tb0, 0,r0, vector 132 */
+#define BKPT_SET(inst)	(BKPT_INST)
 
 /* Entry trap for the debugger - used for inline assembly breaks*/
 #define ENTRY_ASM       	"tb0 0, r0, 132"
diff --git a/sys/arch/mvme88k/include/disklabel.h b/sys/arch/mvme88k/include/disklabel.h
index 60930ba691c..e484bf5e44f 100644
--- a/sys/arch/mvme88k/include/disklabel.h
+++ b/sys/arch/mvme88k/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.8 2001/08/12 12:03:02 heko Exp $ */
+/*	$OpenBSD: disklabel.h,v 1.9 2001/08/26 14:31:07 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1995 Dale Rahn.
@@ -120,4 +120,5 @@ struct cpu_disklabel {
 	u_long		magic2;
 	u_char		cfg_4[192];
 };
+
 #endif /* __MACHINE_DISKLABEL_H__ */
diff --git a/sys/arch/mvme88k/include/exception_vectors.h b/sys/arch/mvme88k/include/exception_vectors.h
index bda2211ee13..1b38329beb8 100644
--- a/sys/arch/mvme88k/include/exception_vectors.h
+++ b/sys/arch/mvme88k/include/exception_vectors.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exception_vectors.h,v 1.8 2001/08/12 12:03:02 heko Exp $ */
+/*	$OpenBSD: exception_vectors.h,v 1.9 2001/08/26 14:31:07 miod Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1991, 1992 Carnegie Mellon University
@@ -165,7 +165,7 @@
 /* vector 0x82 (#130) */  word   break
 /* vector 0x83 (#131) */  word   trace
 /* vector 0x84 (#132) */  word   _entry
-#if defined(RAW_PRINTF) && RAW_PRINTF
+#if defined(RAW_PRINTF)
 /* vector 0x85 (#133) */  word   user_raw_putstr /* for USER raw_printf() */
 /* vector 0x85 (#134) */  word   user_raw_xpr 	 /* for USER raw_xpr() */
 #endif
diff --git a/sys/arch/mvme88k/include/intr.h b/sys/arch/mvme88k/include/intr.h
index 4559c6be83f..3479240c8cd 100644
--- a/sys/arch/mvme88k/include/intr.h
+++ b/sys/arch/mvme88k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.2 2001/03/16 00:05:24 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.3 2001/08/26 14:31:07 miod Exp $	*/
 /*
  * Copyright (C) 2000 Steve Murphree, Jr.
  * All rights reserved.
@@ -84,7 +84,7 @@ extern int intrcnt[M88K_NIRQ];
 #ifdef _KERNEL
 #ifndef _LOCORE
 unsigned setipl __P((unsigned level));
-#if DDB
+#ifdef DDB
 unsigned db_setipl __P((unsigned level));
 #endif 
 int spl0 __P((void));
@@ -121,7 +121,7 @@ above...
 
 #define splx(x)		((x) ? setipl((x)) : spl0())
 
-#if DDB
+#ifdef DDB
 #define db_splx(x)	db_setipl((x))
 #define db_splhigh()    db_setipl(IPL_HIGH)
 #endif /* DDB */
diff --git a/sys/arch/mvme88k/include/locore.h b/sys/arch/mvme88k/include/locore.h
index 13688c4295a..8ba4b5ccfce 100644
--- a/sys/arch/mvme88k/include/locore.h
+++ b/sys/arch/mvme88k/include/locore.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.h,v 1.9 2001/03/18 01:47:53 miod Exp $	*/
+/*	$OpenBSD: locore.h,v 1.10 2001/08/26 14:31:07 miod Exp $	*/
 
 #ifndef _MACHINE_LOCORE_H_
 #define _MACHINE_LOCORE_H_
@@ -37,6 +37,9 @@ void set_cpu_number __P((unsigned number));
 void doboot __P((void));
 int db_are_interrupts_disabled __P((void));
 
+void fubail __P((void));
+void subail __P((void));
+
 #if defined(MVME187) || defined(MVME188)
 int guarded_access __P((volatile unsigned char *address,
     unsigned len, u_char *vec));
@@ -51,8 +54,10 @@ void data_access_emulation __P((unsigned *eframe));
 #endif 
 #ifdef MVME188
 unsigned int safe_level __P((unsigned mask, unsigned curlevel));
+#if 0
 void block_obio_interrupt __P((unsigned mask));
 void unblock_obio_interrupt __P((unsigned mask));
+#endif
 #endif 
 unsigned spl __P((void));
 unsigned getipl __P((void));
@@ -86,6 +91,8 @@ void sbc_ext_int __P((u_int v, struct m88100_saved_state *eframe));
 
 /* eh.S */
 
+struct proc;
+void proc_do_uret __P((struct proc *));
 #if defined(MVME187) || defined(MVME188)
 void sigsys __P((void));
 void sigtrap __P((void));
@@ -101,4 +108,8 @@ void m197_userbpt __P((void));
 void m197_syscall_handler __P((void));
 #endif 
 
+/* process.S */
+void savectx __P((struct pcb *));
+void switch_exit __P((struct proc *));
+
 #endif /* _MACHINE_LOCORE_H_ */
diff --git a/sys/arch/mvme88k/include/m88110.h b/sys/arch/mvme88k/include/m88110.h
index 391b3aa2813..98403a34eeb 100644
--- a/sys/arch/mvme88k/include/m88110.h
+++ b/sys/arch/mvme88k/include/m88110.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m88110.h,v 1.5 2001/08/12 12:03:02 heko Exp $ */
+/*	$OpenBSD: m88110.h,v 1.6 2001/08/26 14:31:07 miod Exp $ */
 
 #ifndef	__MACHINE_M88110_H__
 #define	__MACHINE_M88110_H__
@@ -115,23 +115,23 @@
  * Prototypes from "mvme88k/mvme88k/m197_cmmu.c"
  */
 
+#ifdef DDB
+void m197_cmmu_show_translation(unsigned, unsigned, unsigned, int);
+void m197_cmmu_cache_state(unsigned, unsigned);
+void m197_show_cmmu_info(unsigned);
+#endif
+
 #ifdef CMMU_DEBUG
- void m197_show_apr(unsigned value);
- void m197_show_sctr(unsigned value);
+void m197_show_apr(unsigned value);
+void m197_show_sctr(unsigned value);
 #endif
 
 unsigned m197_cmmu_cpu_number(void);
-#if !DDB
-static
-#endif /* !DDB */
 unsigned m197_cmmu_remote_get(unsigned cpu, unsigned r, unsigned data);
 unsigned m197_cmmu_get_idr(unsigned data);
 void m197_cmmu_init(void);
 void m197_cmmu_shutdown_now(void);
 void m197_cmmu_parity_enable(void);
-#if !DDB
-static
-#endif /* !DDB */
 void m197_setup_board_config(void);
 void m197_setup_cmmu_config(void);
 void m197_cmmu_dump_config(void);
diff --git a/sys/arch/mvme88k/include/m882xx.h b/sys/arch/mvme88k/include/m882xx.h
index 188d1403324..0bfc832e338 100644
--- a/sys/arch/mvme88k/include/m882xx.h
+++ b/sys/arch/mvme88k/include/m882xx.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m882xx.h,v 1.7 2001/03/09 05:44:40 smurph Exp $ */
+/*	$OpenBSD: m882xx.h,v 1.8 2001/08/26 14:31:07 miod Exp $ */
 /* 
  * Mach Operating System
  * Copyright (c) 1993-1992 Carnegie Mellon University
@@ -135,30 +135,23 @@
 /*
  * Prototypes from "mvme88k/mvme88k/m18x_cmmu.c"
  */
-#if DDB
+#ifdef DDB
 void m18x_cmmu_show_translation(unsigned, unsigned, unsigned, int);
 void m18x_cmmu_cache_state(unsigned, unsigned);
 void m18x_show_cmmu_info(unsigned);
 #endif 
 
 #ifdef CMMU_DEBUG
- void m18x_show_apr(unsigned value);
- void m18x_show_sctr(unsigned value);
+void m18x_show_apr(unsigned value);
+void m18x_show_sctr(unsigned value);
 #endif
 
 unsigned m18x_cmmu_cpu_number(void);
-#if !DDB
-static
-#endif /* !DDB */
 unsigned m18x_cmmu_remote_get(unsigned cpu, unsigned r, unsigned data);
 unsigned m18x_cmmu_get_idr(unsigned data);
 void m18x_cmmu_init(void);
 void m18x_cmmu_shutdown_now(void);
 void m18x_cmmu_parity_enable(void);
-#if !DDB
-static
-#endif /* !DDB */
-int m18x_cmmu_alive(int mmu);
 void m18x_setup_board_config(void);
 void m18x_setup_cmmu_config(void);
 void m18x_cmmu_dump_config(void);
diff --git a/sys/arch/mvme88k/include/mvme188.h b/sys/arch/mvme88k/include/mvme188.h
index 5f8c06b0de2..4fd421e8b0b 100644
--- a/sys/arch/mvme88k/include/mvme188.h
+++ b/sys/arch/mvme88k/include/mvme188.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme188.h,v 1.6 2001/08/12 12:03:02 heko Exp $ */
+/*	$OpenBSD: mvme188.h,v 1.7 2001/08/26 14:31:07 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -52,13 +52,13 @@
  */
 #ifndef UDEFINED
 #if defined(_LOCORE)
-#	define U(num)	num
+#define U(num)	num
 #else
-#  if defined(__STDC__)
-#	define U(num)	num ## U
-#  else
-#	define U(num)	num/**/U
-#  endif
+#if defined(__STDC__)
+#define U(num)	num ## U
+#else
+#define U(num)	num/**/U
+#endif
 #endif
 #endif
 
diff --git a/sys/arch/mvme88k/include/mvme1x7.h b/sys/arch/mvme88k/include/mvme1x7.h
index 619bf8f9020..330520895f1 100644
--- a/sys/arch/mvme88k/include/mvme1x7.h
+++ b/sys/arch/mvme88k/include/mvme1x7.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme1x7.h,v 1.5 2001/08/12 12:03:02 heko Exp $ */
+/*	$OpenBSD: mvme1x7.h,v 1.6 2001/08/26 14:31:07 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -55,13 +55,13 @@
  */
 #ifndef UDEFINED
 #if defined(_LOCORE)
-#	define U(num)	num
+#define U(num)	num
 #else
-#  if defined(__STDC__)
-#	define U(num)	num ## U
-#  else
-#	define U(num)	num/**/U
-#  endif
+#if defined(__STDC__)
+#define U(num)	num ## U
+#else
+#define U(num)	num/**/U
+#endif
 #endif
 #endif
 
diff --git a/sys/arch/mvme88k/include/stdarg.h b/sys/arch/mvme88k/include/stdarg.h
index 0ab410d0d5a..2ee76471685 100644
--- a/sys/arch/mvme88k/include/stdarg.h
+++ b/sys/arch/mvme88k/include/stdarg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdarg.h,v 1.4 2001/07/04 08:09:23 niklas Exp $	*/
+/*	$OpenBSD: stdarg.h,v 1.5 2001/08/26 14:31:07 miod Exp $	*/
 
 /* This file has local changes by MOTOROLA
 Thu Sep  9 09:06:29 CDT 1993 Dale Rahn (drahn@pacific)
@@ -24,85 +24,7 @@ Thu Sep  9 09:06:29 CDT 1993 Dale Rahn (drahn@pacific)
    This is relevant only when building GCC with some other compiler.  */
 #include <stdarg.h>
 #else
-#ifdef __clipper__
-#include <va-clipper.h>
-#else
-#ifdef __m88k__
 #include <machine/va-m88k.h>
-#else
-#ifdef __i860__
-#include <va-i860.h>
-#else
-#ifdef __hppa__
-#include <va-pa.h>
-#else
-#ifdef __mips__
-#include <va-mips.h>
-#else
-#ifdef __sparc__
-#include <va-sparc.h>
-#else
-#ifdef __i960__
-#include <va-i960.h>
-#else
-#ifdef __alpha__
-#include <va-alpha.h>
-#else
-
-/* Define __gnuc_va_list.  */
-
-#ifndef __GNUC_VA_LIST
-#define __GNUC_VA_LIST
-#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX)
-typedef char *__gnuc_va_list;
-#else
-typedef void *__gnuc_va_list;
-#endif
-#endif
-
-/* Define the standard macros for the user,
-   if this invocation was from the user program.  */
-#ifdef _STDARG_H
-
-/* Amount of space required in an argument list for an arg of type TYPE.
-   TYPE may alternatively be an expression whose type is used.  */
-
-#define __va_rounded_size(TYPE)  \
-  (((sizeof (TYPE) + sizeof (int) - 1) / sizeof (int)) * sizeof (int))
-
-#define va_start(AP, LASTARG) 						\
- (AP = ((__gnuc_va_list) __builtin_next_arg ()))
-
-#undef va_end
-void va_end (__gnuc_va_list);		/* Defined in libgcc.a */
-#define va_end(AP)
-
-/* We cast to void * and then to TYPE * because this avoids
-   a warning about increasing the alignment requirement.  */
-
-#if defined (__arm__) || defined (__i386__) || defined (__ns32000__) || defined (__vax__)
-/* This is for little-endian machines; small args are padded upward.  */
-#define va_arg(AP, TYPE)						\
- (AP = (__gnuc_va_list) ((char *) (AP) + __va_rounded_size (TYPE)),	\
-  *((TYPE *) (void *) ((char *) (AP) - __va_rounded_size (TYPE))))
-#else /* big-endian */
-/* This is for big-endian machines; small args are padded downward.  */
-#define va_arg(AP, TYPE)						\
- (AP = (__gnuc_va_list) ((char *) (AP) + __va_rounded_size (TYPE)),	\
-  *((TYPE *) (void *) ((char *) (AP) - ((sizeof (TYPE) < 4		\
-					 ? sizeof (TYPE)		\
-					 : __va_rounded_size (TYPE))))))
-#endif /* big-endian */
-#endif /* _STDARG_H */
-
-#endif /* not alpha */
-#endif /* not i960 */
-#endif /* not sparc */
-#endif /* not mips */
-#endif /* not hppa */
-#endif /* not i860 */
-#endif /* not m88k */
-#endif /* not clipper */
 
 #ifdef _STDARG_H
 /* Define va_list, if desired, from __gnuc_va_list. */
@@ -112,66 +34,16 @@ void va_end (__gnuc_va_list);		/* Defined in libgcc.a */
    but must not use that name.  It should use the name __gnuc_va_list,
    which is safe because it is reserved for the implementation.  */
 
-#ifdef _HIDDEN_VA_LIST  /* On OSF1, this means varargs.h is "half-loaded".  */
-#undef _VA_LIST
-#endif
-
 #ifdef _BSD_VA_LIST_
 #undef _BSD_VA_LIST_
 #define _BSD_VA_LIST_	__gnuc_va_list
 #endif /* _BSD_VA_LIST_ */
 
-#ifdef __svr4__
-/* SVR4.2 uses _VA_LIST for an internal alias for va_list,
-   so we must avoid testing it and setting it here.
-   SVR4 uses _VA_LIST as a flag in stdarg.h, but we should
-   have no conflict with that.  */
-#ifndef _VA_LIST_
-#define _VA_LIST_
-#ifdef __i860__
-#ifndef _VA_LIST
-#define _VA_LIST va_list
-#endif
-#endif /* __i860__ */
-typedef __gnuc_va_list va_list;
-#endif /* _VA_LIST_ */
-#else /* not __svr4__ */
-
-/* The macro _VA_LIST_ is the same thing used by this file in Ultrix.
-   But on BSD NET2 we must not test or define or undef it.
-   (Note that the comments in NET 2's ansi.h
-   are incorrect for _VA_LIST_--see stdio.h!)  */
-#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____)
-/* The macro _VA_LIST is used in SCO Unix 3.2.  */
-#ifndef _VA_LIST
-/* The macro _VA_LIST_T_H is used in the Bull dpx2  */
-#ifndef _VA_LIST_T_H
-#define _VA_LIST_T_H
-#if !(defined (__BSD_NET2__) || defined (____386BSD____))
+#if !defined (_VA_LIST_)
 #define _VA_LIST_
-#endif
-#define _VA_LIST
 typedef __gnuc_va_list va_list;
-#endif /* not _VA_LIST_T_H */
-#endif /* not _VA_LIST */
 #endif /* not _VA_LIST_ */
 
-#endif /* not __svr4__ */
-
-#if defined(__cplusplus) && !defined(__GNUG__)
-
-/* This is added to work with AT&T C++. */
-extern "C" {
-      char            *__builtin_next_arg(void);
-      __gnuc_va_list  *__builtin_saveregs(void);
-      void            *__builtin_saveregs2(int);
-      int             *__builtin_argptr(void);
-      int             __builtin_argsize(void);
-      int             __builtin_classify_type(...);
-      int             __alignof__(...);
-}
-#endif
-
 #endif /* _STDARG_H */
 
 #endif /* __GNUC__ */
diff --git a/sys/arch/mvme88k/include/va-m88k.h b/sys/arch/mvme88k/include/va-m88k.h
index af08e572cfc..8033d9ebcf8 100644
--- a/sys/arch/mvme88k/include/va-m88k.h
+++ b/sys/arch/mvme88k/include/va-m88k.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: va-m88k.h,v 1.4 2001/07/04 08:09:23 niklas Exp $	*/
+/*	$OpenBSD: va-m88k.h,v 1.5 2001/08/26 14:31:07 miod Exp $	*/
 
 /* This file has local changes by MOTOROLA
 Thu Sep  9 09:06:29 CDT 1993 Dale Rahn (drahn@pacific)
@@ -27,25 +27,11 @@ typedef struct
 
 #ifdef _STDARG_H /* stdarg.h support */
 
-#if __GNUC__ > 1 /* GCC 2.0 and beyond */
 #define va_start(AP,LASTARG) ((AP) = *(__gnuc_va_list *)__builtin_saveregs())
-#else
-#define va_start(AP,LASTARG) \
-  ( (AP).__va_reg = (int *) __builtin_saveregs2(0), \
-    (AP).__va_stk = (int *) __builtin_argptr(), \
-    (AP).__va_arg = (int) (__builtin_argsize() + 3) / 4 )
-#endif
 
 #else /* varargs.h support */
 
-#if __GNUC__ > 1 /* GCC 2.0 and beyond */
 #define va_start(AP) ((AP) = *(__gnuc_va_list *)__builtin_saveregs())
-#else
-#define va_start(AP) \
-  ( (AP).__va_reg = (int *) __builtin_saveregs2(1), \
-    (AP).__va_stk = (int *) __builtin_argptr(), \
-    (AP).__va_arg = (int) (__builtin_argsize() - 4 + 3) / 4 )
-#endif
 #define va_alist __va_1st_arg
 #define va_dcl register int va_alist;