svn commit: r320573 - in projects/clang500-import: . contrib/atf/atf-sh contrib/ipfilter/lib contrib/ipfilter/tools contrib/jemalloc contrib/jemalloc/doc contrib/jemalloc/include/jemalloc/internal ...

Sun Jul 2 11:48:11 UTC 2017

Author: dim
Date: Sun Jul  2 11:48:07 2017
New Revision: 320573
URL: https://svnweb.freebsd.org/changeset/base/320573

Log:
  Merge ^/head r320398 through r320572.

Added:
  projects/clang500-import/contrib/pjdfstest/.gitignore
     - copied unchanged from r320572, head/contrib/pjdfstest/.gitignore
  projects/clang500-import/contrib/pjdfstest/.travis.yml
     - copied unchanged from r320572, head/contrib/pjdfstest/.travis.yml
  projects/clang500-import/contrib/pjdfstest/AUTHORS
     - copied unchanged from r320572, head/contrib/pjdfstest/AUTHORS
  projects/clang500-import/contrib/pjdfstest/COPYING
     - copied unchanged from r320572, head/contrib/pjdfstest/COPYING
  projects/clang500-import/contrib/pjdfstest/ChangeLog
     - copied unchanged from r320572, head/contrib/pjdfstest/ChangeLog
  projects/clang500-import/contrib/pjdfstest/Makefile.am
     - copied unchanged from r320572, head/contrib/pjdfstest/Makefile.am
  projects/clang500-import/contrib/pjdfstest/NEWS
     - copied unchanged from r320572, head/contrib/pjdfstest/NEWS
  projects/clang500-import/contrib/pjdfstest/configure.ac
     - copied unchanged from r320572, head/contrib/pjdfstest/configure.ac
  projects/clang500-import/contrib/pjdfstest/tests/utimensat/
     - copied from r320572, head/contrib/pjdfstest/tests/utimensat/
  projects/clang500-import/contrib/pjdfstest/travis/
     - copied from r320572, head/contrib/pjdfstest/travis/
  projects/clang500-import/sbin/nvmecontrol/util.c
     - copied unchanged from r320572, head/sbin/nvmecontrol/util.c
  projects/clang500-import/share/examples/tests/tests/tap/
     - copied from r320572, head/share/examples/tests/tests/tap/
  projects/clang500-import/sys/dev/iicbus/iic_recover_bus.c
     - copied unchanged from r320572, head/sys/dev/iicbus/iic_recover_bus.c
  projects/clang500-import/sys/dev/iicbus/iic_recover_bus.h
     - copied unchanged from r320572, head/sys/dev/iicbus/iic_recover_bus.h
  projects/clang500-import/sys/sys/bus_dma_internal.h
     - copied unchanged from r320572, head/sys/sys/bus_dma_internal.h
  projects/clang500-import/sys/x86/include/bus_dma.h
     - copied unchanged from r320572, head/sys/x86/include/bus_dma.h
  projects/clang500-import/tests/sys/pjdfstest/config.h
     - copied unchanged from r320572, head/tests/sys/pjdfstest/config.h
  projects/clang500-import/tests/sys/pjdfstest/tests/utimensat/
     - copied from r320572, head/tests/sys/pjdfstest/tests/utimensat/
Deleted:
  projects/clang500-import/contrib/pjdfstest/Makefile
