Index: projects/clang390-import/cddl/lib/libnvpair/Makefile
===================================================================
--- projects/clang390-import/cddl/lib/libnvpair/Makefile	(revision 304546)
+++ projects/clang390-import/cddl/lib/libnvpair/Makefile	(revision 304547)
@@ -1,34 +1,37 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
 .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/nvpair
 
 LIB=	nvpair
 
 SRCS=	libnvpair.c \
 	nvpair_alloc_system.c \
 	nvpair_json.c \
 	opensolaris_fnvpair.c \
 	opensolaris_nvpair.c \
 	opensolaris_nvpair_alloc_fixed.c
 
 WARNS?=	1
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
 
 # This library uses macros to define fprintf behavior for several object types
 # The compiler will see the non-string literal arguments to the fprintf calls and
 # omit warnings for them. Quiesce these warnings in contrib code: 
 #
 # cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c:743:12: warning: format
 #   string is not a string literal (potentially insecure) [-Wformat-security]
 #    ARENDER(pctl, nvlist_array, nvl, name, val, nelem);
 #
 CFLAGS+= -Wno-format-security
+# For now, don't error out on warnings about undefined behavior calling
+# va_start() on the 'which' parameter of nvlist_prtctl_dofmt().
+CWARNFLAGS.clang+= -Wno-error-varargs
 .include <bsd.lib.mk>