svn commit: r312968 - in projects/clang400-import: . contrib/binutils/gas/config contrib/gcc/config/mips etc/etc.pc98 etc/rc.d include lib lib/libsysdecode lib/libthr/thread libexec release release...

Dimitry Andric dim at FreeBSD.org
Sun Jan 29 22:00:51 UTC 2017 

Author: dim
Date: Sun Jan 29 22:00:47 2017
New Revision: 312968
URL: https://svnweb.freebsd.org/changeset/base/312968

Log:
  Merge ^/head r312894 through r312967.

Added:
  projects/clang400-import/share/man/man9/iflibdd.9
     - copied unchanged from r312967, head/share/man/man9/iflibdd.9
  projects/clang400-import/share/man/man9/iflibdi.9
     - copied unchanged from r312967, head/share/man/man9/iflibdi.9
  projects/clang400-import/share/man/man9/iflibtxrx.9
     - copied unchanged from r312967, head/share/man/man9/iflibtxrx.9
Deleted:
  projects/clang400-import/etc/etc.pc98/
  projects/clang400-import/libexec/Makefile.pc98
  projects/clang400-import/release/pc98/
  projects/clang400-import/sbin/Makefile.pc98
  projects/clang400-import/sbin/fdisk_pc98/
  projects/clang400-import/share/man/man4/man4.i386/ct.4
  projects/clang400-import/share/man/man4/man4.i386/snc.4
  projects/clang400-import/share/syscons/keymaps/jp.pc98.iso.kbd
  projects/clang400-import/share/syscons/keymaps/jp.pc98.kbd
  projects/clang400-import/share/vt/keymaps/jp.pc98.iso.kbd
  projects/clang400-import/share/vt/keymaps/jp.pc98.kbd
  projects/clang400-import/sys/boot/Makefile.pc98
  projects/clang400-import/sys/boot/pc98/
  projects/clang400-import/sys/conf/Makefile.pc98
  projects/clang400-import/sys/conf/files.pc98
  projects/clang400-import/sys/conf/options.pc98
  projects/clang400-import/sys/dev/aic/aic_cbus.c
  projects/clang400-import/sys/dev/ata/ata-cbus.c
  projects/clang400-import/sys/dev/ct/
  projects/clang400-import/sys/dev/ed/if_ed98.h
  projects/clang400-import/sys/dev/ed/if_ed_cbus.c
  projects/clang400-import/sys/dev/fdc/fdc_cbus.c
  projects/clang400-import/sys/dev/fe/if_fe_cbus.c
  projects/clang400-import/sys/dev/ic/i8251.h
  projects/clang400-import/sys/dev/ic/i8255.h
  projects/clang400-import/sys/dev/ic/rsa.h
  projects/clang400-import/sys/dev/ic/wd33c93reg.h
  projects/clang400-import/sys/dev/le/if_le_cbus.c
  projects/clang400-import/sys/dev/mse/mse_cbus.c
  projects/clang400-import/sys/dev/snc/
  projects/clang400-import/sys/dev/uart/uart_cpu_pc98.c
  projects/clang400-import/sys/geom/geom_pc98.c
  projects/clang400-import/sys/geom/geom_pc98_enc.c
  projects/clang400-import/sys/geom/part/g_part_pc98.c
  projects/clang400-import/sys/modules/ata/atacbus/
  projects/clang400-import/sys/modules/canbepm/
  projects/clang400-import/sys/modules/canbus/
  projects/clang400-import/sys/modules/ct/
  projects/clang400-import/sys/modules/geom/geom_part/geom_part_pc98/
  projects/clang400-import/sys/modules/geom/geom_pc98/
  projects/clang400-import/sys/modules/pmc/
  projects/clang400-import/sys/modules/snc/
  projects/clang400-import/sys/pc98/
  projects/clang400-import/sys/sys/disk/pc98.h
  projects/clang400-import/sys/sys/diskpc98.h
  projects/clang400-import/usr.bin/mkimg/pc98.c
  projects/clang400-import/usr.bin/mkimg/tests/img-1x1-4096-pc98.qcow.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-1x1-4096-pc98.qcow2.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-1x1-4096-pc98.raw.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhd.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-1x1-4096-pc98.vmdk.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-1x1-512-pc98.qcow.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-1x1-512-pc98.qcow2.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-1x1-512-pc98.raw.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-1x1-512-pc98.vhd.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-1x1-512-pc98.vmdk.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow2.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-63x255-4096-pc98.raw.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-63x255-4096-pc98.vmdk.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow2.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-63x255-512-pc98.raw.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu
  projects/clang400-import/usr.bin/mkimg/tests/img-63x255-512-pc98.vmdk.gz.uu
  projects/clang400-import/usr.sbin/boot98cfg/
  projects/clang400-import/usr.sbin/bsdinstall/partedit/partedit_pc98.c