Modified:
  projects/clang500-import/MAINTAINERS   (contents, props changed)
  projects/clang500-import/UPDATING
  projects/clang500-import/contrib/atf/atf-sh/atf-sh.3
  projects/clang500-import/contrib/ipfilter/lib/hostname.c
  projects/clang500-import/contrib/ipfilter/lib/portname.c
  projects/clang500-import/contrib/ipfilter/lib/printstate.c
  projects/clang500-import/contrib/ipfilter/tools/ippool.c
  projects/clang500-import/contrib/jemalloc/FREEBSD-diffs
  projects/clang500-import/contrib/jemalloc/FREEBSD-upgrade
  projects/clang500-import/contrib/jemalloc/doc/jemalloc.3
  projects/clang500-import/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h
  projects/clang500-import/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
  projects/clang500-import/contrib/pjdfstest/README
  projects/clang500-import/contrib/pjdfstest/pjdfstest.c
  projects/clang500-import/contrib/pjdfstest/tests/chflags/00.t
  projects/clang500-import/contrib/pjdfstest/tests/chflags/01.t
  projects/clang500-import/contrib/pjdfstest/tests/chflags/02.t
  projects/clang500-import/contrib/pjdfstest/tests/chflags/03.t
  projects/clang500-import/contrib/pjdfstest/tests/chflags/04.t
  projects/clang500-import/contrib/pjdfstest/tests/chflags/05.t
  projects/clang500-import/contrib/pjdfstest/tests/chflags/06.t
  projects/clang500-import/contrib/pjdfstest/tests/chflags/07.t
  projects/clang500-import/contrib/pjdfstest/tests/chflags/08.t
  projects/clang500-import/contrib/pjdfstest/tests/chflags/09.t
  projects/clang500-import/contrib/pjdfstest/tests/chflags/10.t
  projects/clang500-import/contrib/pjdfstest/tests/chflags/11.t
  projects/clang500-import/contrib/pjdfstest/tests/chflags/12.t
  projects/clang500-import/contrib/pjdfstest/tests/chflags/13.t
  projects/clang500-import/contrib/pjdfstest/tests/chmod/00.t
  projects/clang500-import/contrib/pjdfstest/tests/chmod/01.t
  projects/clang500-import/contrib/pjdfstest/tests/chmod/02.t
  projects/clang500-import/contrib/pjdfstest/tests/chmod/03.t
  projects/clang500-import/contrib/pjdfstest/tests/chmod/04.t
  projects/clang500-import/contrib/pjdfstest/tests/chmod/05.t
  projects/clang500-import/contrib/pjdfstest/tests/chmod/06.t
  projects/clang500-import/contrib/pjdfstest/tests/chmod/07.t
  projects/clang500-import/contrib/pjdfstest/tests/chmod/08.t
  projects/clang500-import/contrib/pjdfstest/tests/chmod/09.t
  projects/clang500-import/contrib/pjdfstest/tests/chmod/10.t
  projects/clang500-import/contrib/pjdfstest/tests/chmod/11.t
  projects/clang500-import/contrib/pjdfstest/tests/chmod/12.t
  projects/clang500-import/contrib/pjdfstest/tests/chown/00.t
  projects/clang500-import/contrib/pjdfstest/tests/chown/01.t
  projects/clang500-import/contrib/pjdfstest/tests/chown/02.t
  projects/clang500-import/contrib/pjdfstest/tests/chown/03.t
  projects/clang500-import/contrib/pjdfstest/tests/chown/04.t
  projects/clang500-import/contrib/pjdfstest/tests/chown/05.t
  projects/clang500-import/contrib/pjdfstest/tests/chown/06.t
  projects/clang500-import/contrib/pjdfstest/tests/chown/07.t
  projects/clang500-import/contrib/pjdfstest/tests/chown/08.t
  projects/clang500-import/contrib/pjdfstest/tests/chown/09.t
  projects/clang500-import/contrib/pjdfstest/tests/chown/10.t
  projects/clang500-import/contrib/pjdfstest/tests/conf
  projects/clang500-import/contrib/pjdfstest/tests/ftruncate/00.t
  projects/clang500-import/contrib/pjdfstest/tests/ftruncate/01.t
  projects/clang500-import/contrib/pjdfstest/tests/ftruncate/02.t
  projects/clang500-import/contrib/pjdfstest/tests/ftruncate/03.t
  projects/clang500-import/contrib/pjdfstest/tests/ftruncate/04.t
  projects/clang500-import/contrib/pjdfstest/tests/ftruncate/05.t
  projects/clang500-import/contrib/pjdfstest/tests/ftruncate/06.t
  projects/clang500-import/contrib/pjdfstest/tests/ftruncate/07.t
  projects/clang500-import/contrib/pjdfstest/tests/ftruncate/08.t
  projects/clang500-import/contrib/pjdfstest/tests/ftruncate/09.t
  projects/clang500-import/contrib/pjdfstest/tests/ftruncate/10.t
  projects/clang500-import/contrib/pjdfstest/tests/ftruncate/11.t
  projects/clang500-import/contrib/pjdfstest/tests/ftruncate/12.t
  projects/clang500-import/contrib/pjdfstest/tests/ftruncate/13.t
  projects/clang500-import/contrib/pjdfstest/tests/ftruncate/14.t
  projects/clang500-import/contrib/pjdfstest/tests/granular/00.t
  projects/clang500-import/contrib/pjdfstest/tests/granular/01.t
  projects/clang500-import/contrib/pjdfstest/tests/granular/02.t
  projects/clang500-import/contrib/pjdfstest/tests/granular/03.t
  projects/clang500-import/contrib/pjdfstest/tests/granular/04.t
  projects/clang500-import/contrib/pjdfstest/tests/granular/05.t
  projects/clang500-import/contrib/pjdfstest/tests/link/00.t
  projects/clang500-import/contrib/pjdfstest/tests/link/01.t
  projects/clang500-import/contrib/pjdfstest/tests/link/02.t
  projects/clang500-import/contrib/pjdfstest/tests/link/03.t
  projects/clang500-import/contrib/pjdfstest/tests/link/04.t
  projects/clang500-import/contrib/pjdfstest/tests/link/05.t
  projects/clang500-import/contrib/pjdfstest/tests/link/06.t
  projects/clang500-import/contrib/pjdfstest/tests/link/07.t
  projects/clang500-import/contrib/pjdfstest/tests/link/08.t
  projects/clang500-import/contrib/pjdfstest/tests/link/09.t
  projects/clang500-import/contrib/pjdfstest/tests/link/10.t
  projects/clang500-import/contrib/pjdfstest/tests/link/11.t
  projects/clang500-import/contrib/pjdfstest/tests/link/12.t
  projects/clang500-import/contrib/pjdfstest/tests/link/13.t
  projects/clang500-import/contrib/pjdfstest/tests/link/14.t
  projects/clang500-import/contrib/pjdfstest/tests/link/15.t
  projects/clang500-import/contrib/pjdfstest/tests/link/16.t
  projects/clang500-import/contrib/pjdfstest/tests/link/17.t
  projects/clang500-import/contrib/pjdfstest/tests/misc.sh
  projects/clang500-import/contrib/pjdfstest/tests/mkdir/00.t
  projects/clang500-import/contrib/pjdfstest/tests/mkdir/01.t
  projects/clang500-import/contrib/pjdfstest/tests/mkdir/02.t
  projects/clang500-import/contrib/pjdfstest/tests/mkdir/03.t
  projects/clang500-import/contrib/pjdfstest/tests/mkdir/04.t
  projects/clang500-import/contrib/pjdfstest/tests/mkdir/05.t
  projects/clang500-import/contrib/pjdfstest/tests/mkdir/06.t
  projects/clang500-import/contrib/pjdfstest/tests/mkdir/07.t
  projects/clang500-import/contrib/pjdfstest/tests/mkdir/08.t
  projects/clang500-import/contrib/pjdfstest/tests/mkdir/09.t
  projects/clang500-import/contrib/pjdfstest/tests/mkdir/10.t
  projects/clang500-import/contrib/pjdfstest/tests/mkdir/11.t
  projects/clang500-import/contrib/pjdfstest/tests/mkdir/12.t
  projects/clang500-import/contrib/pjdfstest/tests/mkfifo/00.t
  projects/clang500-import/contrib/pjdfstest/tests/mkfifo/01.t
  projects/clang500-import/contrib/pjdfstest/tests/mkfifo/02.t
  projects/clang500-import/contrib/pjdfstest/tests/mkfifo/03.t
  projects/clang500-import/contrib/pjdfstest/tests/mkfifo/04.t
  projects/clang500-import/contrib/pjdfstest/tests/mkfifo/05.t
  projects/clang500-import/contrib/pjdfstest/tests/mkfifo/06.t
  projects/clang500-import/contrib/pjdfstest/tests/mkfifo/07.t
  projects/clang500-import/contrib/pjdfstest/tests/mkfifo/08.t
  projects/clang500-import/contrib/pjdfstest/tests/mkfifo/09.t
  projects/clang500-import/contrib/pjdfstest/tests/mkfifo/10.t
  projects/clang500-import/contrib/pjdfstest/tests/mkfifo/11.t
  projects/clang500-import/contrib/pjdfstest/tests/mkfifo/12.t
  projects/clang500-import/contrib/pjdfstest/tests/mknod/00.t
  projects/clang500-import/contrib/pjdfstest/tests/mknod/01.t
  projects/clang500-import/contrib/pjdfstest/tests/mknod/02.t
  projects/clang500-import/contrib/pjdfstest/tests/mknod/03.t
  projects/clang500-import/contrib/pjdfstest/tests/mknod/04.t
  projects/clang500-import/contrib/pjdfstest/tests/mknod/05.t
  projects/clang500-import/contrib/pjdfstest/tests/mknod/06.t
  projects/clang500-import/contrib/pjdfstest/tests/mknod/07.t
  projects/clang500-import/contrib/pjdfstest/tests/mknod/08.t
  projects/clang500-import/contrib/pjdfstest/tests/mknod/09.t
  projects/clang500-import/contrib/pjdfstest/tests/mknod/10.t
  projects/clang500-import/contrib/pjdfstest/tests/mknod/11.t
  projects/clang500-import/contrib/pjdfstest/tests/open/00.t
  projects/clang500-import/contrib/pjdfstest/tests/open/01.t
  projects/clang500-import/contrib/pjdfstest/tests/open/02.t
  projects/clang500-import/contrib/pjdfstest/tests/open/03.t
  projects/clang500-import/contrib/pjdfstest/tests/open/04.t
  projects/clang500-import/contrib/pjdfstest/tests/open/05.t
  projects/clang500-import/contrib/pjdfstest/tests/open/06.t
  projects/clang500-import/contrib/pjdfstest/tests/open/07.t
  projects/clang500-import/contrib/pjdfstest/tests/open/08.t
  projects/clang500-import/contrib/pjdfstest/tests/open/09.t
  projects/clang500-import/contrib/pjdfstest/tests/open/10.t
  projects/clang500-import/contrib/pjdfstest/tests/open/11.t
  projects/clang500-import/contrib/pjdfstest/tests/open/12.t
  projects/clang500-import/contrib/pjdfstest/tests/open/13.t
  projects/clang500-import/contrib/pjdfstest/tests/open/14.t
  projects/clang500-import/contrib/pjdfstest/tests/open/15.t
  projects/clang500-import/contrib/pjdfstest/tests/open/16.t
  projects/clang500-import/contrib/pjdfstest/tests/open/17.t
  projects/clang500-import/contrib/pjdfstest/tests/open/18.t
  projects/clang500-import/contrib/pjdfstest/tests/open/19.t
  projects/clang500-import/contrib/pjdfstest/tests/open/20.t
  projects/clang500-import/contrib/pjdfstest/tests/open/21.t
  projects/clang500-import/contrib/pjdfstest/tests/open/22.t
  projects/clang500-import/contrib/pjdfstest/tests/open/23.t
  projects/clang500-import/contrib/pjdfstest/tests/open/24.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/00.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/01.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/02.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/03.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/04.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/05.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/06.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/07.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/08.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/09.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/10.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/11.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/12.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/13.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/14.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/15.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/16.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/17.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/18.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/19.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/20.t
  projects/clang500-import/contrib/pjdfstest/tests/rename/21.t
  projects/clang500-import/contrib/pjdfstest/tests/rmdir/00.t
  projects/clang500-import/contrib/pjdfstest/tests/rmdir/01.t
  projects/clang500-import/contrib/pjdfstest/tests/rmdir/02.t
  projects/clang500-import/contrib/pjdfstest/tests/rmdir/03.t
  projects/clang500-import/contrib/pjdfstest/tests/rmdir/04.t
  projects/clang500-import/contrib/pjdfstest/tests/rmdir/05.t
  projects/clang500-import/contrib/pjdfstest/tests/rmdir/06.t
  projects/clang500-import/contrib/pjdfstest/tests/rmdir/07.t
  projects/clang500-import/contrib/pjdfstest/tests/rmdir/08.t
  projects/clang500-import/contrib/pjdfstest/tests/rmdir/09.t
  projects/clang500-import/contrib/pjdfstest/tests/rmdir/10.t
  projects/clang500-import/contrib/pjdfstest/tests/rmdir/11.t
  projects/clang500-import/contrib/pjdfstest/tests/rmdir/12.t
  projects/clang500-import/contrib/pjdfstest/tests/rmdir/13.t
  projects/clang500-import/contrib/pjdfstest/tests/rmdir/14.t
  projects/clang500-import/contrib/pjdfstest/tests/rmdir/15.t
  projects/clang500-import/contrib/pjdfstest/tests/symlink/00.t
  projects/clang500-import/contrib/pjdfstest/tests/symlink/01.t
  projects/clang500-import/contrib/pjdfstest/tests/symlink/02.t
  projects/clang500-import/contrib/pjdfstest/tests/symlink/03.t
  projects/clang500-import/contrib/pjdfstest/tests/symlink/04.t
  projects/clang500-import/contrib/pjdfstest/tests/symlink/05.t
  projects/clang500-import/contrib/pjdfstest/tests/symlink/06.t
  projects/clang500-import/contrib/pjdfstest/tests/symlink/07.t
  projects/clang500-import/contrib/pjdfstest/tests/symlink/08.t
  projects/clang500-import/contrib/pjdfstest/tests/symlink/09.t
  projects/clang500-import/contrib/pjdfstest/tests/symlink/10.t
  projects/clang500-import/contrib/pjdfstest/tests/symlink/11.t
  projects/clang500-import/contrib/pjdfstest/tests/symlink/12.t
  projects/clang500-import/contrib/pjdfstest/tests/truncate/00.t
  projects/clang500-import/contrib/pjdfstest/tests/truncate/01.t
  projects/clang500-import/contrib/pjdfstest/tests/truncate/02.t
  projects/clang500-import/contrib/pjdfstest/tests/truncate/03.t
  projects/clang500-import/contrib/pjdfstest/tests/truncate/04.t
  projects/clang500-import/contrib/pjdfstest/tests/truncate/05.t
  projects/clang500-import/contrib/pjdfstest/tests/truncate/06.t
  projects/clang500-import/contrib/pjdfstest/tests/truncate/07.t
  projects/clang500-import/contrib/pjdfstest/tests/truncate/08.t
  projects/clang500-import/contrib/pjdfstest/tests/truncate/09.t
  projects/clang500-import/contrib/pjdfstest/tests/truncate/10.t
  projects/clang500-import/contrib/pjdfstest/tests/truncate/11.t
  projects/clang500-import/contrib/pjdfstest/tests/truncate/12.t
  projects/clang500-import/contrib/pjdfstest/tests/truncate/13.t
  projects/clang500-import/contrib/pjdfstest/tests/truncate/14.t
  projects/clang500-import/contrib/pjdfstest/tests/unlink/00.t
  projects/clang500-import/contrib/pjdfstest/tests/unlink/01.t
  projects/clang500-import/contrib/pjdfstest/tests/unlink/02.t
  projects/clang500-import/contrib/pjdfstest/tests/unlink/03.t
  projects/clang500-import/contrib/pjdfstest/tests/unlink/04.t
  projects/clang500-import/contrib/pjdfstest/tests/unlink/05.t
  projects/clang500-import/contrib/pjdfstest/tests/unlink/06.t
  projects/clang500-import/contrib/pjdfstest/tests/unlink/07.t
  projects/clang500-import/contrib/pjdfstest/tests/unlink/08.t
  projects/clang500-import/contrib/pjdfstest/tests/unlink/09.t
  projects/clang500-import/contrib/pjdfstest/tests/unlink/10.t
  projects/clang500-import/contrib/pjdfstest/tests/unlink/11.t
  projects/clang500-import/contrib/pjdfstest/tests/unlink/12.t
  projects/clang500-import/contrib/pjdfstest/tests/unlink/13.t
  projects/clang500-import/etc/mtree/BSD.tests.dist
  projects/clang500-import/lib/libc/arm/gen/_setjmp.S
  projects/clang500-import/lib/libc/arm/gen/setjmp.S
  projects/clang500-import/lib/libc/gen/_pthread_stubs.c
  projects/clang500-import/lib/libc/include/libc_private.h
  projects/clang500-import/lib/libc/rpc/getnetconfig.c
  projects/clang500-import/lib/libc/stdio/fclose.c
  projects/clang500-import/lib/libc/stdio/fflush.c
  projects/clang500-import/lib/libc/stdio/fgetc.c
  projects/clang500-import/lib/libc/stdio/fgetln.c
  projects/clang500-import/lib/libc/stdio/fgets.c
  projects/clang500-import/lib/libc/stdio/fgetwc.c
  projects/clang500-import/lib/libc/stdio/fgetwln.c
  projects/clang500-import/lib/libc/stdio/fgetws.c
  projects/clang500-import/lib/libc/stdio/fputc.c
  projects/clang500-import/lib/libc/stdio/fputs.c
  projects/clang500-import/lib/libc/stdio/fputwc.c
  projects/clang500-import/lib/libc/stdio/fputws.c
  projects/clang500-import/lib/libc/stdio/fread.c
  projects/clang500-import/lib/libc/stdio/freopen.c
  projects/clang500-import/lib/libc/stdio/fscanf.c
  projects/clang500-import/lib/libc/stdio/fseek.c
  projects/clang500-import/lib/libc/stdio/fwrite.c
  projects/clang500-import/lib/libc/stdio/getc.c
  projects/clang500-import/lib/libc/stdio/getchar.c
  projects/clang500-import/lib/libc/stdio/getdelim.c
  projects/clang500-import/lib/libc/stdio/gets.c
  projects/clang500-import/lib/libc/stdio/local.h
  projects/clang500-import/lib/libc/stdio/perror.c
  projects/clang500-import/lib/libc/stdio/putc.c
  projects/clang500-import/lib/libc/stdio/putchar.c
  projects/clang500-import/lib/libc/stdio/puts.c
  projects/clang500-import/lib/libc/stdio/putw.c
  projects/clang500-import/lib/libc/stdio/refill.c
  projects/clang500-import/lib/libc/stdio/scanf.c
  projects/clang500-import/lib/libc/stdio/setvbuf.c
  projects/clang500-import/lib/libc/stdio/stdio.c
  projects/clang500-import/lib/libc/stdio/ungetc.c
  projects/clang500-import/lib/libc/stdio/ungetwc.c
  projects/clang500-import/lib/libc/stdio/vfprintf.c
  projects/clang500-import/lib/libc/stdio/vfscanf.c
  projects/clang500-import/lib/libc/stdio/vfwprintf.c
  projects/clang500-import/lib/libc/stdio/vfwscanf.c
  projects/clang500-import/lib/libc/stdio/vscanf.c
  projects/clang500-import/lib/libmd/Makefile
  projects/clang500-import/lib/libprocstat/libprocstat.3
  projects/clang500-import/lib/libprocstat/libprocstat.c
  projects/clang500-import/lib/libstand/bzipfs.c
  projects/clang500-import/lib/libstand/gzipfs.c
  projects/clang500-import/lib/libstand/lseek.c
  projects/clang500-import/lib/libxo/tests/functional_test.sh
  projects/clang500-import/libexec/atf/atf-sh/Makefile
  projects/clang500-import/libexec/rshd/rshd.c
  projects/clang500-import/release/arm64/RPI3.conf
  projects/clang500-import/sbin/nvmecontrol/Makefile
  projects/clang500-import/sbin/nvmecontrol/identify.c
  projects/clang500-import/sbin/nvmecontrol/logpage.c
  projects/clang500-import/sbin/nvmecontrol/nvmecontrol.h
  projects/clang500-import/sbin/nvmecontrol/wdc.c
  projects/clang500-import/share/examples/tests/tests/Makefile
  projects/clang500-import/share/examples/tests/tests/atf/Makefile
  projects/clang500-import/share/examples/tests/tests/plain/Makefile
  projects/clang500-import/share/misc/committers-src.dot
  projects/clang500-import/share/mk/bsd.linker.mk
  projects/clang500-import/share/mk/src.opts.mk
  projects/clang500-import/share/zoneinfo/Makefile
  projects/clang500-import/sys/amd64/amd64/pmap.c
  projects/clang500-import/sys/amd64/include/bus_dma.h
  projects/clang500-import/sys/arm/arm/busdma_machdep-v4.c
  projects/clang500-import/sys/arm/arm/busdma_machdep-v6.c
  projects/clang500-import/sys/arm/freescale/imx/imx_gpio.c
  projects/clang500-import/sys/arm/freescale/imx/imx_i2c.c
  projects/clang500-import/sys/arm/include/bus_dma.h
  projects/clang500-import/sys/arm64/arm64/busdma_machdep.c
  projects/clang500-import/sys/arm64/arm64/pmap.c
  projects/clang500-import/sys/arm64/include/atomic.h
  projects/clang500-import/sys/arm64/include/bus_dma.h
  projects/clang500-import/sys/arm64/include/bus_dma_impl.h
  projects/clang500-import/sys/arm64/include/endian.h
  projects/clang500-import/sys/boot/arm/uboot/Makefile
  projects/clang500-import/sys/boot/efi/boot1/Makefile
  projects/clang500-import/sys/boot/efi/libefi/efipart.c
  projects/clang500-import/sys/boot/efi/loader/Makefile
  projects/clang500-import/sys/boot/efi/loader/arch/arm/start.S
  projects/clang500-import/sys/boot/i386/libi386/libi386.h
  projects/clang500-import/sys/boot/i386/loader/chain.c
  projects/clang500-import/sys/cam/cam_periph.c
  projects/clang500-import/sys/cam/ctl/ctl_backend_ramdisk.c
  projects/clang500-import/sys/cam/ctl/scsi_ctl.c
  projects/clang500-import/sys/cam/nvme/nvme_da.c
  projects/clang500-import/sys/cam/scsi/scsi_da.c
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  projects/clang500-import/sys/compat/freebsd32/freebsd32.h
  projects/clang500-import/sys/compat/freebsd32/freebsd32_misc.c
  projects/clang500-import/sys/compat/freebsd32/freebsd32_signal.h
  projects/clang500-import/sys/conf/files
  projects/clang500-import/sys/dev/aac/aac.c
  projects/clang500-import/sys/dev/aacraid/aacraid.c
  projects/clang500-import/sys/dev/ath/ah_osdep.c
  projects/clang500-import/sys/dev/bnxt/bnxt.h
  projects/clang500-import/sys/dev/cxgb/cxgb_adapter.h
  projects/clang500-import/sys/dev/cxgb/cxgb_main.c
  projects/clang500-import/sys/dev/cxgb/cxgb_sge.c
  projects/clang500-import/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
  projects/clang500-import/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
  projects/clang500-import/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c
  projects/clang500-import/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c
  projects/clang500-import/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c
  projects/clang500-import/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c
  projects/clang500-import/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c
  projects/clang500-import/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c
  projects/clang500-import/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c
  projects/clang500-import/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c
  projects/clang500-import/sys/dev/cxgbe/iw_cxgbe/cm.c
  projects/clang500-import/sys/dev/cxgbe/tom/t4_cpl_io.c
  projects/clang500-import/sys/dev/cxgbe/tom/t4_listen.c
  projects/clang500-import/sys/dev/hyperv/input/hv_kbdc.c
  projects/clang500-import/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
  projects/clang500-import/sys/dev/iicbus/iiconf.c
  projects/clang500-import/sys/dev/isp/isp_freebsd.c
  projects/clang500-import/sys/dev/mfi/mfi.c
  projects/clang500-import/sys/dev/mfi/mfi_cam.c
  projects/clang500-import/sys/dev/mpt/mpt.h
  projects/clang500-import/sys/dev/nvme/nvme.h
  projects/clang500-import/sys/dev/tsec/if_tsec.c
  projects/clang500-import/sys/dev/xdma/xdma.c
  projects/clang500-import/sys/dev/xen/blkfront/blkfront.c
  projects/clang500-import/sys/dev/xen/netfront/netfront.c
  projects/clang500-import/sys/fs/ext2fs/ext2_inode_cnv.c
  projects/clang500-import/sys/fs/fuse/fuse_io.c
  projects/clang500-import/sys/fs/nfs/nfs_commonsubs.c
  projects/clang500-import/sys/fs/nfsclient/nfs_clport.c
  projects/clang500-import/sys/fs/pseudofs/pseudofs_vnops.c
  projects/clang500-import/sys/geom/virstor/g_virstor.h
  projects/clang500-import/sys/i386/i386/pmap.c
  projects/clang500-import/sys/i386/include/bus_dma.h
  projects/clang500-import/sys/kern/imgact_elf.c
  projects/clang500-import/sys/kern/kern_event.c
  projects/clang500-import/sys/kern/kern_exec.c
  projects/clang500-import/sys/kern/kern_rwlock.c
  projects/clang500-import/sys/kern/subr_blist.c
  projects/clang500-import/sys/kern/sys_process.c
  projects/clang500-import/sys/kern/uipc_mbuf.c
  projects/clang500-import/sys/kern/uipc_shm.c
  projects/clang500-import/sys/kern/uipc_sockbuf.c
  projects/clang500-import/sys/kern/vfs_syscalls.c
  projects/clang500-import/sys/mips/conf/DIR-825C1
  projects/clang500-import/sys/mips/conf/std.AR_MIPS_BASE
  projects/clang500-import/sys/mips/include/bus_dma.h
  projects/clang500-import/sys/mips/mips/busdma_machdep.c
  projects/clang500-import/sys/modules/crypto/Makefile
  projects/clang500-import/sys/net/iflib.h
  projects/clang500-import/sys/netpfil/ipfw/nat64/nat64_translate.c
  projects/clang500-import/sys/netpfil/ipfw/nptv6/nptv6.c
  projects/clang500-import/sys/netpfil/ipfw/pmod/tcpmod.c
  projects/clang500-import/sys/powerpc/booke/pmap.c
  projects/clang500-import/sys/powerpc/include/bus_dma.h
  projects/clang500-import/sys/powerpc/powerpc/busdma_machdep.c
  projects/clang500-import/sys/riscv/include/bus_dma.h
  projects/clang500-import/sys/riscv/riscv/busdma_machdep.c
  projects/clang500-import/sys/sparc64/include/bus_dma.h
  projects/clang500-import/sys/sys/bus_dma.h
  projects/clang500-import/sys/sys/param.h
  projects/clang500-import/sys/sys/ptrace.h
  projects/clang500-import/sys/sys/refcount.h
  projects/clang500-import/sys/sys/signal.h
  projects/clang500-import/sys/ufs/ffs/ffs_alloc.c
  projects/clang500-import/sys/ufs/ffs/ffs_extern.h
  projects/clang500-import/sys/ufs/ffs/ffs_snapshot.c
  projects/clang500-import/sys/ufs/ffs/ffs_vfsops.c
  projects/clang500-import/sys/ufs/ufs/ufs_gjournal.c
  projects/clang500-import/sys/vm/vm_map.c
  projects/clang500-import/sys/vm/vm_map.h
  projects/clang500-import/sys/vm/vm_mmap.c
  projects/clang500-import/sys/x86/include/busdma_impl.h
  projects/clang500-import/sys/x86/iommu/busdma_dmar.c
  projects/clang500-import/sys/x86/x86/busdma_bounce.c
  projects/clang500-import/sys/x86/x86/busdma_machdep.c
  projects/clang500-import/tests/sys/pjdfstest/pjdfstest/Makefile
  projects/clang500-import/tests/sys/pjdfstest/tests/Makefile
  projects/clang500-import/tests/sys/vfs/Makefile
  projects/clang500-import/tests/sys/vfs/trailing_slash.sh
  projects/clang500-import/usr.bin/calendar/calendars/calendar.history
  projects/clang500-import/usr.bin/gcore/elf32core.c
  projects/clang500-import/usr.bin/gcore/elfcore.c
  projects/clang500-import/usr.sbin/bsdinstall/scripts/hardening
  projects/clang500-import/usr.sbin/diskinfo/diskinfo.8
  projects/clang500-import/usr.sbin/diskinfo/diskinfo.c
  projects/clang500-import/usr.sbin/sesutil/Makefile
  projects/clang500-import/usr.sbin/sesutil/eltsub.c
  projects/clang500-import/usr.sbin/sesutil/sesutil.8
  projects/clang500-import/usr.sbin/sesutil/sesutil.c
  projects/clang500-import/usr.sbin/watchdogd/watchdogd.c
