svn commit: r325663 - in projects/bsd_rdma_4_9: . etc lib/libc/gen lib/libcasper/libcasper lib/libclang_rt lib/libnetgraph lib/libsysdecode lib/libthr/tests libexec/rtld-elf/mips rescue/rescue sbin...
Hans Petter Selasky
hselasky at FreeBSD.org
Fri Nov 10 14:46:56 UTC 2017
Author: hselasky
Date: Fri Nov 10 14:46:50 2017
New Revision: 325663
URL: https://svnweb.freebsd.org/changeset/base/325663
Log:
Merge ^/head r325505 through r325662.
Added:
projects/bsd_rdma_4_9/sys/arm/allwinner/clkng/ccu_a13.c
- copied unchanged from r325662, head/sys/arm/allwinner/clkng/ccu_a13.c
projects/bsd_rdma_4_9/sys/arm/allwinner/clkng/ccu_a13.h
- copied unchanged from r325662, head/sys/arm/allwinner/clkng/ccu_a13.h
projects/bsd_rdma_4_9/sys/dev/mlx5/fs.h
- copied unchanged from r325662, head/sys/dev/mlx5/fs.h
projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_core/fs_core.h
- copied unchanged from r325662, head/sys/dev/mlx5/mlx5_core/fs_core.h
projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_core/mlx5_fs_cmd.c
- copied unchanged from r325662, head/sys/dev/mlx5/mlx5_core/mlx5_fs_cmd.c
projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c
- copied unchanged from r325662, head/sys/dev/mlx5/mlx5_core/mlx5_fs_tree.c
Deleted:
projects/bsd_rdma_4_9/sys/dev/mlx5/eswitch_vacl.h
projects/bsd_rdma_4_9/sys/dev/mlx5/flow_table.h
projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_core/mlx5_eswitch_vacl.c
projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_core/mlx5_flow_table.c
Modified:
projects/bsd_rdma_4_9/Makefile
projects/bsd_rdma_4_9/Makefile.inc1
projects/bsd_rdma_4_9/ObsoleteFiles.inc
projects/bsd_rdma_4_9/etc/network.subr
projects/bsd_rdma_4_9/lib/libc/gen/setmode.c
projects/bsd_rdma_4_9/lib/libcasper/libcasper/Makefile
projects/bsd_rdma_4_9/lib/libclang_rt/Makefile.inc
projects/bsd_rdma_4_9/lib/libnetgraph/Makefile
projects/bsd_rdma_4_9/lib/libnetgraph/netgraph.3
projects/bsd_rdma_4_9/lib/libsysdecode/flags.c
projects/bsd_rdma_4_9/lib/libthr/tests/Makefile
projects/bsd_rdma_4_9/libexec/rtld-elf/mips/rtld_start.S
projects/bsd_rdma_4_9/rescue/rescue/Makefile
projects/bsd_rdma_4_9/sbin/ifconfig/ifconfig.c
projects/bsd_rdma_4_9/sbin/ipf/ipf/Makefile
projects/bsd_rdma_4_9/share/man/man4/arcmsr.4
projects/bsd_rdma_4_9/share/man/man4/ctl.4
projects/bsd_rdma_4_9/share/man/man5/rc.conf.5
projects/bsd_rdma_4_9/share/man/man7/ports.7
projects/bsd_rdma_4_9/share/man/man9/EVENTHANDLER.9
projects/bsd_rdma_4_9/share/mk/bsd.clang-analyze.mk
projects/bsd_rdma_4_9/share/mk/bsd.crunchgen.mk
projects/bsd_rdma_4_9/share/mk/bsd.dep.mk
projects/bsd_rdma_4_9/share/mk/bsd.init.mk
projects/bsd_rdma_4_9/share/mk/bsd.obj.mk
projects/bsd_rdma_4_9/share/mk/bsd.progs.mk
projects/bsd_rdma_4_9/share/mk/local.sys.env.mk
projects/bsd_rdma_4_9/share/mk/src.sys.obj.mk
projects/bsd_rdma_4_9/sys/amd64/amd64/pmap.c
projects/bsd_rdma_4_9/sys/amd64/amd64/uma_machdep.c
projects/bsd_rdma_4_9/sys/arm/allwinner/a13/files.a13
projects/bsd_rdma_4_9/sys/arm/allwinner/clkng/aw_ccung.c
projects/bsd_rdma_4_9/sys/arm/allwinner/clkng/aw_clk_nkmp.c
projects/bsd_rdma_4_9/sys/arm64/arm64/uma_machdep.c
projects/bsd_rdma_4_9/sys/boot/arm/uboot/Makefile
projects/bsd_rdma_4_9/sys/boot/efi/include/efilib.h
projects/bsd_rdma_4_9/sys/boot/efi/libefi/devpath.c
projects/bsd_rdma_4_9/sys/boot/efi/loader/Makefile
projects/bsd_rdma_4_9/sys/boot/i386/loader/Makefile
projects/bsd_rdma_4_9/sys/boot/i386/zfsloader/Makefile
projects/bsd_rdma_4_9/sys/boot/mips/beri/loader/Makefile
projects/bsd_rdma_4_9/sys/boot/mips/uboot/Makefile
projects/bsd_rdma_4_9/sys/boot/powerpc/kboot/Makefile
projects/bsd_rdma_4_9/sys/boot/powerpc/ofw/Makefile
projects/bsd_rdma_4_9/sys/boot/powerpc/ps3/Makefile
projects/bsd_rdma_4_9/sys/boot/powerpc/uboot/Makefile
projects/bsd_rdma_4_9/sys/boot/sparc64/loader/Makefile
projects/bsd_rdma_4_9/sys/boot/userboot/userboot/Makefile
projects/bsd_rdma_4_9/sys/cam/ctl/ctl.c
projects/bsd_rdma_4_9/sys/cam/ctl/ctl_ioctl.h
projects/bsd_rdma_4_9/sys/cam/ctl/ctl_private.h
projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c
projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
projects/bsd_rdma_4_9/sys/compat/cloudabi32/cloudabi32_module.c
projects/bsd_rdma_4_9/sys/compat/cloudabi32/cloudabi32_poll.c
projects/bsd_rdma_4_9/sys/compat/cloudabi32/cloudabi32_proto.h
projects/bsd_rdma_4_9/sys/compat/cloudabi32/cloudabi32_systrace_args.c
projects/bsd_rdma_4_9/sys/compat/cloudabi64/cloudabi64_module.c
projects/bsd_rdma_4_9/sys/compat/cloudabi64/cloudabi64_poll.c
projects/bsd_rdma_4_9/sys/compat/cloudabi64/cloudabi64_proto.h
projects/bsd_rdma_4_9/sys/compat/cloudabi64/cloudabi64_systrace_args.c
projects/bsd_rdma_4_9/sys/compat/linuxkpi/common/include/linux/list.h
projects/bsd_rdma_4_9/sys/conf/files
projects/bsd_rdma_4_9/sys/conf/kern.pre.mk
projects/bsd_rdma_4_9/sys/contrib/cloudabi/cloudabi32_types.h
projects/bsd_rdma_4_9/sys/contrib/cloudabi/cloudabi64_types.h
projects/bsd_rdma_4_9/sys/contrib/cloudabi/cloudabi_types_common.h
projects/bsd_rdma_4_9/sys/contrib/cloudabi/syscalls32.master
projects/bsd_rdma_4_9/sys/contrib/cloudabi/syscalls64.master
projects/bsd_rdma_4_9/sys/contrib/ena-com/ena_plat.h
projects/bsd_rdma_4_9/sys/ddb/db_command.c
projects/bsd_rdma_4_9/sys/dev/ahci/ahci_pci.c
projects/bsd_rdma_4_9/sys/dev/arcmsr/arcmsr.c
projects/bsd_rdma_4_9/sys/dev/arcmsr/arcmsr.h
projects/bsd_rdma_4_9/sys/dev/bnxt/bnxt_txrx.c
projects/bsd_rdma_4_9/sys/dev/cxgbe/common/t4_hw.c
projects/bsd_rdma_4_9/sys/dev/ena/ena.c
projects/bsd_rdma_4_9/sys/dev/ena/ena.h
projects/bsd_rdma_4_9/sys/dev/ena/ena_sysctl.c
projects/bsd_rdma_4_9/sys/dev/iicbus/ds1307.c
projects/bsd_rdma_4_9/sys/dev/iicbus/ds1307reg.h
projects/bsd_rdma_4_9/sys/dev/mlx5/device.h
projects/bsd_rdma_4_9/sys/dev/mlx5/driver.h
projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_core/mlx5_eq.c
projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_core/mlx5_mad.c
projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_core/mlx5_main.c
projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_core/mlx5_port.c
projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_core/mlx5_transobj.c
projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_core/mlx5_vport.c
projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_core/transobj.h
projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_en/en.h
projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c
projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c
projects/bsd_rdma_4_9/sys/dev/mlx5/mlx5_ifc.h
projects/bsd_rdma_4_9/sys/dev/mlx5/qp.h
projects/bsd_rdma_4_9/sys/dev/mlx5/vport.h
projects/bsd_rdma_4_9/sys/dev/usb/quirk/usb_quirk.c
projects/bsd_rdma_4_9/sys/dev/usb/usbdevs
projects/bsd_rdma_4_9/sys/fs/tmpfs/tmpfs_subr.c
projects/bsd_rdma_4_9/sys/i386/i386/machdep.c
projects/bsd_rdma_4_9/sys/kern/init_main.c
projects/bsd_rdma_4_9/sys/kern/kern_exec.c
projects/bsd_rdma_4_9/sys/kern/kern_exit.c
projects/bsd_rdma_4_9/sys/kern/kern_fork.c
projects/bsd_rdma_4_9/sys/kern/kern_proc.c
projects/bsd_rdma_4_9/sys/kern/kern_thread.c
projects/bsd_rdma_4_9/sys/kern/subr_eventhandler.c
projects/bsd_rdma_4_9/sys/kern/sys_process.c
projects/bsd_rdma_4_9/sys/kern/uipc_shm.c
projects/bsd_rdma_4_9/sys/kern/vfs_bio.c
projects/bsd_rdma_4_9/sys/mips/mips/uma_machdep.c
projects/bsd_rdma_4_9/sys/modules/mlx5/Makefile
projects/bsd_rdma_4_9/sys/net/if.h
projects/bsd_rdma_4_9/sys/net/raw_usrreq.c
projects/bsd_rdma_4_9/sys/netinet/ip_input.c
projects/bsd_rdma_4_9/sys/netinet6/ip6_input.c
projects/bsd_rdma_4_9/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c
projects/bsd_rdma_4_9/sys/powerpc/aim/mmu_oea64.c
projects/bsd_rdma_4_9/sys/powerpc/aim/slb.c
projects/bsd_rdma_4_9/sys/powerpc/booke/pmap.c
projects/bsd_rdma_4_9/sys/powerpc/booke/trap_subr.S
projects/bsd_rdma_4_9/sys/powerpc/include/cpu.h
projects/bsd_rdma_4_9/sys/powerpc/powerpc/cpu.c
projects/bsd_rdma_4_9/sys/powerpc/powerpc/interrupt.c
projects/bsd_rdma_4_9/sys/powerpc/powerpc/uma_machdep.c
projects/bsd_rdma_4_9/sys/sparc64/sparc64/vm_machdep.c
projects/bsd_rdma_4_9/sys/sys/eventhandler.h
projects/bsd_rdma_4_9/sys/sys/mbuf.h
projects/bsd_rdma_4_9/sys/sys/param.h
projects/bsd_rdma_4_9/sys/sys/socket.h
projects/bsd_rdma_4_9/sys/sys/systm.h
projects/bsd_rdma_4_9/sys/vm/phys_pager.c
projects/bsd_rdma_4_9/sys/vm/swap_pager.c
projects/bsd_rdma_4_9/sys/vm/uma.h
projects/bsd_rdma_4_9/sys/vm/uma_core.c
projects/bsd_rdma_4_9/sys/vm/vm_kern.c
projects/bsd_rdma_4_9/sys/vm/vm_mmap.c
projects/bsd_rdma_4_9/sys/vm/vm_object.c
projects/bsd_rdma_4_9/sys/vm/vm_page.c
projects/bsd_rdma_4_9/sys/vm/vm_page.h
projects/bsd_rdma_4_9/sys/vm/vm_pageout.c
projects/bsd_rdma_4_9/sys/vm/vm_radix.c
projects/bsd_rdma_4_9/sys/vm/vm_radix.h
projects/bsd_rdma_4_9/sys/x86/iommu/intel_utils.c
projects/bsd_rdma_4_9/tools/bsdbox/Makefile
projects/bsd_rdma_4_9/tools/build/mk/OptionalObsoleteFiles.inc
projects/bsd_rdma_4_9/usr.bin/patch/patch.c
projects/bsd_rdma_4_9/usr.sbin/Makefile
projects/bsd_rdma_4_9/usr.sbin/syslogd/syslogd.c
Directory Properties:
projects/bsd_rdma_4_9/ (props changed)
projects/bsd_rdma_4_9/contrib/tcpdump/ (props changed)
projects/bsd_rdma_4_9/sys/cddl/contrib/opensolaris/ (props changed)
projects/bsd_rdma_4_9/sys/contrib/ena-com/ (props changed)
Modified: projects/bsd_rdma_4_9/Makefile
==============================================================================
--- projects/bsd_rdma_4_9/Makefile Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/Makefile Fri Nov 10 14:46:50 2017 (r325663)
@@ -191,10 +191,11 @@ PATH= /sbin:/bin:/usr/sbin:/usr/bin
MAKEOBJDIRPREFIX?= /usr/obj
_MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} MK_AUTO_OBJ=no \
${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \
+ SRCCONF=${SRCCONF} \
-f /dev/null -V MAKEOBJDIRPREFIX dummy
.if !empty(_MAKEOBJDIRPREFIX)
.error MAKEOBJDIRPREFIX can only be set in environment, not as a global\
- (in make.conf(5)) or command-line variable.
+ (in make.conf(5) or src.conf(5)) or command-line variable.
.endif
# We often need to use the tree's version of make to build it.
@@ -553,12 +554,13 @@ universe_${target}_kernels: universe_${target}_worlds
universe_${target}_kernels: universe_${target}_prologue .MAKE .PHONY
.if exists(${KERNSRCDIR}/${target}/conf/NOTES)
@(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \
- ${SUB_MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
+ ${SUB_MAKE} -DNO_OBJ LINT \
+ > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
(echo "${target} 'make LINT' failed," \
"check _.${target}.makeLINT for details"| ${MAKEFAIL}))
.endif
@cd ${.CURDIR}; ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \
- universe_kernels
+ universe_kernels MK_AUTO_OBJ=no
.endif # !MAKE_JUST_WORLDS
# Tell the user the worlds and kernels have completed
Modified: projects/bsd_rdma_4_9/Makefile.inc1
==============================================================================
--- projects/bsd_rdma_4_9/Makefile.inc1 Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/Makefile.inc1 Fri Nov 10 14:46:50 2017 (r325663)
@@ -988,6 +988,14 @@ buildenvvars: .PHONY
.endif
.endif
BUILDENV_DIR?= ${.CURDIR}
+#
+# Note: make will report any errors the shell reports. This can
+# be odd if the last command in an interactive shell generates an
+# error or is terminated by SIGINT. These reported errors look bad,
+# but are harmless. Allowing them also allows BUIDLENV_SHELL to
+# be a complex command whose status will be returned to the caller.
+# Some scripts in tools rely on this behavior to report build errors.
+#
buildenv: .PHONY
@echo Entering world for ${TARGET_ARCH}:${TARGET}
.if ${BUILDENV_SHELL:M*zsh*}
@@ -2388,6 +2396,9 @@ lib/libcasper__L: lib/libnv__L
lib/liblzma__L: lib/libthr__L
_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
+.if ${MK_IPFILTER} != "no"
+_generic_libs+= sbin/ipf/libipf
+.endif
.for _DIR in ${LOCAL_LIB_DIRS}
.if exists(${.CURDIR}/${_DIR}/Makefile) && empty(_generic_libs:M${_DIR})
_generic_libs+= ${_DIR}
@@ -2768,7 +2779,8 @@ BW_CANONICALOBJDIR:=${OBJROOT}
.endif
.endif
cleanworld cleanuniverse: .PHONY
-.if !empty(BW_CANONICALOBJDIR) && exists(${BW_CANONICALOBJDIR})
+.if !empty(BW_CANONICALOBJDIR) && exists(${BW_CANONICALOBJDIR}) && \
+ ${.CURDIR:tA} != ${BW_CANONICALOBJDIR:tA}
-rm -rf ${BW_CANONICALOBJDIR}*
-chflags -R 0 ${BW_CANONICALOBJDIR}
rm -rf ${BW_CANONICALOBJDIR}*
Modified: projects/bsd_rdma_4_9/ObsoleteFiles.inc
==============================================================================
--- projects/bsd_rdma_4_9/ObsoleteFiles.inc Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/ObsoleteFiles.inc Fri Nov 10 14:46:50 2017 (r325663)
@@ -43,8 +43,8 @@ OLD_FILES+=sbin/badsect
OLD_FILES+=rescue/badsect
OLD_FILES+=usr/share/man/man8/badsect.8.gz
# 20171105: fixing lib/libclang_rt CRTARCH for arm:armv[67].
-.if ${MACHINE} == "arm"
-.if ${MACHINE_ARCH:Marmv[67]*} != "" && ${CPUTYPE:M*soft*} == ""
+.if ${MACHINE_ARCH:Marmv[67]*} != "" && \
+ (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-arm.a
OLD_LIBS+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-arm.so
@@ -55,7 +55,6 @@ OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt
OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
-.endif
.endif
# 20171104: libcap_random should be in /lib not in /usr/lib
OLD_LIBS+=usr/lib/libcap_random.so.0
Modified: projects/bsd_rdma_4_9/etc/network.subr
==============================================================================
--- projects/bsd_rdma_4_9/etc/network.subr Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/etc/network.subr Fri Nov 10 14:46:50 2017 (r325663)
@@ -122,7 +122,7 @@ ifn_vnet0()
#
ifconfig_up()
{
- local _cfg _ipv6_opts ifconfig_args
+ local _cfg _ifconfig_descr _ipv6_opts ifconfig_args
_cfg=1
# Make sure lo0 always comes up.
@@ -213,6 +213,11 @@ ifconfig_up()
ifalias $1 link alias
ifalias $1 ether alias
+
+ _ifconfig_descr=`get_if_var $1 ifconfig_IF_descr`
+ if [ -n "${_ifconfig_descr}" ]; then
+ ${IFCONFIG_CMD} $1 description "${_ifconfig_descr}"
+ fi
if wpaif $1; then
/etc/rc.d/wpa_supplicant start $1
Modified: projects/bsd_rdma_4_9/lib/libc/gen/setmode.c
==============================================================================
--- projects/bsd_rdma_4_9/lib/libc/gen/setmode.c Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/lib/libc/gen/setmode.c Fri Nov 10 14:46:50 2017 (r325663)
@@ -356,7 +356,7 @@ getumask(void)
* security.bsd.unprivileged_proc_debug is set to 0.
*/
len = sizeof(smask);
- if (sysctl((int[4]){ CTL_KERN, KERN_PROC, KERN_PROC_UMASK, getpid() },
+ if (sysctl((int[4]){ CTL_KERN, KERN_PROC, KERN_PROC_UMASK, 0 },
4, &smask, &len, NULL, 0) == 0)
return (smask);
Modified: projects/bsd_rdma_4_9/lib/libcasper/libcasper/Makefile
==============================================================================
--- projects/bsd_rdma_4_9/lib/libcasper/libcasper/Makefile Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/lib/libcasper/libcasper/Makefile Fri Nov 10 14:46:50 2017 (r325663)
@@ -4,7 +4,7 @@ SHLIBDIR?= /lib
.include <src.opts.mk>
-PACKAGE=${LIB}
+PACKAGE=casper
.if ${MK_CASPER} != "no"
SHLIB= casper
Modified: projects/bsd_rdma_4_9/lib/libclang_rt/Makefile.inc
==============================================================================
--- projects/bsd_rdma_4_9/lib/libclang_rt/Makefile.inc Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/lib/libclang_rt/Makefile.inc Fri Nov 10 14:46:50 2017 (r325663)
@@ -2,11 +2,11 @@
.include <bsd.compiler.mk>
-.if ${MACHINE} == "arm"
+# armv[67] is a bit special since we allow a soft-floating version via
+# CPUTYPE matching *soft*. This variant is may not actually work though.
.if ${MACHINE_ARCH:Marmv[67]*} != "" && \
- (defined(CPUTYPE) && ${CPUTYPE:M*soft*} == "")
+ (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
CRTARCH= armhf
-.endif
.endif
CRTARCH?= ${MACHINE_CPUARCH:C/amd64/x86_64/}
CRTSRC= ${SRCTOP}/contrib/compiler-rt
Modified: projects/bsd_rdma_4_9/lib/libnetgraph/Makefile
==============================================================================
--- projects/bsd_rdma_4_9/lib/libnetgraph/Makefile Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/lib/libnetgraph/Makefile Fri Nov 10 14:46:50 2017 (r325663)
@@ -15,7 +15,7 @@ MLINKS+= netgraph.3 NgMkSockNode.3
MLINKS+= netgraph.3 NgNameNode.3
MLINKS+= netgraph.3 NgSendMsg.3
MLINKS+= netgraph.3 NgSendAsciiMsg.3
-MLINKS+= netgraph.3 NgSendMsgReply.3
+MLINKS+= netgraph.3 NgSendReplyMsg.3
MLINKS+= netgraph.3 NgRecvMsg.3
MLINKS+= netgraph.3 NgAllocRecvMsg.3
MLINKS+= netgraph.3 NgRecvAsciiMsg.3
Modified: projects/bsd_rdma_4_9/lib/libnetgraph/netgraph.3
==============================================================================
--- projects/bsd_rdma_4_9/lib/libnetgraph/netgraph.3 Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/lib/libnetgraph/netgraph.3 Fri Nov 10 14:46:50 2017 (r325663)
@@ -43,7 +43,7 @@
.Nm NgNameNode ,
.Nm NgSendMsg ,
.Nm NgSendAsciiMsg ,
-.Nm NgSendMsgReply ,
+.Nm NgSendReplyMsg ,
.Nm NgRecvMsg ,
.Nm NgAllocRecvMsg ,
.Nm NgRecvAsciiMsg ,
@@ -70,7 +70,7 @@
.Ft int
.Fn NgSendAsciiMsg "int cs" "const char *path" "const char *fmt" ...
.Ft int
-.Fo NgSendMsgReply
+.Fo NgSendReplyMsg
.Fa "int cs" "const char *path" "struct ng_mesg *msg" "const void *arg"
.Fa "size_t arglen"
.Fc
@@ -162,7 +162,7 @@ header is returned.
This value is typically used to associate replies.
.Pp
Use
-.Fn NgSendMsgReply
+.Fn NgSendReplyMsg
to send reply to a previously received control message.
The original message header should be pointed to by
.Fa msg .
Modified: projects/bsd_rdma_4_9/lib/libsysdecode/flags.c
==============================================================================
--- projects/bsd_rdma_4_9/lib/libsysdecode/flags.c Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/lib/libsysdecode/flags.c Fri Nov 10 14:46:50 2017 (r325663)
@@ -647,9 +647,11 @@ sysdecode_reboot_howto(FILE *fp, int howto, int *rem)
/*
* RB_AUTOBOOT is special in that its value is zero, but it is
* also an implied argument if a different operation is not
- * requested via RB_HALT, RB_POWERCYCLE, RB_POWEROFF, or RB_REROOT.
+ * requested via RB_HALT, RB_POWERCYCLE, RB_POWEROFF, or
+ * RB_REROOT.
*/
- if (howto != 0 && (howto & (RB_HALT | RB_POWEROFF | RB_REROOT | RB_POWERCYCLE)) == 0) {
+ if (howto != 0 && (howto & (RB_HALT | RB_POWEROFF | RB_REROOT |
+ RB_POWERCYCLE)) == 0) {
fputs("RB_AUTOBOOT|", fp);
printed = true;
} else
Modified: projects/bsd_rdma_4_9/lib/libthr/tests/Makefile
==============================================================================
--- projects/bsd_rdma_4_9/lib/libthr/tests/Makefile Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/lib/libthr/tests/Makefile Fri Nov 10 14:46:50 2017 (r325663)
@@ -23,7 +23,7 @@ NETBSD_ATF_TESTS_C+= sigmask_test
NETBSD_ATF_TESTS_C+= sigsuspend_test
NETBSD_ATF_TESTS_C+= siglongjmp_test
NETBSD_ATF_TESTS_C+= sleep_test
-.if ${MACHINE} != "arm64" # ARM64TODO: Missing makecontext
+.if ${MACHINE_CPUARCH} != "aarch64" # ARM64TODO: Missing makecontext
NETBSD_ATF_TESTS_C+= swapcontext_test
.endif
NETBSD_ATF_TESTS_C+= timedmutex_test
Modified: projects/bsd_rdma_4_9/libexec/rtld-elf/mips/rtld_start.S
==============================================================================
--- projects/bsd_rdma_4_9/libexec/rtld-elf/mips/rtld_start.S Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/libexec/rtld-elf/mips/rtld_start.S Fri Nov 10 14:46:50 2017 (r325663)
@@ -32,6 +32,8 @@
#include <machine/asm.h>
+ .cfi_sections .debug_frame
+
.globl _C_LABEL(_rtld_relocate_nonplt_self)
.globl _C_LABEL(_rtld)
@@ -43,8 +45,7 @@
* a2 rtld object (filled in by dynamic loader)
* a3 ps_strings
*/
-LEAF(rtld_start)
- .frame sp, 4*PTR_SIZE, ra
+NESTED(rtld_start, 4*PTR_SIZE, ra)
.mask 0x10090000,-PTR_SIZE
.set noreorder
SETUP_GP
@@ -108,6 +109,7 @@ END(rtld_start)
_rtld_bind_start:
.frame sp, XCALLFRAME_SIZ, $15
.cfi_startproc simple
+ .cfi_def_cfa sp, 0
.cfi_register ra, $15
move v1, gp /* save old GP */
#if defined(__mips_o32) || defined(__mips_o64)
@@ -115,7 +117,7 @@ _rtld_bind_start:
#endif
SETUP_GP
PTR_SUBU sp, XCALLFRAME_SIZ /* save arguments and sp value in stack */
- .cfi_def_cfa sp, XCALLFRAME_SIZ
+ .cfi_def_cfa_offset XCALLFRAME_SIZ
SETUP_GP64(XCALLFRAME_GP, _rtld_bind_start)
SAVE_GP(XCALLFRAME_GP)
#if defined(__mips_n32) || defined(__mips_n64)
@@ -201,6 +203,7 @@ END(_rtld_bind_start)
_rtld_pltbind_start:
.frame sp, XCALLFRAME_SIZ, $15
.cfi_startproc simple
+ .cfi_def_cfa sp, 0
.cfi_register ra, $15
#if defined(__mips_o32)
move v1, gp /* save pointer to .got.plt */
@@ -212,7 +215,7 @@ _rtld_pltbind_start:
#endif
SETUP_GP
PTR_SUBU sp, XCALLFRAME_SIZ /* save arguments and sp value in stack */
- .cfi_def_cfa sp, XCALLFRAME_SIZ
+ .cfi_def_cfa_offset XCALLFRAME_SIZ
SETUP_GP64(XCALLFRAME_GP, _rtld_pltbind_start)
SAVE_GP(XCALLFRAME_GP)
#if defined(__mips_n32) || defined(__mips_n64)
Modified: projects/bsd_rdma_4_9/rescue/rescue/Makefile
==============================================================================
--- projects/bsd_rdma_4_9/rescue/rescue/Makefile Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/rescue/rescue/Makefile Fri Nov 10 14:46:50 2017 (r325663)
@@ -108,6 +108,7 @@ CRUNCH_PROGS_sbin+= rtsol
.if ${MK_IPFILTER} != "no"
CRUNCH_PROGS_sbin+= ipf
+CRUNCH_LIBS_ipf+= ${LIBIPF}
.endif
.if ${MK_ROUTED} != "no"
@@ -192,7 +193,7 @@ CRUNCH_ALIAS_xz= unxz lzma unlzma xzcat lzcat
CRUNCH_PROGS_usr.bin+= zstd
CRUNCH_ALIAS_zstd= unzstd zstdcat zstdmt
-CRUNCH_LIBS+= -lprivatezstd
+CRUNCH_LIBS+= ${LDADD_zstd}
CRUNCH_PROGS_usr.bin+= tar
CRUNCH_LIBS+= -larchive
Modified: projects/bsd_rdma_4_9/sbin/ifconfig/ifconfig.c
==============================================================================
--- projects/bsd_rdma_4_9/sbin/ifconfig/ifconfig.c Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/sbin/ifconfig/ifconfig.c Fri Nov 10 14:46:50 2017 (r325663)
@@ -1143,7 +1143,7 @@ unsetifdescr(const char *val, int value, int s, const
"\020\1RXCSUM\2TXCSUM\3NETCONS\4VLAN_MTU\5VLAN_HWTAGGING\6JUMBO_MTU\7POLLING" \
"\10VLAN_HWCSUM\11TSO4\12TSO6\13LRO\14WOL_UCAST\15WOL_MCAST\16WOL_MAGIC" \
"\17TOE4\20TOE6\21VLAN_HWFILTER\23VLAN_HWTSO\24LINKSTATE\25NETMAP" \
-"\26RXCSUM_IPV6\27TXCSUM_IPV6\31TXRTLMT"
+"\26RXCSUM_IPV6\27TXCSUM_IPV6\31TXRTLMT\32HWRXTSTMP"
/*
* Print the status of the interface. If an address family was
@@ -1456,6 +1456,8 @@ static struct cmd basic_cmds[] = {
DEF_CMD("-wol_magic", -IFCAP_WOL_MAGIC, setifcap),
DEF_CMD("txrtlmt", IFCAP_TXRTLMT, setifcap),
DEF_CMD("-txrtlmt", -IFCAP_TXRTLMT, setifcap),
+ DEF_CMD("hwrxtsmp", IFCAP_HWRXTSTMP, setifcap),
+ DEF_CMD("-hwrxtsmp", -IFCAP_HWRXTSTMP, setifcap),
DEF_CMD("normal", -IFF_LINK0, setifflags),
DEF_CMD("compress", IFF_LINK0, setifflags),
DEF_CMD("noicmp", IFF_LINK1, setifflags),
Modified: projects/bsd_rdma_4_9/sbin/ipf/ipf/Makefile
==============================================================================
--- projects/bsd_rdma_4_9/sbin/ipf/ipf/Makefile Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/sbin/ipf/ipf/Makefile Fri Nov 10 14:46:50 2017 (r325663)
@@ -30,10 +30,7 @@ ipf_l.h: lexer.h
sed -e 's/yy/ipf_yy/g' \
${.ALLSRC} > ${.TARGET}
-.if defined(RESCUE)
-LIBIPF_SRCS!= cd ${.CURDIR:H}/libipf && ${MAKE} -V SRCS
-SRCS+= ${LIBIPF_SRCS}
-.else
+.if !defined(RESCUE)
LIBADD+= pcap
.endif
Modified: projects/bsd_rdma_4_9/share/man/man4/arcmsr.4
==============================================================================
--- projects/bsd_rdma_4_9/share/man/man4/arcmsr.4 Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/share/man/man4/arcmsr.4 Fri Nov 10 14:46:50 2017 (r325663)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd July 14, 2017
+.Dd November 8, 2017
.Dt ARCMSR 4
.Os
.Sh NAME
@@ -104,6 +104,8 @@ ARC-1213
.It
ARC-1214
.It
+ARC-1216
+.It
ARC-1220
.It
ARC-1222
@@ -111,6 +113,8 @@ ARC-1222
ARC-1223
.It
ARC-1224
+.It
+ARC-1226
.It
ARC-1230
.It
Modified: projects/bsd_rdma_4_9/share/man/man4/ctl.4
==============================================================================
--- projects/bsd_rdma_4_9/share/man/man4/ctl.4 Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/share/man/man4/ctl.4 Fri Nov 10 14:46:50 2017 (r325663)
@@ -191,6 +191,17 @@ If there is no primary node (both nodes are secondary,
no connection to primary one), secondary node(s) report Transitioning state.
State with two primary nodes is illegal (split brain condition).
.El
+.Sh TUNABLE VARIABLES
+The following variables are available as
+.Xr loader 8
+tunables:
+.Bl -tag -width indent
+.It Va kern.cam.ctl.max_luns
+Specifies the maximum number of LUNs we support, must be a power of 2.
+The default value is 1024.
+.It Va kern.cam.ctl.max_ports
+Specifies the maximum number of ports we support, must be a power of 2.
+The default value is 256.
.Sh SEE ALSO
.Xr cfiscsi 4 ,
.Xr cfumass 4 ,
Modified: projects/bsd_rdma_4_9/share/man/man5/rc.conf.5
==============================================================================
--- projects/bsd_rdma_4_9/share/man/man5/rc.conf.5 Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/share/man/man5/rc.conf.5 Fri Nov 10 14:46:50 2017 (r325663)
@@ -1616,6 +1616,23 @@ is set to 1.
.Pp
Default is
.Dq Li NO .
+.It Va ifconfig_ Ns Ao Ar interface Ac Ns _descr
+.Pq Vt str
+This assigns arbitrary description to an interface.
+The
+.Xr sysctl 8
+variable
+.Va net.ifdescr_maxlen
+limits its length.
+This static setting may be overridden by commands
+started with dynamic interface configuration utilities
+like
+.Xr dhclient 8
+hooks. The description can be seen with
+.Xr ifconfig 8
+command and it may be exported with
+.Xr bsnmpd 1
+daemon using its MIB-2 module.
.It Va ifconfig_ Ns Ao Ar interface Ac Ns _ipv6
.Pq Vt str
IPv6 functionality on an interface should be configured by
Modified: projects/bsd_rdma_4_9/share/man/man7/ports.7
==============================================================================
--- projects/bsd_rdma_4_9/share/man/man7/ports.7 Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/share/man/man7/ports.7 Fri Nov 10 14:46:50 2017 (r325663)
@@ -494,7 +494,7 @@ More information on these and other related variables
and the
.Fx
Porter's Handbook.
-.Bl -tag -width ".Va OVERRIDE_LINUX_BASE_PORT"
+.Bl -tag -width ".Va WITH_GHOSTSCRIPT_VER"
.It Va WITH_OPENSSL_PORT
.Pq Vt bool
If set, causes ports that make use of OpenSSL to use the OpenSSL from
@@ -514,8 +514,6 @@ If set, enables
for most ports.
.It Va WITH_GHOSTSCRIPT_VER
If set, the version of ghostscript to be used by ports.
-.It Va OVERRIDE_LINUX_BASE_PORT
-The default linux base to use.
.It Va WITH_CCACHE_BUILD
.Pq Vt bool
If set, enables the use of
Modified: projects/bsd_rdma_4_9/share/man/man9/EVENTHANDLER.9
==============================================================================
--- projects/bsd_rdma_4_9/share/man/man9/EVENTHANDLER.9 Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/share/man/man9/EVENTHANDLER.9 Fri Nov 10 14:46:50 2017 (r325663)
@@ -23,7 +23,7 @@
.\" SUCH DAMAGE.
.\" $FreeBSD$
.\"
-.Dd October 1, 2017
+.Dd October 31, 2017
.Dt EVENTHANDLER 9
.Os
.Sh NAME
@@ -38,6 +38,9 @@
.Fn EVENTHANDLER_REGISTER name func arg priority
.Fn EVENTHANDLER_DEREGISTER name tag
.Fn EVENTHANDLER_DEREGISTER_NOWAIT name tag
+.Fn EVENTHANDLER_LIST_DECLARE name
+.Fn EVENTHANDLER_LIST_DEFINE name
+.Fn EVENTHANDLER_DIRECT_INVOKE name
.Ft eventhandler_tag
.Fo eventhandler_register
.Fa "struct eventhandler_list *list"
@@ -82,8 +85,13 @@ may be used if the handler does not have a specific pr
associated with it.
.Pp
The normal way to use this subsystem is via the macro interface.
-The macros that can be used for working with event handlers and callback
-function lists are:
+For events that are high frequency it is suggested that you additionally use
+.Fn EVENTHANDLER_LIST_DEFINE
+so that the event handlers can be invoked directly using
+.Fn EVENTHANDLER_DIRECT_INVOKE
+(see below).
+This saves the invoker from having to do a locked traversal of a global
+list of event handler lists.
.Bl -tag -width indent
.It Fn EVENTHANDLER_DECLARE
This macro declares an event handler named by argument
@@ -148,6 +156,27 @@ Additional arguments to the macro after the
.Fa name
parameter are passed as the second and subsequent arguments to each
registered callback function.
+.It Fn EVENTHANDLER_LIST_DEFINE
+This macro defines a reference to an event handler list named by
+argument
+.Fa name .
+It uses
+.Xr SYSINIT 9
+to initialize the reference and the eventhandler list.
+.It Fn EVENTHANDLER_LIST_DECLARE
+This macro declares an event handler list named by argument
+.Fa name .
+This is only needed for users of
+.Fn EVENTHANDLER_DIRECT_INVOKE
+which are not in the same compilation unit of that list's definition.
+.It Fn EVENTHANDLER_DIRECT_INVOKE
+This macro invokes the event handlers registered for the list named by
+argument
+.Fa name .
+This macro can only be used if the list was defined with
+.Fn EVENTHANDLER_LIST_DEFINE .
+The macro is variadic with the same semantics as
+.Fn EVENTHANDLER_INVOKE .
.El
.Pp
The macros are implemented using the following functions:
@@ -315,7 +344,7 @@ This is never called.
.It Vt process_fork
Callbacks invoked when a process forks a child.
.It Vt process_init
-Callback invoked when a process is initalized.
+Callback invoked when a process is initialized.
.It Vt random_adaptor_attach
Callback invoked when a new random module has been loaded.
.It Vt register_framebuffer
@@ -337,7 +366,7 @@ Callback invoked when a thread object is created.
.It Vt thread_dtor
Callback invoked when a thread object is destroyed.
.It Vt thread_init
-Callback invoked when a thread object is initalized.
+Callback invoked when a thread object is initialized.
.It Vt thread_fini
Callback invoked when a thread object is deinitalized.
.It Vt usb_dev_configured
@@ -384,4 +413,6 @@ facility first appeared in
.Fx 4.0 .
.Sh AUTHORS
This manual page was written by
-.An Joseph Koshy Aq Mt jkoshy at FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy at FreeBSD.org
+and
+.An Matt Joras Aq Mt mjoras at FreeBSD.org .
Modified: projects/bsd_rdma_4_9/share/mk/bsd.clang-analyze.mk
==============================================================================
--- projects/bsd_rdma_4_9/share/mk/bsd.clang-analyze.mk Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/share/mk/bsd.clang-analyze.mk Fri Nov 10 14:46:50 2017 (r325663)
@@ -71,7 +71,7 @@ CLANG_ANALYZE_SRCS= \
${DPSRCS:M*.[cC]} ${DPSRCS:M*.cc} \
${DPSRCS:M*.cpp} ${DPSRCS:M*.cxx}
.if !empty(CLANG_ANALYZE_SRCS)
-CLANG_ANALYZE_OBJS= ${CLANG_ANALYZE_SRCS:O:u:R:S,$,.clang-analyzer,}
+CLANG_ANALYZE_OBJS= ${CLANG_ANALYZE_SRCS:O:u:${OBJS_SRCS_FILTER:ts:}:S,$,.clang-analyzer,}
.NOPATH: ${CLANG_ANALYZE_OBJS}
.endif
Modified: projects/bsd_rdma_4_9/share/mk/bsd.crunchgen.mk
==============================================================================
--- projects/bsd_rdma_4_9/share/mk/bsd.crunchgen.mk Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/share/mk/bsd.crunchgen.mk Fri Nov 10 14:46:50 2017 (r325663)
@@ -100,6 +100,9 @@ ${CONF}: Makefile
.else
echo special ${P} buildopts DIRPRFX=${DIRPRFX}${P}/ >>${.TARGET}
.endif
+.ifdef CRUNCH_LIBS_${P}
+ echo special ${P} lib ${CRUNCH_LIBS_${P}} >>${.TARGET}
+.endif
.for A in ${CRUNCH_ALIAS_${P}}
echo ln ${P} ${A} >>${.TARGET}
.endfor
Modified: projects/bsd_rdma_4_9/share/mk/bsd.dep.mk
==============================================================================
--- projects/bsd_rdma_4_9/share/mk/bsd.dep.mk Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/share/mk/bsd.dep.mk Fri Nov 10 14:46:50 2017 (r325663)
@@ -233,10 +233,14 @@ afterdepend: beforedepend
# mimicing what bmake's meta_name() does and adding in the full path
# as well to ensure that the expected meta file is read.
.if ${__obj:M*/*}
+.if ${MAKE_VERSION} < 20171028
_meta_obj= ${.OBJDIR:C,/,_,g}_${__obj:C,/,_,g}.meta
.else
+_meta_obj= ${__obj:C,/,_,g}.meta
+.endif # ${MAKE_VERSION} < 20171028
+.else
_meta_obj= ${__obj}.meta
-.endif
+.endif # ${__obj:M*/*}
_dep_obj= ${DEPENDFILE}.${__obj:${DEPEND_FILTER}}
.if defined(_meta_filemon)
_depfile= ${.OBJDIR}/${_meta_obj}
Modified: projects/bsd_rdma_4_9/share/mk/bsd.init.mk
==============================================================================
--- projects/bsd_rdma_4_9/share/mk/bsd.init.mk Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/share/mk/bsd.init.mk Fri Nov 10 14:46:50 2017 (r325663)
@@ -13,7 +13,7 @@ __<bsd.init.mk>__:
.if ${MK_AUTO_OBJ} == "yes"
# This is also done in bsd.obj.mk
-.if defined(NO_OBJ)
+.if defined(NO_OBJ) && ${.OBJDIR} != ${.CURDIR}
.OBJDIR: ${.CURDIR}
.endif
.endif
Modified: projects/bsd_rdma_4_9/share/mk/bsd.obj.mk
==============================================================================
--- projects/bsd_rdma_4_9/share/mk/bsd.obj.mk Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/share/mk/bsd.obj.mk Fri Nov 10 14:46:50 2017 (r325663)
@@ -44,11 +44,11 @@ __<bsd.obj.mk>__:
.if ${MK_AUTO_OBJ} == "yes"
# it is done by now
-objwarn:
-obj:
+objwarn: .PHONY
+obj: .PHONY
CANONICALOBJDIR= ${.OBJDIR}
# This is also done in bsd.init.mk
-.if defined(NO_OBJ)
+.if defined(NO_OBJ) && ${.OBJDIR} != ${.CURDIR}
# but this makefile does not want it!
.OBJDIR: ${.CURDIR}
.endif
@@ -145,7 +145,7 @@ obj: .PHONY
.endif
.if !target(objlink)
-objlink:
+objlink: .PHONY
@if test -d ${CANONICALOBJDIR}/; then \
rm -f ${.CURDIR}/obj; \
ln -s ${CANONICALOBJDIR} ${.CURDIR}/obj; \
@@ -159,17 +159,17 @@ objlink:
# where would that obj directory be?
#
.if !target(whereobj)
-whereobj:
+whereobj: .PHONY
@echo ${.OBJDIR}
.endif
# Same check in bsd.progs.mk
.if ${CANONICALOBJDIR} != ${.CURDIR} && exists(${CANONICALOBJDIR}/) && \
(${MK_AUTO_OBJ} == "no" || ${.TARGETS:Nclean*:N*clean:Ndestroy*} == "")
-cleanobj:
+cleanobj: .PHONY
-rm -rf ${CANONICALOBJDIR}
.else
-cleanobj: clean cleandepend
+cleanobj: .PHONY clean cleandepend
.endif
@if [ -L ${.CURDIR}/obj ]; then rm -f ${.CURDIR}/obj; fi
@@ -180,7 +180,7 @@ NOPATH_FILES+= ${CLEANFILES}
.endif
.if !target(clean)
-clean:
+clean: .PHONY
.if defined(CLEANFILES) && !empty(CLEANFILES)
rm -f ${CLEANFILES}
.endif
@@ -196,7 +196,7 @@ clean:
.include <bsd.subdir.mk>
-cleandir: .WAIT cleanobj
+cleandir: .PHONY .WAIT cleanobj
.if make(destroy*) && defined(OBJROOT)
# this (rm -rf objdir) is much faster and more reliable than cleaning.
@@ -206,18 +206,18 @@ _OBJDIR?= ${.OBJDIR}
_CURDIR?= ${.CURDIR}
# destroy almost everything
-destroy: destroy-all
-destroy-all:
+destroy: .PHONY destroy-all
+destroy-all: .PHONY
# just remove our objdir
-destroy-arch: .NOMETA
+destroy-arch: .PHONY .NOMETA
.if ${_OBJDIR} != ${_CURDIR}
cd ${_CURDIR} && rm -rf ${_OBJDIR}
.endif
.if defined(HOST_OBJTOP)
destroy-host: destroy.host
-destroy.host: .NOMETA
+destroy.host: .PHONY .NOMETA
cd ${_CURDIR} && rm -rf ${HOST_OBJTOP}/${RELDIR:N.}
.endif
@@ -226,7 +226,7 @@ destroy-all: destroy-stage
.endif
# remove the stage tree
-destroy-stage: .NOMETA
+destroy-stage: .PHONY .NOMETA
.if defined(STAGE_ROOT)
cd ${_CURDIR} && rm -rf ${STAGE_ROOT}
.endif
@@ -236,7 +236,7 @@ _destroy_machine_list = common host ${ALL_MACHINE_LIST
.for m in ${_destroy_machine_list:O:u}
destroy-all: destroy.$m
.if !target(destroy.$m)
-destroy.$m: .NOMETA
+destroy.$m: .PHONY .NOMETA
.if ${_OBJDIR} != ${_CURDIR}
cd ${_CURDIR} && rm -rf ${OBJROOT}$m*/${RELDIR:N.}
.endif
Modified: projects/bsd_rdma_4_9/share/mk/bsd.progs.mk
==============================================================================
--- projects/bsd_rdma_4_9/share/mk/bsd.progs.mk Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/share/mk/bsd.progs.mk Fri Nov 10 14:46:50 2017 (r325663)
@@ -104,7 +104,7 @@ _PROGS_ALL_SRCS+= ${s}
.if !empty(_PROGS_COMMON_SRCS)
_PROGS_COMMON_OBJS= ${_PROGS_COMMON_SRCS:M*.[dhly]}
.if !empty(_PROGS_COMMON_SRCS:N*.[dhly])
-_PROGS_COMMON_OBJS+= ${_PROGS_COMMON_SRCS:N*.[dhly]:R:S/$/.o/g}
+_PROGS_COMMON_OBJS+= ${_PROGS_COMMON_SRCS:N*.[dhly]:${OBJS_SRCS_FILTER:ts:}:S/$/.o/g}
.endif
.endif
Modified: projects/bsd_rdma_4_9/share/mk/local.sys.env.mk
==============================================================================
--- projects/bsd_rdma_4_9/share/mk/local.sys.env.mk Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/share/mk/local.sys.env.mk Fri Nov 10 14:46:50 2017 (r325663)
@@ -44,4 +44,8 @@ TIME_STAMP_END?= ${TIME_STAMP_DATE}
# error spam and show a proper error.
Mkdirs= Mkdirs() { mkdir -p $$* || :; }
+.if !empty(.MAKEFLAGS:M-s)
+ECHO_TRACE?= true
+.endif
+
.include "src.sys.env.mk"
Modified: projects/bsd_rdma_4_9/share/mk/src.sys.obj.mk
==============================================================================
--- projects/bsd_rdma_4_9/share/mk/src.sys.obj.mk Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/share/mk/src.sys.obj.mk Fri Nov 10 14:46:50 2017 (r325663)
@@ -70,7 +70,10 @@ OBJROOT:= ${OBJROOT:H:tA}/${OBJROOT:T}
.export OBJROOT SRCTOP
.endif
-.if ${MK_UNIFIED_OBJDIR} == "yes"
+# SRCTOP == OBJROOT only happens with clever MAKEOBJDIRPREFIX=/. Don't
+# append TARGET.TARGET_ARCH for that case since the user wants to build
+# in the source tree.
+.if ${MK_UNIFIED_OBJDIR} == "yes" && ${SRCTOP} != ${OBJROOT:tA}
OBJTOP:= ${OBJROOT}${TARGET:D${TARGET}.${TARGET_ARCH}:U${MACHINE}.${MACHINE_ARCH}}
.else
# TARGET.TARGET_ARCH handled in OBJROOT already.
@@ -103,13 +106,12 @@ __objdir:= ${MAKEOBJDIR}
.endif
# Try to enable MK_AUTO_OBJ by default if we can write to the __objdir. Only
-# do this if AUTO_OBJ is not disabled by the user, not cleaning, and this is
-# the first make ran.
-.if 0 && ${.MAKE.LEVEL} == 0 && \
+# do this if AUTO_OBJ is not disabled by the user, and this is the first make
+# ran.
+.if ${.MAKE.LEVEL} == 0 && \
${MK_AUTO_OBJ} == "no" && empty(.MAKEOVERRIDES:MMK_AUTO_OBJ) && \
!defined(WITHOUT_AUTO_OBJ) && !make(showconfig) && !make(print-dir) && \
- !defined(NO_OBJ) && \
- (${.TARGETS} == "" || ${.TARGETS:Nclean*:N*clean:Ndestroy*} != "")
+ !defined(NO_OBJ)
# Find the last existing directory component and check if we can write to it.
# If the last component is a symlink then recurse on the new path.
CheckAutoObj= \
@@ -147,9 +149,13 @@ CheckAutoObj() { \
fi; \
}
.if !empty(__objdir)
+.if ${.CURDIR} == ${__objdir}
+__objdir_writable?= yes
+.else
__objdir_writable!= \
${CheckAutoObj}; CheckAutoObj "${__objdir}" || echo no
.endif
+.endif
__objdir_writable?= no
# Export the decision to sub-makes.
MK_AUTO_OBJ:= ${__objdir_writable}
@@ -179,3 +185,14 @@ MK_AUTO_OBJ:= ${__objdir_writable}
# auto.obj.mk or bsd.obj.mk will create the directory and fix .OBJDIR later.
.OBJDIR: ${.CURDIR}
.endif
+
+# Ensure .OBJDIR=.CURDIR cases have a proper OBJTOP and .OBJDIR
+.if defined(NO_OBJ) || ${__objdir_writable:Uunknown} == "no" || \
+ ${__objdir} == ${.CURDIR}
+OBJTOP= ${SRCTOP}
+OBJROOT= ${SRCTOP}/
+# Compare only to avoid an unneeded chdir(2), :tA purposely left out.
+.if ${.OBJDIR} != ${.CURDIR}
+.OBJDIR: ${.CURDIR}
+.endif
+.endif # defined(NO_OBJ)
Modified: projects/bsd_rdma_4_9/sys/amd64/amd64/pmap.c
==============================================================================
--- projects/bsd_rdma_4_9/sys/amd64/amd64/pmap.c Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/sys/amd64/amd64/pmap.c Fri Nov 10 14:46:50 2017 (r325663)
@@ -2414,9 +2414,8 @@ pmap_pinit_type(pmap_t pmap, enum pmap_type pm_type, i
/*
* allocate the page directory page
*/
- while ((pml4pg = vm_page_alloc(NULL, 0, VM_ALLOC_NORMAL |
- VM_ALLOC_NOOBJ | VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL)
- VM_WAIT;
+ pml4pg = vm_page_alloc(NULL, 0, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ |
+ VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_WAITOK);
pml4phys = VM_PAGE_TO_PHYS(pml4pg);
pmap->pm_pml4 = (pml4_entry_t *)PHYS_TO_DMAP(pml4phys);
Modified: projects/bsd_rdma_4_9/sys/amd64/amd64/uma_machdep.c
==============================================================================
--- projects/bsd_rdma_4_9/sys/amd64/amd64/uma_machdep.c Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/sys/amd64/amd64/uma_machdep.c Fri Nov 10 14:46:50 2017 (r325663)
@@ -47,20 +47,12 @@ uma_small_alloc(uma_zone_t zone, vm_size_t bytes, u_in
vm_page_t m;
vm_paddr_t pa;
void *va;
- int pflags;
*flags = UMA_SLAB_PRIV;
- pflags = malloc2vm_flags(wait) | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED;
- for (;;) {
- m = vm_page_alloc(NULL, 0, pflags);
- if (m == NULL) {
- if (wait & M_NOWAIT)
- return (NULL);
- else
- VM_WAIT;
- } else
- break;
- }
+ m = vm_page_alloc(NULL, 0,
+ malloc2vm_flags(wait) | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED);
+ if (m == NULL)
+ return (NULL);
pa = m->phys_addr;
if ((wait & M_NODUMP) == 0)
dump_add_page(pa);
Modified: projects/bsd_rdma_4_9/sys/arm/allwinner/a13/files.a13
==============================================================================
--- projects/bsd_rdma_4_9/sys/arm/allwinner/a13/files.a13 Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/sys/arm/allwinner/a13/files.a13 Fri Nov 10 14:46:50 2017 (r325663)
@@ -1,3 +1,4 @@
# $FreeBSD$
arm/allwinner/a13/a13_padconf.c standard
+arm/allwinner/clkng/ccu_a13.c standard
Modified: projects/bsd_rdma_4_9/sys/arm/allwinner/clkng/aw_ccung.c
==============================================================================
--- projects/bsd_rdma_4_9/sys/arm/allwinner/clkng/aw_ccung.c Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/sys/arm/allwinner/clkng/aw_ccung.c Fri Nov 10 14:46:50 2017 (r325663)
@@ -58,6 +58,10 @@ __FBSDID("$FreeBSD$");
#include "opt_soc.h"
#endif
+#if defined(SOC_ALLWINNER_A13)
+#include <arm/allwinner/clkng/ccu_a13.h>
+#endif
+
#if defined(SOC_ALLWINNER_A31)
#include <arm/allwinner/clkng/ccu_a31.h>
#endif
@@ -94,7 +98,14 @@ static struct resource_spec aw_ccung_spec[] = {
#define A64_R_CCU 5
#endif
+#if defined(SOC_ALLWINNER_A13)
+#define A13_CCU 6
+#endif
+
static struct ofw_compat_data compat_data[] = {
+#if defined(SOC_ALLWINNER_A31)
+ { "allwinner,sun5i-a13-ccu", A13_CCU},
+#endif
#if defined(SOC_ALLWINNER_H3) || defined(SOC_ALLWINNER_H5)
{ "allwinner,sun8i-h3-ccu", H3_CCU },
{ "allwinner,sun8i-h3-r-ccu", H3_R_CCU },
@@ -322,6 +333,11 @@ aw_ccung_attach(device_t dev)
panic("Cannot create clkdom\n");
switch (sc->type) {
+#if defined(SOC_ALLWINNER_A13)
+ case A13_CCU:
+ ccu_a13_register_clocks(sc);
+ break;
+#endif
#if defined(SOC_ALLWINNER_H3) || defined(SOC_ALLWINNER_H5)
case H3_CCU:
ccu_h3_register_clocks(sc);
Modified: projects/bsd_rdma_4_9/sys/arm/allwinner/clkng/aw_clk_nkmp.c
==============================================================================
--- projects/bsd_rdma_4_9/sys/arm/allwinner/clkng/aw_clk_nkmp.c Fri Nov 10 14:39:03 2017 (r325662)
+++ projects/bsd_rdma_4_9/sys/arm/allwinner/clkng/aw_clk_nkmp.c Fri Nov 10 14:46:50 2017 (r325663)
@@ -300,6 +300,7 @@ aw_clk_nkmp_set_freq(struct clknode *clk, uint64_t fpa
val |= aw_clk_factor_get_value(&sc->p, best_p) << sc->p.shift;
WRITE4(clk, sc->offset, val);
DELAY(2000);
+ DEVICE_UNLOCK(clk);
if ((sc->flags & AW_CLK_HAS_UPDATE) != 0) {
DEVICE_LOCK(clk);
@@ -307,6 +308,7 @@ aw_clk_nkmp_set_freq(struct clknode *clk, uint64_t fpa
val |= 1 << sc->update_shift;
WRITE4(clk, sc->offset, val);
DELAY(2000);
+ DEVICE_UNLOCK(clk);
}
if ((sc->flags & AW_CLK_HAS_LOCK) != 0) {
Copied: projects/bsd_rdma_4_9/sys/arm/allwinner/clkng/ccu_a13.c (from r325662, head/sys/arm/allwinner/clkng/ccu_a13.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/bsd_rdma_4_9/sys/arm/allwinner/clkng/ccu_a13.c Fri Nov 10 14:46:50 2017 (r325663, copy of r325662, head/sys/arm/allwinner/clkng/ccu_a13.c)
@@ -0,0 +1,566 @@
+/*-
+ * Copyright (c) 2017 Emmanuel Vadot <manu 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 ``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 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$
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+
+#include <dev/extres/clk/clk_div.h>
+#include <dev/extres/clk/clk_fixed.h>
+#include <dev/extres/clk/clk_mux.h>
+
+#include <arm/allwinner/clkng/aw_ccung.h>
+#include <arm/allwinner/clkng/aw_clk.h>
+#include <arm/allwinner/clkng/aw_clk_nm.h>
+#include <arm/allwinner/clkng/aw_clk_nkmp.h>
+#include <arm/allwinner/clkng/aw_clk_prediv_mux.h>
+
+#include <dt-bindings/clock/sun5i-ccu.h>
+#include <dt-bindings/reset/sun5i-ccu.h>
+
+#include "ccu_a13.h"
+
+/* Non-exported clocks */
+
+#define CLK_PLL_CORE 2
+#define CLK_PLL_AUDIO_BASE 3
+#define CLK_PLL_AUDIO 4
+#define CLK_PLL_AUDIO_2X 5
+#define CLK_PLL_AUDIO_4X 6
+#define CLK_PLL_AUDIO_8X 7
+#define CLK_PLL_VIDEO0 8
+
+#define CLK_PLL_VE 10
+#define CLK_PLL_DDR_BASE 11
+#define CLK_PLL_DDR 12
+#define CLK_PLL_DDR_OTHER 13
+#define CLK_PLL_PERIPH 14
+#define CLK_PLL_VIDEO1 15
+
+#define CLK_AXI 18
+#define CLK_AHB 19
+#define CLK_APB0 20
+#define CLK_APB1 21
+#define CLK_DRAM_AXI 22
+
+#define CLK_TCON_CH1_SCLK 91
+
+#define CLK_MBUS 99
+
+static struct aw_ccung_reset a13_ccu_resets[] = {
+ CCU_RESET(RST_USB_PHY0, 0xcc, 0)
+ CCU_RESET(RST_USB_PHY1, 0xcc, 1)
+
+ CCU_RESET(RST_GPS, 0xd0, 30)
+
+ CCU_RESET(RST_DE_BE, 0x104, 30)
+
+ CCU_RESET(RST_DE_FE, 0x10c, 30)
+
+ CCU_RESET(RST_TVE, 0x118, 29)
+ CCU_RESET(RST_LCD, 0x118, 30)
+
+ CCU_RESET(RST_CSI, 0x134, 30)
+
+ CCU_RESET(RST_VE, 0x13c, 0)
+ CCU_RESET(RST_GPU, 0x154, 30)
+ CCU_RESET(RST_IEP, 0x160, 30)
+
+};
+
+static struct aw_ccung_gate a13_ccu_gates[] = {
+ CCU_GATE(CLK_HOSC, "hosc", "osc24M", 0x50, 0)
+
+ CCU_GATE(CLK_DRAM_AXI, "axi-dram", "axi", 0x5c, 0)
+
+ CCU_GATE(CLK_AHB_OTG, "ahb-otg", "ahb", 0x60, 0)
+ CCU_GATE(CLK_AHB_EHCI, "ahb-ehci", "ahb", 0x60, 1)
+ CCU_GATE(CLK_AHB_OHCI, "ahb-ohci", "ahb", 0x60, 2)
+ CCU_GATE(CLK_AHB_SS, "ahb-ss", "ahb", 0x60, 5)
+ CCU_GATE(CLK_AHB_DMA, "ahb-dma", "ahb", 0x60, 6)
+ CCU_GATE(CLK_AHB_BIST, "ahb-bist", "ahb", 0x60, 7)
+ CCU_GATE(CLK_AHB_MMC0, "ahb-mmc0", "ahb", 0x60, 8)
+ CCU_GATE(CLK_AHB_MMC1, "ahb-mmc1", "ahb", 0x60, 9)
+ CCU_GATE(CLK_AHB_MMC2, "ahb-mmc2", "ahb", 0x60, 10)
+ CCU_GATE(CLK_AHB_NAND, "ahb-nand", "ahb", 0x60, 13)
+ CCU_GATE(CLK_AHB_SDRAM, "ahb-sdram", "ahb", 0x60, 14)
+ CCU_GATE(CLK_AHB_SPI0, "ahb-spi0", "ahb", 0x60, 20)
+ CCU_GATE(CLK_AHB_SPI1, "ahb-spi1", "ahb", 0x60, 21)
+ CCU_GATE(CLK_AHB_SPI2, "ahb-spi2", "ahb", 0x60, 22)
+ CCU_GATE(CLK_AHB_GPS, "ahb-gps", "ahb", 0x60, 26)
+ CCU_GATE(CLK_AHB_HSTIMER, "ahb-hstimer", "ahb", 0x60, 28)
+
+ CCU_GATE(CLK_AHB_VE, "ahb-ve", "ahb", 0x64, 0)
+ CCU_GATE(CLK_AHB_LCD, "ahb-lcd", "ahb", 0x64, 4)
+ CCU_GATE(CLK_AHB_CSI, "ahb-csi", "ahb", 0x64, 8)
+ CCU_GATE(CLK_AHB_DE_BE, "ahb-de-be", "ahb", 0x64, 12)
+ CCU_GATE(CLK_AHB_DE_FE, "ahb-de-fe", "ahb", 0x64, 14)
+ CCU_GATE(CLK_AHB_IEP, "ahb-iep", "ahb", 0x64, 19)
+ CCU_GATE(CLK_AHB_GPU, "ahb-gpu", "ahb", 0x64, 20)
+
+ CCU_GATE(CLK_APB0_CODEC, "apb0-codec", "apb0", 0x68, 0)
+ CCU_GATE(CLK_APB0_PIO, "apb0-pio", "apb0", 0x68, 5)
+ CCU_GATE(CLK_APB0_IR, "apb0-ir", "apb0", 0x68, 6)
+
+ CCU_GATE(CLK_APB1_I2C0, "apb1-i2c0", "apb1", 0x6c, 0)
+ CCU_GATE(CLK_APB1_I2C1, "apb1-i2c1", "apb1", 0x6c, 1)
+ CCU_GATE(CLK_APB1_I2C2, "apb1-i2c2", "apb1", 0x6c, 2)
+ CCU_GATE(CLK_APB1_UART1, "apb1-uart1", "apb1", 0x6c, 17)
+ CCU_GATE(CLK_APB1_UART3, "apb1-uart3", "apb1", 0x6c, 19)
+
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list