Modified:
  projects/clang400-import/Makefile
  projects/clang400-import/Makefile.inc1
  projects/clang400-import/ObsoleteFiles.inc
  projects/clang400-import/contrib/binutils/gas/config/tc-mips.c
  projects/clang400-import/contrib/gcc/config/mips/mips.c
  projects/clang400-import/contrib/gcc/config/mips/mips.h
  projects/clang400-import/etc/rc.d/syscons
  projects/clang400-import/include/err.h
  projects/clang400-import/include/pthread.h
  projects/clang400-import/include/signal.h
  projects/clang400-import/include/stdio.h
  projects/clang400-import/include/stdlib.h
  projects/clang400-import/lib/Makefile
  projects/clang400-import/lib/libsysdecode/Makefile
  projects/clang400-import/lib/libsysdecode/mkioctls
  projects/clang400-import/lib/libthr/thread/thr_private.h
  projects/clang400-import/release/doc/README
  projects/clang400-import/release/doc/en_US.ISO8859-1/hardware/article.xml
  projects/clang400-import/release/doc/en_US.ISO8859-1/readme/article.xml
  projects/clang400-import/release/doc/share/examples/Makefile.relnotesng
  projects/clang400-import/release/doc/share/misc/dev.archlist.txt
  projects/clang400-import/release/doc/share/xml/release.ent
  projects/clang400-import/release/rc.local
  projects/clang400-import/rescue/rescue/Makefile
  projects/clang400-import/sbin/bsdlabel/bsdlabel.8
  projects/clang400-import/sbin/bsdlabel/bsdlabel.c
  projects/clang400-import/sbin/geom/class/part/gpart.8
  projects/clang400-import/share/examples/bootforth/frames.4th
  projects/clang400-import/share/man/man4/adv.4
  projects/clang400-import/share/man/man4/ahc.4
  projects/clang400-import/share/man/man4/apic.4
  projects/clang400-import/share/man/man4/ed.4
  projects/clang400-import/share/man/man4/esp.4
  projects/clang400-import/share/man/man4/fxp.4
  projects/clang400-import/share/man/man4/geom.4
  projects/clang400-import/share/man/man4/le.4
  projects/clang400-import/share/man/man4/man4.i386/Makefile
  projects/clang400-import/share/man/man4/man4.i386/aic.4
  projects/clang400-import/share/man/man4/man4.i386/ep.4
  projects/clang400-import/share/man/man4/ncr.4
  projects/clang400-import/share/man/man4/ncv.4
  projects/clang400-import/share/man/man4/sym.4
  projects/clang400-import/share/man/man5/src.conf.5
  projects/clang400-import/share/man/man7/build.7
  projects/clang400-import/share/man/man7/release.7
  projects/clang400-import/share/man/man9/Makefile
  projects/clang400-import/share/mk/bsd.stand.mk
  projects/clang400-import/share/mk/local.meta.sys.mk
  projects/clang400-import/share/syscons/keymaps/INDEX.keymaps
  projects/clang400-import/share/syscons/keymaps/Makefile
  projects/clang400-import/share/vt/keymaps/INDEX.keymaps
  projects/clang400-import/share/vt/keymaps/Makefile
  projects/clang400-import/sys/Makefile
  projects/clang400-import/sys/amd64/amd64/pmap.c
  projects/clang400-import/sys/arm/include/atomic-v4.h
  projects/clang400-import/sys/arm/include/atomic-v6.h
  projects/clang400-import/sys/arm/include/atomic.h
  projects/clang400-import/sys/arm64/include/atomic.h
  projects/clang400-import/sys/boot/common/Makefile.inc
  projects/clang400-import/sys/boot/common/isapnp.h
  projects/clang400-import/sys/boot/ficl/loader.c
  projects/clang400-import/sys/boot/forth/frames.4th
  projects/clang400-import/sys/boot/mips/beri/boot2/Makefile
  projects/clang400-import/sys/cam/cam_xpt.c
  projects/clang400-import/sys/conf/NOTES
  projects/clang400-import/sys/conf/config.mk
  projects/clang400-import/sys/conf/dtb.mk
  projects/clang400-import/sys/conf/files
  projects/clang400-import/sys/conf/files.amd64
  projects/clang400-import/sys/conf/files.i386
  projects/clang400-import/sys/conf/options
  projects/clang400-import/sys/crypto/aesni/aesni.h
  projects/clang400-import/sys/crypto/via/padlock.c
  projects/clang400-import/sys/crypto/via/padlock_hash.c
  projects/clang400-import/sys/dev/altera/avgen/altera_avgen.c
  projects/clang400-import/sys/dev/altera/avgen/altera_avgen.h
  projects/clang400-import/sys/dev/altera/avgen/altera_avgen_fdt.c
  projects/clang400-import/sys/dev/altera/avgen/altera_avgen_nexus.c
  projects/clang400-import/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c
  projects/clang400-import/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c
  projects/clang400-import/sys/dev/ata/ata-all.h
  projects/clang400-import/sys/dev/cxgbe/tom/t4_connect.c
  projects/clang400-import/sys/dev/cxgbe/tom/t4_cpl_io.c
  projects/clang400-import/sys/dev/cxgbe/tom/t4_listen.c
  projects/clang400-import/sys/dev/cxgbe/tom/t4_tom.c
  projects/clang400-import/sys/dev/cxgbe/tom/t4_tom.h
  projects/clang400-import/sys/dev/ep/if_ep_isa.c
  projects/clang400-import/sys/dev/exca/excareg.h
  projects/clang400-import/sys/dev/fb/fb.c
  projects/clang400-import/sys/dev/fb/splash_bmp.c
  projects/clang400-import/sys/dev/fdc/fdc.c
  projects/clang400-import/sys/dev/fdc/fdcvar.h
  projects/clang400-import/sys/dev/fe/if_fe.c
  projects/clang400-import/sys/dev/fe/if_fereg.h
  projects/clang400-import/sys/dev/kbd/kbd.c
  projects/clang400-import/sys/dev/le/am79900.c
  projects/clang400-import/sys/dev/mmc/mmc.c
  projects/clang400-import/sys/dev/mmc/mmcsd.c
  projects/clang400-import/sys/dev/mse/msevar.h
  projects/clang400-import/sys/dev/pccbb/pccbb_isa.c
  projects/clang400-import/sys/dev/pci/isa_pci.c
  projects/clang400-import/sys/dev/pci/vga_pci.c
  projects/clang400-import/sys/dev/ppc/ppc.c
  projects/clang400-import/sys/dev/ppc/ppcreg.h
  projects/clang400-import/sys/dev/sdhci/sdhci.c
  projects/clang400-import/sys/dev/sdhci/sdhci.h
  projects/clang400-import/sys/dev/sdhci/sdhci_acpi.c
  projects/clang400-import/sys/dev/sdhci/sdhci_pci.c
  projects/clang400-import/sys/dev/sio/sio_pccard.c
  projects/clang400-import/sys/dev/sio/sio_pci.c
  projects/clang400-import/sys/dev/sio/sio_puc.c
  projects/clang400-import/sys/dev/sio/siovar.h
  projects/clang400-import/sys/dev/sound/isa/mss.c
  projects/clang400-import/sys/dev/sound/isa/mss.h
  projects/clang400-import/sys/dev/sound/isa/sbc.c
  projects/clang400-import/sys/dev/syscons/daemon/daemon_saver.c
  projects/clang400-import/sys/dev/syscons/dragon/dragon_saver.c
  projects/clang400-import/sys/dev/syscons/fire/fire_saver.c
  projects/clang400-import/sys/dev/syscons/logo/logo_saver.c
  projects/clang400-import/sys/dev/syscons/plasma/plasma_saver.c
  projects/clang400-import/sys/dev/syscons/rain/rain_saver.c
  projects/clang400-import/sys/dev/syscons/scmouse.c
  projects/clang400-import/sys/dev/syscons/scvidctl.c
  projects/clang400-import/sys/dev/syscons/star/star_saver.c
  projects/clang400-import/sys/dev/syscons/syscons.c
  projects/clang400-import/sys/dev/syscons/syscons.h
  projects/clang400-import/sys/dev/syscons/warp/warp_saver.c
  projects/clang400-import/sys/dev/uart/uart.h
  projects/clang400-import/sys/dev/uart/uart_bus_isa.c
  projects/clang400-import/sys/geom/geom_bsd.c
  projects/clang400-import/sys/i386/bios/apm.c
  projects/clang400-import/sys/i386/bios/apm.h
  projects/clang400-import/sys/i386/i386/genassym.c
  projects/clang400-import/sys/i386/i386/initcpu.c
  projects/clang400-import/sys/i386/i386/locore.s
  projects/clang400-import/sys/i386/i386/machdep.c
  projects/clang400-import/sys/i386/i386/mp_machdep.c
  projects/clang400-import/sys/i386/i386/mpboot.s
  projects/clang400-import/sys/i386/i386/pmap.c
  projects/clang400-import/sys/i386/i386/vm_machdep.c
  projects/clang400-import/sys/i386/include/pcpu.h
  projects/clang400-import/sys/i386/isa/elink.h
  projects/clang400-import/sys/i386/isa/npx.c
  projects/clang400-import/sys/i386/pci/pci_pir.c
  projects/clang400-import/sys/isa/isareg.h
  projects/clang400-import/sys/isa/isavar.h
  projects/clang400-import/sys/isa/pnp.c
  projects/clang400-import/sys/isa/pnpreg.h
  projects/clang400-import/sys/kern/kern_pmc.c
  projects/clang400-import/sys/kern/vfs_vnops.c
  projects/clang400-import/sys/mips/conf/BERI_TEMPLATE
  projects/clang400-import/sys/mips/conf/ERL
  projects/clang400-import/sys/modules/Makefile
  projects/clang400-import/sys/modules/Makefile.inc
  projects/clang400-import/sys/modules/aic/Makefile
  projects/clang400-import/sys/modules/apm/Makefile
  projects/clang400-import/sys/modules/ata/Makefile
  projects/clang400-import/sys/modules/drm2/Makefile
  projects/clang400-import/sys/modules/dtb/am335x/Makefile
  projects/clang400-import/sys/modules/ed/Makefile
  projects/clang400-import/sys/modules/fdc/Makefile
  projects/clang400-import/sys/modules/fe/Makefile
  projects/clang400-import/sys/modules/geom/geom_part/Makefile
  projects/clang400-import/sys/modules/i2c/controllers/Makefile
  projects/clang400-import/sys/modules/le/Makefile
  projects/clang400-import/sys/modules/mse/Makefile
  projects/clang400-import/sys/modules/ppc/Makefile
  projects/clang400-import/sys/modules/sio/Makefile
  projects/clang400-import/sys/modules/sound/sound/Makefile
  projects/clang400-import/sys/net/if.c
  projects/clang400-import/sys/net/if_stf.c
  projects/clang400-import/sys/net/if_types.h
  projects/clang400-import/sys/net/if_var.h
  projects/clang400-import/sys/net/iflib.c
  projects/clang400-import/sys/net/iflib.h
  projects/clang400-import/sys/netinet/tcp_syncache.c
  projects/clang400-import/sys/netinet6/in6.c
  projects/clang400-import/sys/netinet6/in6_ifattach.c
  projects/clang400-import/sys/netinet6/nd6.c
  projects/clang400-import/sys/netinet6/nd6_nbr.c
  projects/clang400-import/sys/netpfil/pf/pf.c
  projects/clang400-import/sys/sys/cdefs.h
  projects/clang400-import/sys/sys/consio.h
  projects/clang400-import/sys/sys/copyright.h
  projects/clang400-import/sys/sys/eventhandler.h
  projects/clang400-import/sys/sys/fbio.h
  projects/clang400-import/sys/sys/fdcio.h
  projects/clang400-import/sys/sys/syscallsubr.h
  projects/clang400-import/sys/sys/systm.h
  projects/clang400-import/sys/x86/isa/atpic.c
  projects/clang400-import/sys/x86/isa/clock.c
  projects/clang400-import/sys/x86/isa/icu.h
  projects/clang400-import/sys/x86/isa/isa.c
  projects/clang400-import/sys/x86/x86/autoconf.c
  projects/clang400-import/sys/x86/x86/cpu_machdep.c
  projects/clang400-import/sys/x86/x86/intr_machdep.c
  projects/clang400-import/sys/x86/x86/mptable.c
  projects/clang400-import/sys/x86/x86/nexus.c
  projects/clang400-import/targets/pseudo/userland/Makefile.depend
  projects/clang400-import/targets/pseudo/userland/misc/Makefile.depend
  projects/clang400-import/tests/sys/aio/aio_test.c
  projects/clang400-import/tools/build/mk/OptionalObsoleteFiles.inc
  projects/clang400-import/tools/tools/kerninclude/kerninclude.sh
  projects/clang400-import/tools/tools/sysdoc/sysdoc.sh
  projects/clang400-import/tools/tools/vt/keymaps/KBDFILES.map
  projects/clang400-import/tools/tools/vt/keymaps/convert-keymap.pl
  projects/clang400-import/usr.bin/man/man.1
  projects/clang400-import/usr.bin/mkimg/Makefile
  projects/clang400-import/usr.bin/mkimg/tests/mkimg.sh
  projects/clang400-import/usr.sbin/Makefile.i386
  projects/clang400-import/usr.sbin/bsdinstall/partedit/gpart_ops.c
  projects/clang400-import/usr.sbin/bsdinstall/partedit/part_wizard.c
  projects/clang400-import/usr.sbin/bsdinstall/partedit/scripted.c
  projects/clang400-import/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c
  projects/clang400-import/usr.sbin/config/config.5
  projects/clang400-import/usr.sbin/fdcontrol/Makefile
  projects/clang400-import/usr.sbin/fdformat/Makefile
  projects/clang400-import/usr.sbin/fdread/Makefile
  projects/clang400-import/usr.sbin/fdread/fdutil.c
  projects/clang400-import/usr.sbin/kgzip/kgzip.8
  projects/clang400-import/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh
  projects/clang400-import/usr.sbin/pnpinfo/Makefile
  projects/clang400-import/usr.sbin/rtsold/if.c
  projects/clang400-import/usr.sbin/syslogd/syslogd.c
  projects/clang400-import/usr.sbin/vidcontrol/vidcontrol.c