Directory Properties:
  projects/clang500-import/   (props changed)
  projects/clang500-import/contrib/atf/   (props changed)
  projects/clang500-import/contrib/ipfilter/   (props changed)
  projects/clang500-import/contrib/netbsd-tests/   (props changed)
  projects/clang500-import/contrib/pjdfstest/   (props changed)
  projects/clang500-import/sys/cddl/contrib/opensolaris/   (props changed)

Modified: projects/clang500-import/MAINTAINERS
==============================================================================

--- projects/clang500-import/MAINTAINERS	Sun Jul  2 11:41:15 2017	(r320572)
+++ projects/clang500-import/MAINTAINERS	Sun Jul  2 11:48:07 2017	(r320573)
@@ -43,7 +43,7 @@ contrib/libcxxrt	dim	Pre-commit review preferred.
 contrib/llvm		dim	Pre-commit review preferred.
 contrib/llvm/tools/lldb	emaste	Pre-commit review preferred.
 contrib/netbsd-tests	freebsd-testing,ngie	Pre-commit review requested.
-contrib/pjdfstest	freebsd-testing,ngie,pjd	Pre-commit review requested.
+contrib/pjdfstest	freebsd-testing,asomers,ngie,pjd	Pre-commit review requested.
 dev/usb/wlan	adrian	Pre-commit review requested, send to freebsd-wireless at freebsd.org
 *env(3)		secteam	Due to the problematic security history of this
 			code, please have patches reviewed by secteam.

