Reduce pollution in stddef.h and stdarg.h

include/Makefile

@@ -38,9 +38,9 @@ INCS=	a.out.h ar.h assert.h bitstring.h byteswap.h \
 .PATH: ${SRCTOP}/contrib/libc-vis
 INCS+=	vis.h
 
-MHDRS=	float.h floatingpoint.h stdarg.h
+MHDRS=	float.h floatingpoint.h
 
-PHDRS=	_semaphore.h
+PHDRS=	_semaphore.h stdarg.h
 
 LHDRS=	aio.h errno.h fcntl.h linker_set.h poll.h stdatomic.h stdint.h \
 	syslog.h ucontext.h

include/dlfcn.h

@@ -32,6 +32,7 @@
 #ifndef _DLFCN_H_
 #define	_DLFCN_H_
 
+#include <sys/cdefs.h>
 #include <sys/_types.h>
 
 /*

include/stddef.h

@@ -32,9 +32,9 @@
 #ifndef _STDDEF_H_
 #define _STDDEF_H_
 
-#include <sys/cdefs.h>
 #include <sys/_null.h>
 #include <sys/_types.h>
+#include <sys/_visible.h>
 
 #ifndef _PTRDIFF_T_DECLARED
 typedef	__ptrdiff_t	ptrdiff_t;
@@ -61,7 +61,9 @@ typedef	__max_align_t	max_align_t;
 #endif
 #endif
 
-#define	offsetof(type, field)	__offsetof(type, field)
+#ifndef offsetof
+#define	offsetof(type, field)	__builtin_offsetof(type, field)
+#endif
 
 #if __EXT1_VISIBLE
 /* ISO/IEC 9899:2011 K.3.3.2 */

include/stdio.h

@@ -74,7 +74,7 @@ typedef	__off64_t	off64_t;
 
 #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
 #ifndef _VA_LIST_DECLARED
-typedef	__va_list	va_list;
+typedef	__builtin_va_list	va_list;
 #define	_VA_LIST_DECLARED
 #endif
 #endif

include/wchar.h

@@ -78,7 +78,7 @@ typedef	__size_t	size_t;
 
 #if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE
 #ifndef _VA_LIST_DECLARED
-typedef	__va_list	va_list;
+typedef	__builtin_va_list	va_list;
 #define	_VA_LIST_DECLARED
 #endif
 #endif

lib/msun/src/math.h

@@ -15,6 +15,7 @@
 #ifndef _MATH_H_
 #define	_MATH_H_
 
+#include <sys/cdefs.h>
 #include <sys/_types.h>
 #include <machine/_limits.h>
 

share/man/man9/PCI_IOV_ADD_VF.9

@@ -31,7 +31,7 @@
 .Nd inform a PF driver that a VF is being created
 .Sh SYNOPSIS
 .In sys/bus.h
-.In machine/stdarg.h
+.In sys/stdarg.h
 .In sys/nv.h
 .In dev/pci/pci_iov.h
 .Ft int

share/man/man9/PCI_IOV_INIT.9

@@ -31,7 +31,7 @@
 .Nd enable SR-IOV on a PF device
 .Sh SYNOPSIS
 .In sys/bus.h
-.In machine/stdarg.h
+.In sys/stdarg.h
 .In sys/nv.h
 .In dev/pci/pci_iov.h
 .Ft int

share/man/man9/pci_iov_schema.9

@@ -38,7 +38,7 @@
 .Nm pci_iov_schema_add_unicast_mac
 .Nd PCI SR-IOV config schema interface
 .Sh SYNOPSIS
-.In machine/stdarg.h
+.In sys/stdarg.h
 .In sys/nv.h
 .In sys/iov_schema.h
 .Ft nvlist_t *

stand/common/dev_net.c

@@ -47,9 +47,10 @@
  * for use by the NFS open code (NFS/lookup).
  */
 
-#include <machine/stdarg.h>
 #include <sys/param.h>
 #include <sys/socket.h>
