Date: Sat, 20 Jun 2015 00:58:48 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r284621 - in projects/release-pkg: . bin/cat bin/ls contrib/gcc contrib/libcxxrt etc/devd gnu/lib/libgcc gnu/usr.bin/binutils/as gnu/usr.bin/binutils/ld gnu/usr.bin/binutils/libbinutils... Message-ID: <201506200058.t5K0wmJf072353@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sat Jun 20 00:58:46 2015 New Revision: 284621 URL: https://svnweb.freebsd.org/changeset/base/284621 Log: Merge from head @274131 Added: projects/release-pkg/lib/clang/liblldb/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldb/Makefile.depend projects/release-pkg/lib/clang/liblldbAPI/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbAPI/Makefile.depend projects/release-pkg/lib/clang/liblldbBreakpoint/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbBreakpoint/Makefile.depend projects/release-pkg/lib/clang/liblldbCommands/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbCommands/Makefile.depend projects/release-pkg/lib/clang/liblldbCore/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbCore/Makefile.depend projects/release-pkg/lib/clang/liblldbDataFormatters/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbDataFormatters/Makefile.depend projects/release-pkg/lib/clang/liblldbExpression/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbExpression/Makefile.depend projects/release-pkg/lib/clang/liblldbHostCommon/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbHostCommon/Makefile.depend projects/release-pkg/lib/clang/liblldbHostFreeBSD/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbHostFreeBSD/Makefile.depend projects/release-pkg/lib/clang/liblldbHostPOSIX/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbHostPOSIX/Makefile.depend projects/release-pkg/lib/clang/liblldbInterpreter/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbInterpreter/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginABISysV_ppc/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginABISysV_ppc/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginABISysV_ppc64/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginABISysV_ppc64/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginABISysV_x86_64/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginABISysV_x86_64/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginCXXItaniumABI/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginCXXItaniumABI/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginDisassemblerLLVM/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginDisassemblerLLVM/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginDynamicLoaderPosixDYLD/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginDynamicLoaderStatic/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginDynamicLoaderStatic/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginInstructionARM/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginInstructionARM/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginInstructionARM64/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginInstructionARM64/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginJITLoaderGDB/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginJITLoaderGDB/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginMemoryHistoryASan/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginMemoryHistoryASan/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginObjectContainerBSDArchive/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginObjectContainerBSDArchive/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginObjectFileELF/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginObjectFileELF/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginObjectFileJIT/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginObjectFileJIT/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginPlatformFreeBSD/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginPlatformFreeBSD/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginPlatformGDB/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginPlatformGDB/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginProcessElfCore/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginProcessElfCore/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginProcessFreeBSD/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginProcessFreeBSD/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginProcessGDBRemote/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginProcessGDBRemote/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginProcessPOSIX/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginProcessPOSIX/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginProcessUtility/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginProcessUtility/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginSymbolFileDWARF/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginSymbolFileDWARF/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginSymbolFileSymtab/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginSymbolFileSymtab/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginSymbolVendorELF/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginSymbolVendorELF/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginUnwindAssemblyInstEmulation/Makefile.depend projects/release-pkg/lib/clang/liblldbPluginUnwindAssemblyX86/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbPluginUnwindAssemblyX86/Makefile.depend projects/release-pkg/lib/clang/liblldbSymbol/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbSymbol/Makefile.depend projects/release-pkg/lib/clang/liblldbTarget/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbTarget/Makefile.depend projects/release-pkg/lib/clang/liblldbUtility/Makefile.depend - copied unchanged from r284620, head/lib/clang/liblldbUtility/Makefile.depend projects/release-pkg/release/Makefile.azure - copied unchanged from r284620, head/release/Makefile.azure projects/release-pkg/share/doc/usd/13.viref/merge.awk - copied unchanged from r284620, head/share/doc/usd/13.viref/merge.awk projects/release-pkg/share/mk/local.sys.env.mk - copied unchanged from r284620, head/share/mk/local.sys.env.mk projects/release-pkg/share/mk/src.sys.env.mk - copied unchanged from r284620, head/share/mk/src.sys.env.mk projects/release-pkg/sys/arm/ti/am335x/hdmi.h - copied unchanged from r284620, head/sys/arm/ti/am335x/hdmi.h projects/release-pkg/sys/arm/ti/am335x/hdmi_if.m - copied unchanged from r284620, head/sys/arm/ti/am335x/hdmi_if.m projects/release-pkg/sys/arm/ti/am335x/tda19988.c - copied unchanged from r284620, head/sys/arm/ti/am335x/tda19988.c projects/release-pkg/sys/boot/common/Makefile - copied unchanged from r284620, head/sys/boot/common/Makefile projects/release-pkg/sys/contrib/dev/acpica/include/acclib.h - copied unchanged from r284620, head/sys/contrib/dev/acpica/include/acclib.h projects/release-pkg/usr.bin/addr2line/Makefile.depend - copied unchanged from r284620, head/usr.bin/addr2line/Makefile.depend projects/release-pkg/usr.bin/clang/lldb/Makefile.depend - copied unchanged from r284620, head/usr.bin/clang/lldb/Makefile.depend projects/release-pkg/usr.bin/nm/Makefile.depend - copied unchanged from r284620, head/usr.bin/nm/Makefile.depend projects/release-pkg/usr.bin/readelf/Makefile.depend - copied unchanged from r284620, head/usr.bin/readelf/Makefile.depend projects/release-pkg/usr.bin/size/Makefile.depend - copied unchanged from r284620, head/usr.bin/size/Makefile.depend projects/release-pkg/usr.bin/strings/Makefile.depend - copied unchanged from r284620, head/usr.bin/strings/Makefile.depend projects/release-pkg/usr.sbin/bhyve/bootrom.c - copied unchanged from r284620, head/usr.sbin/bhyve/bootrom.c projects/release-pkg/usr.sbin/bhyve/bootrom.h - copied unchanged from r284620, head/usr.sbin/bhyve/bootrom.h projects/release-pkg/usr.sbin/fstyp/geli.c - copied unchanged from r284620, head/usr.sbin/fstyp/geli.c projects/release-pkg/usr.sbin/fstyp/zfs.c - copied unchanged from r284620, head/usr.sbin/fstyp/zfs.c Deleted: projects/release-pkg/usr.bin/make/ Modified: projects/release-pkg/Makefile projects/release-pkg/UPDATING projects/release-pkg/bin/cat/Makefile.depend projects/release-pkg/bin/ls/Makefile.depend projects/release-pkg/bin/ls/print.c projects/release-pkg/contrib/gcc/longlong.h projects/release-pkg/contrib/libcxxrt/FREEBSD-upgrade projects/release-pkg/contrib/libcxxrt/libelftc_dem_gnu3.c projects/release-pkg/etc/devd/usb.conf projects/release-pkg/gnu/lib/libgcc/Makefile projects/release-pkg/gnu/lib/libgcc/Makefile.depend projects/release-pkg/gnu/usr.bin/binutils/as/Makefile.depend projects/release-pkg/gnu/usr.bin/binutils/ld/Makefile.depend.amd64 projects/release-pkg/gnu/usr.bin/binutils/libbinutils/Makefile.depend projects/release-pkg/include/Makefile.depend projects/release-pkg/kerberos5/lib/libasn1/Makefile.depend projects/release-pkg/kerberos5/lib/libheimbase/Makefile.depend projects/release-pkg/kerberos5/lib/libheimipcc/Makefile.depend projects/release-pkg/kerberos5/lib/libhx509/Makefile projects/release-pkg/kerberos5/lib/libhx509/Makefile.depend projects/release-pkg/kerberos5/lib/libkrb5/Makefile.depend projects/release-pkg/kerberos5/lib/libroken/Makefile.depend projects/release-pkg/kerberos5/lib/libwind/Makefile.depend projects/release-pkg/lib/clang/libllvmexecutionengine/Makefile.depend projects/release-pkg/lib/clang/libllvmmcdisassembler/Makefile.depend projects/release-pkg/lib/clang/libllvmmcjit/Makefile.depend projects/release-pkg/lib/clang/libllvmruntimedyld/Makefile.depend projects/release-pkg/lib/libbegemot/Makefile.depend projects/release-pkg/lib/libc/Makefile.depend projects/release-pkg/lib/libcom_err/Makefile.depend projects/release-pkg/lib/libcrypt/Makefile.depend projects/release-pkg/lib/libdwarf/Makefile.depend projects/release-pkg/lib/libfetch/Makefile.depend projects/release-pkg/lib/libipsec/Makefile.depend projects/release-pkg/lib/libldns/Makefile.depend projects/release-pkg/lib/liblzma/Makefile.depend projects/release-pkg/lib/libmagic/Makefile.depend projects/release-pkg/lib/libmd/Makefile.depend projects/release-pkg/lib/libmd/Makefile.depend.host projects/release-pkg/lib/libmp/Makefile.depend projects/release-pkg/lib/libopie/Makefile.depend projects/release-pkg/lib/libpam/libpam/Makefile.depend projects/release-pkg/lib/libradius/Makefile.depend projects/release-pkg/lib/libsbuf/Makefile.depend projects/release-pkg/lib/libthr/Makefile.depend projects/release-pkg/lib/libthread_db/Makefile.depend projects/release-pkg/lib/libutil/Makefile.depend projects/release-pkg/lib/libvmmapi/vmmapi.c projects/release-pkg/lib/libvmmapi/vmmapi.h projects/release-pkg/lib/libypclnt/Makefile.depend projects/release-pkg/lib/libz/Makefile.depend projects/release-pkg/lib/msun/Makefile.depend projects/release-pkg/lib/ncurses/ncurses/Makefile.depend projects/release-pkg/lib/ncurses/ncursesw/Makefile.depend projects/release-pkg/lib/ncurses/panel/Makefile.depend projects/release-pkg/lib/ncurses/panelw/Makefile.depend projects/release-pkg/libexec/rtld-elf/Makefile.depend projects/release-pkg/release/Makefile.vm projects/release-pkg/release/arm/BEAGLEBONE.conf projects/release-pkg/release/arm/CUBOX-HUMMINGBOARD.conf projects/release-pkg/release/arm/GUMSTIX.conf projects/release-pkg/release/arm/PANDABOARD.conf projects/release-pkg/release/arm/RPI-B.conf projects/release-pkg/release/arm/RPI2.conf projects/release-pkg/release/arm/WANDBOARD.conf projects/release-pkg/release/tools/azure.conf projects/release-pkg/sbin/atm/atmconfig/Makefile.depend projects/release-pkg/sbin/devd/Makefile.depend projects/release-pkg/sbin/init/Makefile.depend projects/release-pkg/sbin/umount/umount.8 projects/release-pkg/secure/lib/libcrypt/crypt-blowfish.c projects/release-pkg/secure/lib/libcrypto/Makefile.depend projects/release-pkg/secure/lib/libssh/Makefile.depend projects/release-pkg/secure/lib/libssl/Makefile.depend projects/release-pkg/share/doc/usd/13.viref/Makefile projects/release-pkg/share/examples/bhyve/vmrun.sh projects/release-pkg/share/i18n/csmapper/Makefile.depend projects/release-pkg/share/i18n/esdb/Makefile.depend projects/release-pkg/share/man/man4/aacraid.4 projects/release-pkg/share/man/man4/acpi_hp.4 projects/release-pkg/share/man/man4/acpi_ibm.4 projects/release-pkg/share/man/man4/acpi_panasonic.4 projects/release-pkg/share/man/man4/ada.4 projects/release-pkg/share/man/man9/pci_iov_schema.9 projects/release-pkg/share/man/man9/sbuf.9 projects/release-pkg/share/man/man9/taskqueue.9 projects/release-pkg/share/mk/bsd.doc.mk projects/release-pkg/share/mk/local.sys.mk projects/release-pkg/share/mk/meta.stage.mk projects/release-pkg/share/mk/src.opts.mk projects/release-pkg/share/mk/src.sys.mk projects/release-pkg/share/mk/sys.mk projects/release-pkg/sys/amd64/include/vmm.h (contents, props changed) projects/release-pkg/sys/amd64/include/vmm_dev.h (contents, props changed) projects/release-pkg/sys/amd64/vmm/amd/svm.c projects/release-pkg/sys/amd64/vmm/intel/vmx.c projects/release-pkg/sys/amd64/vmm/io/ppt.c projects/release-pkg/sys/amd64/vmm/vmm.c projects/release-pkg/sys/amd64/vmm/vmm_dev.c projects/release-pkg/sys/amd64/vmm/vmm_instruction_emul.c projects/release-pkg/sys/amd64/vmm/vmm_mem.c projects/release-pkg/sys/amd64/vmm/vmm_mem.h projects/release-pkg/sys/arm/conf/BEAGLEBONE projects/release-pkg/sys/arm/ti/am335x/am335x_lcd.c projects/release-pkg/sys/arm/ti/am335x/am335x_lcd.h projects/release-pkg/sys/arm/ti/am335x/am335x_prcm.c projects/release-pkg/sys/arm/ti/am335x/files.am335x projects/release-pkg/sys/arm/ti/omap4/omap4_prcm_clks.c projects/release-pkg/sys/arm/ti/ti_prcm.c projects/release-pkg/sys/arm/ti/ti_prcm.h projects/release-pkg/sys/boot/Makefile projects/release-pkg/sys/boot/common/Makefile.inc projects/release-pkg/sys/boot/fdt/dts/arm/beaglebone-black.dts projects/release-pkg/sys/boot/i386/loader/Makefile projects/release-pkg/sys/boot/mips/beri/loader/Makefile projects/release-pkg/sys/boot/pc98/loader/Makefile projects/release-pkg/sys/boot/powerpc/kboot/Makefile projects/release-pkg/sys/boot/powerpc/ofw/Makefile projects/release-pkg/sys/boot/powerpc/ps3/Makefile projects/release-pkg/sys/boot/sparc64/loader/Makefile projects/release-pkg/sys/boot/uboot/lib/copy.c projects/release-pkg/sys/boot/uboot/lib/glue.c projects/release-pkg/sys/cam/ctl/scsi_ctl.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h projects/release-pkg/sys/conf/NOTES projects/release-pkg/sys/conf/files projects/release-pkg/sys/conf/files.mips projects/release-pkg/sys/contrib/dev/acpica/acpica_prep.sh projects/release-pkg/sys/contrib/dev/acpica/changes.txt projects/release-pkg/sys/contrib/dev/acpica/common/adisasm.c projects/release-pkg/sys/contrib/dev/acpica/common/ahids.c projects/release-pkg/sys/contrib/dev/acpica/common/ahpredef.c projects/release-pkg/sys/contrib/dev/acpica/common/ahuuids.c projects/release-pkg/sys/contrib/dev/acpica/common/dmextern.c projects/release-pkg/sys/contrib/dev/acpica/common/dmrestag.c projects/release-pkg/sys/contrib/dev/acpica/common/dmtable.c projects/release-pkg/sys/contrib/dev/acpica/common/dmtbdump.c projects/release-pkg/sys/contrib/dev/acpica/common/dmtbinfo.c projects/release-pkg/sys/contrib/dev/acpica/common/getopt.c projects/release-pkg/sys/contrib/dev/acpica/compiler/aslanalyze.c projects/release-pkg/sys/contrib/dev/acpica/compiler/aslascii.c projects/release-pkg/sys/contrib/dev/acpica/compiler/aslcodegen.c projects/release-pkg/sys/contrib/dev/acpica/compiler/aslcompile.c projects/release-pkg/sys/contrib/dev/acpica/compiler/aslcompiler.h projects/release-pkg/sys/contrib/dev/acpica/compiler/aslcompiler.l projects/release-pkg/sys/contrib/dev/acpica/compiler/asldefine.h projects/release-pkg/sys/contrib/dev/acpica/compiler/aslerror.c projects/release-pkg/sys/contrib/dev/acpica/compiler/aslfileio.c projects/release-pkg/sys/contrib/dev/acpica/compiler/aslfiles.c projects/release-pkg/sys/contrib/dev/acpica/compiler/aslfold.c projects/release-pkg/sys/contrib/dev/acpica/compiler/aslglobal.h projects/release-pkg/sys/contrib/dev/acpica/compiler/aslmain.c projects/release-pkg/sys/contrib/dev/acpica/compiler/aslmapenter.c projects/release-pkg/sys/contrib/dev/acpica/compiler/aslmapoutput.c projects/release-pkg/sys/contrib/dev/acpica/compiler/aslmethod.c projects/release-pkg/sys/contrib/dev/acpica/compiler/aslopcodes.c projects/release-pkg/sys/contrib/dev/acpica/compiler/asloperands.c projects/release-pkg/sys/contrib/dev/acpica/compiler/aslopt.c projects/release-pkg/sys/contrib/dev/acpica/compiler/asloptions.c projects/release-pkg/sys/contrib/dev/acpica/compiler/aslprintf.c projects/release-pkg/sys/contrib/dev/acpica/compiler/aslstartup.c projects/release-pkg/sys/contrib/dev/acpica/compiler/aslsupport.l projects/release-pkg/sys/contrib/dev/acpica/compiler/asltypes.h projects/release-pkg/sys/contrib/dev/acpica/compiler/aslutils.c projects/release-pkg/sys/contrib/dev/acpica/compiler/asluuid.c projects/release-pkg/sys/contrib/dev/acpica/compiler/dtcompile.c projects/release-pkg/sys/contrib/dev/acpica/compiler/dtcompiler.h projects/release-pkg/sys/contrib/dev/acpica/compiler/dtexpress.c projects/release-pkg/sys/contrib/dev/acpica/compiler/dtfield.c projects/release-pkg/sys/contrib/dev/acpica/compiler/dtio.c projects/release-pkg/sys/contrib/dev/acpica/compiler/dtparser.y projects/release-pkg/sys/contrib/dev/acpica/compiler/dtsubtable.c projects/release-pkg/sys/contrib/dev/acpica/compiler/dttable.c projects/release-pkg/sys/contrib/dev/acpica/compiler/dttemplate.c projects/release-pkg/sys/contrib/dev/acpica/compiler/dttemplate.h projects/release-pkg/sys/contrib/dev/acpica/compiler/dtutils.c projects/release-pkg/sys/contrib/dev/acpica/compiler/prparser.y projects/release-pkg/sys/contrib/dev/acpica/compiler/prscan.c projects/release-pkg/sys/contrib/dev/acpica/compiler/prutils.c projects/release-pkg/sys/contrib/dev/acpica/components/debugger/dbcmds.c projects/release-pkg/sys/contrib/dev/acpica/components/debugger/dbconvert.c projects/release-pkg/sys/contrib/dev/acpica/components/debugger/dbdisply.c projects/release-pkg/sys/contrib/dev/acpica/components/debugger/dbexec.c projects/release-pkg/sys/contrib/dev/acpica/components/debugger/dbfileio.c projects/release-pkg/sys/contrib/dev/acpica/components/debugger/dbhistry.c projects/release-pkg/sys/contrib/dev/acpica/components/debugger/dbinput.c projects/release-pkg/sys/contrib/dev/acpica/components/debugger/dbmethod.c projects/release-pkg/sys/contrib/dev/acpica/components/debugger/dbnames.c projects/release-pkg/sys/contrib/dev/acpica/components/debugger/dbtest.c projects/release-pkg/sys/contrib/dev/acpica/components/debugger/dbutils.c projects/release-pkg/sys/contrib/dev/acpica/components/debugger/dbxface.c projects/release-pkg/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c projects/release-pkg/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c projects/release-pkg/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/release-pkg/sys/contrib/dev/acpica/components/dispatcher/dsfield.c projects/release-pkg/sys/contrib/dev/acpica/components/dispatcher/dsinit.c projects/release-pkg/sys/contrib/dev/acpica/components/dispatcher/dsobject.c projects/release-pkg/sys/contrib/dev/acpica/components/dispatcher/dsutils.c projects/release-pkg/sys/contrib/dev/acpica/components/dispatcher/dswload.c projects/release-pkg/sys/contrib/dev/acpica/components/events/evgpe.c projects/release-pkg/sys/contrib/dev/acpica/components/events/evgpeinit.c projects/release-pkg/sys/contrib/dev/acpica/components/executer/exconfig.c projects/release-pkg/sys/contrib/dev/acpica/components/executer/exconvrt.c projects/release-pkg/sys/contrib/dev/acpica/components/executer/exdebug.c projects/release-pkg/sys/contrib/dev/acpica/components/executer/exdump.c projects/release-pkg/sys/contrib/dev/acpica/components/executer/exfield.c projects/release-pkg/sys/contrib/dev/acpica/components/executer/exfldio.c projects/release-pkg/sys/contrib/dev/acpica/components/executer/exmisc.c projects/release-pkg/sys/contrib/dev/acpica/components/executer/exnames.c projects/release-pkg/sys/contrib/dev/acpica/components/executer/exoparg2.c projects/release-pkg/sys/contrib/dev/acpica/components/executer/exoparg3.c projects/release-pkg/sys/contrib/dev/acpica/components/executer/exregion.c projects/release-pkg/sys/contrib/dev/acpica/components/executer/exstorob.c projects/release-pkg/sys/contrib/dev/acpica/components/executer/exutils.c projects/release-pkg/sys/contrib/dev/acpica/components/hardware/hwgpe.c projects/release-pkg/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c projects/release-pkg/sys/contrib/dev/acpica/components/namespace/nsaccess.c projects/release-pkg/sys/contrib/dev/acpica/components/namespace/nsconvert.c projects/release-pkg/sys/contrib/dev/acpica/components/namespace/nsdump.c projects/release-pkg/sys/contrib/dev/acpica/components/namespace/nseval.c projects/release-pkg/sys/contrib/dev/acpica/components/namespace/nsinit.c projects/release-pkg/sys/contrib/dev/acpica/components/namespace/nsparse.c projects/release-pkg/sys/contrib/dev/acpica/components/namespace/nsrepair2.c projects/release-pkg/sys/contrib/dev/acpica/components/namespace/nssearch.c projects/release-pkg/sys/contrib/dev/acpica/components/namespace/nsutils.c projects/release-pkg/sys/contrib/dev/acpica/components/namespace/nsxfeval.c projects/release-pkg/sys/contrib/dev/acpica/components/namespace/nsxfname.c projects/release-pkg/sys/contrib/dev/acpica/components/parser/psutils.c projects/release-pkg/sys/contrib/dev/acpica/components/resources/rscreate.c projects/release-pkg/sys/contrib/dev/acpica/components/resources/rsmisc.c projects/release-pkg/sys/contrib/dev/acpica/components/resources/rsutils.c projects/release-pkg/sys/contrib/dev/acpica/components/resources/rsxface.c projects/release-pkg/sys/contrib/dev/acpica/components/tables/tbdata.c projects/release-pkg/sys/contrib/dev/acpica/components/tables/tbfadt.c projects/release-pkg/sys/contrib/dev/acpica/components/tables/tbfind.c projects/release-pkg/sys/contrib/dev/acpica/components/tables/tbinstal.c projects/release-pkg/sys/contrib/dev/acpica/components/tables/tbprint.c projects/release-pkg/sys/contrib/dev/acpica/components/tables/tbutils.c projects/release-pkg/sys/contrib/dev/acpica/components/tables/tbxface.c projects/release-pkg/sys/contrib/dev/acpica/components/tables/tbxfload.c projects/release-pkg/sys/contrib/dev/acpica/components/utilities/utalloc.c projects/release-pkg/sys/contrib/dev/acpica/components/utilities/utbuffer.c projects/release-pkg/sys/contrib/dev/acpica/components/utilities/utcache.c projects/release-pkg/sys/contrib/dev/acpica/components/utilities/utcopy.c projects/release-pkg/sys/contrib/dev/acpica/components/utilities/utids.c projects/release-pkg/sys/contrib/dev/acpica/components/utilities/utmisc.c projects/release-pkg/sys/contrib/dev/acpica/components/utilities/utosi.c projects/release-pkg/sys/contrib/dev/acpica/components/utilities/utpredef.c projects/release-pkg/sys/contrib/dev/acpica/components/utilities/utprint.c projects/release-pkg/sys/contrib/dev/acpica/components/utilities/utstring.c projects/release-pkg/sys/contrib/dev/acpica/components/utilities/uttrack.c projects/release-pkg/sys/contrib/dev/acpica/components/utilities/utxface.c projects/release-pkg/sys/contrib/dev/acpica/components/utilities/utxfinit.c projects/release-pkg/sys/contrib/dev/acpica/include/accommon.h projects/release-pkg/sys/contrib/dev/acpica/include/acglobal.h projects/release-pkg/sys/contrib/dev/acpica/include/acinterp.h projects/release-pkg/sys/contrib/dev/acpica/include/aclocal.h projects/release-pkg/sys/contrib/dev/acpica/include/acnames.h projects/release-pkg/sys/contrib/dev/acpica/include/acnamesp.h projects/release-pkg/sys/contrib/dev/acpica/include/acobject.h projects/release-pkg/sys/contrib/dev/acpica/include/acoutput.h projects/release-pkg/sys/contrib/dev/acpica/include/acpixf.h projects/release-pkg/sys/contrib/dev/acpica/include/acstruct.h projects/release-pkg/sys/contrib/dev/acpica/include/actbl.h projects/release-pkg/sys/contrib/dev/acpica/include/actbl1.h projects/release-pkg/sys/contrib/dev/acpica/include/actbl2.h projects/release-pkg/sys/contrib/dev/acpica/include/actbl3.h projects/release-pkg/sys/contrib/dev/acpica/include/actypes.h projects/release-pkg/sys/contrib/dev/acpica/include/acutils.h projects/release-pkg/sys/contrib/dev/acpica/include/platform/acenv.h projects/release-pkg/sys/contrib/dev/acpica/include/platform/acenvex.h projects/release-pkg/sys/contrib/dev/acpica/include/platform/acgcc.h projects/release-pkg/sys/ddb/db_sym.c projects/release-pkg/sys/dev/atkbdc/psm.c projects/release-pkg/sys/dev/bxe/bxe.c projects/release-pkg/sys/dev/bxe/ecore_sp.c projects/release-pkg/sys/dev/filemon/filemon.h projects/release-pkg/sys/dev/filemon/filemon_wrapper.c projects/release-pkg/sys/dev/isp/isp_freebsd.c projects/release-pkg/sys/dev/iwn/if_iwn.c projects/release-pkg/sys/dev/iwn/if_iwnvar.h projects/release-pkg/sys/dev/ixl/if_ixl.c projects/release-pkg/sys/dev/mii/mii.h projects/release-pkg/sys/dev/videomode/videomode.h projects/release-pkg/sys/dev/virtio/mmio/virtio_mmio.h projects/release-pkg/sys/dev/xen/blkfront/blkfront.c projects/release-pkg/sys/fs/nfsclient/nfs_clbio.c projects/release-pkg/sys/fs/tmpfs/tmpfs_subr.c projects/release-pkg/sys/geom/label/g_label.c projects/release-pkg/sys/geom/label/g_label.h projects/release-pkg/sys/geom/label/g_label_iso9660.c projects/release-pkg/sys/geom/label/g_label_msdosfs.c projects/release-pkg/sys/kern/imgact_binmisc.c projects/release-pkg/sys/kern/kern_jail.c projects/release-pkg/sys/kern/stack_protector.c projects/release-pkg/sys/kern/vfs_subr.c projects/release-pkg/sys/modules/usb/Makefile projects/release-pkg/sys/netinet/if_ether.c projects/release-pkg/sys/netinet/ip_encap.c projects/release-pkg/sys/netinet/sctp_asconf.c projects/release-pkg/sys/netinet/sctp_input.c projects/release-pkg/sys/netinet/sctp_input.h projects/release-pkg/sys/netinet/sctp_os_bsd.h projects/release-pkg/sys/netinet/sctp_output.c projects/release-pkg/sys/netinet/sctp_output.h projects/release-pkg/sys/netinet/sctp_pcb.c projects/release-pkg/sys/netinet/sctp_pcb.h projects/release-pkg/sys/netinet/sctp_syscalls.c projects/release-pkg/sys/netinet/sctp_usrreq.c projects/release-pkg/sys/netinet/sctputil.c projects/release-pkg/sys/netinet/sctputil.h projects/release-pkg/sys/netinet6/sctp6_usrreq.c projects/release-pkg/sys/opencrypto/crypto.c projects/release-pkg/sys/ufs/ffs/ffs_vfsops.c projects/release-pkg/sys/vm/swap_pager.c projects/release-pkg/sys/vm/vm_pager.c projects/release-pkg/sys/vm/vm_pager.h projects/release-pkg/sys/x86/acpica/acpi_wakeup.c projects/release-pkg/targets/pseudo/clang/Makefile.depend projects/release-pkg/targets/pseudo/toolchain/Makefile.depend projects/release-pkg/targets/pseudo/userland/gnu/Makefile.depend projects/release-pkg/tools/build/mk/OptionalObsoleteFiles.inc projects/release-pkg/usr.bin/Makefile projects/release-pkg/usr.bin/ar/Makefile.depend projects/release-pkg/usr.bin/bmake/Makefile.depend projects/release-pkg/usr.bin/calendar/calendars/calendar.freebsd projects/release-pkg/usr.bin/clang/clang-tblgen/Makefile.depend projects/release-pkg/usr.bin/clang/clang/Makefile.depend projects/release-pkg/usr.bin/clang/tblgen/Makefile.depend projects/release-pkg/usr.bin/colldef/Makefile.depend projects/release-pkg/usr.bin/ee/Makefile.depend projects/release-pkg/usr.bin/elfcopy/Makefile.depend projects/release-pkg/usr.bin/find/Makefile.depend projects/release-pkg/usr.bin/getconf/Makefile.depend projects/release-pkg/usr.bin/grep/Makefile.depend projects/release-pkg/usr.bin/kdump/Makefile.depend projects/release-pkg/usr.bin/less/Makefile.depend projects/release-pkg/usr.bin/lessecho/Makefile.depend projects/release-pkg/usr.bin/lesskey/Makefile.depend projects/release-pkg/usr.bin/mandoc/Makefile.depend projects/release-pkg/usr.bin/mklocale/Makefile.depend projects/release-pkg/usr.bin/sockstat/sockstat.c projects/release-pkg/usr.bin/sort/Makefile.depend projects/release-pkg/usr.bin/top/Makefile.depend projects/release-pkg/usr.bin/truss/Makefile.depend.amd64 projects/release-pkg/usr.bin/xinstall/Makefile.depend.host projects/release-pkg/usr.bin/xlint/lint1/Makefile.depend projects/release-pkg/usr.bin/xlint/llib/Makefile.depend projects/release-pkg/usr.sbin/bhyve/Makefile projects/release-pkg/usr.sbin/bhyve/bhyve.8 projects/release-pkg/usr.sbin/bhyve/bhyverun.c projects/release-pkg/usr.sbin/bhyve/pci_lpc.c projects/release-pkg/usr.sbin/bhyve/pci_lpc.h projects/release-pkg/usr.sbin/bhyve/pci_passthru.c projects/release-pkg/usr.sbin/bhyvectl/Makefile projects/release-pkg/usr.sbin/bhyvectl/bhyvectl.c projects/release-pkg/usr.sbin/bhyveload/bhyveload.8 projects/release-pkg/usr.sbin/bhyveload/bhyveload.c projects/release-pkg/usr.sbin/bsdconfig/usermgmt/share/group.subr projects/release-pkg/usr.sbin/bsdconfig/usermgmt/share/user.subr projects/release-pkg/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend projects/release-pkg/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile.depend projects/release-pkg/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile.depend projects/release-pkg/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile.depend projects/release-pkg/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile.depend projects/release-pkg/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile.depend projects/release-pkg/usr.sbin/bsnmpd/modules/snmp_pf/Makefile.depend projects/release-pkg/usr.sbin/bsnmpd/modules/snmp_target/Makefile.depend projects/release-pkg/usr.sbin/bsnmpd/modules/snmp_usm/Makefile.depend projects/release-pkg/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile.depend projects/release-pkg/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile.depend projects/release-pkg/usr.sbin/crunch/crunchgen/Makefile.depend projects/release-pkg/usr.sbin/ctld/token.l projects/release-pkg/usr.sbin/fstyp/Makefile projects/release-pkg/usr.sbin/fstyp/cd9660.c projects/release-pkg/usr.sbin/fstyp/fstyp.8 projects/release-pkg/usr.sbin/fstyp/fstyp.c projects/release-pkg/usr.sbin/fstyp/fstyp.h projects/release-pkg/usr.sbin/fstyp/msdosfs.c projects/release-pkg/usr.sbin/nologin/Makefile.depend projects/release-pkg/usr.sbin/ntp/libntp/Makefile.depend projects/release-pkg/usr.sbin/ntp/ntp-keygen/Makefile.depend projects/release-pkg/usr.sbin/ntp/ntpd/Makefile.depend projects/release-pkg/usr.sbin/ntp/ntpdate/Makefile.depend projects/release-pkg/usr.sbin/ntp/ntpdc/Makefile.depend projects/release-pkg/usr.sbin/ntp/ntpq/Makefile.depend projects/release-pkg/usr.sbin/ntp/sntp/Makefile.depend projects/release-pkg/usr.sbin/syslogd/syslogd.8 projects/release-pkg/usr.sbin/syslogd/syslogd.c Directory Properties: projects/release-pkg/ (props changed) projects/release-pkg/contrib/gcc/ (props changed) projects/release-pkg/contrib/libcxxrt/ (props changed) projects/release-pkg/etc/ (props changed) projects/release-pkg/gnu/lib/ (props changed) projects/release-pkg/gnu/usr.bin/binutils/ (props changed) projects/release-pkg/include/ (props changed) projects/release-pkg/lib/libc/ (props changed) projects/release-pkg/lib/libutil/ (props changed) projects/release-pkg/lib/libvmmapi/ (props changed) projects/release-pkg/lib/libz/ (props changed) projects/release-pkg/sbin/ (props changed) projects/release-pkg/share/ (props changed) projects/release-pkg/share/man/man4/ (props changed) projects/release-pkg/sys/ (props changed) projects/release-pkg/sys/amd64/vmm/ (props changed) projects/release-pkg/sys/boot/ (props changed) projects/release-pkg/sys/boot/powerpc/kboot/ (props changed) projects/release-pkg/sys/boot/powerpc/ofw/ (props changed) projects/release-pkg/sys/cddl/contrib/opensolaris/ (props changed) projects/release-pkg/sys/conf/ (props changed) projects/release-pkg/sys/contrib/dev/acpica/ (props changed) projects/release-pkg/targets/ (props changed) projects/release-pkg/usr.bin/calendar/ (props changed) projects/release-pkg/usr.sbin/bhyve/ (props changed) projects/release-pkg/usr.sbin/bhyvectl/ (props changed) projects/release-pkg/usr.sbin/bhyveload/ (props changed) Modified: projects/release-pkg/Makefile ============================================================================== --- projects/release-pkg/Makefile Sat Jun 20 00:17:57 2015 (r284620) +++ projects/release-pkg/Makefile Sat Jun 20 00:58:46 2015 (r284621) @@ -442,10 +442,9 @@ universe_${target}_prologue: universe_pr universe_${target}_worlds: .if !defined(MAKE_JUST_KERNELS) +universe_${target}_done: universe_${target}_worlds .for target_arch in ${TARGET_ARCHES_${target}} -universe_${target}: universe_${target}_${target_arch} universe_${target}_worlds: universe_${target}_${target_arch} -universe_${target}_done: universe_${target}_worlds universe_${target}_${target_arch}: universe_${target}_prologue .MAKE @echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`" @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ @@ -461,7 +460,6 @@ universe_${target}_${target_arch}: unive .endif # !MAKE_JUST_KERNELS .if !defined(MAKE_JUST_WORLDS) -universe_${target}: universe_${target}_kernels universe_${target}_done: universe_${target}_kernels universe_${target}_kernels: universe_${target}_worlds universe_${target}_kernels: universe_${target}_prologue .MAKE Modified: projects/release-pkg/UPDATING ============================================================================== --- projects/release-pkg/UPDATING Sat Jun 20 00:17:57 2015 (r284620) +++ projects/release-pkg/UPDATING Sat Jun 20 00:58:46 2015 (r284621) @@ -31,6 +31,27 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150616: + /etc/make.conf now included earlier. + sys.mk now includes /etc/make.conf and {local,src}.sys.mk earlier + than previously. + This makes it simple to interpose external toolchains etc. + However it may cause problems for users who have things like:: + + INSTALL+= something + + in /etc/make.conf, since INSTALL is not yet defined. + A safe fix for that is to have:: + + INSTALL?= install + INSTALL+= something + + which is equivalent to previous behavior. + +20150616: + FreeBSD's old make (fmake) has been removed from the system. It is + available as the devel/fmake port or via pkg install fmake. + 20150615: The fix for the issue described in the 20150614 sendmail entry below has been been committed in revision 284436. The work Modified: projects/release-pkg/bin/cat/Makefile.depend ============================================================================== --- projects/release-pkg/bin/cat/Makefile.depend Sat Jun 20 00:17:57 2015 (r284620) +++ projects/release-pkg/bin/cat/Makefile.depend Sat Jun 20 00:58:46 2015 (r284621) @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ Modified: projects/release-pkg/bin/ls/Makefile.depend ============================================================================== --- projects/release-pkg/bin/ls/Makefile.depend Sat Jun 20 00:17:57 2015 (r284620) +++ projects/release-pkg/bin/ls/Makefile.depend Sat Jun 20 00:58:46 2015 (r284621) @@ -10,6 +10,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/libutil \ + lib/libxo \ lib/ncurses/ncursesw \ Modified: projects/release-pkg/bin/ls/print.c ============================================================================== --- projects/release-pkg/bin/ls/print.c Sat Jun 20 00:17:57 2015 (r284620) +++ projects/release-pkg/bin/ls/print.c Sat Jun 20 00:58:46 2015 (r284621) @@ -178,7 +178,7 @@ printlong(const DISPLAY *dp) sp = p->fts_statp; name = getname(p->fts_name); if (name) - xo_emit("{ke:name}", name); + xo_emit("{ke:name/%hs}", name); if (f_inode) xo_emit("{:inode/%*ju} ", dp->s_inode, (uintmax_t)sp->st_ino); @@ -214,7 +214,7 @@ printlong(const DISPLAY *dp) #endif if (name) { - xo_emit("{dk:name}", name); + xo_emit("{dk:name/%hs}", name); free(name); } @@ -425,7 +425,7 @@ printtime(const char *field, time_t ftim format = d_first ? "%e %b %Y" : "%b %e %Y"; strftime(longstring, sizeof(longstring), format, localtime(&ftime)); - snprintf(fmt, sizeof(fmt), "{:%s/%%s} ", field); + snprintf(fmt, sizeof(fmt), "{:%s/%%hs} ", field); xo_attr("value", "%ld", (long) ftime); xo_emit(fmt, longstring); } Modified: projects/release-pkg/contrib/gcc/longlong.h ============================================================================== --- projects/release-pkg/contrib/gcc/longlong.h Sat Jun 20 00:17:57 2015 (r284620) +++ projects/release-pkg/contrib/gcc/longlong.h Sat Jun 20 00:58:46 2015 (r284621) @@ -584,11 +584,11 @@ UDItype __umulsidi3 (USItype, USItype); #if defined (__mips__) && W_TYPE_SIZE == 32 #define umul_ppmm(w1, w0, u, v) \ - __asm__ ("multu %2,%3" \ - : "=l" ((USItype) (w0)), \ - "=h" ((USItype) (w1)) \ - : "d" ((USItype) (u)), \ - "d" ((USItype) (v))) + do { \ + UDItype __x = (UDItype) (USItype) (u) * (USItype) (v); \ + w1 = __x >> 32; \ + w0 = __x; \ + } while (0) #define UMUL_TIME 10 #define UDIV_TIME 100 #endif /* __mips__ */ Modified: projects/release-pkg/contrib/libcxxrt/FREEBSD-upgrade ============================================================================== --- projects/release-pkg/contrib/libcxxrt/FREEBSD-upgrade Sat Jun 20 00:17:57 2015 (r284620) +++ projects/release-pkg/contrib/libcxxrt/FREEBSD-upgrade Sat Jun 20 00:58:46 2015 (r284621) @@ -3,4 +3,4 @@ $FreeBSD$ This is the FreeBSD copy of libcxxrt. It contains the src directory from the upstream repository. -When updating, copy *.{c,cc,h} and typeinfo from the upstream src/. +When updating, copy *.{c,cc,h} from the upstream src/. Modified: projects/release-pkg/contrib/libcxxrt/libelftc_dem_gnu3.c ============================================================================== --- projects/release-pkg/contrib/libcxxrt/libelftc_dem_gnu3.c Sat Jun 20 00:17:57 2015 (r284620) +++ projects/release-pkg/contrib/libcxxrt/libelftc_dem_gnu3.c Sat Jun 20 00:58:46 2015 (r284621) @@ -59,7 +59,7 @@ struct vector_str { enum type_qualifier { TYPE_PTR, TYPE_REF, TYPE_CMX, TYPE_IMG, TYPE_EXT, TYPE_RST, TYPE_VAT, - TYPE_CST + TYPE_CST, TYPE_VEC }; struct vector_type_qualifier { @@ -397,6 +397,8 @@ static int cpp_demangle_read_array(struc static int cpp_demangle_read_encoding(struct cpp_demangle_data *); static int cpp_demangle_read_expr_primary(struct cpp_demangle_data *); static int cpp_demangle_read_expression(struct cpp_demangle_data *); +static int cpp_demangle_read_expression_flat(struct cpp_demangle_data *, + char **); static int cpp_demangle_read_expression_binary(struct cpp_demangle_data *, const char *, size_t); static int cpp_demangle_read_expression_unary(struct cpp_demangle_data *, @@ -408,8 +410,12 @@ static int cpp_demangle_read_function(st static int cpp_demangle_local_source_name(struct cpp_demangle_data *ddata); static int cpp_demangle_read_local_name(struct cpp_demangle_data *); static int cpp_demangle_read_name(struct cpp_demangle_data *); +static int cpp_demangle_read_name_flat(struct cpp_demangle_data *, + char**); static int cpp_demangle_read_nested_name(struct cpp_demangle_data *); static int cpp_demangle_read_number(struct cpp_demangle_data *, long *); +static int cpp_demangle_read_number_as_string(struct cpp_demangle_data *, + char **); static int cpp_demangle_read_nv_offset(struct cpp_demangle_data *); static int cpp_demangle_read_offset(struct cpp_demangle_data *); static int cpp_demangle_read_offset_number(struct cpp_demangle_data *); @@ -423,6 +429,8 @@ static int cpp_demangle_read_tmpl_arg(st static int cpp_demangle_read_tmpl_args(struct cpp_demangle_data *); static int cpp_demangle_read_tmpl_param(struct cpp_demangle_data *); static int cpp_demangle_read_type(struct cpp_demangle_data *, int); +static int cpp_demangle_read_type_flat(struct cpp_demangle_data *, + char **); static int cpp_demangle_read_uqname(struct cpp_demangle_data *); static int cpp_demangle_read_v_offset(struct cpp_demangle_data *); static char *decode_fp_to_double(const char *, size_t); @@ -601,17 +609,18 @@ cpp_demangle_push_fp(struct cpp_demangle fp = ddata->cur; while (*ddata->cur != 'E') ++ddata->cur; - ++ddata->cur; if ((f = decoder(fp, ddata->cur - fp)) == NULL) return (0); rtn = 0; if ((len = strlen(f)) > 0) - rtn = cpp_demangle_push_str(ddata, f, len); + rtn = cpp_demangle_push_str(ddata, f, len); free(f); + ++ddata->cur; + return (rtn); } @@ -695,7 +704,8 @@ cpp_demangle_push_type_qualifier(struct if (type_str != NULL) { if (!vector_str_push(&subst_v, "*", 1)) goto clean; - if (!cpp_demangle_push_subst_v(ddata, &subst_v)) + if (!cpp_demangle_push_subst_v(ddata, + &subst_v)) goto clean; } break; @@ -706,7 +716,8 @@ cpp_demangle_push_type_qualifier(struct if (type_str != NULL) { if (!vector_str_push(&subst_v, "&", 1)) goto clean; - if (!cpp_demangle_push_subst_v(ddata, &subst_v)) + if (!cpp_demangle_push_subst_v(ddata, + &subst_v)) goto clean; } break; @@ -717,7 +728,8 @@ cpp_demangle_push_type_qualifier(struct if (type_str != NULL) { if (!vector_str_push(&subst_v, " complex", 8)) goto clean; - if (!cpp_demangle_push_subst_v(ddata, &subst_v)) + if (!cpp_demangle_push_subst_v(ddata, + &subst_v)) goto clean; } break; @@ -726,23 +738,26 @@ cpp_demangle_push_type_qualifier(struct if (!cpp_demangle_push_str(ddata, " imaginary", 10)) goto clean; if (type_str != NULL) { - if (!vector_str_push(&subst_v, " imaginary", 10)) + if (!vector_str_push(&subst_v, " imaginary", + 10)) goto clean; - if (!cpp_demangle_push_subst_v(ddata, &subst_v)) + if (!cpp_demangle_push_subst_v(ddata, + &subst_v)) goto clean; } break; case TYPE_EXT: - if (e_idx > v->ext_name.size - 1) + if (v->ext_name.size == 0 || + e_idx > v->ext_name.size - 1) goto clean; - if ((e_len = strlen(v->ext_name.container[e_idx])) == 0) + if ((e_len = strlen(v->ext_name.container[e_idx])) == + 0) goto clean; - if ((buf = malloc(sizeof(char) * (e_len + 1))) == NULL) + if ((buf = malloc(e_len + 2)) == NULL) goto clean; - - memcpy(buf, " ", 1); - memcpy(buf + 1, v->ext_name.container[e_idx], e_len); + snprintf(buf, e_len + 2, " %s", + v->ext_name.container[e_idx]); if (!cpp_demangle_push_str(ddata, buf, e_len + 1)) { free(buf); @@ -755,7 +770,8 @@ cpp_demangle_push_type_qualifier(struct free(buf); goto clean; } - if (!cpp_demangle_push_subst_v(ddata, &subst_v)) { + if (!cpp_demangle_push_subst_v(ddata, + &subst_v)) { free(buf); goto clean; } @@ -770,7 +786,8 @@ cpp_demangle_push_type_qualifier(struct if (type_str != NULL) { if (!vector_str_push(&subst_v, " restrict", 9)) goto clean; - if (!cpp_demangle_push_subst_v(ddata, &subst_v)) + if (!cpp_demangle_push_subst_v(ddata, + &subst_v)) goto clean; } break; @@ -781,7 +798,8 @@ cpp_demangle_push_type_qualifier(struct if (type_str != NULL) { if (!vector_str_push(&subst_v, " volatile", 9)) goto clean; - if (!cpp_demangle_push_subst_v(ddata, &subst_v)) + if (!cpp_demangle_push_subst_v(ddata, + &subst_v)) goto clean; } break; @@ -792,11 +810,42 @@ cpp_demangle_push_type_qualifier(struct if (type_str != NULL) { if (!vector_str_push(&subst_v, " const", 6)) goto clean; - if (!cpp_demangle_push_subst_v(ddata, &subst_v)) + if (!cpp_demangle_push_subst_v(ddata, + &subst_v)) goto clean; } break; + case TYPE_VEC: + if (v->ext_name.size == 0 || + e_idx > v->ext_name.size - 1) + goto clean; + if ((e_len = strlen(v->ext_name.container[e_idx])) == + 0) + goto clean; + if ((buf = malloc(e_len + 12)) == NULL) + goto clean; + snprintf(buf, e_len + 12, " __vector(%s)", + v->ext_name.container[e_idx]); + if (!cpp_demangle_push_str(ddata, buf, e_len + 11)) { + free(buf); + goto clean; + } + if (type_str != NULL) { + if (!vector_str_push(&subst_v, buf, + e_len + 11)) { + free(buf); + goto clean; + } + if (!cpp_demangle_push_subst_v(ddata, + &subst_v)) { + free(buf); + goto clean; + } + } + free(buf); + ++e_idx; + break; }; --idx; } @@ -947,10 +996,14 @@ cpp_demangle_read_expr_primary(struct cp switch (*ddata->cur) { case 'b': + if (*(ddata->cur + 2) != 'E') + return (0); switch (*(++ddata->cur)) { case '0': + ddata->cur += 2; return (cpp_demangle_push_str(ddata, "false", 5)); case '1': + ddata->cur += 2; return (cpp_demangle_push_str(ddata, "true", 4)); default: return (0); @@ -999,7 +1052,8 @@ cpp_demangle_read_expr_primary(struct cp ++ddata->cur; } ++ddata->cur; - return (cpp_demangle_push_str(ddata, num, ddata->cur - num)); + return (cpp_demangle_push_str(ddata, num, + ddata->cur - num - 1)); default: return (0); @@ -1291,6 +1345,38 @@ cpp_demangle_read_expression(struct cpp_ } static int +cpp_demangle_read_expression_flat(struct cpp_demangle_data *ddata, char **str) +{ + struct vector_str *output; + size_t i, p_idx, idx, exp_len; + char *exp; + + output = ddata->push_head > 0 ? &ddata->output_tmp : + &ddata->output; + + p_idx = output->size; + + if (!cpp_demangle_read_expression(ddata)) + return (0); + + if ((exp = vector_str_substr(output, p_idx, output->size - 1, + &exp_len)) == NULL) + return (0); + + idx = output->size; + for (i = p_idx; i < idx; ++i) { + if (!vector_str_pop(output)) { + free(exp); + return (0); + } + } + + *str = exp; + + return (1); +} + +static int cpp_demangle_read_expression_binary(struct cpp_demangle_data *ddata, const char *name, size_t len) { @@ -1419,12 +1505,65 @@ cpp_demangle_read_function(struct cpp_de static int cpp_demangle_read_encoding(struct cpp_demangle_data *ddata) { + char *name, *type, *num_str; + long offset; + int rtn; if (ddata == NULL || *ddata->cur == '\0') return (0); /* special name */ switch (SIMPLE_HASH(*ddata->cur, *(ddata->cur + 1))) { + case SIMPLE_HASH('G', 'A'): + if (!cpp_demangle_push_str(ddata, "hidden alias for ", 17)) + return (0); + ddata->cur += 2; + if (*ddata->cur == '\0') + return (0); + return (cpp_demangle_read_encoding(ddata)); + + case SIMPLE_HASH('G', 'R'): + if (!cpp_demangle_push_str(ddata, "reference temporary #", 21)) + return (0); + ddata->cur += 2; + if (*ddata->cur == '\0') + return (0); + if (!cpp_demangle_read_name_flat(ddata, &name)) + return (0); + rtn = 0; + if (!cpp_demangle_read_number_as_string(ddata, &num_str)) + goto clean1; + if (!cpp_demangle_push_str(ddata, num_str, strlen(num_str))) + goto clean2; + if (!cpp_demangle_push_str(ddata, " for ", 5)) + goto clean2; + if (!cpp_demangle_push_str(ddata, name, strlen(name))) + goto clean2; + rtn = 1; + clean2: + free(num_str); + clean1: + free(name); + return (rtn); + + case SIMPLE_HASH('G', 'T'): + ddata->cur += 2; + if (*ddata->cur == '\0') + return (0); + switch (*ddata->cur) { + case 'n': + if (!cpp_demangle_push_str(ddata, + "non-transaction clone for ", 26)) + return (0); + case 't': + default: + if (!cpp_demangle_push_str(ddata, + "transaction clone for ", 22)) + return (0); + } + ++ddata->cur; + return (cpp_demangle_read_encoding(ddata)); + case SIMPLE_HASH('G', 'V'): /* sentry object for 1 time init */ if (!cpp_demangle_push_str(ddata, "guard variable for ", 20)) @@ -1446,14 +1585,49 @@ cpp_demangle_read_encoding(struct cpp_de return (0); return (cpp_demangle_read_encoding(ddata)); + case SIMPLE_HASH('T', 'C'): + /* construction vtable */ + if (!cpp_demangle_push_str(ddata, "construction vtable for ", + 24)) + return (0); + ddata->cur += 2; + if (*ddata->cur == '\0') + return (0); + if (!cpp_demangle_read_type_flat(ddata, &type)) + return (0); + rtn = 0; + if (!cpp_demangle_read_number(ddata, &offset)) + goto clean3; + if (*ddata->cur++ != '_') + goto clean3; + if (!cpp_demangle_read_type(ddata, 0)) + goto clean3; + if (!cpp_demangle_push_str(ddata, "-in-", 4)) + goto clean3; + if (!cpp_demangle_push_str(ddata, type, strlen(type))) + goto clean3; + rtn = 1; + clean3: + free(type); + return (rtn); + case SIMPLE_HASH('T', 'D'): /* typeinfo common proxy */ break; + case SIMPLE_HASH('T', 'F'): + /* typeinfo fn */ + if (!cpp_demangle_push_str(ddata, "typeinfo fn for ", 16)) + return (0); + ddata->cur += 2; + if (*ddata->cur == '\0') + return (0); + return (cpp_demangle_read_type(ddata, 0)); + case SIMPLE_HASH('T', 'h'): /* virtual function non-virtual override thunk */ - if (cpp_demangle_push_str(ddata, - "virtual function non-virtual override ", 38) == 0) + if (!cpp_demangle_push_str(ddata, + "virtual function non-virtual override ", 38)) return (0); ddata->cur += 2; if (*ddata->cur == '\0') @@ -1462,24 +1636,51 @@ cpp_demangle_read_encoding(struct cpp_de return (0); return (cpp_demangle_read_encoding(ddata)); + case SIMPLE_HASH('T', 'H'): + /* TLS init function */ + if (!cpp_demangle_push_str(ddata, "TLS init function for ", + 22)) + return (0); + ddata->cur += 2; + if (*ddata->cur == '\0') + return (0); + break; + case SIMPLE_HASH('T', 'I'): /* typeinfo structure */ - /* FALLTHROUGH */ + if (!cpp_demangle_push_str(ddata, "typeinfo for ", 13)) + return (0); + ddata->cur += 2; + if (*ddata->cur == '\0') + return (0); + return (cpp_demangle_read_type(ddata, 0)); + + case SIMPLE_HASH('T', 'J'): + /* java class */ + if (!cpp_demangle_push_str(ddata, "java Class for ", 15)) + return (0); + ddata->cur += 2; + if (*ddata->cur == '\0') + return (0); + return (cpp_demangle_read_type(ddata, 0)); + case SIMPLE_HASH('T', 'S'): /* RTTI name (NTBS) */ - if (!cpp_demangle_push_str(ddata, "typeinfo for ", 14)) + if (!cpp_demangle_push_str(ddata, "typeinfo name for ", 18)) return (0); ddata->cur += 2; if (*ddata->cur == '\0') return (0); - return (cpp_demangle_read_type(ddata, 1)); + return (cpp_demangle_read_type(ddata, 0)); case SIMPLE_HASH('T', 'T'): /* VTT table */ if (!cpp_demangle_push_str(ddata, "VTT for ", 8)) return (0); ddata->cur += 2; - return (cpp_demangle_read_type(ddata, 1)); + if (*ddata->cur == '\0') + return (0); + return (cpp_demangle_read_type(ddata, 0)); case SIMPLE_HASH('T', 'v'): /* virtual function virtual override thunk */ @@ -1500,7 +1701,17 @@ cpp_demangle_read_encoding(struct cpp_de ddata->cur += 2; if (*ddata->cur == '\0') return (0); - return (cpp_demangle_read_type(ddata, 1)); + return (cpp_demangle_read_type(ddata, 0)); + + case SIMPLE_HASH('T', 'W'): + /* TLS wrapper function */ + if (!cpp_demangle_push_str(ddata, "TLS wrapper function for ", + 25)) + return (0); + ddata->cur += 2; + if (*ddata->cur == '\0') + return (0); + break; }; return (cpp_demangle_read_name(ddata)); @@ -1618,6 +1829,38 @@ clean: } static int +cpp_demangle_read_name_flat(struct cpp_demangle_data *ddata, char **str) +{ + struct vector_str *output; + size_t i, p_idx, idx, name_len; + char *name; + + output = ddata->push_head > 0 ? &ddata->output_tmp : + &ddata->output; + + p_idx = output->size; + + if (!cpp_demangle_read_name(ddata)) + return (0); + + if ((name = vector_str_substr(output, p_idx, output->size - 1, + &name_len)) == NULL) + return (0); + + idx = output->size; + for (i = p_idx; i < idx; ++i) { + if (!vector_str_pop(output)) { + free(name); + return (0); + } + } + + *str = name; + + return (1); +} + +static int cpp_demangle_read_nested_name(struct cpp_demangle_data *ddata) { struct vector_str *output, v; @@ -1743,6 +1986,24 @@ cpp_demangle_read_number(struct cpp_dema } static int +cpp_demangle_read_number_as_string(struct cpp_demangle_data *ddata, char **str) +{ + long n; + + if (!cpp_demangle_read_number(ddata, &n)) { + *str = NULL; + return (0); + } + + if (asprintf(str, "%ld", n) < 0) { + *str = NULL; + return (0); + } + + return (1); +} + +static int cpp_demangle_read_nv_offset(struct cpp_demangle_data *ddata) { @@ -1877,11 +2138,11 @@ cpp_demangle_read_sname(struct cpp_deman len <= 0) return (0); - if (len == 12 && (memcmp("_GLOBAL__N_1", ddata->cur, 12) == 0)) + if (len == 12 && (memcmp("_GLOBAL__N_1", ddata->cur, 12) == 0)) err = cpp_demangle_push_str(ddata, "(anonymous namespace)", 21); else err = cpp_demangle_push_str(ddata, ddata->cur, len); - + if (err == 0) return (0); @@ -2232,7 +2493,7 @@ cpp_demangle_read_type(struct cpp_demang size_t p_idx, type_str_len; int extern_c, is_builtin; long len; - char *type_str; + char *type_str, *exp_str, *num_str; if (ddata == NULL) return (0); @@ -2274,7 +2535,7 @@ cpp_demangle_read_type(struct cpp_demang extern_c = 0; is_builtin = 1; p_idx = output->size; - type_str = NULL; + type_str = exp_str = num_str = NULL; again: /* builtin type */ switch (*ddata->cur) { @@ -2320,6 +2581,82 @@ again: ++ddata->cur; goto rtn; + case 'D': + ++ddata->cur; + switch (*ddata->cur) { + case 'd': + /* IEEE 754r decimal floating point (64 bits) */ + if (!cpp_demangle_push_str(ddata, "decimal64", 9)) + goto clean; + ++ddata->cur; + break; + case 'e': + /* IEEE 754r decimal floating point (128 bits) */ + if (!cpp_demangle_push_str(ddata, "decimal128", 10)) + goto clean; + ++ddata->cur; + break; + case 'f': + /* IEEE 754r decimal floating point (32 bits) */ + if (!cpp_demangle_push_str(ddata, "decimal32", 9)) + goto clean; + ++ddata->cur; + break; + case 'h': + /* IEEE 754r half-precision floating point (16 bits) */ + if (!cpp_demangle_push_str(ddata, "half", 4)) + goto clean; + ++ddata->cur; + break; + case 'i': + /* char32_t */ + if (!cpp_demangle_push_str(ddata, "char32_t", 8)) + goto clean; + ++ddata->cur; + break; + case 'n': + /* std::nullptr_t (i.e., decltype(nullptr)) */ + if (!cpp_demangle_push_str(ddata, "decltype(nullptr)", + 17)) + goto clean; + ++ddata->cur; + break; + case 's': + /* char16_t */ + if (!cpp_demangle_push_str(ddata, "char16_t", 8)) + goto clean; + ++ddata->cur; + break; + case 'v': + /* gcc vector_size extension. */ + ++ddata->cur; + if (*ddata->cur == '_') { + ++ddata->cur; + if (!cpp_demangle_read_expression_flat(ddata, + &exp_str)) + goto clean; + if (!vector_str_push(&v.ext_name, exp_str, + strlen(exp_str))) + goto clean; + } else { + if (!cpp_demangle_read_number_as_string(ddata, + &num_str)) + goto clean; + if (!vector_str_push(&v.ext_name, num_str, + strlen(num_str))) + goto clean; + } + if (*ddata->cur != '_') + goto clean; + ++ddata->cur; + if (!vector_type_qualifier_push(&v, TYPE_VEC)) + goto clean; + goto again; + default: + goto clean; + } + goto rtn; + case 'e': /* long double */ if (!cpp_demangle_push_str(ddata, "long double", 11)) @@ -2414,7 +2751,7 @@ again: case 'o': /* unsigned __int128 */ - if (!cpp_demangle_push_str(ddata, "unsigned _;int128", 17)) + if (!cpp_demangle_push_str(ddata, "unsigned __int128", 17)) goto clean; ++ddata->cur; goto rtn; @@ -2485,6 +2822,8 @@ again: if (!vector_str_push(&v.ext_name, ddata->cur, len)) return (0); ddata->cur += len; + if (!vector_type_qualifier_push(&v, TYPE_EXT)) + goto clean; goto again; case 'v': @@ -2549,6 +2888,8 @@ rtn: goto clean; free(type_str); + free(exp_str); + free(num_str); vector_type_qualifier_dest(&v); if (ddata->push_head > 0) { @@ -2580,11 +2921,45 @@ rtn: return (1); clean: free(type_str); + free(exp_str); + free(num_str); vector_type_qualifier_dest(&v); return (0); } +static int +cpp_demangle_read_type_flat(struct cpp_demangle_data *ddata, char **str) +{ + struct vector_str *output; + size_t i, p_idx, idx, type_len; + char *type; + + output = ddata->push_head > 0 ? &ddata->output_tmp : + &ddata->output; + + p_idx = output->size; + + if (!cpp_demangle_read_type(ddata, 0)) + return (0); + + if ((type = vector_str_substr(output, p_idx, output->size - 1, + &type_len)) == NULL) + return (0); + + idx = output->size; + for (i = p_idx; i < idx; ++i) { + if (!vector_str_pop(output)) { + free(type); + return (0); + } + } + + *str = type; + + return (1); +} + /* * read unqualified-name, unqualified name are operator-name, ctor-dtor-name, * source-name @@ -3008,39 +3383,38 @@ cpp_demangle_read_uqname(struct cpp_dema if (ELFTC_ISDIGIT(*ddata->cur) != 0) return (cpp_demangle_read_sname(ddata)); - - /* local source name */ - if (*ddata->cur == 'L') - return (cpp_demangle_local_source_name(ddata)); - - return (1); -} - -/* - * Read local source name. - * - * References: - * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31775 - * http://gcc.gnu.org/viewcvs?view=rev&revision=124467 - */ -static int -cpp_demangle_local_source_name(struct cpp_demangle_data *ddata) -{ - /* L */ - if (ddata == NULL || *ddata->cur != 'L') - return (0); - ++ddata->cur; - - /* source name */ - if (!cpp_demangle_read_sname(ddata)) - return (0); - - /* discriminator */ - if (*ddata->cur == '_') { - ++ddata->cur; - while (ELFTC_ISDIGIT(*ddata->cur) != 0) - ++ddata->cur; - } + /* local source name */ + if (*ddata->cur == 'L') + return (cpp_demangle_local_source_name(ddata)); + + return (1); +} + +/* + * Read local source name. + * + * References: + * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31775 + * http://gcc.gnu.org/viewcvs?view=rev&revision=124467 + */ +static int +cpp_demangle_local_source_name(struct cpp_demangle_data *ddata) +{ + /* L */ + if (ddata == NULL || *ddata->cur != 'L') + return (0); + ++ddata->cur; + + /* source name */ + if (!cpp_demangle_read_sname(ddata)) + return (0); + + /* discriminator */ + if (*ddata->cur == '_') { + ++ddata->cur; + while (ELFTC_ISDIGIT(*ddata->cur) != 0) + ++ddata->cur; + } return (1); } Modified: projects/release-pkg/etc/devd/usb.conf ============================================================================== --- projects/release-pkg/etc/devd/usb.conf Sat Jun 20 00:17:57 2015 (r284620) +++ projects/release-pkg/etc/devd/usb.conf Sat Jun 20 00:58:46 2015 (r284621) @@ -145,7 +145,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0403"; - match "product" "(0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x6015|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xa6d1|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbbe2|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbcda|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed73|0xed74|0xee1 8|0xeee8|0xeee9|0xeeea|0xeeeb|0xeeec|0xeeed|0xeeee|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8)"; + match "product" "(0x5259|0x6001|0x6004|0x6006|0x6006|0x6010|0x6011|0x6014|0x6015|0x8372|0x9378|0x9379|0x937a|0x937c|0x9868|0x9e90|0x9f80|0xa6d0|0xa6d1|0xabb8|0xb810|0xb811|0xb812|0xbaf8|0xbbe2|0xbca0|0xbca1|0xbca2|0xbca4|0xbcd8|0xbcd9|0xbcda|0xbdc8|0xbfd8|0xbfd9|0xbfda|0xbfdb|0xbfdc|0xc7d0|0xc850|0xc991|0xcaa0|0xcc48|0xcc49|0xcc4a|0xd010|0xd011|0xd012|0xd013|0xd014|0xd015|0xd016|0xd017|0xd070|0xd071|0xd388|0xd389|0xd38a|0xd38b|0xd38c|0xd38d|0xd38e|0xd38f|0xd578|0xd678|0xd738|0xd780|0xdaf8|0xdaf9|0xdafa|0xdafb|0xdafc|0xdafd|0xdafe|0xdaff|0xdc00|0xdc01|0xdd20|0xdf28|0xdf30|0xdf31|0xdf32|0xdf33|0xdf35|0xe000|0xe001|0xe002|0xe004|0xe006|0xe008|0xe009|0xe00a|0xe050|0xe0e8|0xe0e9|0xe0ea|0xe0eb|0xe0ec|0xe0ed|0xe0ee|0xe0ef|0xe0f0|0xe0f1|0xe0f2|0xe0f3|0xe0f4|0xe0f5|0xe0f6|0xe0f7|0xe40b|0xe520|0xe548|0xe6c8|0xe700|0xe729|0xe808|0xe809|0xe80a|0xe80b|0xe80c|0xe80d|0xe80e|0xe80f|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xe88d|0xe88e|0xe88f|0xea90|0xebe0|0xec88|0xec89|0xed22|0xed71|0xed72|0xed73|0xed7 4|0xee18|0xeee8|0xeee9|0xeeea|0xeeeb|0xeeec|0xeeed|0xeeee|0xeeef|0xef50|0xef51|0xf068|0xf069|0xf06a|0xf06b|0xf06c|0xf06d|0xf06e|0xf06f|0xf070|0xf0c0|0xf0c8|0xf208|0xf2d0|0xf3c0|0xf3c1|0xf3c2|0xf448|0xf449|0xf44a|0xf44b|0xf44c|0xf460|0xf608|0xf60b|0xf680|0xf850|0xf857|0xf9d0|0xf9d1|0xf9d2|0xf9d3|0xf9d4|0xf9d5|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfa05|0xfa06|0xfa10|0xfa33|0xfa88|0xfad0|0xfaf0|0xfb58|0xfb59|0xfb5a|0xfb5b|0xfb5c|0xfb5d|0xfb5e|0xfb5f|0xfb80|0xfb99|0xfbfa|0xfc08|0xfc09|0xfc0a|0xfc0b|0xfc0c|0xfc0d|0xfc0e|0xfc0f|0xfc60|0xfc70|0xfc71|0xfc72|0xfc73|0xfc82|0xfd60|0xfe38|0xff00|0xff18|0xff1c|0xff1d|0xff20|0xff38|0xff39|0xff3a|0xff3b|0xff3c|0xff3d|0xff3e|0xff3f|0xffa8)"; action "kldload -n uftdi"; }; @@ -281,7 +281,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0411"; - match "product" "(0x0148|0x0150|0x015d|0x016f|0x01a2|0x01ee)"; + match "product" "(0x0148|0x0150|0x015d|0x016f|0x01a2|0x01a8|0x01ee)"; action "kldload -n if_run"; }; @@ -1193,7 +1193,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x05c6"; - match "product" "(0x1000|0x6000|0x6500|0x6613|0x9000|0x9204|0x9205)"; + match "product" "(0x1000|0x6000|0x6500|0x6613|0x9000|0x9002|0x9204|0x9205)"; action "kldload -n u3g"; }; @@ -2561,7 +2561,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0bda"; - match "product" "(0x8176|0x8176|0x8177|0x8178|0x8179|0x817a|0x817b|0x817c|0x817d|0x817e|0x817f)"; + match "product" "(0x8176|0x8177|0x8178|0x8179|0x817a|0x817b|0x817c|0x817d|0x817e|0x817f)"; action "kldload -n if_urtwn"; }; @@ -2577,7 +2577,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x0bda"; - match "product" "0x818a"; + match "product" "(0x818a|0x8191)"; action "kldload -n if_urtwn"; }; @@ -2680,6 +2680,14 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x0c45"; + match "product" "0x7401"; + action "kldload -n ugold"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; match "vendor" "0x0c52"; match "product" "(0x2101|0x2102|0x2103|0x2104|0x2211|0x2212|0x2213|0x2221|0x2222|0x2223|0x2411|0x2412|0x2413|0x2421|0x2422|0x2423|0x2431|0x2432|0x2433|0x2441|0x2442|0x2443|0x2811|0x2812|0x2813|0x2821|0x2822|0x2823|0x2831|0x2832|0x2833|0x2841|0x2842|0x2843|0x2851|0x2852|0x2853|0x2861|0x2862|0x2863|0x2871|0x2872|0x2873|0x2881|0x2882|0x2883|0x9020)"; action "kldload -n uftdi"; @@ -3521,7 +3529,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x1199"; - match "product" "(0x6802|0x6803|0x6804|0x6805|0x6808|0x6809|0x6812|0x6813|0x6815|0x6816|0x6820|0x6821|0x6822|0x6832|0x6833|0x6834|0x6835|0x6838|0x6839|0x683a|0x683b|0x683c|0x683d|0x683e|0x6850|0x6851|0x6852|0x6853|0x6855|0x6856|0x6859|0x685a|0x6880|0x6890|0x6891|0x6892|0x6893|0x68a3)"; + match "product" "(0x6802|0x6803|0x6804|0x6805|0x6808|0x6809|0x6812|0x6813|0x6815|0x6816|0x6820|0x6820|0x6821|0x6822|0x6832|0x6833|0x6834|0x6835|0x6838|0x6839|0x683a|0x683b|0x683c|0x683d|0x683e|0x6850|0x6851|0x6852|0x6853|0x6855|0x6856|0x6859|0x685a|0x6880|0x6890|0x6891|0x6892|0x6893|0x68a3)"; action "kldload -n u3g"; }; @@ -4424,6 +4432,22 @@ nomatch 32 { nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; + match "vendor" "0x17e9"; + match "product" "(0x0059|0x0100|0x0117|0x0136|0x0138|0x0141|0x015a|0x0198|0x019b|0x01ba|0x01bb|0x01d4|0x01d7|0x01e2|0x0215|0x024c|0x02a9|0x0377|0x03e0|0x401a)"; + action "kldload -n udl"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; + match "vendor" "0x17ef"; + match "product" "0x304b"; + action "kldload -n if_axge"; +}; + +nomatch 32 { + match "bus" "uhub[0-9]+"; + match "mode" "host"; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506200058.t5K0wmJf072353>