Modified: projects/clang500-import/UPDATING
==============================================================================
--- projects/clang500-import/UPDATING	Sun Jul  2 11:41:15 2017	(r320572)
+++ projects/clang500-import/UPDATING	Sun Jul  2 11:48:07 2017	(r320573)
@@ -56,6 +56,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 	Please see the 20141231 entry below for information about prerequisites
 	and upgrading, if you are not already using clang 3.5.0 or higher.
 
+20170701:
+	WITHOUT_RCMDS is now the default. Set WITH_RCMDS if you need them to be
+	built with the base system.
+
 20170625:
 	The FreeBSD/powerpc platform now uses a 64-bit type for time_t.  This is
 	a very major ABI incompatible change, so users of FreeBSD/powerpc must

Modified: projects/clang500-import/contrib/atf/atf-sh/atf-sh.3
==============================================================================
--- projects/clang500-import/contrib/atf/atf-sh/atf-sh.3	Sun Jul  2 11:41:15 2017	(r320572)
+++ projects/clang500-import/contrib/atf/atf-sh/atf-sh.3	Sun Jul  2 11:48:07 2017	(r320573)
@@ -40,6 +40,7 @@
 .Nm atf_fail ,
 .Nm atf_get ,
 .Nm atf_get_srcdir ,
+.Nm atf_init_test_cases ,
 .Nm atf_pass ,
 .Nm atf_require_prog ,
 .Nm atf_set ,
@@ -82,6 +83,8 @@
 .Nm atf_get
 .Qq var_name
 .Nm atf_get_srcdir
+.Nm atf_init_test_cases
+.Qq name
 .Nm atf_pass
 .Nm atf_require_prog
 .Qq prog_name

Modified: projects/clang500-import/contrib/ipfilter/lib/hostname.c
==============================================================================
--- projects/clang500-import/contrib/ipfilter/lib/hostname.c	Sun Jul  2 11:41:15 2017	(r320572)
+++ projects/clang500-import/contrib/ipfilter/lib/hostname.c	Sun Jul  2 11:48:07 2017	(r320573)
@@ -10,9 +10,8 @@
 
 #include "ipf.h"
 
-char *hostname(family, ip)
-	int family;
-	void *ip;
+char *
+hostname(int family, void *ip)
 {
 	static char hostbuf[MAXHOSTNAMELEN+1];
 	struct hostent *hp;
@@ -24,7 +23,7 @@ char *hostname(family, ip)
 	if (family == AF_INET) {
 		ipa.s_addr = *(u_32_t *)ip;
 		if (ipa.s_addr == htonl(0xfedcba98))
-			return "test.host.dots";
+			return ("test.host.dots");
 	}
 
 	if ((opts & OPT_NORESOLVE) == 0) {
@@ -34,7 +33,7 @@ char *hostname(family, ip)
 			    *hp->h_name != '\0') {
 				strncpy(hostbuf, hp->h_name, sizeof(hostbuf));
 				hostbuf[sizeof(hostbuf) - 1] = '\0';
-				return hostbuf;
+				return (hostbuf);
 			}
 
 			np = getnetbyaddr(ipa.s_addr, AF_INET);
@@ -42,19 +41,19 @@ char *hostname(family, ip)
 			    *np->n_name != '\0') {
 				strncpy(hostbuf, np->n_name, sizeof(hostbuf));
 				hostbuf[sizeof(hostbuf) - 1] = '\0';
-				return hostbuf;
+				return (hostbuf);
 			}
 		}
 	}
 
 	if (family == AF_INET) {
-		return inet_ntoa(ipa);
+		return (inet_ntoa(ipa));
 	}
 #ifdef  USE_INET6
 	(void) inet_ntop(AF_INET6, ip, hostbuf, sizeof(hostbuf) - 1);
 	hostbuf[MAXHOSTNAMELEN] = '\0';
-	return hostbuf;
+	return (hostbuf);
 #else
-	return "IPv6";
+	return ("IPv6");
 #endif
 }

Modified: projects/clang500-import/contrib/ipfilter/lib/portname.c
==============================================================================
--- projects/clang500-import/contrib/ipfilter/lib/portname.c	Sun Jul  2 11:41:15 2017	(r320572)
+++ projects/clang500-import/contrib/ipfilter/lib/portname.c	Sun Jul  2 11:48:07 2017	(r320573)
@@ -10,8 +10,8 @@
 #include "ipf.h"
 
 
-char *portname(pr, port)
-	int pr, port;
+char *
+portname(int pr, int port)
 {
 	static char buf[32];
 	struct protoent *p = NULL;
@@ -28,16 +28,16 @@ char *portname(pr, port)
 				     NULL : sv1;
 			}
 			if (sv)
-				return buf;
+				return (buf);
 		} else if ((pr != -2) && (p = getprotobynumber(pr))) {
 			if ((sv = getservbyport(htons(port), p->p_name))) {
 				strncpy(buf, sv->s_name, sizeof(buf)-1);
 				buf[sizeof(buf)-1] = '\0';
-				return buf;
+				return (buf);
 			}
 		}
 	}
 
 	(void) sprintf(buf, "%d", port);
-	return buf;
+	return (buf);
 }

Modified: projects/clang500-import/contrib/ipfilter/lib/printstate.c
==============================================================================
--- projects/clang500-import/contrib/ipfilter/lib/printstate.c	Sun Jul  2 11:41:15 2017	(r320572)
+++ projects/clang500-import/contrib/ipfilter/lib/printstate.c	Sun Jul  2 11:48:07 2017	(r320573)
@@ -11,10 +11,7 @@
 
 
 ipstate_t *
-printstate(sp, opts, now)
-	ipstate_t *sp;
-	int opts;
-	u_long now;
+printstate(ipstate_t *sp, int opts, u_long now)
 {
 	struct protoent *pr;
 	synclist_t ipsync;
@@ -210,7 +207,7 @@ printstate(sp, opts, now)
 		if (kmemcpy((char *)&ipsync, (u_long)sp->is_sync,
 			    sizeof(ipsync))) {
 			PRINTF("status could not be retrieved\n");
-			return NULL;
+			return (NULL);
 		}
 
 		PRINTF("idx %d num %d v %d pr %d rev %d\n",
@@ -220,5 +217,5 @@ printstate(sp, opts, now)
 		PRINTF("not synchronized\n");
 	}
 
-	return sp->is_next;
+	return (sp->is_next);
 }