+#include <sys/stdarg.h>
+
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>

stand/common/md.c

@@ -28,7 +28,7 @@
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/queue.h>
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 
 #include "bootstrap.h"
 

stand/efi/boot1/boot1.c

@@ -20,8 +20,10 @@
  */
 
 #include <sys/param.h>
+#include <sys/stdarg.h>
+
 #include <machine/elf.h>
-#include <machine/stdarg.h>
+
 #include <stand.h>
 
 #include <efi.h>

stand/efi/boot1/proto.c

@@ -20,8 +20,10 @@
  */
 
 #include <sys/param.h>
+#include <sys/stdarg.h>
+
 #include <machine/elf.h>
-#include <machine/stdarg.h>
+
 #include <stand.h>
 
 #include <efi.h>

stand/efi/gptboot/proto.c

@@ -24,8 +24,10 @@
  */
 
 #include <sys/param.h>
+#include <sys/stdarg.h>
+
 #include <machine/elf.h>
-#include <machine/stdarg.h>
+
 #include <stand.h>
 
 #include <efi.h>

stand/i386/libi386/biosacpi.c

@@ -25,7 +25,7 @@
  */
 
 #include <stand.h>
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 #include <bootstrap.h>
 #include <btxv86.h>
 #include "libi386.h"

stand/i386/libi386/biospci.c

@@ -31,7 +31,7 @@
  */
 
 #include <stand.h>
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 #include <bootstrap.h>
 #include <isapnp.h>
 #include <btxv86.h>

stand/i386/libi386/biospnp.c

@@ -29,7 +29,7 @@
  */
 
 #include <stand.h>
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 #include <bootstrap.h>
 #include <isapnp.h>
 #include <btxv86.h>

stand/liblua/lstd.h

@@ -29,10 +29,10 @@
 
 #include <stand.h>
 #include <sys/types.h>
+#include <sys/stdarg.h>
 #include <sys/stdint.h>
 #include <limits.h>
 #include <string.h>
-#include <machine/stdarg.h>
 
 /*
  * Mini stdio FILE and DIR routines. These are the minimal routines needed by

stand/libofw/ofw_disk.c

@@ -28,11 +28,10 @@
  */
 
 #include <sys/param.h>
+#include <sys/stdarg.h>
 
 #include <netinet/in.h>
 
-#include <machine/stdarg.h>
-
 #include <stand.h>
 #include <sys/disk.h>
 

stand/libofw/openfirm.c

@@ -56,8 +56,7 @@
  */
 
 #include <sys/endian.h>
-
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 
 #include <stand.h>
 

stand/libsa/Makefile

@@ -209,8 +209,8 @@ beforedepend:
 	for i in ${SAFE_INCS}; do \
 		ln -sf ${SRCTOP}/include/$$i $$i; \
 	done; \
-	ln -sf ${SYSDIR}/${MACHINE}/include/stdarg.h stdarg.h; \
 	ln -sf ${SYSDIR}/sys/errno.h errno.h; \
+	ln -sf ${SYSDIR}/sys/stdarg.h stdarg.h; \
 	ln -sf ${SYSDIR}/sys/stdint.h stdint.h; \
 	ln -sf ${SRCTOP}/include/arpa/inet.h arpa/inet.h; \
 	ln -sf ${SRCTOP}/include/arpa/tftp.h arpa/tftp.h; \

stand/libsa/panic.c

@@ -34,7 +34,7 @@
  */
 
 #include <stand.h>
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
 
 /*
  * Boot loaders and other standalone programs that wish to have a

stand/libsa/printf.c

@@ -37,18 +37,13 @@
  */
 
 #include <sys/types.h>
+#include <sys/stdarg.h>
 #include <sys/stddef.h>
 #include <sys/stdint.h>
 #include <limits.h>
 #include <string.h>
 #include "stand.h"
 