Directory Properties:
  projects/clang400-import/   (props changed)
  projects/clang400-import/contrib/binutils/   (props changed)
  projects/clang400-import/contrib/gcc/   (props changed)

Modified: projects/clang400-import/Makefile
==============================================================================
--- projects/clang400-import/Makefile	Sun Jan 29 21:56:47 2017	(r312967)
+++ projects/clang400-import/Makefile	Sun Jan 29 22:00:47 2017	(r312968)
@@ -236,7 +236,7 @@ _MAKE+=	MK_META_MODE=no
 
 # Guess machine architecture from machine type, and vice versa.
 .if !defined(TARGET_ARCH) && defined(TARGET)
-_TARGET_ARCH=	${TARGET:S/pc98/i386/:S/arm64/aarch64/}
+_TARGET_ARCH=	${TARGET:S/arm64/aarch64/}
 .elif !defined(TARGET) && defined(TARGET_ARCH) && \
     ${TARGET_ARCH} != ${MACHINE_ARCH}
 _TARGET=		${TARGET_ARCH:C/mips(n32|64)?(el)?(hf)?/mips/:C/arm(v6)?(eb)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/:C/powerpcspe/powerpc/:C/riscv64(sf)?/riscv/}
@@ -417,13 +417,12 @@ worlds: .PHONY
 # existing system is.
 #
 .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets)
-TARGETS?=amd64 arm arm64 i386 mips pc98 powerpc sparc64
+TARGETS?=amd64 arm arm64 i386 mips powerpc sparc64
 _UNIVERSE_TARGETS=	${TARGETS}
 TARGET_ARCHES_arm?=	arm armeb armv6
 TARGET_ARCHES_arm64?=	aarch64
 TARGET_ARCHES_mips?=	mipsel mips mips64el mips64 mipsn32 mipselhf mipshf mips64elhf mips64hf
 TARGET_ARCHES_powerpc?=	powerpc powerpc64 powerpcspe
-TARGET_ARCHES_pc98?=	i386
 .for target in ${TARGETS}
 TARGET_ARCHES_${target}?= ${target}
 .endfor

Modified: projects/clang400-import/Makefile.inc1
==============================================================================
--- projects/clang400-import/Makefile.inc1	Sun Jan 29 21:56:47 2017	(r312967)
+++ projects/clang400-import/Makefile.inc1	Sun Jan 29 22:00:47 2017	(r312968)
@@ -349,7 +349,6 @@ KNOWN_ARCHES?=	aarch64/arm64 \
 		armeb/arm \
 		armv6/arm \
 		i386 \
-		i386/pc98 \
 		mips \
 		mipsel/mips \
 		mips64el/mips \

Modified: projects/clang400-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang400-import/ObsoleteFiles.inc	Sun Jan 29 21:56:47 2017	(r312967)
+++ projects/clang400-import/ObsoleteFiles.inc	Sun Jan 29 22:00:47 2017	(r312968)
@@ -151,6 +151,19 @@ OLD_FILES+=usr/lib/clang/3.9.1/lib/freeb
 OLD_DIRS+=usr/lib/clang/3.9.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.9.1/lib
 OLD_DIRS+=usr/lib/clang/3.9.1
+# 20170128: remove pc98 support
+OLD_FILES+=usr/include/dev/ic/i8251.h
+OLD_FILES+=usr/include/dev/ic/i8255.h
+OLD_FILES+=usr/include/dev/ic/rsa.h
+OLD_FILES+=usr/include/dev/ic/wd33c93reg.h
+OLD_FILES+=usr/include/sys/disk/pc98.h
+OLD_FILES+=usr/include/sys/diskpc98.h
+OLD_FILES+=usr/share/man/man4/i386/ct.4.gz
+OLD_FILES+=usr/share/man/man4/i386/snc.4.gz
+OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.iso.kbd
+OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.kbd
+OLD_FILES+=usr/share/vt/keymaps/jp.pc98.iso.kbd
+OLD_FILES+=usr/share/vt/keymaps/jp.pc98.kbd
 # 20170110: Four files from ggate tests consolidated into one
 OLD_FILES+=usr/tests/sys/geom/class/gate/1_test
 OLD_FILES+=usr/tests/sys/geom/class/gate/2_test

Modified: projects/clang400-import/contrib/binutils/gas/config/tc-mips.c
==============================================================================
--- projects/clang400-import/contrib/binutils/gas/config/tc-mips.c	Sun Jan 29 21:56:47 2017	(r312967)
+++ projects/clang400-import/contrib/binutils/gas/config/tc-mips.c	Sun Jan 29 22:00:47 2017	(r312968)
@@ -15156,6 +15156,7 @@ static const struct mips_cpu_info mips_c
 
   /* Cavium Networks Octeon CPU core */
   { "octeon",         0,      ISA_MIPS64R2,   CPU_OCTEON },
+  { "octeon+",        0,      ISA_MIPS64R2,   CPU_OCTEON },
 
   /* End marker */
   { NULL, 0, 0, 0 }

Modified: projects/clang400-import/contrib/gcc/config/mips/mips.c
==============================================================================
--- projects/clang400-import/contrib/gcc/config/mips/mips.c	Sun Jan 29 21:56:47 2017	(r312967)
+++ projects/clang400-import/contrib/gcc/config/mips/mips.c	Sun Jan 29 22:00:47 2017	(r312968)
@@ -765,6 +765,7 @@ const struct mips_cpu_info mips_cpu_info
 
   /* MIPS64R2 */
   { "octeon", PROCESSOR_OCTEON, 65 },
+  { "octeon+", PROCESSOR_OCTEON, 65 },
 
   /* End marker */
   { 0, 0, 0 }

Modified: projects/clang400-import/contrib/gcc/config/mips/mips.h
==============================================================================
--- projects/clang400-import/contrib/gcc/config/mips/mips.h	Sun Jan 29 21:56:47 2017	(r312967)
+++ projects/clang400-import/contrib/gcc/config/mips/mips.h	Sun Jan 29 22:00:47 2017	(r312968)
@@ -285,7 +285,10 @@ extern const struct mips_rtx_cost_data *
 								\
       macro = concat ((PREFIX), "_", (INFO)->name, NULL);	\
       for (p = macro; *p != 0; p++)				\
-	*p = TOUPPER (*p);					\
+	if (*p == '+')						\
+	  *p = 'P';						\
+	else							\
+	  *p = TOUPPER (*p);					\
 								\
       builtin_define (macro);					\
       builtin_define_with_value ((PREFIX), (INFO)->name, 1);	\

Modified: projects/clang400-import/etc/rc.d/syscons
==============================================================================
--- projects/clang400-import/etc/rc.d/syscons	Sun Jan 29 21:56:47 2017	(r312967)
+++ projects/clang400-import/etc/rc.d/syscons	Sun Jan 29 22:00:47 2017	(r312968)
@@ -112,7 +112,6 @@ icelandic.iso)			echo is;;
 it.iso)				echo it;;
 jp.106x)			echo jp.capsctrl;;
 jp.106)				echo jp;;
-#?? jp.pc98.iso)		echo jp.pc98;;
 kk.pt154.io)			echo kz.io;;
 kk.pt154.kst)			echo kz.kst;;
 latinamerican.iso.acc)		echo latinamerican.acc;;