Modified: projects/clang500-import/contrib/ipfilter/tools/ippool.c
==============================================================================
--- projects/clang500-import/contrib/ipfilter/tools/ippool.c	Sun Jul  2 11:41:15 2017	(r320572)
+++ projects/clang500-import/contrib/ipfilter/tools/ippool.c	Sun Jul  2 11:48:07 2017	(r320573)
@@ -75,7 +75,7 @@ usage(prog)
 	char *prog;
 {
 	fprintf(stderr, "Usage:\t%s\n", prog);
-	fprintf(stderr, "\t-a [-dnv] [-m <name>] [-o <role>] [-t type] [-T ttl] -i <ipaddr>[/netmask]\n");
+	fprintf(stderr, "\t-a [-dnv] -m <name> [-o <role>] [-t type] [-T ttl] -i <ipaddr>[/netmask]\n");
 	fprintf(stderr, "\t-A [-dnv] [-m <name>] [-o <role>] [-S <seed>] [-t <type>]\n");
 	fprintf(stderr, "\t-f <file> [-dnuv]\n");
 	fprintf(stderr, "\t-F [-dv] [-o <role>] [-t <type>]\n");

Modified: projects/clang500-import/contrib/jemalloc/FREEBSD-diffs
==============================================================================
--- projects/clang500-import/contrib/jemalloc/FREEBSD-diffs	Sun Jul  2 11:41:15 2017	(r320572)
+++ projects/clang500-import/contrib/jemalloc/FREEBSD-diffs	Sun Jul  2 11:48:07 2017	(r320573)
@@ -1,8 +1,8 @@
 diff --git a/doc/jemalloc.xml.in b/doc/jemalloc.xml.in
-index 21e401ac..f977c5f5 100644
+index 21e401ac..c26f9f4a 100644
 --- a/doc/jemalloc.xml.in
 +++ b/doc/jemalloc.xml.in
-@@ -53,11 +53,21 @@
+@@ -53,11 +53,22 @@
      <para>This manual describes jemalloc @jemalloc_version at .  More information
      can be found at the <ulink
      url="http://jemalloc.net/">jemalloc website</ulink>.</para>
@@ -10,7 +10,8 @@ index 21e401ac..f977c5f5 100644
 +    <para>The following configuration options are enabled in libc's built-in
 +    jemalloc: <option>--enable-fill</option>,
 +    <option>--enable-lazy-lock</option>, <option>--enable-stats</option>,
-+    <option>--enable-utrace</option>, and <option>--enable-xmalloc</option>.
++    <option>--enable-utrace</option>, <option>--enable-xmalloc</option>, and
++    <option>--with-malloc-conf=abort_conf:false</option>.
 +    Additionally, <option>--enable-debug</option> is enabled in development
 +    versions of FreeBSD (controlled by the
 +    <constant>MALLOC_PRODUCTION</constant> make variable).</para>
@@ -25,7 +26,7 @@ index 21e401ac..f977c5f5 100644
        <refsect2>
          <title>Standard API</title>
          <funcprototype>
-@@ -3252,4 +3262,18 @@ malloc_conf = "narenas:1";]]></programlisting></para>
+@@ -3252,4 +3263,18 @@ malloc_conf = "narenas:1";]]></programlisting></para>
      <para>The <function>posix_memalign()</function> function conforms
      to IEEE Std 1003.1-2001 (<quote>POSIX.1</quote>).</para>
    </refsect1>

