Add a new machine independent varargs.h and use it as a central place

to announce the demise of varargs support in GCC versions 3.3+ and to
direct users to stdarg.h instead.

Fall back to machine/varargs.h for older GCC versions.

2 files changed, 46 insertions, 3 deletions

diff --git a/include/Makefile b/include/Makefile
index 5c471444f270..1684c896d5c1 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -16,10 +16,10 @@ INCS=	a.out.h ar.h assert.h bitstring.h complex.h cpio.h ctype.h db.h \
 	resolv.h rune.h runetype.h search.h setjmp.h sgtty.h signal.h stab.h \
 	stdbool.h stddef.h stdio.h stdlib.h strhash.h string.h stringlist.h \
 	strings.h sysexits.h tar.h time.h timeconv.h timers.h ttyent.h \
-	ulimit.h unistd.h utime.h utmp.h uuid.h vis.h wchar.h wctype.h \
-	wordexp.h
+	ulimit.h unistd.h utime.h utmp.h uuid.h varargs.h vis.h wchar.h \
+	wctype.h wordexp.h
 
-MHDRS=	float.h floatingpoint.h stdarg.h varargs.h
+MHDRS=	float.h floatingpoint.h stdarg.h
 
 # posix4/mqueue.h is useless without an implementation and isn't installed:
 PHDRS=	sched.h semaphore.h _semaphore.h # mqueue.h
diff --git a/include/varargs.h b/include/varargs.h
new file mode 100644
index 000000000000..51a9b595c54b
--- /dev/null
+++ b/include/varargs.h
@@ -0,0 +1,43 @@
+/*-
+ * Copyright (c) 2003 Alexander Kabaev
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _VARARGS_H_
+#define	_VARARGS_H_
+
+#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ > 2 || __GNUC__ >= 4)
+
+#error "<varargs.h> is obsolete with this version of GCC."
+#error "Change your code to use <stdarg.h> instead."
+
+#else	/* ! __GNUC__ post GCC 3.3 */
+
+#include <machine/varargs.h>
+
+#endif /* __GNUC__ post GCC 3.3 */
+
+#endif /* !_VARARGS_H_ */