[src/trunk]: src/sys/arch/powerpc/include Make these work with GCC 3.x.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7a4cfa59f21f
branches:  trunk
changeset: 538687:7a4cfa59f21f
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Oct 25 20:46:44 2002 +0000

description:
Make these work with GCC 3.x.

diffstat:

 sys/arch/powerpc/include/ansi.h    |  10 +++-------
 sys/arch/powerpc/include/stdarg.h  |  10 +++++-----
 sys/arch/powerpc/include/varargs.h |   4 ++--
 3 files changed, 10 insertions(+), 14 deletions(-)

diffs (73 lines):

diff -r c13226d8a020 -r 7a4cfa59f21f sys/arch/powerpc/include/ansi.h
--- a/sys/arch/powerpc/include/ansi.h   Fri Oct 25 20:42:02 2002 +0000
+++ b/sys/arch/powerpc/include/ansi.h   Fri Oct 25 20:46:44 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ansi.h,v 1.15 2002/08/14 15:41:57 matt Exp $   */
+/*     $NetBSD: ansi.h,v 1.16 2002/10/25 20:46:44 thorpej Exp $        */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -66,19 +66,15 @@
 #define        _BSD_TIMER_T_           int             /* timer_t */
 #define        _BSD_SUSECONDS_T_       int             /* suseconds_t */
 #define        _BSD_USECONDS_T_        unsigned int    /* useconds_t */
-#ifdef _LP64
+#if __GNUC_PREREQ__(3, 0)
 #define        _BSD_VA_LIST_           __builtin_va_list /* GCC builtin type */
 #else
 #define        _BSD_VA_LIST_           __va_list       /* va_list */
 typedef struct {
-#if __GNUC_PREREQ__(3, 0)
-       __builtin_va_list __va;
-#else
        char __gpr, __fpr, __pad[2];
        char *__stack, *__base;
-#endif
+} __va_list;
 #endif
-} __va_list;
 
 /*
  * NOTE: rune_t is not covered by ANSI nor other standards, and should not
diff -r c13226d8a020 -r 7a4cfa59f21f sys/arch/powerpc/include/stdarg.h
--- a/sys/arch/powerpc/include/stdarg.h Fri Oct 25 20:42:02 2002 +0000
+++ b/sys/arch/powerpc/include/stdarg.h Fri Oct 25 20:46:44 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: stdarg.h,v 1.9 2002/06/01 09:22:44 tsubai Exp $        */
+/*     $NetBSD: stdarg.h,v 1.10 2002/10/25 20:46:44 thorpej Exp $      */
 
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
@@ -53,10 +53,10 @@
 
 #elif __GNUC_PREREQ__(3, 0)
 
-#define va_start(ap, last)     __builtin_stdarg_start((ap).__va, last)
-#define va_arg(ap, type)       __builtin_va_arg((ap).__va, type)
-#define va_end(ap)             __builtin_va_end((ap).__va)
-#define __va_copy(dest, src)   __builtin_va_copy((dest).__va, (src).__va)
+#define va_start(ap, last)     __builtin_stdarg_start((ap), last)
+#define va_arg(ap, type)       __builtin_va_arg((ap), type)
+#define va_end(ap)             __builtin_va_end((ap))
+#define __va_copy(dest, src)   __builtin_va_copy((dest), (src))
 
 #else
 
diff -r c13226d8a020 -r 7a4cfa59f21f sys/arch/powerpc/include/varargs.h
--- a/sys/arch/powerpc/include/varargs.h        Fri Oct 25 20:42:02 2002 +0000
+++ b/sys/arch/powerpc/include/varargs.h        Fri Oct 25 20:46:44 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: varargs.h,v 1.7 2002/06/01 09:22:44 tsubai Exp $       */
+/*     $NetBSD: varargs.h,v 1.8 2002/10/25 20:46:44 thorpej Exp $      */
 
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
@@ -39,7 +39,7 @@
 #ifdef __lint__
 #define va_start(ap)   ((ap) = *(va_list *)0)
 #elif __GNUC_PREREQ__(3, 0)
-#define va_start(ap)   __builtin_varargs_start((ap).__va)
+#define va_start(ap)   __builtin_varargs_start((ap))
 #elif __GNUC_PREREQ__(2, 95)
 #define va_start(ap)   ((ap) = *(va_list *)__builtin_saveregs())
 #undef va_alist