Modified: projects/clang500-import/contrib/jemalloc/FREEBSD-upgrade
==============================================================================
--- projects/clang500-import/contrib/jemalloc/FREEBSD-upgrade	Sun Jul  2 11:41:15 2017	(r320572)
+++ projects/clang500-import/contrib/jemalloc/FREEBSD-upgrade	Sun Jul  2 11:48:07 2017	(r320573)
@@ -96,6 +96,7 @@ do_extract_helper() {
 
 do_autogen() {
   ./autogen.sh --enable-xmalloc --enable-utrace \
+    --with-malloc-conf=abort_conf:false \
     --with-xslroot=/usr/local/share/xsl/docbook --with-private-namespace=__ \
     --with-lg-page-sizes=12,13,14,16
 }

Modified: projects/clang500-import/contrib/jemalloc/doc/jemalloc.3
==============================================================================
--- projects/clang500-import/contrib/jemalloc/doc/jemalloc.3	Sun Jul  2 11:41:15 2017	(r320572)
+++ projects/clang500-import/contrib/jemalloc/doc/jemalloc.3	Sun Jul  2 11:48:07 2017	(r320573)
@@ -2,12 +2,12 @@
 .\"     Title: JEMALLOC
 .\"    Author: Jason Evans
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 06/14/2017
+.\"      Date: 06/29/2017
 .\"    Manual: User Manual
 .\"    Source: jemalloc 5.0.0-4-g84f6c2cae0fb1399377ef6aea9368444c4987cc6
 .\"  Language: English
 .\"
-.TH "JEMALLOC" "3" "06/14/2017" "jemalloc 5.0.0-4-g84f6c2cae0fb" "User Manual"
+.TH "JEMALLOC" "3" "06/29/2017" "jemalloc 5.0.0-4-g84f6c2cae0fb" "User Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -38,8 +38,9 @@ The following configuration options are enabled in lib
 \fB\-\-enable\-fill\fR,
 \fB\-\-enable\-lazy\-lock\fR,
 \fB\-\-enable\-stats\fR,
-\fB\-\-enable\-utrace\fR, and
-\fB\-\-enable\-xmalloc\fR\&. Additionally,
+\fB\-\-enable\-utrace\fR,
+\fB\-\-enable\-xmalloc\fR, and
+\fB\-\-with\-malloc\-conf=abort_conf:false\fR\&. Additionally,
 \fB\-\-enable\-debug\fR
 is enabled in development versions of FreeBSD (controlled by the
 \fBMALLOC_PRODUCTION\fR

Modified: projects/clang500-import/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h
==============================================================================
--- projects/clang500-import/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h	Sun Jul  2 11:41:15 2017	(r320572)
+++ projects/clang500-import/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h	Sun Jul  2 11:48:07 2017	(r320573)
@@ -329,7 +329,7 @@
 /* #undef JEMALLOC_EXPORT */
 
 /* config.malloc_conf options string. */
-#define JEMALLOC_CONFIG_MALLOC_CONF ""
+#define JEMALLOC_CONFIG_MALLOC_CONF "abort_conf:false"
 
 /* If defined, jemalloc takes the malloc/free/etc. symbol names. */
 #define JEMALLOC_IS_MALLOC 1

Modified: projects/clang500-import/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
==============================================================================
--- projects/clang500-import/contrib/netbsd-tests/usr.bin/grep/t_grep.sh	Sun Jul  2 11:41:15 2017	(r320572)
+++ projects/clang500-import/contrib/netbsd-tests/usr.bin/grep/t_grep.sh	Sun Jul  2 11:48:07 2017	(r320573)
@@ -658,6 +658,8 @@ mmap_eof_not_eol_body()
 		atf_expect_fail "gnu grep from ports has no --mmap option"
 	fi
 
+	atf_expect_fail "relies on jemalloc feature no longer available; needs to be rewritten - bug 220309"
+
 	printf "ABC" > test1
 	jot -b " "  -s "" 4096 >> test2
 

Copied: projects/clang500-import/contrib/pjdfstest/.gitignore (from r320572, head/contrib/pjdfstest/.gitignore)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang500-import/contrib/pjdfstest/.gitignore	Sun Jul  2 11:48:07 2017	(r320573, copy of r320572, head/contrib/pjdfstest/.gitignore)
@@ -0,0 +1,19 @@
+autom4te.cache
+aclocal.m4
+compile
+configure
+config.h*
+config.guess
+config.log
+config.status
+config.sub
+depcomp
+install-sh
+missing
+pjdfstest
+stamp-h1
+INSTALL
+Makefile
+Makefile.in
+.deps
+*.o

Copied: projects/clang500-import/contrib/pjdfstest/.travis.yml (from r320572, head/contrib/pjdfstest/.travis.yml)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang500-import/contrib/pjdfstest/.travis.yml	Sun Jul  2 11:48:07 2017	(r320573, copy of r320572, head/contrib/pjdfstest/.travis.yml)
@@ -0,0 +1,19 @@
+language: c
+sudo: required
+
+matrix:
+    include:
+        - os: linux
+          compiler: clang
+          dist: xenial
+        - os: linux
+          compiler: gcc
+          dist: xenial
+        - os: osx
+          compiler: clang
+        - os: osx
+          compiler: gcc
+
+script:
+    - ./travis/build.sh
+    - ./travis/test.sh

Copied: projects/clang500-import/contrib/pjdfstest/AUTHORS (from r320572, head/contrib/pjdfstest/AUTHORS)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang500-import/contrib/pjdfstest/AUTHORS	Sun Jul  2 11:48:07 2017	(r320573, copy of r320572, head/contrib/pjdfstest/AUTHORS)
@@ -0,0 +1,3 @@
+* Alan Somers <asomers at FreeBSD.org>		- contributor/co-maintainer
+* Ngie Cooper <ngie at FreeBSD.org>		- contributor/co-maintainer
+* Pawel Jakub Dawidek <pawel at dawidek.net>	- pjdfstest author/maintainer

Copied: projects/clang500-import/contrib/pjdfstest/COPYING (from r320572, head/contrib/pjdfstest/COPYING)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang500-import/contrib/pjdfstest/COPYING	Sun Jul  2 11:48:07 2017	(r320573, copy of r320572, head/contrib/pjdfstest/COPYING)
@@ -0,0 +1,27 @@
+$FreeBSD: head/tools/regression/pjdfstest/LICENSE 211354 2010-08-15 21:29:03Z pjd $
+
+License for all regression tests available with pjdfstest:
+
+Copyright (c) 2006-2012 Pawel Jakub Dawidek <pawel at dawidek.net>
+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 AUTHORS 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 AUTHORS 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.

Copied: projects/clang500-import/contrib/pjdfstest/ChangeLog (from r320572, head/contrib/pjdfstest/ChangeLog)
==============================================================================

Copied: projects/clang500-import/contrib/pjdfstest/Makefile.am (from r320572, head/contrib/pjdfstest/Makefile.am)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang500-import/contrib/pjdfstest/Makefile.am	Sun Jul  2 11:48:07 2017	(r320573, copy of r320572, head/contrib/pjdfstest/Makefile.am)
@@ -0,0 +1,5 @@
+AM_CFLAGS=	-Wall -Werror
+
+bin_PROGRAMS=	pjdfstest
+
+pjdfstest_SOURCES=	pjdfstest.c

Copied: projects/clang500-import/contrib/pjdfstest/NEWS (from r320572, head/contrib/pjdfstest/NEWS)
==============================================================================

Modified: projects/clang500-import/contrib/pjdfstest/README
==============================================================================
--- projects/clang500-import/contrib/pjdfstest/README	Sun Jul  2 11:41:15 2017	(r320572)
+++ projects/clang500-import/contrib/pjdfstest/README	Sun Jul  2 11:48:07 2017	(r320573)
@@ -1,22 +1,57 @@
 $FreeBSD: head/tools/regression/pjdfstest/README 211354 2010-08-15 21:29:03Z pjd $
 
-Few notes on how to use pjdfstest in short steps:
+============
+Introduction
+============
 
-	# cd pjdfstest
-	# vi tests/conf
-	Change 'fs' to file system type you want to test (UFS or ZFS).
-	# vi Makefile
-	You need to manually tweak few things by editing CFLAGS lines
-	at the top of the file.
-	# make
-	It will compile pjdfstest utility which is used by regression tests.
-	# cd /path/to/file/system/you/want/to/test/
-	# prove -r /path/to/pjdfstest/tests
+pjdfstest is a test suite that helps exercise POSIX system calls.
 
-That's all. Enjoy.
+pjdfstest supports the following operating systems/filesystems:
 
-Currently supported operating systems: FreeBSD, Solaris.
-Currently supported file system types: UFS, ZFS.
+- Supported Operating Systems: FreeBSD, Linux, Solaris
+- Supported Filesystems: ext4, UFS, ZFS
 
--- 
-Pawel Jakub Dawidek <pawel at dawidek.net>
+==================
+Building pjdfstest
+==================
+
+-------------
+Prerequisites
+-------------
+
+- autoconf 2.69 or newer
+- automake 1.15 or newer
+- cc (clang or gcc)
+- make
+- appropriate system headers (please install your distribution appropriate
+  header package)
+
+---------
+Procedure
+---------
+
+  $ autoreconf -ifs
+  $ ./configure
+  $ make pjdfstest
+
+=================
+Running pjdfstest
+=================
+
+-------------
+Prerequisites
+-------------
+- You must be root when running these testcases.
+
+----------------------
+Software Prerequisites
+----------------------
+- perl
+- TAP-Harness (perl package)
+
+---------
+Procedure
+---------
+
+  # cd /path/to/filesystem/under/test
+  # prove -rv /path/to/pjdfstest/tests

Copied: projects/clang500-import/contrib/pjdfstest/configure.ac (from r320572, head/contrib/pjdfstest/configure.ac)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang500-import/contrib/pjdfstest/configure.ac	Sun Jul  2 11:48:07 2017	(r320573, copy of r320572, head/contrib/pjdfstest/configure.ac)
@@ -0,0 +1,107 @@
+AC_PREREQ(2.61)
+AC_INIT([pjdfstest],[0.1],)
+AC_CONFIG_AUX_DIR([.])
+AM_INIT_AUTOMAKE
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_FILES([ \
+    Makefile \
+])
+
+AC_CANONICAL_HOST
+
+AC_PROG_CC([cc])
+
+# For _GNU_SOURCE on Linux, etc.
+AC_USE_SYSTEM_EXTENSIONS
+
+AC_CHECK_HEADERS([ \
+    sys/mkdev.h \
+])
+
+#HAS_FREEBSD_ACL
+
+AC_CHECK_FUNC([bindat],
+	      [AC_DEFINE([HAVE_BINDAT], [1], [Define if bindat exists])])
+AC_CHECK_FUNC([chflags],
+	      [AC_DEFINE([HAVE_CHFLAGS], [1], [Define if chflags exists])])
+AC_CHECK_FUNC([chflagsat],
+	      [AC_DEFINE([HAVE_CHFLAGSAT], [1], [Define if chflagsat exists])])
+AC_CHECK_FUNC([connectat],
+	      [AC_DEFINE([HAVE_CONNECTAT], [1], [Define if connectat exists])])
+AC_CHECK_FUNC([faccessat],
+	      [AC_DEFINE([HAVE_FACCESSAT], [1], [Define if faccessat exists])])
+AC_CHECK_FUNC([fchflags],
+	      [AC_DEFINE([HAVE_FCHFLAGS], [1], [Define if fchflags exists])])
+AC_CHECK_FUNC([fchmodat],
+	      [AC_DEFINE([HAVE_FCHMODAT], [1], [Define if fchmodat exists])])
+AC_CHECK_FUNC([fchownat],
+	      [AC_DEFINE([HAVE_FCHOWNAT], [1], [Define if fchownat exists])])
+AC_CHECK_FUNC([fstatat],
+	      [AC_DEFINE([HAVE_FSTATAT], [1], [Define if fstatat exists])])
+AC_CHECK_FUNC([lchflags],
+	      [AC_DEFINE([HAVE_LCHFLAGS], [1], [Define if lchflags exists])])
+AC_CHECK_FUNC([lchmod],
+	      [AC_DEFINE([HAVE_LCHMOD], [1], [Define if lchmod exists])])
+AC_CHECK_FUNC([linkat],
+	      [AC_DEFINE([HAVE_LINKAT], [1], [Define if linkat exists])])
+AC_CHECK_FUNC([lpathconf],
+	      [AC_DEFINE([HAVE_LPATHCONF], [1], [Define if lpathconf exists])])
+AC_CHECK_FUNC([mkdirat],
+	      [AC_DEFINE([HAVE_MKDIRAT], [1], [Define if mkdirat exists])])
+AC_CHECK_FUNC([mkfifoat],
+	      [AC_DEFINE([HAVE_MKFIFOAT], [1], [Define if mkfifoat exists])])
+AC_CHECK_FUNC([mknodat],
+	      [AC_DEFINE([HAVE_MKNODAT], [1], [Define if mknodat exists])])
+AC_CHECK_FUNC([openat],
+	      [AC_DEFINE([HAVE_OPENAT], [1], [Define if openat exists])])
+AC_CHECK_FUNC([posix_fallocate],
+	      [AC_DEFINE([HAVE_POSIX_FALLOCATE], [1], [Define if posix_fallocate exists])])
+AC_CHECK_FUNC([readlinkat],
+	      [AC_DEFINE([HAVE_READLINKAT], [1], [Define if readlinkat exists])])
+AC_CHECK_FUNC([renameat],
+	      [AC_DEFINE([HAVE_RENAMEAT], [1], [Define if renameat exists])])
+AC_CHECK_FUNC([symlinkat],
+	      [AC_DEFINE([HAVE_SYMLINKAT], [1], [Define if symlinkat exists])])
+AC_CHECK_FUNC([utimensat],
+	      [AC_DEFINE([HAVE_UTIMENSAT], [1], [Define if utimensat exists])])
+
+# ACL test battery.
+AC_CHECK_HEADER([sys/acl.h], [has_sys_acl_h=yes], [has_sys_acl_h=no])
+has_acl_funcs=no
+if test x$has_sys_acl_h = xyes; then
+	AC_DEFINE([HAVE_SYS_ACL_H], [1],
+		  [Define to 1 if sys/acl.h is available])
+	AC_CHECK_FUNCS([acl_create_entry_np acl_from_text acl_get_entry acl_get_file acl_set_file],
+		       [has_acl_funcs=yes],[])
+fi
+if test x$has_acl_funcs = xyes; then
+	# Check for NFSv4 ACL support.
+	AC_CHECK_DECL([ACL_TYPE_NFS4],
+		      [has_nfsv4_acl_support=yes], [has_nfsv4_acl_support=no],[[#include <sys/acl.h>]])
+	if test x$has_nfsv4_acl_support = xyes; then
+	      AC_DEFINE([HAS_NFSV4_ACL_SUPPORT], [1],
+			[Define to 1 if NFSv4 ACL support is available])
+	fi
+fi
+
+AC_CHECK_MEMBERS([struct stat.st_atim, struct stat.st_atimespec], [], [], [[
+#include <sys/types.h>
+#include <sys/stat.h>
+]])
+
+AC_CHECK_MEMBERS([struct stat.st_birthtim, struct stat.st_birthtime, struct stat.st_birthtimespec], [], [], [[
+#include <sys/types.h>
+#include <sys/stat.h>
+]])
+
+AC_CHECK_MEMBERS([struct stat.st_ctim, struct stat.st_ctimespec], [], [], [[
+#include <sys/types.h>
+#include <sys/stat.h>
+]])
+
+AC_CHECK_MEMBERS([struct stat.st_mtim, struct stat.st_mtimespec], [], [], [[
+#include <sys/types.h>
+#include <sys/stat.h>
+]])
+
+AC_OUTPUT

Modified: projects/clang500-import/contrib/pjdfstest/pjdfstest.c
==============================================================================
--- projects/clang500-import/contrib/pjdfstest/pjdfstest.c	Sun Jul  2 11:41:15 2017	(r320572)
+++ projects/clang500-import/contrib/pjdfstest/pjdfstest.c	Sun Jul  2 11:48:07 2017	(r320573)
@@ -26,14 +26,19 @@
  * $FreeBSD$
  */
 
+/* Needs to be first to twiddle appropriate system configuration/HAVE_* flags */
+#include "config.h"
+
 #include <sys/param.h>
-#include <sys/types.h>
+#ifdef	HAVE_SYS_ACL_H
+#include <sys/acl.h>
+#endif
+#ifdef	HAVE_SYS_MKDEV_H
+#include <sys/mkdev.h>
+#endif
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#ifndef makedev
-#include <sys/mkdev.h>
-#endif
 
 #include <assert.h>
 #include <ctype.h>
@@ -45,18 +50,15 @@
 #include <string.h>
 #include <unistd.h>
 
-#ifndef HAS_TRUNCATE64
-#define	truncate64	truncate
-#define	ftruncate64	ftruncate
+#ifdef	__sun__
+#define	_USE_STAT64
 #endif
-#ifndef HAS_STAT64
-#define	stat64	stat
-#define	fstat64	fstat
-#define	lstat64	lstat
+
+#ifdef	_USE_STAT64
+typedef	struct stat64	stat_t;
+#else
+typedef	struct stat	stat_t;
 #endif
-#ifdef HAS_FREEBSD_ACL
-#include <sys/acl.h>
-#endif
 
 #ifndef ALLPERMS
 #define	ALLPERMS	(S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)
@@ -64,69 +66,91 @@
 
 enum action {
 	ACTION_OPEN,
+#ifdef	HAVE_OPENAT
 	ACTION_OPENAT,
+#endif
 	ACTION_CREATE,
 	ACTION_UNLINK,
+#ifdef	HAVE_UNLINKAT
 	ACTION_UNLINKAT,
+#endif
 	ACTION_MKDIR,
+#ifdef	HAVE_MKDIRAT
 	ACTION_MKDIRAT,
+#endif
 	ACTION_RMDIR,
 	ACTION_LINK,
+#ifdef	HAVE_LINKAT
 	ACTION_LINKAT,
+#endif
 	ACTION_SYMLINK,
+#ifdef	HAVE_SYMLINKAT
 	ACTION_SYMLINKAT,
+#endif
 	ACTION_RENAME,
+#ifdef	HAVE_RENAMEAT
 	ACTION_RENAMEAT,
+#endif
 	ACTION_MKFIFO,
+#ifdef	HAVE_MKFIFOAT
 	ACTION_MKFIFOAT,
+#endif
 	ACTION_MKNOD,
 	ACTION_MKNODAT,
 	ACTION_BIND,
-#ifdef HAS_BINDAT
+#ifdef	HAVE_BINDAT
 	ACTION_BINDAT,
 #endif
 	ACTION_CONNECT,
-#ifdef HAS_CONNECTAT
+#ifdef	HAVE_CONNECTAT
 	ACTION_CONNECTAT,
 #endif
 	ACTION_CHMOD,
 	ACTION_FCHMOD,
-#ifdef HAS_LCHMOD
+#ifdef	HAVE_LCHMOD
 	ACTION_LCHMOD,
 #endif
 	ACTION_FCHMODAT,
 	ACTION_CHOWN,
 	ACTION_FCHOWN,
 	ACTION_LCHOWN,
+#ifdef	HAVE_FCHOWNAT
 	ACTION_FCHOWNAT,
-#ifdef HAS_CHFLAGS
+#endif
+#ifdef	HAVE_CHFLAGS
 	ACTION_CHFLAGS,
 #endif
-#ifdef HAS_FCHFLAGS
+#ifdef	HAVE_FCHFLAGS
 	ACTION_FCHFLAGS,
 #endif
-#ifdef HAS_CHFLAGSAT
+#ifdef	HAVE_CHFLAGSAT
 	ACTION_CHFLAGSAT,
 #endif
-#ifdef HAS_LCHFLAGS
+#ifdef	HAVE_LCHFLAGS
 	ACTION_LCHFLAGS,
 #endif
 	ACTION_TRUNCATE,
 	ACTION_FTRUNCATE,
+#ifdef	HAVE_POSIX_FALLOCATE
+	ACTION_POSIX_FALLOCATE,
+#endif
 	ACTION_STAT,
 	ACTION_FSTAT,
 	ACTION_LSTAT,
 	ACTION_FSTATAT,
 	ACTION_PATHCONF,
 	ACTION_FPATHCONF,
-#ifdef HAS_LPATHCONF
+#ifdef	HAVE_LPATHCONF
 	ACTION_LPATHCONF,
 #endif
-#ifdef HAS_FREEBSD_ACL
+#ifdef	HAS_NFSV4_ACL_SUPPORT
 	ACTION_PREPENDACL,
 	ACTION_READACL,
 #endif
 	ACTION_WRITE,
+#ifdef	HAVE_UTIMENSAT
+	ACTION_UTIMENSAT,
+#endif
 };
 
 #define	TYPE_NONE	0x0000
@@ -147,69 +171,104 @@ struct syscall_desc {
 
 static struct syscall_desc syscalls[] = {
 	{ "open", ACTION_OPEN, { TYPE_STRING, TYPE_STRING, TYPE_NUMBER | TYPE_OPTIONAL, TYPE_NONE } },
+#ifdef	HAVE_OPENAT
 	{ "openat", ACTION_OPENAT, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_STRING, TYPE_NUMBER | TYPE_OPTIONAL, TYPE_NONE } },
+#endif
 	{ "create", ACTION_CREATE, { TYPE_STRING, TYPE_NUMBER, TYPE_NONE } },
 	{ "unlink", ACTION_UNLINK, { TYPE_STRING, TYPE_NONE } },
+#ifdef	HAVE_UNLINKAT
 	{ "unlinkat", ACTION_UNLINKAT, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_STRING, TYPE_NONE } },
+#endif
 	{ "mkdir", ACTION_MKDIR, { TYPE_STRING, TYPE_NUMBER, TYPE_NONE } },
+#ifdef	HAVE_MKDIRAT
 	{ "mkdirat", ACTION_MKDIRAT, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_NUMBER, TYPE_NONE } },
+#endif
 	{ "rmdir", ACTION_RMDIR, { TYPE_STRING, TYPE_NONE } },
 	{ "link", ACTION_LINK, { TYPE_STRING, TYPE_STRING, TYPE_NONE } },
+#ifdef	HAVE_LINKAT
 	{ "linkat", ACTION_LINKAT, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_DESCRIPTOR, TYPE_STRING, TYPE_STRING, TYPE_NONE } },
+#endif
 	{ "symlink", ACTION_SYMLINK, { TYPE_STRING, TYPE_STRING, TYPE_NONE } },
+#ifdef	HAVE_SYMLINKAT
 	{ "symlinkat", ACTION_SYMLINKAT, { TYPE_STRING, TYPE_DESCRIPTOR, TYPE_STRING, TYPE_NONE } },
+#endif
 	{ "rename", ACTION_RENAME, { TYPE_STRING, TYPE_STRING, TYPE_NONE } },
+#ifdef	HAVE_RENAMEAT
 	{ "renameat", ACTION_RENAMEAT, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_DESCRIPTOR, TYPE_STRING, TYPE_NONE } },
+#endif
 	{ "mkfifo", ACTION_MKFIFO, { TYPE_STRING, TYPE_NUMBER, TYPE_NONE } },
+#ifdef	HAVE_MKFIFOAT
 	{ "mkfifoat", ACTION_MKFIFOAT, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_NUMBER, TYPE_NONE } },
+#endif
 	{ "mknod", ACTION_MKNOD, { TYPE_STRING, TYPE_STRING, TYPE_NUMBER, TYPE_NUMBER, TYPE_NUMBER, TYPE_NONE} },
+#ifdef	HAVE_MKNODAT
 	{ "mknodat", ACTION_MKNODAT, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_STRING, TYPE_NUMBER, TYPE_NUMBER, TYPE_NUMBER, TYPE_NONE} },