Modified: projects/clang400-import/include/err.h
==============================================================================
--- projects/clang400-import/include/err.h	Sun Jan 29 21:56:47 2017	(r312967)
+++ projects/clang400-import/include/err.h	Sun Jan 29 22:00:47 2017	(r312968)
@@ -43,6 +43,8 @@
 #include <sys/cdefs.h>
 #include <sys/_types.h>
 
+__NULLABILITY_PRAGMA_PUSH
+
 __BEGIN_DECLS
 void	err(int, const char *, ...) __dead2 __printf0like(2, 3);
 void	verr(int, const char *, __va_list) __dead2 __printf0like(2, 0);
@@ -58,7 +60,8 @@ void	vwarnc(int, const char *, __va_list
 void	warnx(const char *, ...) __printflike(1, 2);
 void	vwarnx(const char *, __va_list) __printflike(1, 0);
 void	err_set_file(void *);
-void	err_set_exit(void (*)(int));
+void	err_set_exit(void (* _Nullable)(int));
 __END_DECLS
+__NULLABILITY_PRAGMA_POP
 
 #endif /* !_ERR_H_ */

Modified: projects/clang400-import/include/pthread.h
==============================================================================
--- projects/clang400-import/include/pthread.h	Sun Jan 29 21:56:47 2017	(r312967)
+++ projects/clang400-import/include/pthread.h	Sun Jan 29 22:00:47 2017	(r312968)
@@ -46,6 +46,8 @@
 #include <sched.h>
 #include <time.h>
 
+__NULLABILITY_PRAGMA_PUSH
+
 /*
  * Run-time invariant values:
  */
@@ -147,28 +149,35 @@ struct _pthread_cleanup_info {
  */
 __BEGIN_DECLS
 int		pthread_atfork(void (*)(void), void (*)(void), void (*)(void));
-int		pthread_attr_destroy(pthread_attr_t *);
-int		pthread_attr_getstack(const pthread_attr_t * __restrict, 
-			void ** __restrict, size_t * __restrict);
-int		pthread_attr_getstacksize(const pthread_attr_t *, size_t *);
-int		pthread_attr_getguardsize(const pthread_attr_t *, size_t *);
+int		pthread_attr_destroy(pthread_attr_t * _Nonnull);
+int		pthread_attr_getstack(
+		    const pthread_attr_t * _Nonnull __restrict, 
+		    void ** _Nonnull __restrict,
+		    size_t * _Nonnull __restrict);
+int		pthread_attr_getstacksize(const pthread_attr_t * _Nonnull,
+		    size_t * _Nonnull);
+int		pthread_attr_getguardsize(const pthread_attr_t * _Nonnull,
+		    size_t * _Nonnull);
 int		pthread_attr_getstackaddr(const pthread_attr_t *, void **);
-int		pthread_attr_getdetachstate(const pthread_attr_t *, int *);
-int		pthread_attr_init(pthread_attr_t *);
-int		pthread_attr_setstacksize(pthread_attr_t *, size_t);
-int		pthread_attr_setguardsize(pthread_attr_t *, size_t);
-int		pthread_attr_setstack(pthread_attr_t *, void *, size_t);
+int		pthread_attr_getdetachstate(const pthread_attr_t * _Nonnull,
+		    int * _Nonnull);
+int		pthread_attr_init(pthread_attr_t * _Nonnull);
+int		pthread_attr_setstacksize(pthread_attr_t * _Nonnull, size_t);
+int		pthread_attr_setguardsize(pthread_attr_t * _Nonnull, size_t);
+int		pthread_attr_setstack(pthread_attr_t * _Nonnull, void *,
+		    size_t);
 int		pthread_attr_setstackaddr(pthread_attr_t *, void *);
-int		pthread_attr_setdetachstate(pthread_attr_t *, int);
-int		pthread_barrier_destroy(pthread_barrier_t *);
-int		pthread_barrier_init(pthread_barrier_t *,
+int		pthread_attr_setdetachstate(pthread_attr_t * _Nonnull, int);
+int		pthread_barrier_destroy(pthread_barrier_t * _Nonnull);
+int		pthread_barrier_init(pthread_barrier_t * _Nonnull,
 			const pthread_barrierattr_t *, unsigned);
-int		pthread_barrier_wait(pthread_barrier_t *);
-int		pthread_barrierattr_destroy(pthread_barrierattr_t *);
-int		pthread_barrierattr_getpshared(const pthread_barrierattr_t *,
-			int *);
-int		pthread_barrierattr_init(pthread_barrierattr_t *);
-int		pthread_barrierattr_setpshared(pthread_barrierattr_t *, int);
+int		pthread_barrier_wait(pthread_barrier_t * _Nonnull);
+int		pthread_barrierattr_destroy(pthread_barrierattr_t * _Nonnull);
+int		pthread_barrierattr_getpshared(
+		    const pthread_barrierattr_t * _Nonnull, int * _Nonnull);
+int		pthread_barrierattr_init(pthread_barrierattr_t * _Nonnull);
+int		pthread_barrierattr_setpshared(pthread_barrierattr_t * _Nonnull,
+		    int);
 
 #define		pthread_cleanup_push(cleanup_routine, cleanup_arg)		\
 		{								\
@@ -183,100 +192,109 @@ int		pthread_barrierattr_setpshared(pthr
 			__pthread_cleanup_pop_imp(execute);			\
 		}
 
-int		pthread_condattr_destroy(pthread_condattr_t *);
-int		pthread_condattr_getclock(const pthread_condattr_t *,
-			clockid_t *);
-int		pthread_condattr_getpshared(const pthread_condattr_t *, int *);
-int		pthread_condattr_init(pthread_condattr_t *);
-int		pthread_condattr_setclock(pthread_condattr_t *, clockid_t);
-int		pthread_condattr_setpshared(pthread_condattr_t *, int);
-int		pthread_cond_broadcast(pthread_cond_t *);
-int		pthread_cond_destroy(pthread_cond_t *);
-int		pthread_cond_init(pthread_cond_t *,
+int		pthread_condattr_destroy(pthread_condattr_t * _Nonnull);
+int		pthread_condattr_getclock(const pthread_condattr_t * _Nonnull,
+		    clockid_t * _Nonnull);
+int		pthread_condattr_getpshared(const pthread_condattr_t * _Nonnull,
+		    int * _Nonnull);
+int		pthread_condattr_init(pthread_condattr_t * _Nonnull);
+int		pthread_condattr_setclock(pthread_condattr_t * _Nonnull,
+		    clockid_t);
+int		pthread_condattr_setpshared(pthread_condattr_t * _Nonnull, int);
+int		pthread_cond_broadcast(pthread_cond_t * _Nonnull);
+int		pthread_cond_destroy(pthread_cond_t * _Nonnull);
+int		pthread_cond_init(pthread_cond_t * _Nonnull,
 			const pthread_condattr_t *);
-int		pthread_cond_signal(pthread_cond_t *);
-int		pthread_cond_timedwait(pthread_cond_t *,
-			pthread_mutex_t *__mutex, const struct timespec *)
+int		pthread_cond_signal(pthread_cond_t * _Nonnull);
+int		pthread_cond_timedwait(pthread_cond_t * _Nonnull,
+		    pthread_mutex_t * _Nonnull __mutex,
+		    const struct timespec * _Nonnull)
 		    __requires_exclusive(*__mutex);
-int		pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *__mutex)
+int		pthread_cond_wait(pthread_cond_t * _Nonnull,
+		    pthread_mutex_t * _Nonnull __mutex)
 		    __requires_exclusive(*__mutex);
-int		pthread_create(pthread_t *, const pthread_attr_t *,
-			void *(*) (void *), void *);
+int		pthread_create(pthread_t * _Nonnull, const pthread_attr_t *,
+		    void *(* _Nonnull) (void *), void *);
 int		pthread_detach(pthread_t);
 int		pthread_equal(pthread_t, pthread_t);
 void		pthread_exit(void *) __dead2;
 void		*pthread_getspecific(pthread_key_t);
-int		pthread_getcpuclockid(pthread_t, clockid_t *);
+int		pthread_getcpuclockid(pthread_t, clockid_t * _Nonnull);
 int		pthread_join(pthread_t, void **);
-int		pthread_key_create(pthread_key_t *,
-			void (*) (void *));
+int		pthread_key_create(pthread_key_t * _Nonnull,
+		    void (*) (void *));
 int		pthread_key_delete(pthread_key_t);
-int		pthread_mutexattr_init(pthread_mutexattr_t *);
-int		pthread_mutexattr_destroy(pthread_mutexattr_t *);
-int		pthread_mutexattr_getpshared(const pthread_mutexattr_t *,
-			int *);
-int		pthread_mutexattr_gettype(pthread_mutexattr_t *, int *);
-int		pthread_mutexattr_settype(pthread_mutexattr_t *, int);
-int		pthread_mutexattr_setpshared(pthread_mutexattr_t *, int);
-int		pthread_mutex_consistent(pthread_mutex_t *__mutex)
-			__nonnull(1) __requires_exclusive(*__mutex);
-int		pthread_mutex_destroy(pthread_mutex_t *__mutex)
+int		pthread_mutexattr_init(pthread_mutexattr_t * _Nonnull);
+int		pthread_mutexattr_destroy(pthread_mutexattr_t * _Nonnull);
+int		pthread_mutexattr_getpshared(
+		    const pthread_mutexattr_t * _Nonnull, int * _Nonnull);
+int		pthread_mutexattr_gettype(pthread_mutexattr_t * _Nonnull,
+		    int * _Nonnull);
+int		pthread_mutexattr_settype(pthread_mutexattr_t * _Nonnull, int);
+int		pthread_mutexattr_setpshared(pthread_mutexattr_t * _Nonnull,
+		    int);
+int		pthread_mutex_consistent(pthread_mutex_t * _Nonnull __mutex)
+		    __requires_exclusive(*__mutex);
+int		pthread_mutex_destroy(pthread_mutex_t * _Nonnull __mutex)
 		    __requires_unlocked(*__mutex);
-int		pthread_mutex_init(pthread_mutex_t *__mutex,
-			const pthread_mutexattr_t *)
+int		pthread_mutex_init(pthread_mutex_t * _Nonnull __mutex,
+		    const pthread_mutexattr_t *)
 		    __requires_unlocked(*__mutex);
-int		pthread_mutex_lock(pthread_mutex_t *__mutex)
-                    __locks_exclusive(*__mutex);
-int		pthread_mutex_trylock(pthread_mutex_t *__mutex)
-                    __trylocks_exclusive(0, *__mutex);
-int		pthread_mutex_timedlock(pthread_mutex_t *__mutex,
-			const struct timespec *)
-                    __trylocks_exclusive(0, *__mutex);
-int		pthread_mutex_unlock(pthread_mutex_t *__mutex)
+int		pthread_mutex_lock(pthread_mutex_t * _Nonnull __mutex)
+		    __locks_exclusive(*__mutex);
+int		pthread_mutex_trylock(pthread_mutex_t * _Nonnull __mutex)
+		    __trylocks_exclusive(0, *__mutex);
+int		pthread_mutex_timedlock(pthread_mutex_t * _Nonnull __mutex,
+		    const struct timespec * _Nonnull)
+		    __trylocks_exclusive(0, *__mutex);
+int		pthread_mutex_unlock(pthread_mutex_t * _Nonnull __mutex)
 		    __unlocks(*__mutex);
-int		pthread_once(pthread_once_t *, void (*) (void));
-int		pthread_rwlock_destroy(pthread_rwlock_t *__rwlock)
+int		pthread_once(pthread_once_t * _Nonnull,
+		    void (* _Nonnull) (void));
+int		pthread_rwlock_destroy(pthread_rwlock_t * _Nonnull __rwlock)
 		    __requires_unlocked(*__rwlock);
-int		pthread_rwlock_init(pthread_rwlock_t *__rwlock,
-			const pthread_rwlockattr_t *)
+int		pthread_rwlock_init(pthread_rwlock_t * _Nonnull __rwlock,
+		    const pthread_rwlockattr_t *)
 		    __requires_unlocked(*__rwlock);
-int		pthread_rwlock_rdlock(pthread_rwlock_t *__rwlock)
-                    __locks_shared(*__rwlock);
-int		pthread_rwlock_timedrdlock(pthread_rwlock_t *__rwlock,
-			const struct timespec *)
-                    __trylocks_shared(0, *__rwlock);
-int		pthread_rwlock_timedwrlock(pthread_rwlock_t *__rwlock,
-			const struct timespec *)
-                    __trylocks_exclusive(0, *__rwlock);
-int		pthread_rwlock_tryrdlock(pthread_rwlock_t *__rwlock)
-                    __trylocks_shared(0, *__rwlock);
-int		pthread_rwlock_trywrlock(pthread_rwlock_t *__rwlock)
-                    __trylocks_exclusive(0, *__rwlock);
-int		pthread_rwlock_unlock(pthread_rwlock_t *__rwlock)
+int		pthread_rwlock_rdlock(pthread_rwlock_t * _Nonnull __rwlock)
+		    __locks_shared(*__rwlock);
+int		pthread_rwlock_timedrdlock(pthread_rwlock_t * _Nonnull __rwlock,
+		    const struct timespec * _Nonnull)
+		    __trylocks_shared(0, *__rwlock);
+int		pthread_rwlock_timedwrlock(pthread_rwlock_t * _Nonnull __rwlock,
+		    const struct timespec * _Nonnull)
+		    __trylocks_exclusive(0, *__rwlock);
+int		pthread_rwlock_tryrdlock(pthread_rwlock_t * _Nonnull __rwlock)
+		    __trylocks_shared(0, *__rwlock);
+int		pthread_rwlock_trywrlock(pthread_rwlock_t * _Nonnull __rwlock)
+		    __trylocks_exclusive(0, *__rwlock);
+int		pthread_rwlock_unlock(pthread_rwlock_t * _Nonnull __rwlock)
 		    __unlocks(*__rwlock);
-int		pthread_rwlock_wrlock(pthread_rwlock_t *__rwlock)
-                    __locks_exclusive(*__rwlock);
-int		pthread_rwlockattr_destroy(pthread_rwlockattr_t *);
-int		pthread_rwlockattr_getkind_np(const pthread_rwlockattr_t *,
-			int *);
-int		pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *,
-			int *);
-int		pthread_rwlockattr_init(pthread_rwlockattr_t *);
-int		pthread_rwlockattr_setkind_np(pthread_rwlockattr_t *, int);
-int		pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int);
+int		pthread_rwlock_wrlock(pthread_rwlock_t * _Nonnull __rwlock)
+		    __locks_exclusive(*__rwlock);
+int		pthread_rwlockattr_destroy(pthread_rwlockattr_t * _Nonnull);
+int		pthread_rwlockattr_getkind_np(
+		    const pthread_rwlockattr_t * _Nonnull, int *);
+int		pthread_rwlockattr_getpshared(
+		    const pthread_rwlockattr_t * _Nonnull, int * _Nonnull);
+int		pthread_rwlockattr_init(pthread_rwlockattr_t * _Nonnull);
+int		pthread_rwlockattr_setkind_np(pthread_rwlockattr_t * _Nonnull,
+		    int);
+int		pthread_rwlockattr_setpshared(pthread_rwlockattr_t * _Nonnull,
+		    int);
 pthread_t	pthread_self(void);
 int		pthread_setspecific(pthread_key_t, const void *);
 
-int		pthread_spin_init(pthread_spinlock_t *__spin, int)
+int		pthread_spin_init(pthread_spinlock_t * _Nonnull __spin, int)
 		    __requires_unlocked(*__spin);
-int		pthread_spin_destroy(pthread_spinlock_t *__spin)
+int		pthread_spin_destroy(pthread_spinlock_t * _Nonnull __spin)
 		    __requires_unlocked(*__spin);
-int		pthread_spin_lock(pthread_spinlock_t *__spin)
-                    __locks_exclusive(*__spin);
-int		pthread_spin_trylock(pthread_spinlock_t *__spin)
-                    __trylocks_exclusive(0, *__spin);
-int		pthread_spin_unlock(pthread_spinlock_t *__spin)
-		    __unlocks(*__spin);
+int		pthread_spin_lock(pthread_spinlock_t * _Nonnull __spin)
+			__locks_exclusive(*__spin);
+int		pthread_spin_trylock(pthread_spinlock_t * _Nonnull __spin)
+			__trylocks_exclusive(0, *__spin);
+int		pthread_spin_unlock(pthread_spinlock_t * _Nonnull __spin)
+			__unlocks(*__spin);
 int		pthread_cancel(pthread_t);
 int		pthread_setcancelstate(int, int *);
 int		pthread_setcanceltype(int, int *);
@@ -288,35 +306,36 @@ int		pthread_setprio(pthread_t, int);
 void		pthread_yield(void);
 #endif
 
-int		pthread_mutexattr_getprioceiling(pthread_mutexattr_t *,
-			int *);
-int		pthread_mutexattr_setprioceiling(pthread_mutexattr_t *,
-			int);
+int		pthread_mutexattr_getprioceiling(pthread_mutexattr_t *, int *);
+int		pthread_mutexattr_setprioceiling(pthread_mutexattr_t *, int);
 int		pthread_mutex_getprioceiling(pthread_mutex_t *, int *);
 int		pthread_mutex_setprioceiling(pthread_mutex_t *, int, int *);
 
 int		pthread_mutexattr_getprotocol(pthread_mutexattr_t *, int *);
 int		pthread_mutexattr_setprotocol(pthread_mutexattr_t *, int);
 
-int		pthread_mutexattr_getrobust(pthread_mutexattr_t *__restrict,
-			int *__restrict) __nonnull_all;
-int		pthread_mutexattr_setrobust(pthread_mutexattr_t *, int)
-			__nonnull(1);
+int		pthread_mutexattr_getrobust(
+		    pthread_mutexattr_t * _Nonnull __restrict,
+		    int * _Nonnull __restrict);
+int		pthread_mutexattr_setrobust(pthread_mutexattr_t * _Nonnull,
+		    int);
 
 int		pthread_attr_getinheritsched(const pthread_attr_t *, int *);
-int		pthread_attr_getschedparam(const pthread_attr_t *,
-			struct sched_param *);
-int		pthread_attr_getschedpolicy(const pthread_attr_t *, int *);
-int		pthread_attr_getscope(const pthread_attr_t *, int *);
+int		pthread_attr_getschedparam(const pthread_attr_t * _Nonnull,
+		    struct sched_param * _Nonnull);
+int		pthread_attr_getschedpolicy(const pthread_attr_t * _Nonnull,
+		    int * _Nonnull);
+int		pthread_attr_getscope(const pthread_attr_t * _Nonnull,
+		    int * _Nonnull);
 int		pthread_attr_setinheritsched(pthread_attr_t *, int);
-int		pthread_attr_setschedparam(pthread_attr_t *,
-			const struct sched_param *);
-int		pthread_attr_setschedpolicy(pthread_attr_t *, int);
-int		pthread_attr_setscope(pthread_attr_t *, int);
-int		pthread_getschedparam(pthread_t pthread, int *,
-			struct sched_param *);
+int		pthread_attr_setschedparam(pthread_attr_t * _Nonnull,
+		    const struct sched_param * _Nonnull);
+int		pthread_attr_setschedpolicy(pthread_attr_t * _Nonnull, int);
+int		pthread_attr_setscope(pthread_attr_t * _Nonnull, int);
+int		pthread_getschedparam(pthread_t pthread, int * _Nonnull,
+		    struct sched_param * _Nonnull);
 int		pthread_setschedparam(pthread_t, int,
-			const struct sched_param *);
+		    const struct sched_param * _Nonnull);
 #if __XSI_VISIBLE
 int		pthread_getconcurrency(void);
 int		pthread_setconcurrency(int);
@@ -326,5 +345,6 @@ void		__pthread_cleanup_push_imp(void (*
 			struct _pthread_cleanup_info *);
 void		__pthread_cleanup_pop_imp(int);
 __END_DECLS
+__NULLABILITY_PRAGMA_POP
 
-#endif
+#endif	/* _PTHREAD_H_ */

Modified: projects/clang400-import/include/signal.h
==============================================================================
--- projects/clang400-import/include/signal.h	Sun Jan 29 21:56:47 2017	(r312967)
+++ projects/clang400-import/include/signal.h	Sun Jan 29 22:00:47 2017	(r312968)
@@ -41,6 +41,8 @@
 #include <sys/_ucontext.h>
 #endif
 
+__NULLABILITY_PRAGMA_PUSH
+
 #if __BSD_VISIBLE
 /*
  * XXX should enlarge these, if only to give empty names instead of bounds
@@ -82,10 +84,11 @@ int	sigdelset(sigset_t *, int);
 int	sigemptyset(sigset_t *);
 int	sigfillset(sigset_t *);
 int	sigismember(const sigset_t *, int);
-int	sigpending(sigset_t *);
+int	sigpending(sigset_t * _Nonnull);
 int	sigprocmask(int, const sigset_t * __restrict, sigset_t * __restrict);
-int	sigsuspend(const sigset_t *);
-int	sigwait(const sigset_t * __restrict, int * __restrict);
+int	sigsuspend(const sigset_t * _Nonnull);
+int	sigwait(const sigset_t * _Nonnull __restrict,
+	    int * _Nonnull __restrict);
 #endif
 
 #if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 600
@@ -104,7 +107,7 @@ int	sighold(int);
 int	sigignore(int);
 int	sigpause(int);
 int	sigrelse(int);
-void	(*sigset(int, void (*)(int)))(int);
+void	(* _Nullable sigset(int, void (* _Nullable)(int)))(int);
 int	xsi_sigpause(int);
 #endif
 
@@ -124,5 +127,6 @@ int	sigstack(const struct sigstack *, st
 int	sigvec(int, struct sigvec *, struct sigvec *);
 #endif
 __END_DECLS
+__NULLABILITY_PRAGMA_POP
 
 #endif /* !_SIGNAL_H_ */

Modified: projects/clang400-import/include/stdio.h
==============================================================================
--- projects/clang400-import/include/stdio.h	Sun Jan 29 21:56:47 2017	(r312967)
+++ projects/clang400-import/include/stdio.h	Sun Jan 29 22:00:47 2017	(r312968)
@@ -40,6 +40,8 @@
 #include <sys/_null.h>
 #include <sys/_types.h>
 
+__NULLABILITY_PRAGMA_PUSH
+
 typedef	__off_t		fpos_t;
 
 #ifndef _SIZE_T_DECLARED
@@ -123,10 +125,10 @@ struct __sFILE {
 
 	/* operations */
 	void	*_cookie;	/* (*) cookie passed to io functions */
-	int	(*_close)(void *);
-	int	(*_read)(void *, char *, int);
-	fpos_t	(*_seek)(void *, fpos_t, int);
-	int	(*_write)(void *, const char *, int);
+	int	(* _Nullable _close)(void *);
+	int	(* _Nullable _read)(void *, char *, int);
+	fpos_t	(* _Nullable _seek)(void *, fpos_t, int);
+	int	(* _Nullable _write)(void *, const char *, int);
 
 	/* separate buffer for long sequences of ungetc() */
 	struct	__sbuf _ub;	/* ungetc buffer */
@@ -390,10 +392,10 @@ extern const char * const sys_errlist[];
  * Stdio function-access interface.
  */
 FILE	*funopen(const void *,
-	    int (*)(void *, char *, int),
-	    int (*)(void *, const char *, int),
-	    fpos_t (*)(void *, fpos_t, int),
-	    int (*)(void *));
+	    int (* _Nullable)(void *, char *, int),
+	    int (* _Nullable)(void *, const char *, int),
+	    fpos_t (* _Nullable)(void *, fpos_t, int),
+	    int (* _Nullable)(void *));
 #define	fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0)
 #define	fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0)
 
@@ -506,4 +508,6 @@ extern int __isthreaded;
 #endif /* __cplusplus */
 
 __END_DECLS
+__NULLABILITY_PRAGMA_POP
+
 #endif /* !_STDIO_H_ */

Modified: projects/clang400-import/include/stdlib.h
==============================================================================
--- projects/clang400-import/include/stdlib.h	Sun Jan 29 21:56:47 2017	(r312967)
+++ projects/clang400-import/include/stdlib.h	Sun Jan 29 22:00:47 2017	(r312968)
@@ -37,6 +37,8 @@
 #include <sys/_null.h>
 #include <sys/_types.h>
 
+__NULLABILITY_PRAGMA_PUSH
+
 #if __BSD_VISIBLE
 #ifndef _RUNE_T_DECLARED
 typedef	__rune_t	rune_t;
@@ -81,12 +83,12 @@ extern int ___mb_cur_max(void);
 
 _Noreturn void	 abort(void);
 int	 abs(int) __pure2;
-int	 atexit(void (*)(void));
+int	 atexit(void (* _Nonnull)(void));
 double	 atof(const char *);
 int	 atoi(const char *);
 long	 atol(const char *);
 void	*bsearch(const void *, const void *, size_t,
-	    size_t, int (*)(const void *, const void *));
+	    size_t, int (*)(const void * _Nonnull, const void *));
 void	*calloc(size_t, size_t) __malloc_like __result_use_check
 	     __alloc_size(1) __alloc_size(2);
 div_t	 div(int, int) __pure2;
@@ -100,7 +102,7 @@ int	 mblen(const char *, size_t);
 size_t	 mbstowcs(wchar_t * __restrict , const char * __restrict, size_t);
 int	 mbtowc(wchar_t * __restrict, const char * __restrict, size_t);
 void	 qsort(void *, size_t, size_t,
-	    int (*)(const void *, const void *));
+	    int (* _Nonnull)(const void *, const void *));
 int	 rand(void);
 void	*realloc(void *, size_t) __result_use_check __alloc_size(2);
 void	 srand(unsigned);
