svn commit: r329605 - in user/jeff/numa: . bin/df cddl/contrib/opensolaris/cmd/zpool contrib/llvm/tools/clang/lib/CodeGen contrib/netbsd-tests/lib/libc/sys crypto/openssl/doc/man3 etc/devd lib/clan...
Jeff Roberson
jeff at FreeBSD.org
Mon Feb 19 22:00:06 UTC 2018
Author: jeff
Date: Mon Feb 19 22:00:02 2018
New Revision: 329605
URL: https://svnweb.freebsd.org/changeset/base/329605
Log:
Commit missing !sys portion of last merge.
Added:
user/jeff/numa/share/man/man9/syscall_helper_register.9
- copied unchanged from r329139, head/share/man/man9/syscall_helper_register.9
user/jeff/numa/stand/usb/test/
- copied from r329139, head/stand/usb/test/
user/jeff/numa/tools/build/options/WITHOUT_LLVM_COV
- copied unchanged from r329139, head/tools/build/options/WITHOUT_LLVM_COV
user/jeff/numa/tools/build/options/WITH_LLVM_COV
- copied unchanged from r329139, head/tools/build/options/WITH_LLVM_COV
user/jeff/numa/tools/diag/prtblknos/
- copied from r329139, head/tools/diag/prtblknos/
Deleted:
user/jeff/numa/crypto/openssl/doc/man3/
user/jeff/numa/secure/usr.bin/openssl/man/c_rehash.1
user/jeff/numa/stand/usb/Makefile.test
user/jeff/numa/stand/usb/bsd_usbloader_test.c
user/jeff/numa/tools/regression/sockets/socketpair/
Modified:
user/jeff/numa/Makefile
user/jeff/numa/Makefile.inc1
user/jeff/numa/ObsoleteFiles.inc
user/jeff/numa/bin/df/df.c
user/jeff/numa/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
user/jeff/numa/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp
user/jeff/numa/contrib/netbsd-tests/lib/libc/sys/t_socketpair.c
user/jeff/numa/etc/devd/usb.conf
user/jeff/numa/lib/clang/libllvm/Makefile
user/jeff/numa/lib/libc/rpc/svc_dg.c
user/jeff/numa/lib/libc/sys/fsync.2
user/jeff/numa/lib/libc/sys/socketpair.2
user/jeff/numa/lib/libcompat/4.3/rexec.c
user/jeff/numa/sbin/dumpfs/dumpfs.c
user/jeff/numa/sbin/fsck_ffs/fsck.h
user/jeff/numa/sbin/fsck_ffs/globs.c
user/jeff/numa/sbin/fsck_ffs/main.c
user/jeff/numa/sbin/fsck_ffs/pass5.c
user/jeff/numa/sbin/geom/class/part/gpart.8
user/jeff/numa/sbin/newfs/mkfs.c
user/jeff/numa/secure/lib/libcrypto/Makefile.inc
user/jeff/numa/secure/usr.bin/openssl/Makefile.man
user/jeff/numa/share/man/man4/dtrace_tcp.4
user/jeff/numa/share/man/man5/src.conf.5
user/jeff/numa/share/man/man9/Makefile
user/jeff/numa/share/misc/committers-src.dot
user/jeff/numa/share/misc/organization.dot
user/jeff/numa/share/mk/bsd.compiler.mk
user/jeff/numa/share/mk/bsd.linker.mk
user/jeff/numa/share/mk/src.opts.mk
user/jeff/numa/share/zoneinfo/Makefile
user/jeff/numa/stand/common/boot.c
user/jeff/numa/stand/common/bootstrap.h
user/jeff/numa/stand/common/interp.c
user/jeff/numa/stand/common/interp_backslash.c
user/jeff/numa/stand/common/interp_forth.c
user/jeff/numa/stand/common/interp_parse.c
user/jeff/numa/stand/common/interp_simple.c
user/jeff/numa/stand/common/load_elf.c
user/jeff/numa/stand/defs.mk
user/jeff/numa/stand/kshim/bsd_kernel.h
user/jeff/numa/stand/usb/usbcore.mk
user/jeff/numa/stand/userboot/userboot/Makefile
user/jeff/numa/tools/diag/README
user/jeff/numa/tools/tools/nanobsd/embedded/beaglebone.cfg
user/jeff/numa/tools/tools/nanobsd/embedded/common
user/jeff/numa/tools/tools/nanobsd/embedded/pandaboard.cfg
user/jeff/numa/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg
user/jeff/numa/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg
user/jeff/numa/tools/tools/nanobsd/embedded/qemu-amd64.cfg
user/jeff/numa/tools/tools/nanobsd/embedded/qemu-armv7.cfg
user/jeff/numa/tools/tools/nanobsd/embedded/rpi2.cfg
user/jeff/numa/usr.bin/clang/Makefile
user/jeff/numa/usr.bin/clang/lld/ld.lld.1
user/jeff/numa/usr.bin/lex/initparse.c
user/jeff/numa/usr.bin/lock/Makefile
user/jeff/numa/usr.bin/lock/lock.c
user/jeff/numa/usr.bin/sort/radixsort.c
user/jeff/numa/usr.bin/tftp/main.c
user/jeff/numa/usr.bin/vmstat/vmstat.c
user/jeff/numa/usr.sbin/acpi/iasl/Makefile
user/jeff/numa/usr.sbin/mountd/mountd.c
user/jeff/numa/usr.sbin/ppp/defs.h
user/jeff/numa/usr.sbin/ppp/iface.c
user/jeff/numa/usr.sbin/ppp/ip.c
user/jeff/numa/usr.sbin/ppp/ipv6cp.c
user/jeff/numa/usr.sbin/ppp/ncpaddr.c
user/jeff/numa/usr.sbin/ppp/route.c
user/jeff/numa/usr.sbin/ypserv/yp_svc_udp.c
Directory Properties:
user/jeff/numa/ (props changed)
user/jeff/numa/cddl/ (props changed)
user/jeff/numa/cddl/contrib/opensolaris/ (props changed)
user/jeff/numa/contrib/llvm/ (props changed)
user/jeff/numa/contrib/llvm/tools/clang/ (props changed)
user/jeff/numa/contrib/netbsd-tests/ (props changed)
user/jeff/numa/crypto/openssl/ (props changed)
Modified: user/jeff/numa/Makefile
==============================================================================
--- user/jeff/numa/Makefile Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/Makefile Mon Feb 19 22:00:02 2018 (r329605)
@@ -106,9 +106,13 @@
#
# This is included so CC is set to ccache for -V, and COMPILER_TYPE/VERSION
-# can be cached for sub-makes.
+# can be cached for sub-makes. We can't do this while still running on the
+# old fmake from FreeBSD 9.x or older, so avoid including it then to avoid
+# heartburn upgrading from older systems. The need for CC is done with new
+# make later in the build, and caching COMPILER_TYPE/VERSION is only an
+# optimization. Also sinclude it to be friendlier to foreign OS hosted builds.
.if ${MAKE_VERSION} >= 20140620 && defined(.PARSEDIR)
-.include <bsd.compiler.mk>
+.sinclude <bsd.compiler.mk>
.endif
# Note: we use this awkward construct to be compatible with FreeBSD's
Modified: user/jeff/numa/Makefile.inc1
==============================================================================
--- user/jeff/numa/Makefile.inc1 Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/Makefile.inc1 Mon Feb 19 22:00:02 2018 (r329605)
@@ -85,8 +85,10 @@ MK_GCC_BOOTSTRAP= no
.-include "${OBJTOP}/compiler-metadata.mk"
.endif
-# Pull in COMPILER_TYPE and COMPILER_FREEBSD_VERSION early.
-.include <bsd.compiler.mk>
+# Pull in COMPILER_TYPE and COMPILER_FREEBSD_VERSION early. Pull it from the
+# tree to be friendlier to foreign OS builds. It's safe to do so unconditionally
+# here since we will always have the right make, unlike in src/Makefile
+.include "share/mk/bsd.compiler.mk"
.include "share/mk/src.opts.mk"
# Check if there is a local compiler that can satisfy as an external compiler.
@@ -165,11 +167,11 @@ test-system-compiler: .PHONY
.if !defined(X_COMPILER_TYPE)
CROSSENV+= COMPILER_VERSION=${COMPILER_VERSION} \
COMPILER_TYPE=${COMPILER_TYPE} \
- COMPILER_FEATURES=${COMPILER_FEATURES} \
+ COMPILER_FEATURES="${COMPILER_FEATURES}" \
COMPILER_FREEBSD_VERSION=${COMPILER_FREEBSD_VERSION}
.else
CROSSENV+= COMPILER_VERSION=${X_COMPILER_VERSION} \
- COMPILER_FEATURES=${X_COMPILER_FEATURES} \
+ COMPILER_FEATURES="${X_COMPILER_FEATURES}" \
COMPILER_TYPE=${X_COMPILER_TYPE} \
COMPILER_FREEBSD_VERSION=${X_COMPILER_FREEBSD_VERSION}
.endif
@@ -1107,7 +1109,7 @@ _zoneinfo= zic tzsetup
ITOOLS= [ awk cap_mkdb cat chflags chmod chown cmp cp \
date echo egrep find grep id install ${_install-info} \
ln make mkdir mtree mv pwd_mkdb \
- rm sed services_mkdb sh strip sysctl test true uname wc ${_zoneinfo} \
+ rm sed services_mkdb sh sort strip sysctl test true uname wc ${_zoneinfo} \
${LOCAL_ITOOLS}
# Needed for share/man
Modified: user/jeff/numa/ObsoleteFiles.inc
==============================================================================
--- user/jeff/numa/ObsoleteFiles.inc Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/ObsoleteFiles.inc Mon Feb 19 22:00:02 2018 (r329605)
@@ -38,6 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20180208: remove c_rehash(1)
+OLD_FILES+=usr/share/openssl/man/man1/c_rehash.1.gz
# 20180206: remove gdbtui
OLD_FILES+=usr/bin/gdbtui
# 20180201: Obsolete forth files
Modified: user/jeff/numa/bin/df/df.c
==============================================================================
--- user/jeff/numa/bin/df/df.c Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/bin/df/df.c Mon Feb 19 22:00:02 2018 (r329605)
@@ -254,9 +254,11 @@ main(int argc, char *argv[])
rv = 1;
continue;
}
-#ifdef MOUNT_CHAR_DEVS
} else if (S_ISCHR(stbuf.st_mode)) {
if ((mntpt = getmntpt(*argv)) == NULL) {
+#ifdef MOUNT_CHAR_DEVS
+ xo_warnx(
+ "df on unmounted devices is deprecated");
mdev.fspec = *argv;
mntpath = strdup("/tmp/df.XXXXXX");
if (mntpath == NULL) {
@@ -305,8 +307,12 @@ main(int argc, char *argv[])
(void)rmdir(mntpt);
free(mntpath);
continue;
- }
+#else
+ xo_warnx("%s: not mounted", *argv);
+ rv = 1;
+ continue;
#endif
+ }
} else
mntpt = *argv;
Modified: user/jeff/numa/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
==============================================================================
--- user/jeff/numa/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c Mon Feb 19 22:00:02 2018 (r329605)
@@ -688,6 +688,21 @@ get_replication(nvlist_t *nvroot, boolean_t fatal)
verify(nvlist_lookup_string(cnv,
ZPOOL_CONFIG_TYPE,
&childtype) == 0);
+ if (strcmp(childtype,
+ VDEV_TYPE_SPARE) == 0) {
+ /* We have a replacing vdev with
+ * a spare child. Get the first
+ * real child of the spare
+ */
+ verify(
+ nvlist_lookup_nvlist_array(
+ cnv,
+ ZPOOL_CONFIG_CHILDREN,
+ &rchild,
+ &rchildren) == 0);
+ assert(rchildren >= 2);
+ cnv = rchild[0];
+ }
}
verify(nvlist_lookup_string(cnv,
Modified: user/jeff/numa/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp
==============================================================================
--- user/jeff/numa/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp Mon Feb 19 22:00:02 2018 (r329605)
@@ -3543,7 +3543,17 @@ ABIArgInfo X86_64ABIInfo::classifyRegCallStructType(Qu
void X86_64ABIInfo::computeInfo(CGFunctionInfo &FI) const {
- bool IsRegCall = FI.getCallingConvention() == llvm::CallingConv::X86_RegCall;
+ const unsigned CallingConv = FI.getCallingConvention();
+ // It is possible to force Win64 calling convention on any x86_64 target by
+ // using __attribute__((ms_abi)). In such case to correctly emit Win64
+ // compatible code delegate this call to WinX86_64ABIInfo::computeInfo.
+ if (CallingConv == llvm::CallingConv::Win64) {
+ WinX86_64ABIInfo Win64ABIInfo(CGT);
+ Win64ABIInfo.computeInfo(FI);
+ return;
+ }
+
+ bool IsRegCall = CallingConv == llvm::CallingConv::X86_RegCall;
// Keep track of the number of assigned registers.
unsigned FreeIntRegs = IsRegCall ? 11 : 6;
Modified: user/jeff/numa/contrib/netbsd-tests/lib/libc/sys/t_socketpair.c
==============================================================================
--- user/jeff/numa/contrib/netbsd-tests/lib/libc/sys/t_socketpair.c Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/contrib/netbsd-tests/lib/libc/sys/t_socketpair.c Mon Feb 19 22:00:02 2018 (r329605)
@@ -56,7 +56,7 @@ connected(int fd)
}
static void
-run(int flags)
+run(int domain, int type, int flags)
{
int fd[2], i;
@@ -69,7 +69,7 @@ run(int flags)
ATF_REQUIRE(closefrom(3) != -1);
#endif
- ATF_REQUIRE(socketpair(AF_UNIX, SOCK_DGRAM | flags, 0, fd) == 0);
+ ATF_REQUIRE(socketpair(domain, type | flags, 0, fd) == 0);
ATF_REQUIRE(fd[0] == 3);
ATF_REQUIRE(fd[1] == 4);
@@ -97,6 +97,42 @@ run(int flags)
ATF_REQUIRE(close(fd[1]) != -1);
}
+ATF_TC(inet);
+ATF_TC_HEAD(inet, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "socketpair(2) does not work in the PF_INET domain");
+}
+
+ATF_TC_BODY(inet, tc)
+{
+ int fd[2];
+
+ ATF_REQUIRE_EQ(socketpair(PF_INET, SOCK_DGRAM, 0, fd), -1);
+ ATF_REQUIRE_EQ(EOPNOTSUPP, errno);
+ ATF_REQUIRE_EQ(socketpair(PF_INET, SOCK_STREAM, 0, fd), -1);
+ ATF_REQUIRE_EQ(EOPNOTSUPP, errno);
+}
+
+ATF_TC(null_sv);
+ATF_TC_HEAD(null_sv, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "socketpair(2) should fail without return storage");
+}
+
+ATF_TC_BODY(null_sv, tc)
+{
+ int fd;
+
+ closefrom(3);
+ ATF_REQUIRE_EQ(socketpair(AF_UNIX, SOCK_DGRAM, 0, NULL), -1);
+ ATF_REQUIRE_EQ(EFAULT, errno);
+ fd = open("/", O_RDONLY);
+ ATF_REQUIRE_EQ_MSG(fd, 3,
+ "socketpair(..., NULL) allocated descriptors");
+}
+
ATF_TC(socketpair_basic);
ATF_TC_HEAD(socketpair_basic, tc)
{
@@ -105,7 +141,7 @@ ATF_TC_HEAD(socketpair_basic, tc)
ATF_TC_BODY(socketpair_basic, tc)
{
- run(0);
+ run(AF_UNIX, SOCK_DGRAM, 0);
}
ATF_TC(socketpair_nonblock);
@@ -116,7 +152,7 @@ ATF_TC_HEAD(socketpair_nonblock, tc)
ATF_TC_BODY(socketpair_nonblock, tc)
{
- run(SOCK_NONBLOCK);
+ run(AF_UNIX, SOCK_DGRAM, SOCK_NONBLOCK);
}
ATF_TC(socketpair_cloexec);
@@ -127,15 +163,29 @@ ATF_TC_HEAD(socketpair_cloexec, tc)
ATF_TC_BODY(socketpair_cloexec, tc)
{
- run(SOCK_CLOEXEC);
+ run(AF_UNIX, SOCK_DGRAM, SOCK_CLOEXEC);
}
+ATF_TC(socketpair_stream);
+ATF_TC_HEAD(socketpair_stream, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "A stream-oriented socketpair(2)");
+}
+
+ATF_TC_BODY(socketpair_stream, tc)
+{
+ run(AF_UNIX, SOCK_STREAM, 0);
+}
+
ATF_TP_ADD_TCS(tp)
{
+ ATF_TP_ADD_TC(tp, inet);
+ ATF_TP_ADD_TC(tp, null_sv);
ATF_TP_ADD_TC(tp, socketpair_basic);
ATF_TP_ADD_TC(tp, socketpair_nonblock);
ATF_TP_ADD_TC(tp, socketpair_cloexec);
+ ATF_TP_ADD_TC(tp, socketpair_stream);
return atf_no_error();
}
Modified: user/jeff/numa/etc/devd/usb.conf
==============================================================================
--- user/jeff/numa/etc/devd/usb.conf Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/etc/devd/usb.conf Mon Feb 19 22:00:02 2018 (r329605)
@@ -145,7 +145,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0403";
- match "product" "(0x5259|0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x6015|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xa6d1|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbbe2|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbcda|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed73|0xed7
4|0xee18|0xeee8|0xeee9|0xeeea|0xeeeb|0xeeec|0xeeed|0xeeee|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8)";
+ match "product" "(0x5259|0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x6015|0x8372|0x8a98|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xa6d1|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbbe2|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbcda|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed7
3|0xed74|0xee18|0xeee8|0xeee9|0xeeea|0xeeeb|0xeeec|0xeeed|0xeeee|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8)";
action "kldload -n uftdi";
};
@@ -2793,7 +2793,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x0bda";
- match "product" "0x8754";
+ match "product" "(0x8754|0x8812)";
action "kldload -n if_rtwn_usb";
};
@@ -3681,7 +3681,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x10c4";
- match "product" "(0x8066|0x806f|0x807a|0x80c4|0x80ca|0x80dd|0x80ed|0x80f6|0x8115|0x813d|0x813f|0x814a|0x814a|0x814b|0x8156|0x815e|0x815f|0x818b|0x819f|0x81a6|0x81a9|0x81ac|0x81ad|0x81c8|0x81e2|0x81e7|0x81e8|0x81f2|0x8218|0x822b|0x826b|0x8293|0x82f9|0x8341|0x8382|0x83a8|0x83d8|0x8411|0x8418|0x846e|0x8477|0x85ea|0x85eb|0x85f8|0x8664|0x8665|0x88a4|0x88a5|0xea60|0xea61|0xea70|0xea71|0xea80|0xf001|0xf002|0xf003|0xf004)";
+ match "product" "(0x8066|0x806f|0x807a|0x80c4|0x80ca|0x80dd|0x80ed|0x80f6|0x8115|0x813d|0x813f|0x814a|0x814a|0x814b|0x8156|0x815e|0x815f|0x818b|0x819f|0x81a6|0x81a9|0x81ac|0x81ad|0x81c8|0x81e2|0x81e7|0x81e8|0x81f2|0x8218|0x822b|0x826b|0x8293|0x82f9|0x8341|0x8382|0x83a8|0x83d8|0x8411|0x8418|0x846e|0x8477|0x85ea|0x85eb|0x85f8|0x8664|0x8665|0x88a4|0x88a5|0x8a2a|0xea60|0xea61|0xea70|0xea71|0xea80|0xf001|0xf002|0xf003|0xf004)";
action "kldload -n uslcom";
};
@@ -3921,7 +3921,7 @@ nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
match "vendor" "0x12d1";
- match "product" "(0x1573|0x15c1|0x1803|0x1c05|0x1c0b)";
+ match "product" "(0x155b|0x1573|0x15c1|0x1803|0x1c05|0x1c0b|0x1c1e)";
action "kldload -n u3g";
};
@@ -4432,6 +4432,14 @@ nomatch 32 {
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
+ match "vendor" "0x15eb";
+ match "product" "0x7d0e";
+ action "kldload -n u3g";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
match "vendor" "0x1614";
match "product" "(0x0800|0x0802|0x7002)";
action "kldload -n u3g";
@@ -5328,6 +5336,14 @@ nomatch 32 {
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
+ match "vendor" "0x2357";
+ match "product" "0x0601";
+ action "kldload -n if_ure";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
match "vendor" "0x2405";
match "product" "0x0003";
action "kldload -n uslcom";
@@ -5352,6 +5368,14 @@ nomatch 32 {
nomatch 32 {
match "bus" "uhub[0-9]+";
match "mode" "host";
+ match "vendor" "0x2c7c";
+ match "product" "0x0125";
+ action "kldload -n u3g";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
match "vendor" "0x3195";
match "product" "(0xf190|0xf280|0xf281)";
action "kldload -n uslcom";
@@ -5727,6 +5751,46 @@ nomatch 32 {
match "vendor" "0x12d1";
match "intclass" "0xff";
match "intsubclass" "0x02";
+ match "intprotocol" "0x01";
+ action "kldload -n umodem";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x12d1";
+ match "intclass" "0xff";
+ match "intsubclass" "0x02";
+ match "intprotocol" "0x02";
+ action "kldload -n umodem";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x12d1";
+ match "intclass" "0xff";
+ match "intsubclass" "0x02";
+ match "intprotocol" "0x10";
+ action "kldload -n umodem";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x12d1";
+ match "intclass" "0xff";
+ match "intsubclass" "0x02";
+ match "intprotocol" "0x12";
+ action "kldload -n umodem";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x12d1";
+ match "intclass" "0xff";
+ match "intsubclass" "0x02";
match "intprotocol" "0x16";
action "kldload -n if_cdce";
};
@@ -5747,12 +5811,42 @@ nomatch 32 {
match "vendor" "0x12d1";
match "intclass" "0xff";
match "intsubclass" "0x02";
+ match "intprotocol" "0x61";
+ action "kldload -n umodem";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x12d1";
+ match "intclass" "0xff";
+ match "intsubclass" "0x02";
+ match "intprotocol" "0x62";
+ action "kldload -n umodem";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x12d1";
+ match "intclass" "0xff";
+ match "intsubclass" "0x02";
match "intprotocol" "0x76";
action "kldload -n if_cdce";
};
nomatch 32 {
match "bus" "uhub[0-9]+";
+ match "mode" "host";
+ match "vendor" "0x12d1";
+ match "intclass" "0xff";
+ match "intsubclass" "0x03";
+ match "intprotocol" "0x16";
+ action "kldload -n if_cdce";
+};
+
+nomatch 32 {
+ match "bus" "uhub[0-9]+";
match "mode" "(host|device)";
match "intclass" "0x02";
match "intsubclass" "0x02";
@@ -5921,5 +6015,5 @@ nomatch 32 {
action "kldload -n umass";
};
-# 2760 USB entries processed
+# 2775 USB entries processed
Modified: user/jeff/numa/lib/clang/libllvm/Makefile
==============================================================================
--- user/jeff/numa/lib/clang/libllvm/Makefile Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/lib/clang/libllvm/Makefile Mon Feb 19 22:00:02 2018 (r329605)
@@ -664,7 +664,7 @@ SRCS_MIN+= Passes/PassBuilder.cpp
SRCS_MIN+= ProfileData/Coverage/CoverageMapping.cpp
SRCS_MIN+= ProfileData/Coverage/CoverageMappingReader.cpp
SRCS_MIN+= ProfileData/Coverage/CoverageMappingWriter.cpp
-SRCS_EXT+= ProfileData/GCOV.cpp
+SRCS_MIN+= ProfileData/GCOV.cpp
SRCS_MIN+= ProfileData/InstrProf.cpp
SRCS_MIN+= ProfileData/InstrProfReader.cpp
SRCS_MIN+= ProfileData/InstrProfWriter.cpp
Modified: user/jeff/numa/lib/libc/rpc/svc_dg.c
==============================================================================
--- user/jeff/numa/lib/libc/rpc/svc_dg.c Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/lib/libc/rpc/svc_dg.c Mon Feb 19 22:00:02 2018 (r329605)
@@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$");
#include "rpc_com.h"
#include "mt_misc.h"
-#define su_data(xprt) ((struct svc_dg_data *)(xprt->xp_p2))
+#define su_data(xprt) ((struct svc_dg_data *)((xprt)->xp_p2))
#define rpc_buffer(xprt) ((xprt)->xp_p1)
#ifndef MAX
Modified: user/jeff/numa/lib/libc/sys/fsync.2
==============================================================================
--- user/jeff/numa/lib/libc/sys/fsync.2 Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/lib/libc/sys/fsync.2 Mon Feb 19 22:00:02 2018 (r329605)
@@ -34,7 +34,7 @@
.\" @(#)fsync.2 8.1 (Berkeley) 6/4/93
.\" $FreeBSD$
.\"
-.Dd May 24, 2017
+.Dd February 6, 2018
.Dt FSYNC 2
.Os
.Sh NAME
@@ -108,6 +108,7 @@ refers to a socket, not to a file.
An I/O error occurred while reading from or writing to the file system.
.El
.Sh SEE ALSO
+.Xr fsync 1 ,
.Xr sync 2 ,
.Xr syncer 4 ,
.Xr sync 8
Modified: user/jeff/numa/lib/libc/sys/socketpair.2
==============================================================================
--- user/jeff/numa/lib/libc/sys/socketpair.2 Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/lib/libc/sys/socketpair.2 Mon Feb 19 22:00:02 2018 (r329605)
@@ -28,7 +28,7 @@
.\" @(#)socketpair.2 8.1 (Berkeley) 6/4/93
.\" $FreeBSD$
.\"
-.Dd May 4, 2015
+.Dd February 10, 2018
.Dt SOCKETPAIR 2
.Os
.Sh NAME
@@ -89,6 +89,13 @@ process address space.
.Xr read 2 ,
.Xr socket 2 ,
.Xr write 2
+.Sh STANDARDS
+The
+.Fn socketpair
+system call conforms to
+.St -p1003.1-2001
+and
+.St -p1003.1-2008 .
.Sh HISTORY
The
.Fn socketpair
Modified: user/jeff/numa/lib/libcompat/4.3/rexec.c
==============================================================================
--- user/jeff/numa/lib/libcompat/4.3/rexec.c Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/lib/libcompat/4.3/rexec.c Mon Feb 19 22:00:02 2018 (r329605)
@@ -356,7 +356,7 @@ retry:
goto bad;
}
port = ntohs((u_short)sin2.sin_port);
- (void) sprintf(num, "%u", port);
+ (void) sprintf(num, "%hu", port);
(void) write(s, num, strlen(num)+1);
{ int len = sizeof (from);
s3 = accept(s2, (struct sockaddr *)&from, &len);
Modified: user/jeff/numa/sbin/dumpfs/dumpfs.c
==============================================================================
--- user/jeff/numa/sbin/dumpfs/dumpfs.c Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/sbin/dumpfs/dumpfs.c Mon Feb 19 22:00:02 2018 (r329605)
@@ -257,9 +257,9 @@ dumpfs(const char *name)
if (fsflags & FS_DOSOFTDEP)
printf("soft-updates%s ", (fsflags & FS_SUJ) ? "+journal" : "");
if (fsflags & FS_NEEDSFSCK)
- printf("needs fsck run ");
+ printf("needs-fsck-run ");
if (fsflags & FS_INDEXDIRS)
- printf("indexed directories ");
+ printf("indexed-directories ");
if (fsflags & FS_ACLS)
printf("acls ");
if (fsflags & FS_MULTILABEL)
@@ -267,31 +267,33 @@ dumpfs(const char *name)
if (fsflags & FS_GJOURNAL)
printf("gjournal ");
if (fsflags & FS_FLAGS_UPDATED)
- printf("fs_flags expanded ");
+ printf("fs_flags-expanded ");
if (fsflags & FS_NFS4ACLS)
printf("nfsv4acls ");
if (fsflags & FS_TRIM)
printf("trim ");
- fsflags &= ~(FS_UNCLEAN | FS_DOSOFTDEP | FS_NEEDSFSCK | FS_INDEXDIRS |
+ fsflags &= ~(FS_UNCLEAN | FS_DOSOFTDEP | FS_NEEDSFSCK | FS_METACKHASH |
FS_ACLS | FS_MULTILABEL | FS_GJOURNAL | FS_FLAGS_UPDATED |
- FS_NFS4ACLS | FS_SUJ | FS_TRIM);
+ FS_NFS4ACLS | FS_SUJ | FS_TRIM | FS_INDEXDIRS);
if (fsflags != 0)
- printf("unknown flags (%#x)", fsflags);
+ printf("unknown-flags (%#x)", fsflags);
putchar('\n');
- printf("check hashes\t");
- fsflags = afs.fs_metackhash;
- if (fsflags == 0)
- printf("none");
- if (fsflags & CK_SUPERBLOCK)
- printf("superblock ");
- if (fsflags & CK_CYLGRP)
- printf("cylinder-groups ");
- if (fsflags & CK_INODE)
- printf("inodes ");
- if (fsflags & CK_INDIR)
- printf("indirect-blocks ");
- if (fsflags & CK_DIR)
- printf("directories ");
+ if (afs.fs_flags & FS_METACKHASH) {
+ printf("check hashes\t");
+ fsflags = afs.fs_metackhash;
+ if (fsflags == 0)
+ printf("none");
+ if (fsflags & CK_SUPERBLOCK)
+ printf("superblock ");
+ if (fsflags & CK_CYLGRP)
+ printf("cylinder-groups ");
+ if (fsflags & CK_INODE)
+ printf("inodes ");
+ if (fsflags & CK_INDIR)
+ printf("indirect-blocks ");
+ if (fsflags & CK_DIR)
+ printf("directories ");
+ }
fsflags &= ~(CK_SUPERBLOCK | CK_CYLGRP | CK_INODE | CK_INDIR | CK_DIR);
if (fsflags != 0)
printf("unknown flags (%#x)", fsflags);
Modified: user/jeff/numa/sbin/fsck_ffs/fsck.h
==============================================================================
--- user/jeff/numa/sbin/fsck_ffs/fsck.h Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/sbin/fsck_ffs/fsck.h Mon Feb 19 22:00:02 2018 (r329605)
@@ -315,6 +315,7 @@ extern int Zflag; /* zero empty data blocks */
extern int inoopt; /* trim out unused inodes */
extern char ckclean; /* only do work if not cleanly unmounted */
extern int cvtlevel; /* convert to newer file system format */
+extern int ckhashadd; /* check hashes to be added */
extern int bkgrdcheck; /* determine if background check is possible */
extern int bkgrdsumadj; /* whether the kernel have ability to adjust superblock summary */
extern char usedsoftdep; /* just fix soft dependency inconsistencies */
Modified: user/jeff/numa/sbin/fsck_ffs/globs.c
==============================================================================
--- user/jeff/numa/sbin/fsck_ffs/globs.c Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/sbin/fsck_ffs/globs.c Mon Feb 19 22:00:02 2018 (r329605)
@@ -87,6 +87,7 @@ int Zflag; /* zero empty data blocks */
int inoopt; /* trim out unused inodes */
char ckclean; /* only do work if not cleanly unmounted */
int cvtlevel; /* convert to newer file system format */
+int ckhashadd; /* check hashes to be added */
int bkgrdcheck; /* determine if background check is possible */
int bkgrdsumadj; /* whether the kernel have ability to adjust superblock summary */
char usedsoftdep; /* just fix soft dependency inconsistencies */
Modified: user/jeff/numa/sbin/fsck_ffs/main.c
==============================================================================
--- user/jeff/numa/sbin/fsck_ffs/main.c Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/sbin/fsck_ffs/main.c Mon Feb 19 22:00:02 2018 (r329605)
@@ -43,6 +43,7 @@ static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/14
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#define IN_RTLD /* So we pickup the P_OSREL defines */
#include <sys/param.h>
#include <sys/file.h>
#include <sys/mount.h>
@@ -440,7 +441,46 @@ checkfilesys(char *filesys)
flush(fswritefd, &sblk);
fsmodified = ofsmodified;
}
-
+ /*
+ * If the filesystem was run on an old kernel that did not
+ * support check hashes, clear the check-hash flags so that
+ * we do not try to verify them.
+ */
+ if ((sblock.fs_flags & FS_METACKHASH) == 0)
+ sblock.fs_metackhash = 0;
+ /*
+ * If we are running on a kernel that can provide check hashes
+ * that are not yet enabled for the filesystem and we are
+ * running manually without the -y flag, offer to add any
+ * supported check hashes that are not already enabled.
+ */
+ ckhashadd = 0;
+ if (preen == 0 && yflag == 0 && sblock.fs_magic != FS_UFS1_MAGIC &&
+ fswritefd != -1 && getosreldate() >= P_OSREL_CK_CYLGRP) {
+ if ((sblock.fs_metackhash & CK_CYLGRP) == 0 &&
+ reply("ADD CYLINDER GROUP CHECK-HASH PROTECTION") != 0)
+ ckhashadd |= CK_CYLGRP;
+#ifdef notyet
+ if ((sblock.fs_metackhash & CK_SUPERBLOCK) == 0 &&
+ getosreldate() >= P_OSREL_CK_SUPERBLOCK &&
+ reply("ADD SUPERBLOCK CHECK-HASH PROTECTION") != 0)
+ ckhashadd |= CK_SUPERBLOCK;
+ if ((sblock.fs_metackhash & CK_INODE) == 0 &&
+ getosreldate() >= P_OSREL_CK_INODE &&
+ reply("ADD INODE CHECK-HASH PROTECTION") != 0)
+ ckhashadd |= CK_INODE;
+ if ((sblock.fs_metackhash & CK_INDIR) == 0 &&
+ getosreldate() >= P_OSREL_CK_INDIR &&
+ reply("ADD INDIRECT BLOCK CHECK-HASH PROTECTION") != 0)
+ ckhashadd |= CK_INDIR;
+ if ((sblock.fs_metackhash & CK_DIR) == 0 &&
+ getosreldate() >= P_OSREL_CK_DIR &&
+ reply("ADD DIRECTORY CHECK-HASH PROTECTION") != 0)
+ ckhashadd |= CK_DIR;
+#endif /* notyet */
+ if (ckhashadd != 0)
+ sblock.fs_flags |= FS_METACKHASH;
+ }
/*
* Cleared if any questions answered no. Used to decide if
* the superblock should be marked clean.
Modified: user/jeff/numa/sbin/fsck_ffs/pass5.c
==============================================================================
--- user/jeff/numa/sbin/fsck_ffs/pass5.c Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/sbin/fsck_ffs/pass5.c Mon Feb 19 22:00:02 2018 (r329605)
@@ -37,7 +37,6 @@ static const char sccsid[] = "@(#)pass5.c 8.9 (Berkele
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#define IN_RTLD /* So we pickup the P_OSREL defines */
#include <sys/param.h>
#include <sys/sysctl.h>
@@ -63,7 +62,7 @@ pass5(void)
int inomapsize, blkmapsize;
struct fs *fs = &sblock;
ufs2_daddr_t d, dbase, dmax, start;
- int rewritecg = 0, cgckadd = 0;
+ int rewritecg = 0;
struct csum *cs;
struct csum_total cstotal;
struct inodesc idesc[3];
@@ -74,13 +73,10 @@ pass5(void)
inoinfo(UFS_WINO)->ino_state = USTATE;
memset(newcg, 0, (size_t)fs->fs_cgsize);
newcg->cg_niblk = fs->fs_ipg;
- if (preen == 0 && yflag == 0 && fs->fs_magic == FS_UFS2_MAGIC &&
- fswritefd != -1 && (fs->fs_metackhash & CK_CYLGRP) == 0 &&
- getosreldate() >= P_OSREL_CK_CYLGRP &&
- reply("ADD CYLINDER GROUP CHECKSUM PROTECTION") != 0) {
+ /* check to see if we are to add a cylinder group check hash */
+ if ((ckhashadd & CK_CYLGRP) != 0) {
fs->fs_metackhash |= CK_CYLGRP;
rewritecg = 1;
- cgckadd = 1;
sbdirty();
}
if (cvtlevel >= 3) {
@@ -178,14 +174,20 @@ pass5(void)
cg = cgbp->b_un.b_cg;
if (!cg_chkmagic(cg))
pfatal("CG %d: BAD MAGIC NUMBER\n", c);
- if ((fs->fs_metackhash & CK_CYLGRP) != 0 && cgckadd == 0) {
+ /*
+ * If we have a cylinder group check hash and are not adding
+ * it for the first time, verify that it is good.
+ */
+ if ((fs->fs_metackhash & CK_CYLGRP) != 0 &&
+ (ckhashadd & CK_CYLGRP) == 0) {
uint32_t ckhash, thishash;
ckhash = cg->cg_ckhash;
cg->cg_ckhash = 0;
thishash = calculate_crc32c(~0L, cg, fs->fs_cgsize);
if (ckhash != thishash)
- pwarn("CG %d: BAD CHECKSUM %#x vs %#x", c, ckhash, thishash);
+ pwarn("CG %d: BAD CHECK-HASH %#x vs %#x",
+ c, ckhash, thishash);
cg->cg_ckhash = ckhash;
}
newcg->cg_time = cg->cg_time;
Modified: user/jeff/numa/sbin/geom/class/part/gpart.8
==============================================================================
--- user/jeff/numa/sbin/geom/class/part/gpart.8 Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/sbin/geom/class/part/gpart.8 Mon Feb 19 22:00:02 2018 (r329605)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd September 19, 2017
+.Dd February 10, 2018
.Dt GPART 8
.Os
.Sh NAME
@@ -654,6 +654,8 @@ Another symbolic names that can be used with
.Cm gpart
utility are:
.Bl -tag -width ".Cm dragonfly-disklabel64"
+.It Cm apple-apfs
+An Apple macOS partition used for the Apple file system, APFS.
.It Cm apple-core-storage
An Apple Mac OS X partition used by logical volume manager known as
Core Storage.
Modified: user/jeff/numa/sbin/newfs/mkfs.c
==============================================================================
--- user/jeff/numa/sbin/newfs/mkfs.c Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/sbin/newfs/mkfs.c Mon Feb 19 22:00:02 2018 (r329605)
@@ -489,9 +489,15 @@ restart:
}
/*
* Set flags for metadata that is being check-hashed.
+ *
+ * Metadata check hashes are not supported in the UFS version 1
+ * filesystem to keep it as small and simple as possible.
*/
- if (Oflag > 1 && getosreldate() >= P_OSREL_CK_CYLGRP)
- sblock.fs_metackhash = CK_CYLGRP;
+ if (Oflag > 1) {
+ sblock.fs_flags |= FS_METACKHASH;
+ if (getosreldate() >= P_OSREL_CK_CYLGRP)
+ sblock.fs_metackhash = CK_CYLGRP;
+ }
/*
* Dump out summary information about file system.
Modified: user/jeff/numa/secure/lib/libcrypto/Makefile.inc
==============================================================================
--- user/jeff/numa/secure/lib/libcrypto/Makefile.inc Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/secure/lib/libcrypto/Makefile.inc Mon Feb 19 22:00:02 2018 (r329605)
@@ -64,14 +64,11 @@ MANDIR= ${SHAREDIR}/openssl/man/man
.if defined(LIB)
_docs= ${LIB}
-.if ${LIB} == ssl
-_docs+= man3
-.endif
_skip= SSLeay_version des_modes
_sec= 3
.else
_docs= apps
-_skip= config
+_skip= c_rehash config
_sec= 1
.endif
Modified: user/jeff/numa/secure/usr.bin/openssl/Makefile.man
==============================================================================
--- user/jeff/numa/secure/usr.bin/openssl/Makefile.man Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/secure/usr.bin/openssl/Makefile.man Mon Feb 19 22:00:02 2018 (r329605)
@@ -2,7 +2,6 @@
# DO NOT EDIT: generated from man-makefile-update target
MAN+= CA.pl.1
MAN+= asn1parse.1
-MAN+= c_rehash.1
MAN+= ca.1
MAN+= ciphers.1
MAN+= cms.1
Modified: user/jeff/numa/share/man/man4/dtrace_tcp.4
==============================================================================
--- user/jeff/numa/share/man/man4/dtrace_tcp.4 Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/share/man/man4/dtrace_tcp.4 Mon Feb 19 22:00:02 2018 (r329605)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 15, 2016
+.Dd February 10, 2018
.Dt DTRACE_TCP 4
.Os
.Sh NAME
@@ -135,7 +135,7 @@ Its first, third and fifth arguments are currently alw
.Dv NULL .
Its last argument describes the from-state in the transition, and the to-state
can be obtained from
-.Dv args[2]->tcps_state .
+.Dv args[3]->tcps_state .
.Sh ARGUMENTS
The
.Vt pktinfo_t
Modified: user/jeff/numa/share/man/man5/src.conf.5
==============================================================================
--- user/jeff/numa/share/man/man5/src.conf.5 Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/share/man/man5/src.conf.5 Mon Feb 19 22:00:02 2018 (r329605)
@@ -1,6 +1,6 @@
.\" DO NOT EDIT-- this file is generated by tools/build/options/makeman.
.\" $FreeBSD$
-.Dd January 12, 2018
+.Dd February 9, 2018
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -314,6 +314,8 @@ When set, it enforces these options:
.Va WITHOUT_CLANG_EXTRAS
.It
.Va WITHOUT_CLANG_FULL
+.It
+.Va WITHOUT_LLVM_COV
.El
.It Va WITH_CLANG
Set to build the Clang C/C++ compiler during the normal phase of the build.
@@ -463,6 +465,8 @@ When set, it enforces these options:
.It
.Va WITHOUT_GNUCXX
.It
+.Va WITHOUT_LLVM_COV
+.It
.Va WITHOUT_TESTS
.It
.Va WITHOUT_TESTS_SUPPORT
@@ -986,6 +990,20 @@ Set to use LLVM's LLD as the system linker, instead of
.Pp
This is a default setting on
arm64/aarch64.
+.It Va WITHOUT_LLVM_COV
+Set to not build the
+.Xr llvm-cov 1
+tool.
+.Pp
+This is a default setting on
+riscv/riscv64, riscv/riscv64sf and sparc64/sparc64.
+.It Va WITH_LLVM_COV
+Set to build the
+.Xr llvm-cov 1
+tool.
+.Pp
+This is a default setting on
+amd64/amd64, arm/arm, arm/armeb, arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpc64 and powerpc/powerpcspe.
.It Va WITHOUT_LLVM_LIBUNWIND
Set to use GCC's stack unwinder (instead of LLVM's libunwind).
.Pp
@@ -1494,6 +1512,8 @@ When set, it enforces these options:
.Va WITHOUT_LLD
.It
.Va WITHOUT_LLDB
+.It
+.Va WITHOUT_LLVM_COV
.El
.It Va WITHOUT_UNBOUND
Set to not build
Modified: user/jeff/numa/share/man/man9/Makefile
==============================================================================
--- user/jeff/numa/share/man/man9/Makefile Mon Feb 19 21:58:12 2018 (r329604)
+++ user/jeff/numa/share/man/man9/Makefile Mon Feb 19 22:00:02 2018 (r329605)
@@ -285,6 +285,7 @@ MAN= accept_filter.9 \
style.9 \
swi.9 \
sx.9 \
+ syscall_helper_register.9 \
SYSCALL_MODULE.9 \
sysctl.9 \
sysctl_add_oid.9 \
@@ -1921,6 +1922,11 @@ MLINKS+=sx.9 sx_assert.9 \
sx.9 sx_xlock_sig.9 \
sx.9 sx_xlocked.9 \
sx.9 sx_xunlock.9
+MLINKS+=syscall_helper_register.9 syscall_helper_unregister.9 \
+ syscall_helper_register.9 SYSCALL_INIT_HELPER.9 \
+ syscall_helper_register.9 SYSCALL_INIT_HELPER_COMPAT.9 \
+ syscall_helper_register.9 SYSCALL_INIT_HELPER_COMPAT_F.9 \
+ syscall_helper_register.9 SYSCALL_INIT_HELPER_F.9
MLINKS+=sysctl.9 SYSCTL_DECL.9 \
sysctl.9 SYSCTL_ADD_INT.9 \
sysctl.9 SYSCTL_ADD_LONG.9 \
Copied: user/jeff/numa/share/man/man9/syscall_helper_register.9 (from r329139, head/share/man/man9/syscall_helper_register.9)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/jeff/numa/share/man/man9/syscall_helper_register.9 Mon Feb 19 22:00:02 2018 (r329605, copy of r329139, head/share/man/man9/syscall_helper_register.9)
@@ -0,0 +1,139 @@
+.\" Copyright (c) 2018 Conrad Meyer <cem at FreeBSD.org>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd February 10, 2018
+.Dt SYSCALL_HELPER_REGISTER 9
+.Os
+.Sh NAME
+.Nm syscall_helper_register ,
+.Nm syscall_helper_unregister
+.Nd kernel syscall registration routines
+.\"
+.Sh SYNOPSIS
+.In sys/sysent.h
+.Ft int
+.Fn syscall_helper_register "struct syscall_helper_data *sd" "int flags"
+.Ft int
+.Fn syscall_helper_unregister "struct syscall_helper_data *sd"
+.\"
+.Ss INITIALIZER MACROS
+.Ft struct syscall_helper_data
+.Fn SYSCALL_INIT_HELPER "syscallname"
+.Ft struct syscall_helper_data
+.Fn SYSCALL_INIT_HELPER_F "syscallname" "int flags"
+.\"
+.Ss COMPATIBILITY INITIALIZER MACROS
+.Ft struct syscall_helper_data
+.Fn SYSCALL_INIT_HELPER_COMPAT "syscallname"
+.Ft struct syscall_helper_data
+.Fn SYSCALL_INIT_HELPER_COMPAT_F "syscallname" "int flags"
+.\"
+.Sh DESCRIPTION
+The
+.Fn syscall_helper_register
+registers a system call.
+This function takes the structure
+.Va struct syscall_helper_data sd ,
+which specifies the parameters for syscall registration:
+.Pp
+.Bd -literal -offset indent -compact
+struct syscall_helper_data {
+ struct sysent new_sysent;
+ struct sysent old_sysent;
+ int syscall_no;
+ int registered;
+};
+.Ed
+.Pp
+The only valid flag for the
+.Fa flags
+argument to
+.Fn syscall_helper_register
+is
+.Dv SY_THR_STATIC .
+This flag prevents the syscall from being unregistered.
+.\"
+.Pp
+Before use, the structure must be initialized with one of the
+.Fn SYSCALL_INIT_HELPER*
+macros.
+In new code, syscall implementation functions shall be named
+.Fn sys_syscallname
+and the regular macros shall be used.
+.Pp
+For legacy syscall functions named without "sys_" prefixes, the "COMPAT"
+versions of the macros may be used.
+.Pp
+The only valid flag for the
+.Fa flags
+argument to the "F" variants of the initializer macros is
+.Dv SYF_CAPENABLED .
+This flag indicates that the syscall is allowed in capability mode.
+.Pp
+The
+.Fn syscall_helper_unregister
+unregisters a system call.
+This function takes the same structure
+.Va struct syscall_helper_data sd
+that was previously initialized in the manner described above and used in a
+successful invocation of
+.Fn syscall_helper_register .
+.\"
+.Sh RETURN VALUES
+If successful,
+.Fn syscall_helper_register
+and
+.Fn syscall_helper_unregister
+will return 0.
+Otherwise, they will return an error.
+.\"
+.Sh ERRORS
+The
+.Fn syscall_helper_register
+call will fail and the syscall will not be registered if:
+.Bl -tag -width Er
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list