+#endif
 	{ "bind", ACTION_BIND, { TYPE_STRING, TYPE_NONE } },
-#ifdef HAS_BINDAT
+#ifdef	HAVE_BINDAT
 	{ "bindat", ACTION_BINDAT, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_NONE } },
 #endif
 	{ "connect", ACTION_CONNECT, { TYPE_STRING, TYPE_NONE } },
-#ifdef HAS_CONNECTAT
+#ifdef	HAVE_CONNECTAT
 	{ "connectat", ACTION_CONNECTAT, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_NONE } },
 #endif
 	{ "chmod", ACTION_CHMOD, { TYPE_STRING, TYPE_NUMBER, TYPE_NONE } },
 	{ "fchmod", ACTION_FCHMOD, { TYPE_DESCRIPTOR, TYPE_NUMBER, TYPE_NONE } },
-#ifdef HAS_LCHMOD
+#ifdef	HAVE_LCHMOD
 	{ "lchmod", ACTION_LCHMOD, { TYPE_STRING, TYPE_NUMBER, TYPE_NONE } },
 #endif
+#ifdef	HAVE_FCHMODAT
 	{ "fchmodat", ACTION_FCHMODAT, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_NUMBER, TYPE_STRING, TYPE_NONE } },
+#endif
 	{ "chown", ACTION_CHOWN, { TYPE_STRING, TYPE_NUMBER, TYPE_NUMBER, TYPE_NONE } },
 	{ "fchown", ACTION_FCHOWN, { TYPE_DESCRIPTOR, TYPE_NUMBER, TYPE_NUMBER, TYPE_NONE } },
 	{ "lchown", ACTION_LCHOWN, { TYPE_STRING, TYPE_NUMBER, TYPE_NUMBER, TYPE_NONE } },
+#ifdef	HAVE_FCHOWNAT
 	{ "fchownat", ACTION_FCHOWNAT, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_NUMBER, TYPE_NUMBER, TYPE_STRING, TYPE_NONE } },
-#ifdef HAS_CHFLAGS
+#endif
+#ifdef	HAVE_CHFLAGS
 	{ "chflags", ACTION_CHFLAGS, { TYPE_STRING, TYPE_STRING, TYPE_NONE } },
 #endif
-#ifdef HAS_FCHFLAGS
+#ifdef	HAVE_FCHFLAGS
 	{ "fchflags", ACTION_FCHFLAGS, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_NONE } },
 #endif