@@ -256,9 +258,9 @@ void	 arc4random_stir(void);
 __uint32_t 
 	 arc4random_uniform(__uint32_t);
 #ifdef __BLOCKS__
-int	 atexit_b(void (^)(void));
+int	 atexit_b(void (^ _Nonnull)(void));
 void	*bsearch_b(const void *, const void *, size_t,
-	    size_t, int (^)(const void *, const void *));
+	    size_t, int (^ _Nonnull)(const void *, const void *));
 #endif
 char	*getbsize(int *, long *);
 					/* getcap(3) functions */
@@ -282,11 +284,13 @@ int	 getloadavg(double [], int);
 const char *
 	 getprogname(void);
 
-int	 heapsort(void *, size_t, size_t, int (*)(const void *, const void *));
+int	 heapsort(void *, size_t, size_t,
+	    int (* _Nonnull)(const void *, const void *));
 #ifdef __BLOCKS__
-int	 heapsort_b(void *, size_t, size_t, int (^)(const void *, const void *));
+int	 heapsort_b(void *, size_t, size_t,
+	    int (^ _Nonnull)(const void *, const void *));
 void	 qsort_b(void *, size_t, size_t,
-	    int (^)(const void *, const void *));
+	    int (^ _Nonnull)(const void *, const void *));
 #endif
 int	 l64a_r(long, char *, int);
 int	 mergesort(void *, size_t, size_t, int (*)(const void *, const void *));
