Module Name: src
Committed By: mrg
Date: Thu Jul 7 01:27:13 UTC 2011
Modified Files:
src/sys/arch/alpha/include: stdarg.h
src/sys/arch/hppa/include: stdarg.h
Log Message:
port to GCC 4.5.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/alpha/include/stdarg.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/include/stdarg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/include/stdarg.h
diff -u src/sys/arch/alpha/include/stdarg.h:1.18 src/sys/arch/alpha/include/stdarg.h:1.19
--- src/sys/arch/alpha/include/stdarg.h:1.18 Sun Dec 11 12:16:16 2005
+++ src/sys/arch/alpha/include/stdarg.h Thu Jul 7 01:27:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: stdarg.h,v 1.18 2005/12/11 12:16:16 christos Exp $ */
+/* $NetBSD: stdarg.h,v 1.19 2011/07/07 01:27:13 mrg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -45,7 +45,11 @@
#define va_end(a) /* nothing */
#else /* !__lint__ */
#if __GNUC_PREREQ__(2, 96)
+#if __GNUC_PREREQ__(4, 5)
+#define va_start(ap, last) __builtin_va_start((ap), (last))
+#else
#define va_start(ap, last) __builtin_stdarg_start((ap), (last))
+#endif
#define va_arg __builtin_va_arg
#define va_end __builtin_va_end
#define __va_copy(dest, src) __builtin_va_copy((dest), (src))
Index: src/sys/arch/hppa/include/stdarg.h
diff -u src/sys/arch/hppa/include/stdarg.h:1.5 src/sys/arch/hppa/include/stdarg.h:1.6
--- src/sys/arch/hppa/include/stdarg.h:1.5 Sun Dec 11 12:17:37 2005
+++ src/sys/arch/hppa/include/stdarg.h Thu Jul 7 01:27:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: stdarg.h,v 1.5 2005/12/11 12:17:37 christos Exp $ */
+/* $NetBSD: stdarg.h,v 1.6 2011/07/07 01:27:13 mrg Exp $ */
/* $OpenBSD: stdarg.h,v 1.2 1998/11/23 03:28:23 mickey Exp $ */
@@ -44,12 +44,17 @@
#ifdef __lint__
#define __builtin_next_arg(t) ((t) ? 0 : 0)
#define __builtin_stdarg_start(a, l) ((a) = (va_list)(void *)&(l))
+#define __builtin_va_start(a, l) ((a) = (va_list)(void *)&(l))
#define __builtin_va_arg(a, t) ((a) ? (t) 0 : (t) 0)
#define __builtin_va_end(a) /* nothing */
#define __builtin_va_copy(d, s) ((d) = (s))
#endif /* __lint__ */
+#if __GNUC_PREREQ__(4, 5)
+#define va_start(ap, last) __builtin_va_start((ap), (last))
+#else
#define va_start(ap, last) __builtin_stdarg_start((ap), (last))
+#endif
#define va_arg __builtin_va_arg
#define va_end __builtin_va_end
#define __va_copy(dest, src) __builtin_va_copy((dest), (src))