-#ifdef HAS_CHFLAGSAT
+#ifdef	HAVE_CHFLAGSAT
 	{ "chflagsat", ACTION_CHFLAGSAT, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_STRING, TYPE_STRING, TYPE_NONE } },
 #endif
-#ifdef HAS_LCHFLAGS
+#ifdef	HAVE_LCHFLAGS
 	{ "lchflags", ACTION_LCHFLAGS, { TYPE_STRING, TYPE_STRING, TYPE_NONE } },
 #endif
 	{ "truncate", ACTION_TRUNCATE, { TYPE_STRING, TYPE_NUMBER, TYPE_NONE } },
 	{ "ftruncate", ACTION_FTRUNCATE, { TYPE_DESCRIPTOR, TYPE_NUMBER, TYPE_NONE } },
+#ifdef	HAVE_POSIX_FALLOCATE
+	{ "posix_fallocate", ACTION_POSIX_FALLOCATE, { TYPE_DESCRIPTOR, TYPE_NUMBER, TYPE_NUMBER, TYPE_NONE } },
+#endif
 	{ "stat", ACTION_STAT, { TYPE_STRING, TYPE_STRING, TYPE_NONE } },
 	{ "fstat", ACTION_FSTAT, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_NONE } },
 	{ "lstat", ACTION_LSTAT, { TYPE_STRING, TYPE_STRING, TYPE_NONE } },
+#ifdef	HAVE_FSTATAT
 	{ "fstatat", ACTION_FSTATAT, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_STRING, TYPE_STRING, TYPE_NONE } },
+#endif
 	{ "pathconf", ACTION_PATHCONF, { TYPE_STRING, TYPE_STRING, TYPE_NONE } },
 	{ "fpathconf", ACTION_FPATHCONF, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_NONE } },
-#ifdef HAS_LPATHCONF
+#ifdef	HAVE_LPATHCONF
 	{ "lpathconf", ACTION_LPATHCONF, { TYPE_STRING, TYPE_STRING, TYPE_NONE } },
 #endif
-#ifdef HAS_FREEBSD_ACL
+#ifdef	HAS_NFSV4_ACL_SUPPORT
 	{ "prependacl", ACTION_PREPENDACL, { TYPE_STRING, TYPE_STRING, TYPE_NONE } },
 	{ "readacl", ACTION_READACL, { TYPE_STRING, TYPE_NONE } },
 #endif
 	{ "write", ACTION_WRITE, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_NONE } },
+#ifdef	HAVE_UTIMENSAT
+	{ "utimensat", ACTION_UTIMENSAT, {
+						 TYPE_DESCRIPTOR, /* Directory */
+						 TYPE_STRING, /* Relative path */
+						 TYPE_NUMBER, /* atime seconds */
+						 TYPE_STRING, /* atime nanoseconds */
+						 TYPE_NUMBER, /* mtime seconds */
+						 TYPE_STRING, /* mtime nanoseconds */
+						 TYPE_STRING, /* flags */}},
+#endif
 	{ NULL, -1, { TYPE_NONE } }
 };
 
@@ -219,122 +278,136 @@ struct flag {
 };
 
 static struct flag open_flags[] = {
-#ifdef O_RDONLY
+#ifdef	O_RDONLY
 	{ O_RDONLY, "O_RDONLY" },
 #endif
-#ifdef O_WRONLY
+#ifdef	O_WRONLY
 	{ O_WRONLY, "O_WRONLY" },
 #endif
-#ifdef O_RDWR
+#ifdef	O_RDWR
 	{ O_RDWR, "O_RDWR" },
 #endif
-#ifdef O_NONBLOCK
+#ifdef	O_NONBLOCK
 	{ O_NONBLOCK, "O_NONBLOCK" },
 #endif
-#ifdef O_APPEND
+#ifdef	O_APPEND
 	{ O_APPEND, "O_APPEND" },
 #endif
-#ifdef O_CREAT
+#ifdef	O_CREAT
 	{ O_CREAT, "O_CREAT" },
 #endif
-#ifdef O_TRUNC
+#ifdef	O_TRUNC
 	{ O_TRUNC, "O_TRUNC" },
 #endif
-#ifdef O_EXCL
+#ifdef	O_EXCL
 	{ O_EXCL, "O_EXCL" },
 #endif
-#ifdef O_SHLOCK
+#ifdef	O_SHLOCK
 	{ O_SHLOCK, "O_SHLOCK" },
 #endif
-#ifdef O_EXLOCK
+#ifdef	O_EXLOCK
 	{ O_EXLOCK, "O_EXLOCK" },
 #endif
-#ifdef O_DIRECT
+#ifdef	O_DIRECT
 	{ O_DIRECT, "O_DIRECT" },
 #endif
-#ifdef O_FSYNC
+#ifdef	O_FSYNC
 	{ O_FSYNC, "O_FSYNC" },
 #endif
-#ifdef O_SYNC
+#ifdef	O_SYNC
 	{ O_SYNC, "O_SYNC" },
 #endif
-#ifdef O_NOFOLLOW
+#ifdef	O_NOFOLLOW
 	{ O_NOFOLLOW, "O_NOFOLLOW" },
 #endif
-#ifdef O_NOCTTY
+#ifdef	O_NOCTTY
 	{ O_NOCTTY, "O_NOCTTY" },
 #endif
-#ifdef O_DIRECTORY
+#ifdef	O_DIRECTORY
 	{ O_DIRECTORY, "O_DIRECTORY" },
 #endif
 	{ 0, NULL }
 };
 
-#ifdef HAS_CHFLAGS
+#ifdef	HAVE_CHFLAGS
 static struct flag chflags_flags[] = {
-#ifdef UF_NODUMP
+#ifdef	UF_NODUMP
 	{ UF_NODUMP, "UF_NODUMP" },
 #endif
-#ifdef UF_IMMUTABLE
+#ifdef	UF_IMMUTABLE
 	{ UF_IMMUTABLE, "UF_IMMUTABLE" },
 #endif
-#ifdef UF_APPEND
+#ifdef	UF_APPEND
 	{ UF_APPEND, "UF_APPEND" },
 #endif
-#ifdef UF_NOUNLINK
+#ifdef	UF_NOUNLINK
 	{ UF_NOUNLINK, "UF_NOUNLINK" },
 #endif
-#ifdef UF_OPAQUE
+#ifdef	UF_OPAQUE
 	{ UF_OPAQUE, "UF_OPAQUE" },
 #endif
-#ifdef SF_ARCHIVED
+#ifdef	SF_ARCHIVED
 	{ SF_ARCHIVED, "SF_ARCHIVED" },
 #endif
-#ifdef SF_IMMUTABLE
+#ifdef	SF_IMMUTABLE
 	{ SF_IMMUTABLE, "SF_IMMUTABLE" },
 #endif
-#ifdef SF_APPEND
+#ifdef	SF_APPEND
 	{ SF_APPEND, "SF_APPEND" },
 #endif
-#ifdef SF_NOUNLINK
+#ifdef	SF_NOUNLINK
 	{ SF_NOUNLINK, "SF_NOUNLINK" },
 #endif
-#ifdef SF_SNAPSHOT
+#ifdef	SF_SNAPSHOT
 	{ SF_SNAPSHOT, "SF_SNAPSHOT" },
 #endif
 	{ 0, NULL }
 };
 #endif
 
+#ifdef	HAVE_UNLINKAT
 static struct flag unlinkat_flags[] = {
 	{ AT_REMOVEDIR, "AT_REMOVEDIR" },
 	{ 0, NULL }
 };
+#endif
 
+#ifdef	HAVE_LINKAT
 static struct flag linkat_flags[] = {
+#ifdef	AT_SYMLINK_FOLLOW
 	{ AT_SYMLINK_FOLLOW, "AT_SYMLINK_FOLLOW" },
+#endif
 	{ 0, NULL }
 };
+#endif
 
+#ifdef	HAVE_CHFLAGSAT
 static struct flag chflagsat_flags[] = {
 	{ AT_SYMLINK_NOFOLLOW, "AT_SYMLINK_NOFOLLOW" },
 	{ 0, NULL }
 };
+#endif
 
+#ifdef	HAVE_FCHMODAT
 static struct flag fchmodat_flags[] = {
 	{ AT_SYMLINK_NOFOLLOW, "AT_SYMLINK_NOFOLLOW" },
 	{ 0, NULL }
 };
+#endif
 
+#ifdef	HAVE_FCHOWNAT
 static struct flag fchownat_flags[] = {
 	{ AT_SYMLINK_NOFOLLOW, "AT_SYMLINK_NOFOLLOW" },
 	{ 0, NULL }
 };
+#endif
 
+#ifdef	HAVE_FSTATAT
 static struct flag fstatat_flags[] = {
 	{ AT_SYMLINK_NOFOLLOW, "AT_SYMLINK_NOFOLLOW" },
 	{ 0, NULL }
 };
+#endif
 
 struct name {
 	int		 n_name;
@@ -342,16 +415,16 @@ struct name {
 };
 
 static struct name pathconf_names[] = {
-#ifdef _PC_LINK_MAX
+#ifdef	_PC_LINK_MAX
 	{ _PC_LINK_MAX, "_PC_LINK_MAX" },
 #endif
-#ifdef _PC_NAME_MAX
+#ifdef	_PC_NAME_MAX
 	{ _PC_NAME_MAX, "_PC_NAME_MAX" },
 #endif
-#ifdef _PC_PATH_MAX
+#ifdef	_PC_PATH_MAX
 	{ _PC_PATH_MAX, "_PC_PATH_MAX" },
 #endif
-#ifdef _PC_SYMLINK_MAX
+#ifdef	_PC_SYMLINK_MAX
 	{ _PC_SYMLINK_MAX, "_PC_SYMLINK_MAX" },
 #endif
 	{ 0, NULL }
@@ -394,7 +467,7 @@ str2flags(struct flag *tflags, char *sflags)
 	return (flags);
 }
 
-#ifdef HAS_CHFLAGS
+#ifdef	HAVE_CHFLAGS
 static char *
 flags2str(struct flag *tflags, long long flags)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