@@ -320,5 +324,6 @@ __uint64_t
 extern char *suboptarg;			/* getsubopt(3) external variable */
 #endif /* __BSD_VISIBLE */
 __END_DECLS
+__NULLABILITY_PRAGMA_POP
 
 #endif /* !_STDLIB_H_ */

Modified: projects/clang400-import/lib/Makefile
==============================================================================
--- projects/clang400-import/lib/Makefile	Sun Jan 29 21:56:47 2017	(r312967)
+++ projects/clang400-import/lib/Makefile	Sun Jan 29 22:00:47 2017	(r312968)
@@ -106,7 +106,7 @@ SUBDIR_DEPEND_libdevstat= libkvm
 SUBDIR_DEPEND_libdpv= libfigpar ncurses libutil
 SUBDIR_DEPEND_libedit= ncurses
 SUBDIR_DEPEND_libgeom= libexpat libsbuf
-SUBDIR_DEPEND_liblibrpcsec_gss= libgssapi
+SUBDIR_DEPEND_librpcsec_gss= libgssapi
 SUBDIR_DEPEND_libmagic= libz
 SUBDIR_DEPEND_libmemstat= libkvm
 SUBDIR_DEPEND_libopie= libmd

Modified: projects/clang400-import/lib/libsysdecode/Makefile
==============================================================================
--- projects/clang400-import/lib/libsysdecode/Makefile	Sun Jan 29 21:56:47 2017	(r312967)
+++ projects/clang400-import/lib/libsysdecode/Makefile	Sun Jan 29 22:00:47 2017	(r312968)
@@ -120,7 +120,7 @@ tables.h: mktables
 ioctl.c: .PHONY
 .endif
 ioctl.c: mkioctls .META