-/*
- * Note that stdarg.h and the ANSI style va_start macro is used for both
- * ANSI and traditional C compilers.
- */
-#include <machine/stdarg.h>
-
 #define MAXNBUF (sizeof(intmax_t) * CHAR_BIT + 1)
 
 typedef void (kvprintf_fn_t)(int, void *);

stand/powerpc/boot1.chrp/boot1.c

@@ -18,9 +18,11 @@
 #include <sys/param.h>
 #include <sys/dirent.h>
 #include <sys/endian.h>
+#include <sys/stdarg.h>
+
 #include <machine/elf.h>
-#include <machine/stdarg.h>
 #include <machine/md_var.h>
+
 #include <ufs/ffs/fs.h>
 
 #include "paths.h"

stand/uboot/uboot_disk.c

@@ -33,7 +33,8 @@
 
 #include <sys/param.h>
 #include <sys/disk.h>
-#include <machine/stdarg.h>
+#include <sys/stdarg.h>
+
 #include <stand.h>
 
 #include "api_public.h"

sys/amd64/linux/linux_vdso_gtod.c

@@ -28,6 +28,7 @@
 #include <sys/elf.h>
 #include <sys/errno.h>
 #include <sys/proc.h>
+#include <sys/stdarg.h>
 #include <sys/stddef.h>
 #define	_KERNEL
 #include <sys/vdso.h>
@@ -36,7 +37,6 @@
 
 #include <machine/atomic.h>
 #include <machine/cpufunc.h>
-#include <machine/stdarg.h>
 
 #include <amd64/linux/linux.h>
 #include <amd64/linux/linux_syscall.h>

sys/arm/include/stdarg.h

@@ -30,8 +30,6 @@
 
 #include <sys/_stdarg.h>
 
-#ifndef va_start
-  #error this file needs to be ported to your compiler
-#endif
+#warning "machine/stdarg.h is obsolete, use sys/stdarg.h"
 
 #endif /* !_MACHINE_STDARG_H_ */

sys/arm/ti/cpsw/if_cpsw.c

@@ -59,11 +59,11 @@
 #include <sys/rman.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
+#include <sys/stdarg.h>
 #include <sys/sysctl.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/stdarg.h>
 
 #include <net/ethernet.h>
 #include <net/bpf.h>

sys/arm/xilinx/zy7_devcfg.c

@@ -40,6 +40,7 @@
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
+#include <sys/stdarg.h>
 #include <sys/sysctl.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
@@ -49,7 +50,6 @@
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/stdarg.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>

sys/arm/xilinx/zy7_ehci.c

@@ -45,10 +45,10 @@
 #include <sys/condvar.h>
 #include <sys/resource.h>
 #include <sys/rman.h>
+#include <sys/stdarg.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/stdarg.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>

sys/arm/xilinx/zy7_gpio.c

@@ -53,11 +53,11 @@
 #include <sys/mutex.h>
 #include <sys/resource.h>
 #include <sys/rman.h>
+#include <sys/stdarg.h>
 #include <sys/gpio.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/stdarg.h>
 
 #include <dev/gpio/gpiobusvar.h>
 #include <dev/ofw/ofw_bus.h>

sys/arm/xilinx/zy7_qspi.c

@@ -42,11 +42,11 @@
 #include <sys/mutex.h>
 #include <sys/resource.h>
 #include <sys/rman.h>
+#include <sys/stdarg.h>
 #include <sys/uio.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/stdarg.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>

sys/arm/xilinx/zy7_slcr.c

@@ -42,12 +42,12 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/resource.h>
+#include <sys/stdarg.h>
 #include <sys/sysctl.h>
 #include <sys/rman.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/stdarg.h>
 
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>

sys/arm/xilinx/zy7_spi.c

@@ -34,11 +34,11 @@
 #include <sys/mutex.h>
 #include <sys/resource.h>
 #include <sys/rman.h>
+#include <sys/stdarg.h>
 #include <sys/uio.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/stdarg.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>