Date: Wed, 7 Feb 2018 19:53:14 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r328993 - in user/markj/netdump: . bin/sh contrib/gcc/config/mips contrib/gdb/gdb/tui contrib/libreadline contrib/netbsd-tests/kernel etc etc/rc.d gnu/lib gnu/lib/libreadline gnu/usr.bi... Message-ID: <201802071953.w17JrEwQ091125@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Wed Feb 7 19:53:14 2018 New Revision: 328993 URL: https://svnweb.freebsd.org/changeset/base/328993 Log: MFH at r328991. Added: user/markj/netdump/stand/usb/test/ - copied from r328991, head/stand/usb/test/ user/markj/netdump/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_sprom.c - copied unchanged from r328991, head/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_sprom.c user/markj/netdump/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_sprom.h - copied unchanged from r328991, head/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_sprom.h user/markj/netdump/sys/i386/i386/sigtramp.s - copied unchanged from r328991, head/sys/i386/i386/sigtramp.s user/markj/netdump/sys/vm/vm_pagequeue.h - copied unchanged from r328991, head/sys/vm/vm_pagequeue.h Deleted: user/markj/netdump/contrib/libreadline/ user/markj/netdump/gnu/lib/libreadline/ user/markj/netdump/gnu/usr.bin/gdb/gdbtui/ user/markj/netdump/stand/usb/Makefile.test user/markj/netdump/stand/usb/bsd_usbloader_test.c user/markj/netdump/sys/arm/conf/BWCT user/markj/netdump/sys/arm/conf/BWCT.hints user/markj/netdump/sys/arm/conf/EB9200 user/markj/netdump/sys/arm/conf/EB9200.hints user/markj/netdump/sys/arm/conf/ETHERNUT5 user/markj/netdump/sys/arm/conf/ETHERNUT5.hints user/markj/netdump/sys/arm/conf/HL200 user/markj/netdump/sys/arm/conf/HL201 user/markj/netdump/sys/arm/conf/HL201.hints user/markj/netdump/sys/arm/conf/KB920X user/markj/netdump/sys/arm/conf/KB920X.hints user/markj/netdump/sys/arm/conf/QILA9G20 user/markj/netdump/sys/arm/conf/QILA9G20.hints user/markj/netdump/sys/arm/conf/SAM9260EK user/markj/netdump/sys/arm/conf/SAM9260EK.hints user/markj/netdump/sys/arm/conf/SAM9X25EK user/markj/netdump/sys/arm/conf/SAM9X25EK.hints user/markj/netdump/sys/arm/conf/SN9G45 user/markj/netdump/sys/dev/bwn/if_bwn_bhnd.c user/markj/netdump/sys/dev/bwn/if_bwn_chipid.h user/markj/netdump/sys/dev/bwn/if_bwn_siba.c user/markj/netdump/sys/dev/bwn/if_bwn_siba.h user/markj/netdump/sys/dev/bwn/if_bwn_siba_compat.c user/markj/netdump/sys/dev/bwn/if_bwn_siba_compat.h user/markj/netdump/sys/dev/siba/ user/markj/netdump/sys/modules/bwn_pci/ user/markj/netdump/sys/modules/siba_bwn/ Modified: user/markj/netdump/Makefile user/markj/netdump/Makefile.inc1 user/markj/netdump/ObsoleteFiles.inc user/markj/netdump/bin/sh/mkbuiltins user/markj/netdump/bin/sh/mktokens user/markj/netdump/contrib/gcc/config/mips/mips.h user/markj/netdump/contrib/gdb/gdb/tui/tui-io.c user/markj/netdump/contrib/netbsd-tests/kernel/t_sysv.c user/markj/netdump/etc/rc user/markj/netdump/etc/rc.d/cleanvar user/markj/netdump/etc/regdomain.xml user/markj/netdump/gnu/lib/Makefile user/markj/netdump/gnu/usr.bin/gdb/Makefile user/markj/netdump/gnu/usr.bin/gdb/Makefile.inc user/markj/netdump/gnu/usr.bin/gdb/gdb/Makefile user/markj/netdump/gnu/usr.bin/gdb/kgdb/Makefile user/markj/netdump/lib/libc/mips/gen/_ctx_start.S user/markj/netdump/lib/libc/sys/fsync.2 user/markj/netdump/lib/libcasper/libcasper/libcasper.3 user/markj/netdump/sbin/etherswitchcfg/etherswitchcfg.c user/markj/netdump/share/man/man4/bwn.4 user/markj/netdump/share/man/man7/arch.7 user/markj/netdump/share/man/man8/rc.subr.8 user/markj/netdump/share/man/man9/bus_map_resource.9 user/markj/netdump/share/mk/bsd.compiler.mk user/markj/netdump/share/mk/bsd.linker.mk user/markj/netdump/share/mk/src.libnames.mk user/markj/netdump/share/zoneinfo/Makefile user/markj/netdump/stand/common/load_elf_obj.c user/markj/netdump/stand/kshim/bsd_kernel.h user/markj/netdump/stand/usb/usbcore.mk user/markj/netdump/sys/amd64/amd64/machdep.c user/markj/netdump/sys/amd64/linux/linux.h user/markj/netdump/sys/amd64/linux/linux_ptrace.c user/markj/netdump/sys/amd64/linux/linux_sysvec.c user/markj/netdump/sys/amd64/linux/syscalls.master user/markj/netdump/sys/amd64/linux32/linux.h user/markj/netdump/sys/amd64/linux32/linux32_dummy.c user/markj/netdump/sys/amd64/linux32/linux32_locore.s user/markj/netdump/sys/amd64/linux32/linux32_sysvec.c user/markj/netdump/sys/amd64/linux32/syscalls.master user/markj/netdump/sys/arm/allwinner/if_awg.c user/markj/netdump/sys/arm/arm/machdep.c user/markj/netdump/sys/arm/arm/pmap-v4.c user/markj/netdump/sys/cam/ata/ata_da.c user/markj/netdump/sys/cam/ata/ata_pmp.c user/markj/netdump/sys/cam/ata/ata_xpt.c user/markj/netdump/sys/cam/cam_iosched.c user/markj/netdump/sys/cam/cam_periph.c user/markj/netdump/sys/cam/cam_periph.h user/markj/netdump/sys/cam/ctl/scsi_ctl.c user/markj/netdump/sys/cam/mmc/mmc_da.c user/markj/netdump/sys/cam/mmc/mmc_xpt.c user/markj/netdump/sys/cam/nvme/nvme_da.c user/markj/netdump/sys/cam/nvme/nvme_xpt.c user/markj/netdump/sys/cam/scsi/scsi_cd.c user/markj/netdump/sys/cam/scsi/scsi_da.c user/markj/netdump/sys/cam/scsi/scsi_enc.c user/markj/netdump/sys/cam/scsi/scsi_pass.c user/markj/netdump/sys/cam/scsi/scsi_pt.c user/markj/netdump/sys/cam/scsi/scsi_sa.c user/markj/netdump/sys/cam/scsi/scsi_sg.c user/markj/netdump/sys/cam/scsi/scsi_xpt.c user/markj/netdump/sys/cddl/compat/opensolaris/sys/kmem.h user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c user/markj/netdump/sys/compat/linprocfs/linprocfs.c user/markj/netdump/sys/compat/linux/check_internal_locks.d user/markj/netdump/sys/compat/linux/linux_emul.c user/markj/netdump/sys/compat/linux/linux_event.c user/markj/netdump/sys/compat/linux/linux_file.h user/markj/netdump/sys/compat/linux/linux_fork.c user/markj/netdump/sys/compat/linux/linux_ioctl.c user/markj/netdump/sys/compat/linux/linux_ioctl.h user/markj/netdump/sys/compat/linux/linux_ipc.c user/markj/netdump/sys/compat/linux/linux_ipc.h user/markj/netdump/sys/compat/linux/linux_ipc64.h user/markj/netdump/sys/compat/linux/linux_misc.c user/markj/netdump/sys/compat/linux/linux_persona.h user/markj/netdump/sys/compat/linux/linux_signal.c user/markj/netdump/sys/compat/linux/linux_socket.c user/markj/netdump/sys/compat/linux/linux_socket.h user/markj/netdump/sys/compat/linux/linux_time.c user/markj/netdump/sys/compat/linux/linux_util.h user/markj/netdump/sys/compat/linux/stats_timing.d user/markj/netdump/sys/compat/linux/trace_futexes.d user/markj/netdump/sys/compat/linuxkpi/common/include/linux/ktime.h user/markj/netdump/sys/conf/files user/markj/netdump/sys/conf/files.i386 user/markj/netdump/sys/dev/ath/if_ath.c user/markj/netdump/sys/dev/bhnd/bhnd_ids.h user/markj/netdump/sys/dev/bwn/if_bwn.c user/markj/netdump/sys/dev/bwn/if_bwn_misc.h user/markj/netdump/sys/dev/bwn/if_bwn_pci.c user/markj/netdump/sys/dev/bwn/if_bwn_phy_common.c user/markj/netdump/sys/dev/bwn/if_bwn_phy_common.h user/markj/netdump/sys/dev/bwn/if_bwn_phy_g.c user/markj/netdump/sys/dev/bwn/if_bwn_phy_lp.c user/markj/netdump/sys/dev/bwn/if_bwn_phy_n.c user/markj/netdump/sys/dev/bwn/if_bwn_util.c user/markj/netdump/sys/dev/bwn/if_bwnreg.h user/markj/netdump/sys/dev/bwn/if_bwnvar.h user/markj/netdump/sys/dev/etherswitch/arswitch/arswitch.c user/markj/netdump/sys/dev/etherswitch/arswitch/arswitch_9340.c user/markj/netdump/sys/dev/etherswitch/arswitch/arswitchreg.h user/markj/netdump/sys/dev/etherswitch/arswitch/arswitchvar.h user/markj/netdump/sys/dev/etherswitch/etherswitch.h user/markj/netdump/sys/dev/mpr/mpr.c user/markj/netdump/sys/dev/mpr/mpr_sas.c user/markj/netdump/sys/dev/mpr/mpr_user.c user/markj/netdump/sys/dev/mpr/mprvar.h user/markj/netdump/sys/dev/mps/mps.c user/markj/netdump/sys/dev/mps/mps_sas.c user/markj/netdump/sys/dev/mps/mps_user.c user/markj/netdump/sys/dev/mps/mpsvar.h user/markj/netdump/sys/dev/usb/template/usb_template_audio.c user/markj/netdump/sys/dev/usb/template/usb_template_cdce.c user/markj/netdump/sys/dev/usb/template/usb_template_kbd.c user/markj/netdump/sys/dev/usb/template/usb_template_midi.c user/markj/netdump/sys/dev/usb/template/usb_template_modem.c user/markj/netdump/sys/dev/usb/template/usb_template_mouse.c user/markj/netdump/sys/dev/usb/template/usb_template_msc.c user/markj/netdump/sys/dev/usb/template/usb_template_mtp.c user/markj/netdump/sys/dev/usb/template/usb_template_phone.c user/markj/netdump/sys/dev/usb/template/usb_template_serialnet.c user/markj/netdump/sys/fs/ext2fs/ext2_lookup.c user/markj/netdump/sys/fs/tmpfs/tmpfs_subr.c user/markj/netdump/sys/geom/mirror/g_mirror.c user/markj/netdump/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.c user/markj/netdump/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.h user/markj/netdump/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_ppr.c user/markj/netdump/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_tables.c user/markj/netdump/sys/i386/i386/locore.s user/markj/netdump/sys/i386/i386/machdep.c user/markj/netdump/sys/i386/linux/linux.h user/markj/netdump/sys/i386/linux/linux_dummy.c user/markj/netdump/sys/i386/linux/linux_locore.s user/markj/netdump/sys/i386/linux/linux_machdep.c user/markj/netdump/sys/i386/linux/linux_support.s user/markj/netdump/sys/i386/linux/linux_sysvec.c user/markj/netdump/sys/i386/linux/syscalls.master user/markj/netdump/sys/kern/imgact_elf.c user/markj/netdump/sys/kern/init_main.c user/markj/netdump/sys/kern/kern_malloc.c user/markj/netdump/sys/kern/kern_sendfile.c user/markj/netdump/sys/kern/link_elf_obj.c user/markj/netdump/sys/kern/subr_clock.c user/markj/netdump/sys/kern/subr_fattime.c user/markj/netdump/sys/kern/subr_vmem.c user/markj/netdump/sys/kern/subr_witness.c user/markj/netdump/sys/kern/vfs_bio.c user/markj/netdump/sys/kern/vfs_extattr.c user/markj/netdump/sys/mips/conf/TL-WDR4300.hints user/markj/netdump/sys/mips/mips/busdma_machdep.c user/markj/netdump/sys/mips/mips/machdep.c user/markj/netdump/sys/modules/Makefile user/markj/netdump/sys/modules/bwn/Makefile user/markj/netdump/sys/modules/dtb/allwinner/Makefile user/markj/netdump/sys/modules/ipfw/Makefile user/markj/netdump/sys/netinet/ip_fw.h user/markj/netdump/sys/netpfil/ipfw/ip_fw2.c user/markj/netdump/sys/netpfil/ipfw/ip_fw_dynamic.c user/markj/netdump/sys/netpfil/ipfw/ip_fw_private.h user/markj/netdump/sys/netpfil/ipfw/ip_fw_sockopt.c user/markj/netdump/sys/powerpc/booke/pmap.c user/markj/netdump/sys/powerpc/powerpc/machdep.c user/markj/netdump/sys/sparc64/sparc64/machdep.c user/markj/netdump/sys/sys/bus_dma.h user/markj/netdump/sys/sys/clock.h user/markj/netdump/sys/sys/vmmeter.h user/markj/netdump/sys/ufs/ffs/ffs_alloc.c user/markj/netdump/sys/ufs/ffs/ffs_vfsops.c user/markj/netdump/sys/ufs/ufs/ufs_vnops.c user/markj/netdump/sys/vm/swap_pager.c user/markj/netdump/sys/vm/uma.h user/markj/netdump/sys/vm/uma_core.c user/markj/netdump/sys/vm/uma_int.h user/markj/netdump/sys/vm/vm_extern.h user/markj/netdump/sys/vm/vm_glue.c user/markj/netdump/sys/vm/vm_init.c user/markj/netdump/sys/vm/vm_kern.c user/markj/netdump/sys/vm/vm_map.c user/markj/netdump/sys/vm/vm_meter.c user/markj/netdump/sys/vm/vm_object.c user/markj/netdump/sys/vm/vm_object.h user/markj/netdump/sys/vm/vm_page.c user/markj/netdump/sys/vm/vm_page.h user/markj/netdump/sys/vm/vm_pageout.c user/markj/netdump/sys/vm/vm_pageout.h user/markj/netdump/sys/vm/vm_phys.c user/markj/netdump/sys/vm/vm_phys.h user/markj/netdump/sys/vm/vm_radix.c user/markj/netdump/sys/vm/vm_reserv.c user/markj/netdump/sys/vm/vm_reserv.h user/markj/netdump/sys/vm/vm_swapout.c user/markj/netdump/sys/vm/vnode_pager.c user/markj/netdump/targets/pseudo/userland/gnu/Makefile.depend user/markj/netdump/tests/sys/kern/Makefile user/markj/netdump/tools/build/mk/OptionalObsoleteFiles.inc user/markj/netdump/usr.bin/find/Makefile user/markj/netdump/usr.bin/find/find.h user/markj/netdump/usr.bin/find/function.c user/markj/netdump/usr.bin/find/ls.c user/markj/netdump/usr.bin/find/operator.c user/markj/netdump/usr.bin/find/option.c user/markj/netdump/usr.bin/lex/initparse.c Directory Properties: user/markj/netdump/ (props changed) user/markj/netdump/contrib/gcc/ (props changed) user/markj/netdump/contrib/gdb/ (props changed) user/markj/netdump/contrib/netbsd-tests/ (props changed) user/markj/netdump/gnu/lib/ (props changed) user/markj/netdump/gnu/usr.bin/gdb/ (props changed) user/markj/netdump/sys/cddl/contrib/opensolaris/ (props changed) Modified: user/markj/netdump/Makefile ============================================================================== --- user/markj/netdump/Makefile Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/Makefile Wed Feb 7 19:53:14 2018 (r328993) @@ -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 @@ -352,7 +356,7 @@ _guard: .PHONY @false STARTTIME!= LC_ALL=C date -CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0s ; echo +CHECK_TIME!= cmp=`mktemp`; find ${.CURDIR}/sys/sys/param.h -newer "$$cmp" && rm "$$cmp"; echo .if !empty(CHECK_TIME) .error check your date/time: ${STARTTIME} .endif Modified: user/markj/netdump/Makefile.inc1 ============================================================================== --- user/markj/netdump/Makefile.inc1 Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/Makefile.inc1 Wed Feb 7 19:53:14 2018 (r328993) @@ -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 @@ -463,7 +465,7 @@ TMPPATH= ${STRICTTMPPATH}:${PATH} # when in the middle of installing over this system. # .if make(distributeworld) || make(installworld) || make(stageworld) -INSTALLTMP!= /usr/bin/mktemp -d -u -t install +INSTALLTMP!= mktemp -d -u -t install .endif .if make(stagekernel) || make(distributekernel) Modified: user/markj/netdump/ObsoleteFiles.inc ============================================================================== --- user/markj/netdump/ObsoleteFiles.inc Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/ObsoleteFiles.inc Wed Feb 7 19:53:14 2018 (r328993) @@ -38,10 +38,11 @@ # xargs -n1 | sort | uniq -d; # done +# 20180206: remove gdbtui +OLD_FILES+=usr/bin/gdbtui # 20180201: Obsolete forth files OLD_FILES+=boot/efi.4th OLD_FILES+=boot/pcibios.4th - # 20180114: new clang import which bumps version from 5.0.1 to 6.0.0. OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/allocator_interface.h OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/asan_interface.h Modified: user/markj/netdump/bin/sh/mkbuiltins ============================================================================== --- user/markj/netdump/bin/sh/mkbuiltins Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/bin/sh/mkbuiltins Wed Feb 7 19:53:14 2018 (r328993) @@ -34,7 +34,7 @@ # @(#)mkbuiltins 8.2 (Berkeley) 5/4/95 # $FreeBSD$ -temp=`/usr/bin/mktemp -t ka` +temp=`mktemp -t ka` havehist=1 if [ "X$1" = "X-h" ]; then havehist=0 Modified: user/markj/netdump/bin/sh/mktokens ============================================================================== --- user/markj/netdump/bin/sh/mktokens Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/bin/sh/mktokens Wed Feb 7 19:53:14 2018 (r328993) @@ -38,7 +38,7 @@ # token marks the end of a list. The third column is the name to print in # error messages. -temp=`/usr/bin/mktemp -t ka` +temp=`mktemp -t ka` cat > $temp <<\! TEOF 1 end of file TNL 0 newline Modified: user/markj/netdump/contrib/gcc/config/mips/mips.h ============================================================================== --- user/markj/netdump/contrib/gcc/config/mips/mips.h Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/contrib/gcc/config/mips/mips.h Wed Feb 7 19:53:14 2018 (r328993) @@ -2721,6 +2721,7 @@ while (0) nop\n\ 1: .cpload $31\n\ .set reorder\n\ + .local " USER_LABEL_PREFIX #FUNC "\n\ jal " USER_LABEL_PREFIX #FUNC "\n\ " TEXT_SECTION_ASM_OP); #endif /* Switch to #elif when we're no longer limited by K&R C. */ @@ -2733,6 +2734,7 @@ while (0) nop\n\ 1: .set reorder\n\ .cpsetup $31, $2, 1b\n\ + .local " USER_LABEL_PREFIX #FUNC "\n\ jal " USER_LABEL_PREFIX #FUNC "\n\ " TEXT_SECTION_ASM_OP); #endif Modified: user/markj/netdump/contrib/gdb/gdb/tui/tui-io.c ============================================================================== --- user/markj/netdump/contrib/gdb/gdb/tui/tui-io.c Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/contrib/gdb/gdb/tui/tui-io.c Wed Feb 7 19:53:14 2018 (r328993) @@ -397,7 +397,7 @@ static void tui_rl_display_match_list (char **matches, int len, int max) { typedef int QSFUNC (const void *, const void *); - extern int _rl_qsort_string_compare (const void*, const void*); + extern int _rl_qsort_string_compare (char **, char **); extern int _rl_print_completions_horizontally; int count, limit, printed_len; Modified: user/markj/netdump/contrib/netbsd-tests/kernel/t_sysv.c ============================================================================== --- user/markj/netdump/contrib/netbsd-tests/kernel/t_sysv.c Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/contrib/netbsd-tests/kernel/t_sysv.c Wed Feb 7 19:53:14 2018 (r328993) @@ -72,7 +72,7 @@ void sharer(void); #define MESSAGE_TEXT_LEN 256 -struct mymsg { +struct testmsg { long mtype; char mtext[MESSAGE_TEXT_LEN]; }; @@ -94,11 +94,13 @@ key_t msgkey, semkey, shmkey; int maxloop = 1; +#ifndef __FreeBSD__ union semun { int val; /* value for SETVAL */ struct semid_ds *buf; /* buffer for IPC_{STAT,SET} */ u_short *array; /* array for GETALL & SETALL */ }; +#endif /* Writes an integer to a file. To be used from the body of the test @@ -174,7 +176,7 @@ key_t get_ftok(int id) /* Create the file, since ftok() requires it to exist! */ - fd = open(token_key, O_RDWR | O_CREAT | O_EXCL); + fd = open(token_key, O_RDWR | O_CREAT | O_EXCL, 0600); if (fd == -1) { rmdir(tmpdir); atf_tc_fail("open() of temp file failed: %d", errno); @@ -202,7 +204,7 @@ ATF_TC_BODY(msg, tc) { struct sigaction sa; struct msqid_ds m_ds; - struct mymsg m; + struct testmsg m; sigset_t sigmask; int sender_msqid; int loop; @@ -347,9 +349,7 @@ ATF_TC_CLEANUP(msg, tc) } void -print_msqid_ds(mp, mode) - struct msqid_ds *mp; - mode_t mode; +print_msqid_ds(struct msqid_ds *mp, mode_t mode) { uid_t uid = geteuid(); gid_t gid = getegid(); @@ -381,9 +381,9 @@ print_msqid_ds(mp, mode) } void -receiver() +receiver(void) { - struct mymsg m; + struct testmsg m; int msqid, loop; if ((msqid = msgget(msgkey, 0)) == -1) @@ -588,9 +588,7 @@ ATF_TC_CLEANUP(sem, tc) } void -print_semid_ds(sp, mode) - struct semid_ds *sp; - mode_t mode; +print_semid_ds(struct semid_ds *sp, mode_t mode) { uid_t uid = geteuid(); gid_t gid = getegid(); @@ -620,7 +618,7 @@ print_semid_ds(sp, mode) } void -waiter() +waiter(void) { struct sembuf s; int semid; @@ -789,9 +787,7 @@ ATF_TC_CLEANUP(shm, tc) } void -print_shmid_ds(sp, mode) - struct shmid_ds *sp; - mode_t mode; +print_shmid_ds(struct shmid_ds *sp, mode_t mode) { uid_t uid = geteuid(); gid_t gid = getegid(); @@ -823,7 +819,7 @@ print_shmid_ds(sp, mode) } void -sharer() +sharer(void) { int shmid; void *shm_buf; Modified: user/markj/netdump/etc/rc ============================================================================== --- user/markj/netdump/etc/rc Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/etc/rc Wed Feb 7 19:53:14 2018 (r328993) @@ -141,10 +141,10 @@ if [ -e ${firstboot_sentinel} ]; then if [ -e ${firstboot_sentinel}-reboot ]; then chflags -R 0 ${firstboot_sentinel}-reboot rm -rf ${firstboot_sentinel}-reboot - checkyesno root_rw_mount && mount -ur / + checkyesno root_rw_mount || mount -ur / kill -INT 1 fi - checkyesno root_rw_mount && mount -ur / + checkyesno root_rw_mount || mount -ur / fi echo '' Modified: user/markj/netdump/etc/rc.d/cleanvar ============================================================================== --- user/markj/netdump/etc/rc.d/cleanvar Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/etc/rc.d/cleanvar Wed Feb 7 19:53:14 2018 (r328993) @@ -19,34 +19,6 @@ stop_cmd=":" extra_commands="reload" reload_cmd="${name}_start" -purgedir() -{ - local dir file - - if [ $# -eq 0 ]; then - purgedir . - else - for dir - do - ( - cd "$dir" && for file in .* * - do - # Skip over logging sockets - [ -S "$file" -a "$file" = "log" ] && continue - [ -S "$file" -a "$file" = "logpriv" ] && continue - [ ."$file" = .. -o ."$file" = ... ] && continue - if [ -d "$file" -a ! -L "$file" ] - then - purgedir "$file" - else - rm -f -- "$file" - fi - done - ) - done - fi -} - cleanvar_prestart() { # These files must be removed only the first time this script is run @@ -58,14 +30,17 @@ cleanvar_prestart() cleanvar_start() { if [ -d /var/run -a ! -f /var/run/clean_var ]; then - purgedir /var/run + # Skip over logging sockets + find /var/run \( -type f -or -type s ! -name log -and ! -name logpriv \) -delete >/var/run/clean_var fi if [ -d /var/spool/lock -a ! -f /var/spool/lock/clean_var ]; then - purgedir /var/spool/lock + find /var/spool/lock -type f -delete >/var/spool/lock/clean_var fi - rm -rf /var/spool/uucp/.Temp/* + if [ -d /var/spool/uucp/.Temp ]; then + find /var/spool/uucp/.Temp -delete + fi } load_rc_config $name Modified: user/markj/netdump/etc/regdomain.xml ============================================================================== --- user/markj/netdump/etc/regdomain.xml Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/etc/regdomain.xml Wed Feb 7 19:53:14 2018 (r328993) @@ -1595,7 +1595,7 @@ <isocc>642</isocc> <name>Romania</name> <rd ref="etsi"/> </country> <country id="RU"> - <isocc>643</isocc> <name>Rusia</name> <rd ref="none"/> + <isocc>643</isocc> <name>Russia</name> <rd ref="none"/> </country> <country id="SA"> <isocc>682</isocc> <name>Saudi Arabia</name> <rd ref="none"/> Modified: user/markj/netdump/gnu/lib/Makefile ============================================================================== --- user/markj/netdump/gnu/lib/Makefile Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/gnu/lib/Makefile Wed Feb 7 19:53:14 2018 (r328993) @@ -7,7 +7,6 @@ SUBDIR.${MK_DIALOG}+= libdialog SUBDIR.${MK_GCC}+= libgcov libgomp SUBDIR.${MK_SSP}+= libssp SUBDIR.${MK_TESTS}+= tests -SUBDIR.${MK_GDB}+= libreadline .if ${MK_GNU_GREP} != "no" || ${MK_GNU_GREP_COMPAT} != "no" || \ ${MK_GDB} != "no" Modified: user/markj/netdump/gnu/usr.bin/gdb/Makefile ============================================================================== --- user/markj/netdump/gnu/usr.bin/gdb/Makefile Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/gnu/usr.bin/gdb/Makefile Wed Feb 7 19:53:14 2018 (r328993) @@ -5,8 +5,6 @@ SUBDIR= libgdb gdb kgdb .if ${MK_GDB_LIBEXEC} == "no" -SUBDIR+= gdbtui - .if exists(${.CURDIR}/gdbserver/reg-${MACHINE_CPUARCH}.c) SUBDIR+=gdbserver .endif Modified: user/markj/netdump/gnu/usr.bin/gdb/Makefile.inc ============================================================================== --- user/markj/netdump/gnu/usr.bin/gdb/Makefile.inc Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/gnu/usr.bin/gdb/Makefile.inc Wed Feb 7 19:53:14 2018 (r328993) @@ -13,11 +13,9 @@ BMAKE_BU= ${BMAKE_ROOT}/binutils CNTRB_BU= ${SRCTOP}/contrib/binutils CNTRB_GDB= ${SRCTOP}/contrib/gdb -CNTRB_RL= ${SRCTOP}/contrib/libreadline OBJ_BU= ${OBJTOP}/gnu/usr.bin/binutils OBJ_GDB= ${OBJTOP}/gnu/usr.bin/gdb -OBJ_RL= ${OBJTOP}/gnu/lib/libreadline/readline # These assignments duplicate much of the functionality of # MACHINE_CPUARCH, but there's no easy way to export make functions... @@ -37,7 +35,7 @@ GDB_CROSS_DEBUGGER= .PATH: ${CNTRB_GDB}/gdb ${CNTRB_GDB}/gdb/cli ${CNTRB_GDB}/gdb/mi \ ${CNTRB_GDB}/gdb/signals ${CNTRB_GDB}/gdb/tui ${TARGET_SUBDIR} -CFLAGS+= -DHAVE_CONFIG_H -DRL_NO_COMPAT -DMI_OUT=1 -DTUI=1 +CFLAGS+= -DHAVE_CONFIG_H -DRL_NO_COMPAT -DMI_OUT=1 CFLAGS+= -DDEBUGDIR=\"${DEBUGDIR}\" CFLAGS+= -I. CFLAGS+= -I${TARGET_SUBDIR} @@ -47,7 +45,7 @@ CFLAGS+= -I${CNTRB_GDB}/gdb/config CFLAGS+= -I${CNTRB_BU}/include CFLAGS+= -I${CNTRB_GDB}/include CFLAGS+= -I${CNTRB_BU}/bfd -CFLAGS+= -I${OBJ_RL:H} +CFLAGS+= -I${SRCTOP}/lib/libedit/edit GENSRCS+= nm.h tm.h Modified: user/markj/netdump/gnu/usr.bin/gdb/gdb/Makefile ============================================================================== --- user/markj/netdump/gnu/usr.bin/gdb/gdb/Makefile Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/gnu/usr.bin/gdb/gdb/Makefile Wed Feb 7 19:53:14 2018 (r328993) @@ -13,7 +13,7 @@ LDFLAGS+= -Wl,-E DPADD= ${GDBLIBS} ${BULIBS} LDADD= ${GDBLIBS} ${BULIBS} -LIBADD+= m readline ncursesw gnuregex +LIBADD+= m edit ncursesw gnuregex .include <bsd.prog.mk> CFLAGS+= -DDEBUGDIR=\"${DEBUGDIR}\" Modified: user/markj/netdump/gnu/usr.bin/gdb/kgdb/Makefile ============================================================================== --- user/markj/netdump/gnu/usr.bin/gdb/kgdb/Makefile Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/gnu/usr.bin/gdb/kgdb/Makefile Wed Feb 7 19:53:14 2018 (r328993) @@ -10,6 +10,6 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a DPADD= ${GDBLIBS} ${BULIBS} LDADD= ${GDBLIBS} ${BULIBS} -LIBADD+= m readline ncursesw gnuregex kvm +LIBADD+= m edit ncursesw gnuregex kvm .include <bsd.prog.mk> Modified: user/markj/netdump/lib/libc/mips/gen/_ctx_start.S ============================================================================== --- user/markj/netdump/lib/libc/mips/gen/_ctx_start.S Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/lib/libc/mips/gen/_ctx_start.S Wed Feb 7 19:53:14 2018 (r328993) @@ -28,11 +28,25 @@ __FBSDID("$FreeBSD$"); /* - * XXX gp? + * This requires makecontext() to setup a valid GP for locating + * _ctx_done rather than deriving GP from T9 on entry. Currently this + * uses the GP inherited from getcontext() assuming that getcontext() + * is in the same shared object as _ctx_done(). For N32 and N64, GP + * is caller-save so will be preserved across the call to the callback + * function. For O32, GP is callee-save, so save it in a different + * caller-save register (S1) while invoking the callback. This is + * done instead of the usual SETUP_GP/SAVE_GP to avoid disturbing the + * stack frame setup by makecontext() for the callback function. */ ENTRY(_ctx_start) +#ifdef __mips_o32 + move s1, gp +#endif jalr t9 +#ifdef __mips_o32 + move gp, s1 +#endif move a0, s0 PTR_LA t9, _ctx_done jalr t9 Modified: user/markj/netdump/lib/libc/sys/fsync.2 ============================================================================== --- user/markj/netdump/lib/libc/sys/fsync.2 Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/lib/libc/sys/fsync.2 Wed Feb 7 19:53:14 2018 (r328993) @@ -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/markj/netdump/lib/libcasper/libcasper/libcasper.3 ============================================================================== --- user/markj/netdump/lib/libcasper/libcasper/libcasper.3 Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/lib/libcasper/libcasper/libcasper.3 Wed Feb 7 19:53:14 2018 (r328993) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 3, 2018 +.Dd February 5, 2018 .Dt LIBCASPER 3 .Os .Sh NAME @@ -47,6 +47,7 @@ .Sh LIBRARY .Lb libcasper .Sh SYNOPSIS +.Fd #define WITH_CASPER .In sys/nv.h .In libcasper.h .Ft "cap_channel_t *" Modified: user/markj/netdump/sbin/etherswitchcfg/etherswitchcfg.c ============================================================================== --- user/markj/netdump/sbin/etherswitchcfg/etherswitchcfg.c Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/sbin/etherswitchcfg/etherswitchcfg.c Wed Feb 7 19:53:14 2018 (r328993) @@ -556,6 +556,13 @@ print_config(struct cfg *cfg) printf("none\n"); } } + + /* Print switch MAC address. */ + if (cfg->conf.cmd & ETHERSWITCH_CONF_SWITCH_MACADDR) { + printf("%s: Switch MAC address: %s\n", + c, + ether_ntoa(&cfg->conf.switch_macaddr)); + } } static void Modified: user/markj/netdump/share/man/man4/bwn.4 ============================================================================== --- user/markj/netdump/share/man/man4/bwn.4 Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/share/man/man4/bwn.4 Wed Feb 7 19:53:14 2018 (r328993) @@ -24,26 +24,29 @@ .\" .\" $FreeBSD$ .\" -.Dd June 11, 2015 +.Dd December 16, 2017 .Dt BWN 4 .Os .Sh NAME .Nm bwn -.Nd Broadcom BCM43xx IEEE 802.11b/g wireless network driver +.Nd Broadcom BCM43xx SoftMAC IEEE 802.11 wireless network driver .Sh SYNOPSIS -To compile this driver into the kernel, -place the following lines in your -kernel configuration file: +To compile this driver into the kernel, add the following lines to the kernel +configuration file: .Bd -ragged -offset indent -.Cd "device siba_bwn" .Cd "device bwn" +.Cd "device bhnd" +.Cd "device bhndb" +.Cd "device bhndb_pci" +.Cd "device bcma" +.Cd "device siba" +.Cd "device gpio" .Cd "device wlan" .Cd "device wlan_amrr" .Cd "device firmware" .Ed .Pp -Alternatively, to load the driver as a -module at boot time, place the following line in +To load the driver as a module at boot, add the following lines to .Xr loader.conf 5 : .Bd -literal -offset indent if_bwn_load="YES" @@ -122,9 +125,6 @@ Tunables can be set at the prompt before booting the kernel or stored in .Xr loader.conf 5 . .Bl -tag -width indent -.It Va hw.bwn.msi_disable -This tunable disables MSI support on the hardware. -The default value is 0. .It Va hw.bwn.usedma This tunable enables DMA operations on the hardware. If the value is 0, PIO mode would be used. @@ -132,10 +132,14 @@ The default value is 1. .El .Sh SEE ALSO .Xr arp 4 , +.Xr bcma 4 , +.Xr bhnd 4 , +.Xr bhndb 4 , .Xr bwi 4 , .Xr cardbus 4 , .Xr intro 4 , .Xr pci 4 , +.Xr siba 4 , .Xr wlan 4 , .Xr wlan_amrr 4 , .Xr ifconfig 8 , @@ -145,12 +149,20 @@ The .Nm driver first appeared in .Fx 8.1 . +The driver was updated to support the common Broadcom +.Xr bhnd 4 +bus interface in +.Fx 12.0 . .Sh AUTHORS .An -nosplit The .Nm driver was written by .An Weongyo Jeong Aq Mt weongyo@FreeBSD.org . +Support for +.Xr bhnd 4 +was added by +.An Landon Fuller Aq Mt landonf@FreeBSD.org . .\".Sh BUGS .\"Some card based on the BCM4306 and BCM4309 chips do not work properly .\"on channel 1, 2 and 3. Modified: user/markj/netdump/share/man/man7/arch.7 ============================================================================== --- user/markj/netdump/share/man/man7/arch.7 Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/share/man/man7/arch.7 Wed Feb 7 19:53:14 2018 (r328993) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 31, 2018 +.Dd February 5, 2018 .Dt ARCH 7 .Os .Sh NAME @@ -416,7 +416,7 @@ imply little endian. If we ever were to support the so-called x32 ABI (using 32-bit pointers on the amd64 architecture), it would most likely be encoded as amd64-x32. -It is unfortunate that amd64 speifies the 64-bit evolution of the x86 +It is unfortunate that amd64 specifies the 64-bit evolution of the x86 platform (it matches the 'first rule') as everybody else uses x86_64. There is no standard name for the processor: each OS selects its own conventions. Modified: user/markj/netdump/share/man/man8/rc.subr.8 ============================================================================== --- user/markj/netdump/share/man/man8/rc.subr.8 Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/share/man/man8/rc.subr.8 Wed Feb 7 19:53:14 2018 (r328993) @@ -551,7 +551,7 @@ is mounted. A list of environment variables to run .Va command with. -This will be passed as arguments to +This will be passed as arguments to the .Xr env 1 utility. .It Va ${name}_fib @@ -583,6 +583,13 @@ as. Only supported after .Pa /usr is mounted. +.It Va ${name}_limits +.Xr limits 1 +to apply to +.Va command . +This will be passed as arguments to the +.Xr limits 1 +utility. .It Va ${name}_oomprotect .Xr protect 1 .Va command Modified: user/markj/netdump/share/man/man9/bus_map_resource.9 ============================================================================== --- user/markj/netdump/share/man/man9/bus_map_resource.9 Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/share/man/man9/bus_map_resource.9 Wed Feb 7 19:53:14 2018 (r328993) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 20, 2016 +.Dd February 5, 2018 .Dt BUS_MAP_RESOURCE 9 .Os .Sh NAME @@ -143,16 +143,16 @@ reads the first 32-bit word: .Bd -literal struct resource *r; struct resource_map map; - struct resource_map_args args; + struct resource_map_request req; uint32_t val; int rid; rid = PCIR_BAR(0); r = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE | RF_UNMAPPED); - resource_init_map_request(&args); - args.memattr = VM_MEMATTR_WRITE_COMBINING; - bus_map_resource(dev, SYS_RES_MEMORY, r, &args, &map); + resource_init_map_request(&req); + req.memattr = VM_MEMATTR_WRITE_COMBINING; + bus_map_resource(dev, SYS_RES_MEMORY, r, &req, &map); val = bus_read_4(&map, 0); .Ed .Sh SEE ALSO Modified: user/markj/netdump/share/mk/bsd.compiler.mk ============================================================================== --- user/markj/netdump/share/mk/bsd.compiler.mk Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/share/mk/bsd.compiler.mk Wed Feb 7 19:53:14 2018 (r328993) @@ -19,7 +19,9 @@ # COMPILER_FEATURES will contain one or more of the following, based on # compiler support for that feature: # -# - c++11 : supports full (or nearly full) C++11 programming environment. +# - c++11: supports full (or nearly full) C++11 programming environment. +# - retpoline: supports the retpoline speculative execution vulnerability +# mitigation. # # These variables with an X_ prefix will also be provided if XCC is set. # @@ -178,11 +180,13 @@ ${X_}COMPILER_FREEBSD_VERSION= unknown .endif .endif +${X_}COMPILER_FEATURES= .if ${${X_}COMPILER_TYPE} == "clang" || \ (${${X_}COMPILER_TYPE} == "gcc" && ${${X_}COMPILER_VERSION} >= 40800) -${X_}COMPILER_FEATURES= c++11 -.else -${X_}COMPILER_FEATURES= +${X_}COMPILER_FEATURES+= c++11 +.endif +.if ${${X_}COMPILER_TYPE} == "clang" && ${${X_}COMPILER_VERSION} >= 60000 +${X_}COMPILER_FEATURES+= retpoline .endif .else Modified: user/markj/netdump/share/mk/bsd.linker.mk ============================================================================== --- user/markj/netdump/share/mk/bsd.linker.mk Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/share/mk/bsd.linker.mk Wed Feb 7 19:53:14 2018 (r328993) @@ -12,7 +12,9 @@ # LINKER_FEATURES may contain one or more of the following, based on # linker support for that feature: # -# - build-id : support for generating a Build-ID note +# - build-id: support for generating a Build-ID note +# - retpoline: support for generating PLT with retpoline speculative +# execution vulnerability mitigation # # These variables with an X_ prefix will also be provided if XLD is set. # @@ -72,6 +74,9 @@ ${X_}LINKER_FEATURES+= build-id .endif .if ${${X_}LINKER_TYPE} != "lld" || ${${X_}LINKER_VERSION} >= 50000 ${X_}LINKER_FEATURES+= filter +.endif +.if ${${X_}LINKER_TYPE} == "lld" && ${${X_}LINKER_VERSION} >= 60000 +${X_}LINKER_FEATURES+= retpoline .endif .endif .else Modified: user/markj/netdump/share/mk/src.libnames.mk ============================================================================== --- user/markj/netdump/share/mk/src.libnames.mk Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/share/mk/src.libnames.mk Wed Feb 7 19:53:14 2018 (r328993) @@ -44,7 +44,6 @@ _INTERNALLIBS= \ parse \ pe \ pmcstat \ - readline \ sl \ sm \ smdb \ @@ -147,7 +146,6 @@ _LIBRARIES= \ procstat \ pthread \ radius \ - readline \ regex \ roken \ rpcsec_gss \ @@ -290,7 +288,6 @@ _DP_pam+= ssh .if ${MK_NIS} != "no" _DP_pam+= ypclnt .endif -_DP_readline= ncursesw _DP_roken= crypt _DP_kadm5clnt= com_err krb5 roken _DP_kadm5srv= com_err hdb krb5 roken @@ -413,9 +410,6 @@ LIBELFTC?= ${LIBELFTCDIR}/libelftc.a LIBPEDIR= ${OBJTOP}/lib/libpe LIBPE?= ${LIBPEDIR}/libpe.a - -LIBREADLINEDIR= ${OBJTOP}/gnu/lib/libreadline/readline -LIBREADLINE?= ${LIBREADLINEDIR}/libreadline.a LIBOPENBSDDIR= ${OBJTOP}/lib/libopenbsd LIBOPENBSD?= ${LIBOPENBSDDIR}/libopenbsd.a Modified: user/markj/netdump/share/zoneinfo/Makefile ============================================================================== --- user/markj/netdump/share/zoneinfo/Makefile Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/share/zoneinfo/Makefile Wed Feb 7 19:53:14 2018 (r328993) @@ -95,8 +95,13 @@ zoneinfo: yearistype ${TDATA} zic -D -d ${TZBUILDDIR} -p ${POSIXRULES} -m ${NOBINMODE} \ ${LEAPFILE} -y ${.OBJDIR}/yearistype ${TZFILES} +# +# Sort TZS to ensure they are the same every build. find -s might +# be a shorter way to express this, but it's non-portable. Any +# differences between the two don't matter for this purpose. +# .if make(*install*) -TZS!= cd ${TZBUILDDIR} && find -s * -type f +TZS!= cd ${TZBUILDDIR} && find * -type f | env LC_ALL=C sort .endif beforeinstall: install-zoneinfo Modified: user/markj/netdump/stand/common/load_elf_obj.c ============================================================================== --- user/markj/netdump/stand/common/load_elf_obj.c Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/stand/common/load_elf_obj.c Wed Feb 7 19:53:14 2018 (r328993) @@ -282,6 +282,8 @@ __elfN(obj_loadimage)(struct preloaded_file *fp, elf_f switch (shdr[i].sh_type) { case SHT_REL: case SHT_RELA: + if ((shdr[shdr[i].sh_info].sh_flags & SHF_ALLOC) == 0) + break; lastaddr = roundup(lastaddr, shdr[i].sh_addralign); shdr[i].sh_addr = (Elf_Addr)lastaddr; lastaddr += shdr[i].sh_size; Modified: user/markj/netdump/stand/kshim/bsd_kernel.h ============================================================================== --- user/markj/netdump/stand/kshim/bsd_kernel.h Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/stand/kshim/bsd_kernel.h Wed Feb 7 19:53:14 2018 (r328993) @@ -50,6 +50,8 @@ #define USB_BUS_EXPLORE_PROC(bus) (usb_process + 0) #define USB_BUS_CONTROL_XFER_PROC(bus) (usb_process + 1) #define SYSCTL_DECL(...) +struct sysctl_ctx_list { +}; struct sysctl_req { void *newptr; }; @@ -59,6 +61,13 @@ struct sysctl_req { #define SYSCTL_INT(...) #define SYSCTL_UINT(...) #define SYSCTL_PROC(...) +#define SYSCTL_ADD_NODE(...) NULL +#define SYSCTL_ADD_U16(...) NULL +#define SYSCTL_ADD_PROC(...) NULL +#define sysctl_handle_int(...) EOPNOTSUPP +#define sysctl_handle_string(...) EOPNOTSUPP +#define sysctl_ctx_init(ctx) do { (void)(ctx); } while (0) +#define sysctl_ctx_free(ctx) do { (void)(ctx); } while (0) #define TUNABLE_INT(...) #define MALLOC_DECLARE(...) #define MALLOC_DEFINE(...) @@ -177,6 +186,10 @@ struct uio; struct thread; struct malloc_type; struct usb_process; + +#ifndef INT32_MAX +#define INT32_MAX 0x7fffffff +#endif #ifndef HAVE_STANDARD_DEFS #define _UINT8_T_DECLARED Modified: user/markj/netdump/stand/usb/usbcore.mk ============================================================================== --- user/markj/netdump/stand/usb/usbcore.mk Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/stand/usb/usbcore.mk Wed Feb 7 19:53:14 2018 (r328993) @@ -32,7 +32,7 @@ # USBCOREDIR:= ${.PARSEDIR} -S=${USBCOREDIR}/../.. +S=${USBCOREDIR}/../../sys MACHDEP_DIRS= Modified: user/markj/netdump/sys/amd64/amd64/machdep.c ============================================================================== --- user/markj/netdump/sys/amd64/amd64/machdep.c Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/sys/amd64/amd64/machdep.c Wed Feb 7 19:53:14 2018 (r328993) @@ -282,7 +282,7 @@ cpu_startup(dummy) memsize = (uintmax_t)strtoul(sysenv, (char **)NULL, 10) << 10; freeenv(sysenv); } - if (memsize < ptoa((uintmax_t)vm_cnt.v_free_count)) + if (memsize < ptoa((uintmax_t)vm_free_count())) memsize = ptoa((uintmax_t)Maxmem); printf("real memory = %ju (%ju MB)\n", memsize, memsize >> 20); realmem = atop(memsize); @@ -309,8 +309,8 @@ cpu_startup(dummy) vm_ksubmap_init(&kmi); printf("avail memory = %ju (%ju MB)\n", - ptoa((uintmax_t)vm_cnt.v_free_count), - ptoa((uintmax_t)vm_cnt.v_free_count) / 1048576); + ptoa((uintmax_t)vm_free_count()), + ptoa((uintmax_t)vm_free_count()) / 1048576); /* * Set up buffers, so they can be used to read disk labels. Modified: user/markj/netdump/sys/amd64/linux/linux.h ============================================================================== --- user/markj/netdump/sys/amd64/linux/linux.h Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/sys/amd64/linux/linux.h Wed Feb 7 19:53:14 2018 (r328993) @@ -459,7 +459,7 @@ struct l_pollfd { struct linux_robust_list { l_uintptr_t next; }; - + struct linux_robust_list_head { struct linux_robust_list list; l_long futex_offset; Modified: user/markj/netdump/sys/amd64/linux/linux_ptrace.c ============================================================================== --- user/markj/netdump/sys/amd64/linux/linux_ptrace.c Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/sys/amd64/linux/linux_ptrace.c Wed Feb 7 19:53:14 2018 (r328993) @@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$"); #define LINUX_PTRACE_O_TRACEVFORKDONE 32 #define LINUX_PTRACE_O_TRACEEXIT 64 #define LINUX_PTRACE_O_TRACESECCOMP 128 -#define LINUX_PTRACE_O_EXITKILL 1048576 +#define LINUX_PTRACE_O_EXITKILL 1048576 #define LINUX_PTRACE_O_SUSPEND_SECCOMP 2097152 #define LINUX_NT_PRSTATUS 1 @@ -239,7 +239,7 @@ linux_ptrace_setoptions(struct thread *td, pid_t pid, if (data & LINUX_PTRACE_O_TRACEFORK) mask |= PTRACE_FORK; - if (data & LINUX_PTRACE_O_TRACEVFORK) + if (data & LINUX_PTRACE_O_TRACEVFORK) mask |= PTRACE_VFORK; if (data & LINUX_PTRACE_O_TRACECLONE) Modified: user/markj/netdump/sys/amd64/linux/linux_sysvec.c ============================================================================== --- user/markj/netdump/sys/amd64/linux/linux_sysvec.c Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/sys/amd64/linux/linux_sysvec.c Wed Feb 7 19:53:14 2018 (r328993) @@ -758,7 +758,7 @@ linux_vsyscall(struct thread *td) struct trapframe *frame; uint64_t retqaddr; int code, traced; - int error; + int error; frame = td->td_frame; @@ -832,7 +832,7 @@ linux_vdso_install(void *param) amd64_lower_shared_page(&elf_linux_sysvec); - linux_szsigcode = (&_binary_linux_locore_o_end - + linux_szsigcode = (&_binary_linux_locore_o_end - &_binary_linux_locore_o_start); if (linux_szsigcode > elf_linux_sysvec.sv_shared_page_len) Modified: user/markj/netdump/sys/amd64/linux/syscalls.master ============================================================================== --- user/markj/netdump/sys/amd64/linux/syscalls.master Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/sys/amd64/linux/syscalls.master Wed Feb 7 19:53:14 2018 (r328993) @@ -76,7 +76,7 @@ l_size_t nbyte, l_loff_t offset); } 18 AUE_PWRITE STD { int linux_pwrite(l_uint fd, char *buf, \ l_size_t nbyte, l_loff_t offset); } -19 AUE_READV NOPROTO { int readv(int fd, struct iovec *iovp, \ +19 AUE_READV NOPROTO { int readv(int fd, struct iovec *iovp, \ u_int iovcnt); } 20 AUE_WRITEV NOPROTO { int writev(int fd, struct iovec *iovp, \ u_int iovcnt); } @@ -471,10 +471,10 @@ 278 AUE_NULL STD { int linux_vmsplice(void); } 279 AUE_NULL STD { int linux_move_pages(void); } 280 AUE_FUTIMESAT STD { int linux_utimensat(l_int dfd, const char *pathname, \ - const struct l_timespec *times, l_int flags); } -281 AUE_NULL STD { int linux_epoll_pwait(l_int epfd, struct epoll_event *events, \ - l_int maxevents, l_int timeout, l_sigset_t *mask, \ - l_size_t sigsetsize); } + const struct l_timespec *times, l_int flags); } +281 AUE_NULL STD { int linux_epoll_pwait(l_int epfd, struct epoll_event *events, \ + l_int maxevents, l_int timeout, l_sigset_t *mask, \ + l_size_t sigsetsize); } 282 AUE_NULL STD { int linux_signalfd(void); } 283 AUE_NULL STD { int linux_timerfd_create(l_int clockid, l_int flags); } 284 AUE_NULL STD { int linux_eventfd(l_uint initval); } @@ -496,10 +496,10 @@ 293 AUE_NULL STD { int linux_pipe2(l_int *pipefds, l_int flags); } 294 AUE_NULL STD { int linux_inotify_init1(l_int flags); } ; linux 2.6.30: -295 AUE_NULL STD { int linux_preadv(l_ulong fd, \ +295 AUE_NULL STD { int linux_preadv(l_ulong fd, \ struct iovec *vec, l_ulong vlen, \ l_ulong pos_l, l_ulong pos_h); } -296 AUE_NULL STD { int linux_pwritev(l_ulong fd, \ +296 AUE_NULL STD { int linux_pwritev(l_ulong fd, \ struct iovec *vec, l_ulong vlen, \ l_ulong pos_l, l_ulong pos_h); } ; linux 2.6.31: @@ -551,7 +551,7 @@ void *attr, l_uint size, l_uint flags); } ; linux 3.15: 316 AUE_NULL STD { int linux_renameat2(l_int oldfd, \ - const char *oldname, l_int newfd, \ + const char *oldname, l_int newfd, \ const char *newname, unsigned int flags); } ; linux 3.17: 317 AUE_NULL STD { int linux_seccomp(l_uint op, l_uint flags, \ Modified: user/markj/netdump/sys/amd64/linux32/linux.h ============================================================================== --- user/markj/netdump/sys/amd64/linux32/linux.h Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/sys/amd64/linux32/linux.h Wed Feb 7 19:53:14 2018 (r328993) @@ -242,19 +242,19 @@ struct l_stat64 { l_ulonglong st_ino; } __packed; -struct l_statfs64 { - l_int f_type; - l_int f_bsize; - uint64_t f_blocks; - uint64_t f_bfree; - uint64_t f_bavail; - uint64_t f_files; - uint64_t f_ffree; - l_fsid_t f_fsid; - l_int f_namelen; - l_int f_frsize; - l_int f_flags; - l_int f_spare[4]; +struct l_statfs64 { + l_int f_type; + l_int f_bsize; + uint64_t f_blocks; + uint64_t f_bfree; + uint64_t f_bavail; + uint64_t f_files; + uint64_t f_ffree; + l_fsid_t f_fsid; + l_int f_namelen; + l_int f_frsize; + l_int f_flags; + l_int f_spare[4]; } __packed; /* sigaction flags */ @@ -454,11 +454,11 @@ struct l_sigframe { struct l_rt_sigframe { l_int sf_sig; - l_uintptr_t sf_siginfo; + l_uintptr_t sf_siginfo; l_uintptr_t sf_ucontext; l_siginfo_t sf_si; - struct l_ucontext sf_sc; - l_handler_t sf_handler; + struct l_ucontext sf_sc; + l_handler_t sf_handler; } __packed; /* Modified: user/markj/netdump/sys/amd64/linux32/linux32_dummy.c ============================================================================== --- user/markj/netdump/sys/amd64/linux32/linux32_dummy.c Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/sys/amd64/linux32/linux32_dummy.c Wed Feb 7 19:53:14 2018 (r328993) @@ -8,7 +8,7 @@ * 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 + * notice, this list of conditions and the following disclaimer * in this position and unchanged. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the Modified: user/markj/netdump/sys/amd64/linux32/linux32_locore.s ============================================================================== --- user/markj/netdump/sys/amd64/linux32/linux32_locore.s Wed Feb 7 19:49:07 2018 (r328992) +++ user/markj/netdump/sys/amd64/linux32/linux32_locore.s Wed Feb 7 19:53:14 2018 (r328993) @@ -72,12 +72,12 @@ NON_GPROF_ENTRY(linux32_vsyscall) .previous #endif -#define do_cfa_expr(offset) \ - .byte 0x0f; /* DW_CFA_def_cfa_expression */ \ - .uleb128 11f-10f; /* length */ \ -10: .byte 0x74; /* DW_OP_breg4 */ \ - .sleb128 offset; /* offset */ \ - .byte 0x06; /* DW_OP_deref */ \ +#define do_cfa_expr(offset) \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802071953.w17JrEwQ091125>