-	env MACHINE=${MACHINE} CPP="${CPP}" \
+	env CPP="${CPP}" \
 		/bin/sh ${.CURDIR}/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET}
 
 beforedepend: ioctl.c tables.h

Modified: projects/clang400-import/lib/libsysdecode/mkioctls
==============================================================================
--- projects/clang400-import/lib/libsysdecode/mkioctls	Sun Jan 29 21:56:47 2017	(r312967)
+++ projects/clang400-import/lib/libsysdecode/mkioctls	Sun Jan 29 22:00:47 2017	(r312968)
@@ -24,15 +24,7 @@ ioctl_includes=$(
 		awk '{printf("#include <%s>\\n", $1)}'
 )
 
-: ${MACHINE=$(uname -m)}
-case "${MACHINE}" in
-*pc98*)
-	ioctl_includes="$ioctl_includes#include <sys/diskpc98.h>\\n"
-	;;
-*)
-	ioctl_includes="$ioctl_includes#include <sys/diskmbr.h>\\n"
-	;;
-esac
+ioctl_includes="$ioctl_includes#include <sys/diskmbr.h>\\n"
 
 awk -v x="$ioctl_includes" 'BEGIN {print x}' |
 	$CPP -nostdinc -I$includedir -dM -DCOMPAT_43TTY - |

Modified: projects/clang400-import/lib/libthr/thread/thr_private.h
==============================================================================
--- projects/clang400-import/lib/libthr/thread/thr_private.h	Sun Jan 29 21:56:47 2017	(r312967)
+++ projects/clang400-import/lib/libthr/thread/thr_private.h	Sun Jan 29 22:00:47 2017	(r312968)
@@ -53,6 +53,8 @@
 #include <sys/thr.h>
 #include <pthread.h>
 
+__NULLABILITY_PRAGMA_PUSH
+
 #define	SYM_FB10(sym)			__CONCAT(sym, _fb10)
 #define	SYM_FBP10(sym)			__CONCAT(sym, _fbp10)
 #define	WEAK_REF(sym, alias)		__weak_reference(sym, alias)
@@ -835,11 +837,10 @@ void	_pthread_cleanup_pop(int);
 void	_pthread_exit_mask(void *status, sigset_t *mask) __dead2 __hidden;
 void	_pthread_cancel_enter(int maycancel);
 void 	_pthread_cancel_leave(int maycancel);
-int	_pthread_mutex_consistent(pthread_mutex_t *) __nonnull(1);
-int	_pthread_mutexattr_getrobust(pthread_mutexattr_t *__restrict,
-	    int *__restrict) __nonnull_all;
-int	_pthread_mutexattr_setrobust(pthread_mutexattr_t *, int)
-	    __nonnull(1);
+int	_pthread_mutex_consistent(pthread_mutex_t * _Nonnull);
+int	_pthread_mutexattr_getrobust(pthread_mutexattr_t * _Nonnull __restrict,
+	    int * _Nonnull __restrict);
+int	_pthread_mutexattr_setrobust(pthread_mutexattr_t * _Nonnull, int);
 
 /* #include <fcntl.h> */
 #ifdef  _SYS_FCNTL_H_
@@ -984,5 +985,6 @@ void __thr_pshared_atfork_pre(void) __hi
 void __thr_pshared_atfork_post(void) __hidden;
 
 __END_DECLS
+__NULLABILITY_PRAGMA_POP
 
 #endif  /* !_THR_PRIVATE_H */

Modified: projects/clang400-import/release/doc/README
==============================================================================
--- projects/clang400-import/release/doc/README	Sun Jan 29 21:56:47 2017	(r312967)
+++ projects/clang400-import/release/doc/README	Sun Jan 29 22:00:47 2017	(r312968)
@@ -99,7 +99,7 @@ element will be included.  For example:
 
 	<para arch="sparc64">SPARC64-specific text</para>
 
-The currently-supported architectures are amd64, arm, i386, pc98,
+The currently-supported architectures are amd64, arm, i386,
 powerpc and sparc64.  An element may appear for multiple architectures
 by specifying a comma-separated list of architectures
 (i.e. arch="sparc64,amd64").

Modified: projects/clang400-import/release/doc/en_US.ISO8859-1/hardware/article.xml
==============================================================================
--- projects/clang400-import/release/doc/en_US.ISO8859-1/hardware/article.xml	Sun Jan 29 21:56:47 2017	(r312967)
+++ projects/clang400-import/release/doc/en_US.ISO8859-1/hardware/article.xml	Sun Jan 29 22:00:47 2017	(r312968)
@@ -252,35 +252,6 @@
 	more information.</para>
     </sect2>
 
-    <sect2 xml:id="proc-pc98">
-      <title>pc98</title>
-
-      <para>NEC PC-9801/9821 series with almost all &i386;-compatible
-	processors, including 80486, &pentium;, &pentium; Pro,
-	&pentium; II, and variants.  All &i386;-compatible processors
-	by AMD, Cyrix, IBM, and IDT are also supported.</para>
-
-      <para>NEC FC-9801/9821 series, and NEC SV-98 series (both of
-	them are compatible with PC-9801/9821 series) should be
-	supported.</para>
-
-      <para>EPSON PC-386/486/586 series, which are compatible with NEC
-	PC-9801 series are supported.</para>
-
-      <para>High-resolution mode is not supported.  NEC
-	PC-98XA/XL/RL/XL^2, and NEC PC-H98 series are supported in
-	normal (PC-9801 compatible) mode only.</para>
-
-      <para>Although there are some multi-processor systems (such as
-	Rs20/B20), SMP-related features of &os; are not supported
-	yet.</para>
-
-      <para>PC-9801/9821 standard bus (called C-Bus), PC-9801NOTE
-	expansion bus (110pin), and PCI bus are supported.  New Extend
-	Standard Architecture (NESA) bus (used in PC-H98, SV-H98, and
-	FC-H98 series) is not supported.</para>
-    </sect2>
-
     <sect2 xml:id="proc-powerpc">
       <title>powerpc</title>
 
@@ -636,17 +607,9 @@
     <sect2 xml:id="disk">
       <title>Disk Controllers</title>
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;, &arch.sparc64;]
+      <para>[&arch.amd64;, &arch.i386;, &arch.sparc64;]
 	IDE/ATA controllers (&man.ata.4; driver)</para>
 
-      <para>[&arch.pc98;] IDE/ATA controllers (wdc driver)</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para>On-board IDE controller</para>
-	</listitem>
-      </itemizedlist>
-
       &hwlist.aac;
 
       &hwlist.adv;
@@ -673,8 +636,6 @@
 
       &hwlist.ciss;
 
-      &hwlist.ct;
-
       &hwlist.dpt;
 
       <note>
@@ -894,8 +855,6 @@
 
       &hwlist.sn;
 
-      &hwlist.snc;
-
       &hwlist.ste;
 
       &hwlist.stge;
@@ -904,7 +863,7 @@
 
       &hwlist.tl;
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] SMC 83c17x
+      <para>[&arch.amd64;, &arch.i386;] SMC 83c17x
 	(EPIC)-based Ethernet NICs (&man.tx.4; driver)</para>
 
       &hwlist.txp;
@@ -934,8 +893,7 @@
     <sect2 xml:id="fddi">
       <title>FDDI Interfaces</title>
 
-      <para>[&arch.i386;, &arch.pc98;] DEC DEFPA PCI (&man.fpa.4;
-	driver)</para>
+      <para>[&arch.i386;] DEC DEFPA PCI (&man.fpa.4; driver)</para>
 
       <para>[&arch.i386;] DEC DEFEA EISA (&man.fpa.4; driver)</para>
     </sect2>
@@ -943,28 +901,28 @@
     <sect2 xml:id="atm">
       <title>ATM Interfaces</title>
 
-      <para>[&arch.i386;, &arch.pc98;] Midway-based ATM interfaces
+      <para>[&arch.i386;] Midway-based ATM interfaces
 	(&man.en.4; driver)</para>
 
-      <para>[&arch.i386;, &arch.pc98; &arch.sparc64;] FORE Systems,
+      <para>[&arch.i386;, &arch.sparc64;] FORE Systems,
 	Inc. PCA-200E ATM PCI Adapters (hfa and &man.fatm.4;
 	drivers)</para>
 
-      <para>[&arch.i386;, &arch.pc98;] IDT NICStAR 77201/211-based ATM
+      <para>[&arch.i386;] IDT NICStAR 77201/211-based ATM
 	Adapters (&man.idt.4; driver)</para>
 
-      <para>[&arch.i386;, &arch.pc98; &arch.sparc64;] FORE Systems,
+      <para>[&arch.i386;, &arch.sparc64;] FORE Systems,
 	Inc. HE155 and HE622 ATM interfaces (&man.hatm.4;
 	driver)</para>
 
-      <para>[&arch.i386;, &arch.pc98;] IDT77252-based ATM cards
+      <para>[&arch.i386;] IDT77252-based ATM cards
 	(&man.patm.4; driver)</para>
     </sect2>
 
     <sect2 xml:id="wlan">
       <title>Wireless Network Interfaces</title>
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] Cisco/Aironet
+      <para>[&arch.amd64;, &arch.i386;] Cisco/Aironet
 	802.11b wireless adapters (&man.an.4; driver)</para>
 
       &hwlist.ath;
@@ -1016,7 +974,7 @@
 
       &hwlist.urtw;
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] Lucent
+      <para>[&arch.amd64;, &arch.i386;] Lucent
 	Technologies WaveLAN/IEEE 802.11b wireless network adapters
 	and workalikes using the Lucent Hermes, Intersil PRISM-II,
 	Intersil PRISM-2.5, Intersil Prism-3, and Symbol Spectrum24
@@ -1214,77 +1172,6 @@
 
       &hwlist.rc;
 
-      <para>[&arch.pc98;] Internel serial interfaces (&man.sio.4;
-	driver)</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para>PC-9801 on-board</para>
-	</listitem>
-	<listitem>
-	  <para>PC-9821 2'nd CCU (flags 0x12000000)</para>
-	</listitem>
-      </itemizedlist>
-
-      <para>[&arch.pc98;] NEC PC-9861K, PC-9801-101 and Midori-Denshi
-	MDC-926Rs (&man.sio.4; driver)</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para>COM2 (flags 0x01000000)</para>
-	</listitem>
-
-	<listitem>
-	  <para>COM3 (flags 0x02000000)</para>
-	</listitem>
-      </itemizedlist>
-
-      <para>[&arch.pc98;] NEC PC-9801-120 (&man.sio.4; driver)</para>
-
-      <note>
-	<para>"flags 0x11000000" is necessary in kernel
-	  configuration.</para>
-      </note>
-
-      <para>[&arch.pc98;] Microcore MC-16550, MC-16550II, MC-RS98
-	(&man.sio.4; driver)</para>
-
-      <note>
-	<para>"flags 0x14000?01" is necessary in kernel
-	  configuration.</para>
-      </note>
-
-      <para>[&arch.pc98;] Media Intelligent RSB-2000, RSB-3000 and
-	AIWA B98-02 (&man.sio.4; driver)</para>
-
-      <note>
-	<para>"flags 0x15000?01" is necessary in kernel
-	configuration.</para>
-      </note>
-
-      <para>[&arch.pc98;] Media Intelligent RSB-384 (&man.sio.4;
-	driver)</para>
-
-      <note>
-	<para>"flags 0x16000001" is necessary in kernel
-	  configuration.</para>
-      </note>
-
-      <para>[&arch.pc98;] I-O DATA RSA-98III (&man.sio.4;
-	driver)</para>
-
-      <note>
-	<para>"flags 0x18000?01" is necessary in kernel
-	  configuration.</para>
-      </note>
-
-      <para>[&arch.pc98;] Hayes ESP98 (&man.sio.4; driver)</para>
-
-      <note>
-	<para>"options COM_ESP" and "flags 0x19000000" are necessary
-	  in kernel configuration.</para>
-      </note>
-
     </sect2>
 
     <sect2 xml:id="sound">
@@ -1350,35 +1237,6 @@
 
       &hwlist.snd.vibes;
 
-      <para>[&arch.pc98;] NEC PC-9801-73, 86 and compatibles (nss
-	driver)</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para>NEC A-MATE internal sound</para>
-	</listitem>
-
-	<listitem>
-	  <para>Q-Vision WaveStar, WaveMaster</para>
-	</listitem>
-      </itemizedlist>
-
-      <para>[&arch.pc98;] NEC X-MATE, CanBe, ValueStar internal (mss
-	driver)</para>
-
-      <para>[&arch.pc98;] Creative Technologies SoundBlaster(98)
-	(&man.sb.4; driver)</para>
-
-      <para>[&arch.pc98;] I-O DATA CD-BOX (&man.sb.4; driver)</para>
-
-      <para>[&arch.pc98;] MPU-401 and compatible interfaces (mpu
-	driver)</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para>Q-Vision WaveStar</para>
-	</listitem>
-      </itemizedlist>
     </sect2>
 
     <sect2 xml:id="camera">
@@ -1392,7 +1250,7 @@
     <sect2 xml:id="usb">
       <title>USB Devices</title>
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] A
+      <para>[&arch.amd64;, &arch.i386;] A
 	range of USB peripherals are supported; devices known to work
 	are listed in this section.  Owing to the generic nature of
 	most USB devices, with some exceptions any device of a given
@@ -1400,14 +1258,14 @@
 	here.</para>
 
       <note>
-	<para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
+	<para>[&arch.amd64;, &arch.i386;]
 	  USB Ethernet adapters can be found in the section listing
 	  <link linkend="ethernet">Ethernet
 	    interfaces</link>.</para>
       </note>
 
       <note>
-	<para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
+	<para>[&arch.amd64;, &arch.i386;]
 	  USB Bluetooth adapters can be found in <link linkend="bluetooth">Bluetooth</link> section.</para>
       </note>
 
@@ -1415,18 +1273,15 @@
 
       &hwlist.uhci;
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] USB
+      <para>[&arch.amd64;, &arch.i386;] USB
 	2.0 controllers using the EHCI interface (&man.ehci.4;
 	driver)</para>
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
-	Hubs</para>
+      <para>[&arch.amd64;, &arch.i386;] Hubs</para>
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
-	Keyboards (&man.ukbd.4; driver)</para>
+      <para>[&arch.amd64;, &arch.i386;] Keyboards (&man.ukbd.4; driver)</para>
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
-	Miscellaneous</para>
+      <para>[&arch.amd64;, &arch.i386;] Miscellaneous</para>
 
       <itemizedlist>
 	<listitem>
@@ -1454,8 +1309,7 @@
 
       &hwlist.umodem;
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] Mice
-	(&man.ums.4; driver)</para>
+      <para>[&arch.amd64;, &arch.i386;] Mice (&man.ums.4; driver)</para>
 
       &hwlist.ulpt;
 
@@ -1471,7 +1325,7 @@
 
       &hwlist.umass;
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] Audio Devices

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

More information about the svn-src-projects mailing list