Date: Thu, 22 Dec 2016 15:19:32 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r310415 - in projects/ipsec: . bin/dd bin/df bin/ed bin/ls/tests bin/pax cddl/contrib/opensolaris/lib/libdtrace/common cddl/usr.sbin/dtrace/tests/tools contrib/binutils/bfd contrib/bmak... Message-ID: <201612221519.uBMFJW0Z098170@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Thu Dec 22 15:19:31 2016 New Revision: 310415 URL: https://svnweb.freebsd.org/changeset/base/310415 Log: Merge from head/. Added: projects/ipsec/contrib/bmake/mk/sys.debug.mk - copied unchanged from r310413, head/contrib/bmake/mk/sys.debug.mk projects/ipsec/contrib/bmake/mk/sys.vars.mk - copied unchanged from r310413, head/contrib/bmake/mk/sys.vars.mk projects/ipsec/contrib/compiler-rt/lib/builtins/unwind-ehabi-helpers.h - copied unchanged from r310413, head/contrib/compiler-rt/lib/builtins/unwind-ehabi-helpers.h projects/ipsec/contrib/libarchive/libarchive/archive_openssl_evp_private.h - copied unchanged from r310413, head/contrib/libarchive/libarchive/archive_openssl_evp_private.h projects/ipsec/contrib/libarchive/libarchive/archive_openssl_hmac_private.h - copied unchanged from r310413, head/contrib/libarchive/libarchive/archive_openssl_hmac_private.h projects/ipsec/contrib/llvm/tools/clang/lib/Headers/msa.h - copied unchanged from r310413, head/contrib/llvm/tools/clang/lib/Headers/msa.h projects/ipsec/share/colldef/fr_CA.UTF-8.src - copied unchanged from r310413, head/share/colldef/fr_CA.UTF-8.src projects/ipsec/share/colldef/ja_JP.eucJP.src - copied unchanged from r310413, head/share/colldef/ja_JP.eucJP.src projects/ipsec/share/colldef/nn_NO.ISO8859-1.src - copied unchanged from r310413, head/share/colldef/nn_NO.ISO8859-1.src projects/ipsec/share/colldef/nn_NO.ISO8859-15.src - copied unchanged from r310413, head/share/colldef/nn_NO.ISO8859-15.src projects/ipsec/share/colldef/nn_NO.UTF-8.src - copied unchanged from r310413, head/share/colldef/nn_NO.UTF-8.src projects/ipsec/share/colldef/sr_RS.ISO8859-2.src - copied unchanged from r310413, head/share/colldef/sr_RS.ISO8859-2.src projects/ipsec/share/colldef/sr_RS.ISO8859-5.src - copied unchanged from r310413, head/share/colldef/sr_RS.ISO8859-5.src projects/ipsec/share/colldef/sr_RS.UTF-8.src - copied unchanged from r310413, head/share/colldef/sr_RS.UTF-8.src projects/ipsec/share/colldef/sr_RS.UTF-8@latin.src - copied unchanged from r310413, head/share/colldef/sr_RS.UTF-8@latin.src projects/ipsec/share/colldef/zh_CN.GB18030.src - copied unchanged from r310413, head/share/colldef/zh_CN.GB18030.src projects/ipsec/share/colldef/zh_CN.GBK.src - copied unchanged from r310413, head/share/colldef/zh_CN.GBK.src projects/ipsec/share/colldef/zh_TW.Big5.src - copied unchanged from r310413, head/share/colldef/zh_TW.Big5.src projects/ipsec/share/ctypedef/ja_JP.eucJP.src - copied unchanged from r310413, head/share/ctypedef/ja_JP.eucJP.src projects/ipsec/share/ctypedef/zh_CN.eucCN.src - copied unchanged from r310413, head/share/ctypedef/zh_CN.eucCN.src projects/ipsec/share/man/man4/xdma.4 - copied unchanged from r310413, head/share/man/man4/xdma.4 projects/ipsec/share/monetdef/nl_BE.UTF-8.src - copied unchanged from r310413, head/share/monetdef/nl_BE.UTF-8.src projects/ipsec/sys/arm/rockchip/rk30xx_mp.h - copied unchanged from r310413, head/sys/arm/rockchip/rk30xx_mp.h projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_data_sprom_subr.c - copied unchanged from r310413, head/sys/dev/bhnd/nvram/bhnd_nvram_data_sprom_subr.c projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_ioptr.c - copied unchanged from r310413, head/sys/dev/bhnd/nvram/bhnd_nvram_ioptr.c projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_plist.c - copied unchanged from r310413, head/sys/dev/bhnd/nvram/bhnd_nvram_plist.c projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_plist.h - copied unchanged from r310413, head/sys/dev/bhnd/nvram/bhnd_nvram_plist.h projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_plistvar.h - copied unchanged from r310413, head/sys/dev/bhnd/nvram/bhnd_nvram_plistvar.h projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_store_subr.c - copied unchanged from r310413, head/sys/dev/bhnd/nvram/bhnd_nvram_store_subr.c projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_value_subr.c - copied unchanged from r310413, head/sys/dev/bhnd/nvram/bhnd_nvram_value_subr.c projects/ipsec/sys/dev/hdmi/ - copied from r310413, head/sys/dev/hdmi/ projects/ipsec/sys/dev/hyperv/utilities/vmbus_heartbeat.c - copied unchanged from r310413, head/sys/dev/hyperv/utilities/vmbus_heartbeat.c projects/ipsec/sys/dev/hyperv/utilities/vmbus_ic.c - copied unchanged from r310413, head/sys/dev/hyperv/utilities/vmbus_ic.c projects/ipsec/sys/dev/hyperv/utilities/vmbus_icvar.h - copied unchanged from r310413, head/sys/dev/hyperv/utilities/vmbus_icvar.h projects/ipsec/sys/dev/hyperv/utilities/vmbus_shutdown.c - copied unchanged from r310413, head/sys/dev/hyperv/utilities/vmbus_shutdown.c projects/ipsec/sys/dev/hyperv/utilities/vmbus_timesync.c - copied unchanged from r310413, head/sys/dev/hyperv/utilities/vmbus_timesync.c projects/ipsec/sys/dev/xdma/ - copied from r310413, head/sys/dev/xdma/ projects/ipsec/sys/mips/ingenic/jz4780_aic.c - copied unchanged from r310413, head/sys/mips/ingenic/jz4780_aic.c projects/ipsec/sys/mips/ingenic/jz4780_lcd.c - copied unchanged from r310413, head/sys/mips/ingenic/jz4780_lcd.c projects/ipsec/sys/mips/ingenic/jz4780_lcd.h - copied unchanged from r310413, head/sys/mips/ingenic/jz4780_lcd.h projects/ipsec/sys/mips/ingenic/jz4780_pdma.c - copied unchanged from r310413, head/sys/mips/ingenic/jz4780_pdma.c projects/ipsec/sys/mips/ingenic/jz4780_smb.c - copied unchanged from r310413, head/sys/mips/ingenic/jz4780_smb.c projects/ipsec/sys/mips/ingenic/jz4780_smb.h - copied unchanged from r310413, head/sys/mips/ingenic/jz4780_smb.h projects/ipsec/sys/netinet6/ip6_fastfwd.c - copied unchanged from r310413, head/sys/netinet6/ip6_fastfwd.c projects/ipsec/tests/sys/kern/reaper.c - copied unchanged from r310413, head/tests/sys/kern/reaper.c projects/ipsec/tests/sys/vfs/lookup_cap_dotdot.c - copied unchanged from r310413, head/tests/sys/vfs/lookup_cap_dotdot.c projects/ipsec/tools/build/options/WITH_REPRODUCIBLE_BUILD - copied unchanged from r310413, head/tools/build/options/WITH_REPRODUCIBLE_BUILD projects/ipsec/tools/tools/locale/etc/final-maps/map.CP949 - copied unchanged from r310413, head/tools/tools/locale/etc/final-maps/map.CP949 projects/ipsec/usr.sbin/prometheus_sysctl_exporter/ - copied from r310413, head/usr.sbin/prometheus_sysctl_exporter/ Deleted: projects/ipsec/share/colldef/hr_HR.UTF-8.src projects/ipsec/share/colldef/nb_NO.UTF-8.src projects/ipsec/share/ctypedef/ja_JP.SJIS.src projects/ipsec/share/ctypedef/zh_CN.GB18030.src projects/ipsec/share/monetdef/be_BY.CP1251.src projects/ipsec/share/monetdef/lv_LV.ISO8859-13.src projects/ipsec/share/monetdef/lv_LV.UTF-8.src projects/ipsec/share/monetdef/ru_RU.CP1251.src projects/ipsec/share/msgdef/he_IL.UTF-8.src projects/ipsec/share/numericdef/hy_AM.UTF-8.src projects/ipsec/sys/arm/arm/hdmi_if.m projects/ipsec/sys/arm/freescale/imx/imx6_hdmireg.h projects/ipsec/sys/dev/hyperv/utilities/hv_heartbeat.c projects/ipsec/sys/dev/hyperv/utilities/hv_shutdown.c projects/ipsec/sys/dev/hyperv/utilities/hv_timesync.c projects/ipsec/sys/dev/hyperv/utilities/hv_util.c projects/ipsec/sys/dev/hyperv/utilities/hv_util.h Modified: projects/ipsec/Makefile.inc1 projects/ipsec/ObsoleteFiles.inc projects/ipsec/UPDATING projects/ipsec/bin/dd/dd.c projects/ipsec/bin/df/Makefile projects/ipsec/bin/df/df.c projects/ipsec/bin/ed/buf.c projects/ipsec/bin/ed/ed.h projects/ipsec/bin/ed/glbl.c projects/ipsec/bin/ed/main.c projects/ipsec/bin/ls/tests/ls_tests.sh projects/ipsec/bin/pax/buf_subs.c projects/ipsec/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c projects/ipsec/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/ipsec/cddl/usr.sbin/dtrace/tests/tools/exclude.sh projects/ipsec/contrib/binutils/bfd/elf.c projects/ipsec/contrib/binutils/bfd/elflink.c projects/ipsec/contrib/bmake/ChangeLog projects/ipsec/contrib/bmake/Makefile projects/ipsec/contrib/bmake/bmake.1 projects/ipsec/contrib/bmake/bmake.cat1 projects/ipsec/contrib/bmake/compat.c projects/ipsec/contrib/bmake/job.c projects/ipsec/contrib/bmake/main.c projects/ipsec/contrib/bmake/make.1 projects/ipsec/contrib/bmake/make.c projects/ipsec/contrib/bmake/make.h projects/ipsec/contrib/bmake/mk/ChangeLog projects/ipsec/contrib/bmake/mk/FILES projects/ipsec/contrib/bmake/mk/dirdeps.mk projects/ipsec/contrib/bmake/mk/gendirdeps.mk projects/ipsec/contrib/bmake/mk/install-mk projects/ipsec/contrib/bmake/mk/lib.mk projects/ipsec/contrib/bmake/mk/meta.stage.mk projects/ipsec/contrib/bmake/mk/meta.sys.mk projects/ipsec/contrib/bmake/mk/meta2deps.py projects/ipsec/contrib/bmake/mk/meta2deps.sh projects/ipsec/contrib/bmake/mk/sys.mk projects/ipsec/contrib/bmake/nonints.h projects/ipsec/contrib/bmake/parse.c projects/ipsec/contrib/bsnmp/lib/snmpclient.c projects/ipsec/contrib/byacc/CHANGES projects/ipsec/contrib/byacc/MANIFEST projects/ipsec/contrib/byacc/VERSION projects/ipsec/contrib/byacc/aclocal.m4 projects/ipsec/contrib/byacc/btyaccpar.c projects/ipsec/contrib/byacc/btyaccpar.skel projects/ipsec/contrib/byacc/config.guess projects/ipsec/contrib/byacc/config.sub projects/ipsec/contrib/byacc/configure projects/ipsec/contrib/byacc/defs.h projects/ipsec/contrib/byacc/error.c projects/ipsec/contrib/byacc/main.c projects/ipsec/contrib/byacc/mstring.c projects/ipsec/contrib/byacc/output.c projects/ipsec/contrib/byacc/package/byacc.spec projects/ipsec/contrib/byacc/package/debian/changelog projects/ipsec/contrib/byacc/package/mingw-byacc.spec projects/ipsec/contrib/byacc/package/pkgsrc/Makefile projects/ipsec/contrib/byacc/reader.c projects/ipsec/contrib/byacc/test/btyacc/btyacc_calc1.tab.c projects/ipsec/contrib/byacc/test/btyacc/btyacc_demo.tab.c projects/ipsec/contrib/byacc/test/btyacc/btyacc_demo.tab.h projects/ipsec/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c projects/ipsec/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c projects/ipsec/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c projects/ipsec/contrib/byacc/test/btyacc/calc.tab.c projects/ipsec/contrib/byacc/test/btyacc/calc1.tab.c projects/ipsec/contrib/byacc/test/btyacc/calc2.tab.c projects/ipsec/contrib/byacc/test/btyacc/calc3.tab.c projects/ipsec/contrib/byacc/test/btyacc/code_calc.code.c projects/ipsec/contrib/byacc/test/btyacc/code_calc.tab.c projects/ipsec/contrib/byacc/test/btyacc/code_error.code.c projects/ipsec/contrib/byacc/test/btyacc/code_error.tab.c projects/ipsec/contrib/byacc/test/btyacc/empty.tab.c projects/ipsec/contrib/byacc/test/btyacc/err_inherit3.tab.c projects/ipsec/contrib/byacc/test/btyacc/err_inherit4.tab.c projects/ipsec/contrib/byacc/test/btyacc/err_inherit4.tab.h projects/ipsec/contrib/byacc/test/btyacc/err_syntax10.tab.c projects/ipsec/contrib/byacc/test/btyacc/err_syntax11.tab.c projects/ipsec/contrib/byacc/test/btyacc/err_syntax12.tab.c projects/ipsec/contrib/byacc/test/btyacc/err_syntax18.tab.c projects/ipsec/contrib/byacc/test/btyacc/err_syntax20.tab.c projects/ipsec/contrib/byacc/test/btyacc/error.tab.c projects/ipsec/contrib/byacc/test/btyacc/grammar.tab.c projects/ipsec/contrib/byacc/test/btyacc/inherit0.tab.c projects/ipsec/contrib/byacc/test/btyacc/inherit1.tab.c projects/ipsec/contrib/byacc/test/btyacc/inherit2.tab.c projects/ipsec/contrib/byacc/test/btyacc/ok_syntax1.tab.c projects/ipsec/contrib/byacc/test/btyacc/pure_calc.tab.c projects/ipsec/contrib/byacc/test/btyacc/pure_error.tab.c projects/ipsec/contrib/byacc/test/btyacc/quote_calc-s.tab.c projects/ipsec/contrib/byacc/test/btyacc/quote_calc.tab.c projects/ipsec/contrib/byacc/test/btyacc/quote_calc2-s.tab.c projects/ipsec/contrib/byacc/test/btyacc/quote_calc2.tab.c projects/ipsec/contrib/byacc/test/btyacc/quote_calc3-s.tab.c projects/ipsec/contrib/byacc/test/btyacc/quote_calc3.tab.c projects/ipsec/contrib/byacc/test/btyacc/quote_calc4-s.tab.c projects/ipsec/contrib/byacc/test/btyacc/quote_calc4.tab.c projects/ipsec/contrib/byacc/test/btyacc/rename_debug.c projects/ipsec/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c projects/ipsec/contrib/byacc/yaccpar.c projects/ipsec/contrib/byacc/yaccpar.skel projects/ipsec/contrib/compiler-rt/lib/builtins/gcc_personality_v0.c projects/ipsec/contrib/dma/dma-mbox-create.c projects/ipsec/contrib/elftoolchain/libelf/gelf_phdr.c projects/ipsec/contrib/elftoolchain/libelf/libelf_ehdr.c projects/ipsec/contrib/libarchive/cat/bsdcat.c projects/ipsec/contrib/libarchive/cpio/cpio.c projects/ipsec/contrib/libarchive/cpio/test/test_option_J_upper.c projects/ipsec/contrib/libarchive/cpio/test/test_option_Z_upper.c projects/ipsec/contrib/libarchive/cpio/test/test_option_lz4.c projects/ipsec/contrib/libarchive/cpio/test/test_option_u.c projects/ipsec/contrib/libarchive/cpio/test/test_option_y.c projects/ipsec/contrib/libarchive/libarchive/archive.h projects/ipsec/contrib/libarchive/libarchive/archive_acl.c projects/ipsec/contrib/libarchive/libarchive/archive_cryptor.c projects/ipsec/contrib/libarchive/libarchive/archive_cryptor_private.h projects/ipsec/contrib/libarchive/libarchive/archive_digest.c projects/ipsec/contrib/libarchive/libarchive/archive_digest_private.h projects/ipsec/contrib/libarchive/libarchive/archive_entry.c projects/ipsec/contrib/libarchive/libarchive/archive_hmac.c projects/ipsec/contrib/libarchive/libarchive/archive_hmac_private.h projects/ipsec/contrib/libarchive/libarchive/archive_options.c projects/ipsec/contrib/libarchive/libarchive/archive_read.c projects/ipsec/contrib/libarchive/libarchive/archive_read_append_filter.c projects/ipsec/contrib/libarchive/libarchive/archive_read_disk_posix.c projects/ipsec/contrib/libarchive/libarchive/archive_read_extract2.c projects/ipsec/contrib/libarchive/libarchive/archive_read_open_memory.c projects/ipsec/contrib/libarchive/libarchive/archive_read_private.h projects/ipsec/contrib/libarchive/libarchive/archive_read_support_filter_uu.c projects/ipsec/contrib/libarchive/libarchive/archive_read_support_format_7zip.c projects/ipsec/contrib/libarchive/libarchive/archive_read_support_format_ar.c projects/ipsec/contrib/libarchive/libarchive/archive_read_support_format_cpio.c projects/ipsec/contrib/libarchive/libarchive/archive_read_support_format_mtree.c projects/ipsec/contrib/libarchive/libarchive/archive_read_support_format_rar.c projects/ipsec/contrib/libarchive/libarchive/archive_read_support_format_tar.c projects/ipsec/contrib/libarchive/libarchive/archive_read_support_format_warc.c projects/ipsec/contrib/libarchive/libarchive/archive_string.c projects/ipsec/contrib/libarchive/libarchive/archive_write.c projects/ipsec/contrib/libarchive/libarchive/archive_write_add_filter_lz4.c projects/ipsec/contrib/libarchive/libarchive/archive_write_disk_posix.c projects/ipsec/contrib/libarchive/libarchive/archive_write_disk_set_standard_lookup.c projects/ipsec/contrib/libarchive/libarchive/archive_write_open_memory.c projects/ipsec/contrib/libarchive/libarchive/archive_write_set_format_ar.c projects/ipsec/contrib/libarchive/libarchive/archive_write_set_format_cpio_newc.c projects/ipsec/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c projects/ipsec/contrib/libarchive/libarchive/archive_write_set_format_pax.c projects/ipsec/contrib/libarchive/libarchive/archive_write_set_format_shar.c projects/ipsec/contrib/libarchive/libarchive/archive_write_set_format_ustar.c projects/ipsec/contrib/libarchive/libarchive/archive_write_set_format_v7tar.c projects/ipsec/contrib/libarchive/libarchive/archive_write_set_format_xar.c projects/ipsec/contrib/libarchive/libarchive/test/read_open_memory.c projects/ipsec/contrib/libarchive/libarchive/test/test_archive_read_add_passphrase.c projects/ipsec/contrib/libarchive/libarchive/test/test_fuzz.c projects/ipsec/contrib/libarchive/libarchive/test/test_pax_filename_encoding.c projects/ipsec/contrib/libarchive/libarchive/test/test_read_disk_directory_traversals.c projects/ipsec/contrib/libarchive/libarchive/test/test_read_set_format.c projects/ipsec/contrib/libarchive/tar/test/main.c projects/ipsec/contrib/libarchive/tar/test/test_leading_slash.c projects/ipsec/contrib/libarchive/tar/test/test_option_a.c projects/ipsec/contrib/libarchive/tar/test/test_option_b.c projects/ipsec/contrib/libarchive/tar/test/test_option_b64encode.c projects/ipsec/contrib/libarchive/tar/test/test_option_gid_gname.c projects/ipsec/contrib/libarchive/tar/test/test_option_grzip.c projects/ipsec/contrib/libarchive/tar/test/test_option_j.c projects/ipsec/contrib/libarchive/tar/test/test_option_lrzip.c projects/ipsec/contrib/libarchive/tar/test/test_option_lz4.c projects/ipsec/contrib/libarchive/tar/test/test_option_lzma.c projects/ipsec/contrib/libarchive/tar/test/test_option_lzop.c projects/ipsec/contrib/libarchive/tar/test/test_option_r.c projects/ipsec/contrib/libarchive/tar/test/test_option_uid_uname.c projects/ipsec/contrib/libarchive/tar/test/test_option_uuencode.c projects/ipsec/contrib/libarchive/tar/test/test_option_xz.c projects/ipsec/contrib/libarchive/tar/test/test_option_z.c projects/ipsec/contrib/libarchive/tar/test/test_stdio.c projects/ipsec/contrib/libarchive/tar/test/test_version.c projects/ipsec/contrib/libc++/include/tuple projects/ipsec/contrib/llvm/include/llvm/Analysis/LoopAccessAnalysis.h projects/ipsec/contrib/llvm/include/llvm/ExecutionEngine/RTDyldMemoryManager.h projects/ipsec/contrib/llvm/include/llvm/IR/Intrinsics.td projects/ipsec/contrib/llvm/include/llvm/IR/TypeFinder.h projects/ipsec/contrib/llvm/include/llvm/Support/Threading.h projects/ipsec/contrib/llvm/lib/Analysis/LoopAccessAnalysis.cpp projects/ipsec/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.h projects/ipsec/contrib/llvm/lib/CodeGen/BranchFolding.cpp projects/ipsec/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp projects/ipsec/contrib/llvm/lib/Linker/IRMover.cpp projects/ipsec/contrib/llvm/lib/Support/Unix/Signals.inc projects/ipsec/contrib/llvm/lib/Target/AArch64/AArch64ExpandPseudoInsts.cpp projects/ipsec/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp projects/ipsec/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp projects/ipsec/contrib/llvm/lib/Target/AMDGPU/SIInstructions.td projects/ipsec/contrib/llvm/lib/Target/AMDGPU/SIWholeQuadMode.cpp projects/ipsec/contrib/llvm/lib/Target/ARM/ARMExpandPseudoInsts.cpp projects/ipsec/contrib/llvm/lib/Target/ARM/ARMInstrThumb2.td projects/ipsec/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp projects/ipsec/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp projects/ipsec/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h projects/ipsec/contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td projects/ipsec/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td projects/ipsec/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/ipsec/contrib/llvm/lib/Target/X86/X86InstrAVX512.td projects/ipsec/contrib/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp projects/ipsec/contrib/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp projects/ipsec/contrib/llvm/lib/Transforms/Scalar/JumpThreading.cpp projects/ipsec/contrib/llvm/lib/Transforms/Utils/SimplifyCFG.cpp projects/ipsec/contrib/llvm/projects/libunwind/src/UnwindLevel1-gcc-ext.c projects/ipsec/contrib/llvm/tools/clang/include/clang/AST/DeclTemplate.h projects/ipsec/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticDriverKinds.td projects/ipsec/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td projects/ipsec/contrib/llvm/tools/clang/include/clang/Sema/Sema.h projects/ipsec/contrib/llvm/tools/clang/lib/Basic/Targets.cpp projects/ipsec/contrib/llvm/tools/clang/lib/Basic/Version.cpp projects/ipsec/contrib/llvm/tools/clang/lib/CodeGen/CGExpr.cpp projects/ipsec/contrib/llvm/tools/clang/lib/CodeGen/CGStmt.cpp projects/ipsec/contrib/llvm/tools/clang/lib/CodeGen/CGStmtOpenMP.cpp projects/ipsec/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.cpp projects/ipsec/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.h projects/ipsec/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp projects/ipsec/contrib/llvm/tools/clang/lib/Driver/Tools.cpp projects/ipsec/contrib/llvm/tools/clang/lib/Sema/Sema.cpp projects/ipsec/contrib/llvm/tools/clang/lib/Sema/SemaCXXScopeSpec.cpp projects/ipsec/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp projects/ipsec/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp projects/ipsec/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp projects/ipsec/contrib/llvm/tools/clang/lib/Sema/SemaExprCXX.cpp projects/ipsec/contrib/llvm/tools/clang/lib/Sema/SemaLambda.cpp projects/ipsec/contrib/llvm/tools/clang/lib/Sema/SemaOpenMP.cpp projects/ipsec/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp projects/ipsec/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiate.cpp projects/ipsec/contrib/llvm/tools/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp projects/ipsec/contrib/llvm/tools/clang/lib/Serialization/ASTReaderDecl.cpp projects/ipsec/contrib/llvm/tools/lld/COFF/CMakeLists.txt projects/ipsec/contrib/llvm/tools/lld/ELF/InputFiles.cpp projects/ipsec/contrib/llvm/tools/lldb/include/lldb/Core/ArchSpec.h projects/ipsec/contrib/llvm/tools/lldb/source/Core/ArchSpec.cpp projects/ipsec/contrib/llvm/tools/lldb/source/Core/RegisterValue.cpp projects/ipsec/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.cpp projects/ipsec/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfos_mips.h projects/ipsec/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterInfos_mips64.h projects/ipsec/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/lldb-mips-linux-register-enums.h projects/ipsec/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp projects/ipsec/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerCommon.cpp projects/ipsec/contrib/netbsd-tests/lib/libc/sys/t_mincore.c projects/ipsec/etc/inetd.conf projects/ipsec/etc/mtree/BSD.debug.dist projects/ipsec/etc/mtree/BSD.usr.dist projects/ipsec/etc/services projects/ipsec/include/Makefile projects/ipsec/lib/clang/freebsd_cc_version.h projects/ipsec/lib/clang/headers/Makefile projects/ipsec/lib/clang/include/clang/Basic/Version.inc projects/ipsec/lib/clang/include/clang/Config/config.h projects/ipsec/lib/clang/include/llvm/Config/config.h projects/ipsec/lib/clang/include/llvm/Config/llvm-config.h projects/ipsec/lib/libc/stdio/vfprintf.c projects/ipsec/lib/libc/x86/sys/__vdso_gettc.c projects/ipsec/lib/libcapsicum/capsicum_helpers.h projects/ipsec/lib/libclang_rt/Makefile.inc projects/ipsec/lib/libcompiler_rt/Makefile projects/ipsec/lib/libelftc/Makefile projects/ipsec/lib/libkvm/kvm_private.c projects/ipsec/libexec/rtld-elf/rtld.c projects/ipsec/release/scripts/make-pkg-package.sh projects/ipsec/release/tools/openstack.conf projects/ipsec/sbin/camcontrol/timestamp.c projects/ipsec/sbin/decryptcore/decryptcore.8 projects/ipsec/sbin/ifconfig/ifieee80211.c projects/ipsec/sbin/mount/getmntopts.c projects/ipsec/sbin/mount/mntopts.h projects/ipsec/sbin/tunefs/Makefile projects/ipsec/sbin/tunefs/tunefs.c projects/ipsec/share/colldef/Makefile projects/ipsec/share/colldef/af_ZA.UTF-8.src projects/ipsec/share/colldef/am_ET.UTF-8.src projects/ipsec/share/colldef/ar_SA.UTF-8.src projects/ipsec/share/colldef/be_BY.UTF-8.src projects/ipsec/share/colldef/ca_AD.UTF-8.src projects/ipsec/share/colldef/cs_CZ.ISO8859-2.src projects/ipsec/share/colldef/cs_CZ.UTF-8.src projects/ipsec/share/colldef/da_DK.ISO8859-1.src projects/ipsec/share/colldef/da_DK.ISO8859-15.src projects/ipsec/share/colldef/da_DK.UTF-8.src projects/ipsec/share/colldef/el_GR.UTF-8.src projects/ipsec/share/colldef/en_US.UTF-8.src projects/ipsec/share/colldef/es_MX.UTF-8.src projects/ipsec/share/colldef/et_EE.UTF-8.src projects/ipsec/share/colldef/fi_FI.UTF-8.src projects/ipsec/share/colldef/he_IL.UTF-8.src projects/ipsec/share/colldef/hi_IN.UTF-8.src projects/ipsec/share/colldef/hr_HR.ISO8859-2.src projects/ipsec/share/colldef/hu_HU.ISO8859-2.src projects/ipsec/share/colldef/hu_HU.UTF-8.src projects/ipsec/share/colldef/hy_AM.UTF-8.src projects/ipsec/share/colldef/is_IS.UTF-8.src projects/ipsec/share/colldef/ja_JP.UTF-8.src projects/ipsec/share/colldef/kk_KZ.UTF-8.src projects/ipsec/share/colldef/ko_KR.UTF-8.src projects/ipsec/share/colldef/lt_LT.UTF-8.src projects/ipsec/share/colldef/lv_LV.UTF-8.src projects/ipsec/share/colldef/nb_NO.ISO8859-1.src projects/ipsec/share/colldef/nb_NO.ISO8859-15.src projects/ipsec/share/colldef/pl_PL.UTF-8.src projects/ipsec/share/colldef/ro_RO.UTF-8.src projects/ipsec/share/colldef/ru_RU.UTF-8.src projects/ipsec/share/colldef/se_NO.UTF-8.src projects/ipsec/share/colldef/sk_SK.ISO8859-2.src projects/ipsec/share/colldef/sk_SK.UTF-8.src projects/ipsec/share/colldef/sl_SI.UTF-8.src projects/ipsec/share/colldef/sv_SE.UTF-8.src projects/ipsec/share/colldef/tr_TR.UTF-8.src projects/ipsec/share/colldef/uk_UA.UTF-8.src projects/ipsec/share/colldef/zh_CN.GB2312.src projects/ipsec/share/colldef/zh_CN.UTF-8.src projects/ipsec/share/colldef/zh_CN.eucCN.src projects/ipsec/share/colldef/zh_TW.UTF-8.src projects/ipsec/share/ctypedef/Makefile projects/ipsec/share/ctypedef/be_BY.CP1131.src projects/ipsec/share/ctypedef/ca_IT.ISO8859-1.src projects/ipsec/share/ctypedef/en_US.ISO8859-1.src projects/ipsec/share/ctypedef/en_US.UTF-8.src projects/ipsec/share/ctypedef/hi_IN.ISCII-DEV.src projects/ipsec/share/ctypedef/uk_UA.CP1251.src projects/ipsec/share/man/man4/isp.4 projects/ipsec/share/man/man5/src.conf.5 projects/ipsec/share/man/man9/Makefile projects/ipsec/share/man/man9/sysctl.9 projects/ipsec/share/man/man9/sysctl_add_oid.9 projects/ipsec/share/misc/committers-ports.dot projects/ipsec/share/misc/organization.dot projects/ipsec/share/mk/bsd.own.mk projects/ipsec/share/mk/src.opts.mk projects/ipsec/share/monetdef/Makefile projects/ipsec/share/monetdef/ar_AE.UTF-8.src projects/ipsec/share/monetdef/ar_EG.UTF-8.src projects/ipsec/share/monetdef/ar_JO.UTF-8.src projects/ipsec/share/monetdef/ar_QA.UTF-8.src projects/ipsec/share/monetdef/ar_SA.UTF-8.src projects/ipsec/share/monetdef/be_BY.CP1131.src projects/ipsec/share/monetdef/be_BY.ISO8859-5.src projects/ipsec/share/monetdef/be_BY.UTF-8.src projects/ipsec/share/monetdef/bg_BG.CP1251.src projects/ipsec/share/monetdef/bg_BG.UTF-8.src projects/ipsec/share/monetdef/es_AR.UTF-8.src projects/ipsec/share/monetdef/es_CR.UTF-8.src projects/ipsec/share/monetdef/hu_HU.ISO8859-2.src projects/ipsec/share/monetdef/hu_HU.UTF-8.src projects/ipsec/share/monetdef/hy_AM.ARMSCII-8.src projects/ipsec/share/monetdef/hy_AM.UTF-8.src projects/ipsec/share/monetdef/ru_RU.CP866.src projects/ipsec/share/monetdef/ru_RU.ISO8859-5.src projects/ipsec/share/monetdef/ru_RU.KOI8-R.src projects/ipsec/share/monetdef/ru_RU.UTF-8.src projects/ipsec/share/monetdef/sl_SI.UTF-8.src projects/ipsec/share/monetdef/tr_TR.ISO8859-9.src projects/ipsec/share/monetdef/tr_TR.UTF-8.src projects/ipsec/share/monetdef/zh_CN.GB2312.src projects/ipsec/share/monetdef/zh_CN.GBK.src projects/ipsec/share/monetdef/zh_CN.UTF-8.src projects/ipsec/share/monetdef/zh_CN.eucCN.src projects/ipsec/share/monetdef/zh_TW.Big5.src projects/ipsec/share/monetdef/zh_TW.UTF-8.src projects/ipsec/share/msgdef/Makefile projects/ipsec/share/msgdef/ja_JP.SJIS.src projects/ipsec/share/msgdef/ja_JP.UTF-8.src projects/ipsec/share/msgdef/ja_JP.eucJP.src projects/ipsec/share/msgdef/tr_TR.ISO8859-9.src projects/ipsec/share/msgdef/tr_TR.UTF-8.src projects/ipsec/share/numericdef/Makefile projects/ipsec/sys/amd64/amd64/machdep.c projects/ipsec/sys/amd64/amd64/trap.c projects/ipsec/sys/amd64/conf/GENERIC projects/ipsec/sys/amd64/conf/MINIMAL projects/ipsec/sys/arm/allwinner/a10/a10_padconf.c projects/ipsec/sys/arm/allwinner/a10_mmc.c projects/ipsec/sys/arm/allwinner/a13/a13_padconf.c projects/ipsec/sys/arm/allwinner/a20/a20_padconf.c projects/ipsec/sys/arm/allwinner/a31/a31_padconf.c projects/ipsec/sys/arm/allwinner/a31/a31_r_padconf.c projects/ipsec/sys/arm/allwinner/a31/a31s_padconf.c projects/ipsec/sys/arm/allwinner/a64/a64_padconf.c projects/ipsec/sys/arm/allwinner/a64/a64_r_padconf.c projects/ipsec/sys/arm/allwinner/allwinner_pinctrl.h projects/ipsec/sys/arm/allwinner/aw_machdep.c projects/ipsec/sys/arm/allwinner/aw_wdog.c projects/ipsec/sys/arm/allwinner/clk/aw_debeclk.c projects/ipsec/sys/arm/allwinner/clk/aw_hdmiclk.c projects/ipsec/sys/arm/allwinner/clk/aw_lcdclk.c projects/ipsec/sys/arm/allwinner/clk/aw_mmcclk.c projects/ipsec/sys/arm/allwinner/clk/aw_modclk.c projects/ipsec/sys/arm/allwinner/clk/aw_pll.c projects/ipsec/sys/arm/allwinner/clk/aw_thsclk.c projects/ipsec/sys/arm/allwinner/files.allwinner projects/ipsec/sys/arm/allwinner/h3/h3_padconf.c projects/ipsec/sys/arm/allwinner/h3/h3_r_padconf.c projects/ipsec/sys/arm/amlogic/aml8726/aml8726_identsoc.c projects/ipsec/sys/arm/amlogic/aml8726/aml8726_machdep.c projects/ipsec/sys/arm/amlogic/aml8726/aml8726_wdt.c projects/ipsec/sys/arm/arm/cpufunc.c projects/ipsec/sys/arm/arm/db_trace.c projects/ipsec/sys/arm/arm/gic.c projects/ipsec/sys/arm/arm/gic_common.h projects/ipsec/sys/arm/arm/physmem.c projects/ipsec/sys/arm/arm/platform_if.m projects/ipsec/sys/arm/arm/undefined.c projects/ipsec/sys/arm/at91/at91_spi.c projects/ipsec/sys/arm/broadcom/bcm2835/bcm2835_machdep.c projects/ipsec/sys/arm/broadcom/bcm2835/bcm2835_spi.c projects/ipsec/sys/arm/broadcom/bcm2835/bcm2835_wdog.c projects/ipsec/sys/arm/conf/RK3188 projects/ipsec/sys/arm/freescale/imx/files.imx6 projects/ipsec/sys/arm/freescale/imx/imx51_machdep.c projects/ipsec/sys/arm/freescale/imx/imx53_machdep.c projects/ipsec/sys/arm/freescale/imx/imx6_anatop.c projects/ipsec/sys/arm/freescale/imx/imx6_hdmi.c projects/ipsec/sys/arm/freescale/imx/imx6_machdep.c projects/ipsec/sys/arm/freescale/imx/imx6_sdma.c projects/ipsec/sys/arm/freescale/imx/imx6_sdma.h projects/ipsec/sys/arm/freescale/imx/imx6_src.c projects/ipsec/sys/arm/freescale/imx/imx6_ssi.c projects/ipsec/sys/arm/freescale/imx/imx_gpt.c projects/ipsec/sys/arm/freescale/vybrid/vf_spi.c projects/ipsec/sys/arm/lpc/lpc_gpio.c projects/ipsec/sys/arm/lpc/lpc_spi.c projects/ipsec/sys/arm/nvidia/tegra124/tegra124_machdep.c projects/ipsec/sys/arm/nvidia/tegra_efuse.c projects/ipsec/sys/arm/qemu/virt_machdep.c projects/ipsec/sys/arm/rockchip/rk30xx_machdep.c projects/ipsec/sys/arm/rockchip/rk30xx_mp.c projects/ipsec/sys/arm/rockchip/rk30xx_wdog.c projects/ipsec/sys/arm/samsung/exynos/exynos5_spi.c projects/ipsec/sys/arm/ti/am335x/am335x_dmtpps.c projects/ipsec/sys/arm/ti/cpsw/if_cpsw.c projects/ipsec/sys/arm/ti/ti_machdep.c projects/ipsec/sys/arm/ti/ti_spi.c projects/ipsec/sys/arm/versatile/versatile_machdep.c projects/ipsec/sys/arm/xilinx/zy7_machdep.c projects/ipsec/sys/arm/xilinx/zy7_slcr.c projects/ipsec/sys/arm/xscale/pxa/pxa_gpio.c projects/ipsec/sys/arm/xscale/pxa/pxa_icu.c projects/ipsec/sys/arm/xscale/pxa/pxa_space.c projects/ipsec/sys/arm/xscale/pxa/pxa_timer.c projects/ipsec/sys/arm64/arm64/gic_v3.c projects/ipsec/sys/arm64/arm64/gic_v3_reg.h projects/ipsec/sys/arm64/conf/GENERIC projects/ipsec/sys/boot/arm/uboot/Makefile projects/ipsec/sys/boot/common/Makefile.inc projects/ipsec/sys/boot/common/interp_forth.c projects/ipsec/sys/boot/common/newvers.sh projects/ipsec/sys/boot/efi/loader/Makefile projects/ipsec/sys/boot/efi/loader/main.c projects/ipsec/sys/boot/i386/loader/Makefile projects/ipsec/sys/boot/i386/loader/main.c projects/ipsec/sys/boot/mips/beri/loader/Makefile projects/ipsec/sys/boot/mips/beri/loader/loader.h projects/ipsec/sys/boot/mips/beri/loader/main.c projects/ipsec/sys/boot/mips/uboot/Makefile projects/ipsec/sys/boot/ofw/common/main.c projects/ipsec/sys/boot/pc98/loader/Makefile projects/ipsec/sys/boot/pc98/loader/main.c projects/ipsec/sys/boot/powerpc/kboot/Makefile projects/ipsec/sys/boot/powerpc/kboot/main.c projects/ipsec/sys/boot/powerpc/ofw/Makefile projects/ipsec/sys/boot/powerpc/ps3/Makefile projects/ipsec/sys/boot/powerpc/ps3/main.c projects/ipsec/sys/boot/powerpc/uboot/Makefile projects/ipsec/sys/boot/sparc64/loader/Makefile projects/ipsec/sys/boot/sparc64/loader/main.c projects/ipsec/sys/boot/uboot/common/main.c projects/ipsec/sys/boot/userboot/userboot/Makefile projects/ipsec/sys/boot/userboot/userboot/main.c projects/ipsec/sys/cam/ata/ata_da.c projects/ipsec/sys/cam/ata/ata_pmp.c projects/ipsec/sys/cam/cam_xpt.c projects/ipsec/sys/cam/ctl/ctl.c projects/ipsec/sys/cam/ctl/ctl.h projects/ipsec/sys/cam/ctl/ctl_backend_block.c projects/ipsec/sys/cam/ctl/ctl_cmd_table.c projects/ipsec/sys/cam/ctl/ctl_error.c projects/ipsec/sys/cam/ctl/ctl_error.h projects/ipsec/sys/cam/ctl/ctl_private.h projects/ipsec/sys/cam/ctl/ctl_tpc.c projects/ipsec/sys/cam/nvme/nvme_da.c projects/ipsec/sys/cam/scsi/scsi_all.c projects/ipsec/sys/cam/scsi/scsi_all.h projects/ipsec/sys/cam/scsi/scsi_cd.c projects/ipsec/sys/cam/scsi/scsi_da.c projects/ipsec/sys/cam/scsi/scsi_da.h projects/ipsec/sys/cam/scsi/scsi_sa.c projects/ipsec/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c projects/ipsec/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/ipsec/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/ipsec/sys/compat/linuxkpi/common/include/linux/pci.h projects/ipsec/sys/compat/linuxkpi/common/include/linux/sysfs.h projects/ipsec/sys/conf/files projects/ipsec/sys/conf/files.amd64 projects/ipsec/sys/conf/files.arm projects/ipsec/sys/conf/files.i386 projects/ipsec/sys/conf/kern.opts.mk projects/ipsec/sys/conf/kern.post.mk projects/ipsec/sys/conf/newvers.sh projects/ipsec/sys/conf/options projects/ipsec/sys/conf/options.arm projects/ipsec/sys/ddb/db_sym.c projects/ipsec/sys/dev/acpica/acpi.c projects/ipsec/sys/dev/acpica/acpi_thermal.c projects/ipsec/sys/dev/acpica/acpivar.h projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram.h projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_data.c projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_data.h projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_data_bcm.c projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmreg.h projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_data_bcmvar.h projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_data_btxt.c projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_data_sprom.c projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_data_spromvar.h projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_data_tlv.c projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_datavar.h projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_io.h projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_private.h projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_store.c projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_store.h projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_storevar.h projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_subr.c projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_value.c projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_value.h projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_value_fmts.c projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_value_prf.c projects/ipsec/sys/dev/bhnd/nvram/bhnd_nvram_valuevar.h projects/ipsec/sys/dev/bhnd/tools/nvram_map_gen.awk projects/ipsec/sys/dev/cxgbe/adapter.h projects/ipsec/sys/dev/cxgbe/common/common.h projects/ipsec/sys/dev/cxgbe/common/t4_hw.c projects/ipsec/sys/dev/cxgbe/common/t4_msg.h projects/ipsec/sys/dev/cxgbe/firmware/t6fw_cfg.txt projects/ipsec/sys/dev/cxgbe/t4_main.c projects/ipsec/sys/dev/cxgbe/t4_sge.c projects/ipsec/sys/dev/drm2/i915/i915_gem.c projects/ipsec/sys/dev/extres/clk/clk_div.c projects/ipsec/sys/dev/extres/clk/clk_div.h projects/ipsec/sys/dev/gpio/gpiobus.c projects/ipsec/sys/dev/gpio/gpiospi.c projects/ipsec/sys/dev/hyperv/include/hyperv.h projects/ipsec/sys/dev/hyperv/include/vmbus.h projects/ipsec/sys/dev/hyperv/netvsc/if_hn.c projects/ipsec/sys/dev/hyperv/netvsc/if_hnvar.h projects/ipsec/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/ipsec/sys/dev/hyperv/utilities/hv_kvp.c projects/ipsec/sys/dev/hyperv/utilities/hv_snapshot.c projects/ipsec/sys/dev/hyperv/vmbus/amd64/hyperv_machdep.c projects/ipsec/sys/dev/hyperv/vmbus/hyperv_reg.h projects/ipsec/sys/dev/hyperv/vmbus/vmbus.c projects/ipsec/sys/dev/hyperv/vmbus/vmbus_chan.c projects/ipsec/sys/dev/hyperv/vmbus/vmbus_chanvar.h projects/ipsec/sys/dev/hyperv/vmbus/vmbus_var.h projects/ipsec/sys/dev/ichiic/ig4_pci.c projects/ipsec/sys/dev/isp/isp_pci.c projects/ipsec/sys/dev/iwn/if_iwn.c projects/ipsec/sys/dev/mlx4/mlx4_core/mlx4_main.c projects/ipsec/sys/dev/mlx4/mlx4_ib/mlx4_ib_sysfs.c projects/ipsec/sys/dev/mlx5/mlx5_en/mlx5_en_main.c projects/ipsec/sys/dev/mmc/mmc.c projects/ipsec/sys/dev/ow/ow_temp.c projects/ipsec/sys/dev/pci/pci_host_generic_fdt.c projects/ipsec/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c projects/ipsec/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c projects/ipsec/sys/dev/rtwn/rtl8192c/r92c.h projects/ipsec/sys/dev/rtwn/rtl8192c/r92c_init.c projects/ipsec/sys/dev/rtwn/rtl8812a/r12a_priv.h projects/ipsec/sys/dev/sdhci/sdhci_pci.c projects/ipsec/sys/dev/spibus/ofw_spibus.c projects/ipsec/sys/dev/spibus/spibus.c projects/ipsec/sys/dev/spibus/spibusvar.h projects/ipsec/sys/dev/spibus/spigen.c projects/ipsec/sys/dev/uart/uart_dev_pl011.c projects/ipsec/sys/dev/usb/usb_hub.c projects/ipsec/sys/dev/usb/usb_process.c projects/ipsec/sys/dev/usb/wlan/if_rsu.c projects/ipsec/sys/dev/usb/wlan/if_rsureg.h projects/ipsec/sys/dev/xen/blkfront/blkfront.c projects/ipsec/sys/dev/xilinx/axi_quad_spi.c projects/ipsec/sys/fs/tmpfs/tmpfs_subr.c projects/ipsec/sys/geom/geom_map.c projects/ipsec/sys/i386/conf/GENERIC projects/ipsec/sys/kern/kern_descrip.c projects/ipsec/sys/kern/kern_et.c projects/ipsec/sys/kern/kern_event.c projects/ipsec/sys/kern/kern_exit.c projects/ipsec/sys/kern/kern_fork.c projects/ipsec/sys/kern/kern_procctl.c projects/ipsec/sys/kern/kern_synch.c projects/ipsec/sys/kern/kern_sysctl.c projects/ipsec/sys/kern/kern_tc.c projects/ipsec/sys/kern/subr_bus.c projects/ipsec/sys/kern/subr_counter.c projects/ipsec/sys/kern/uipc_shm.c projects/ipsec/sys/kern/vfs_cache.c projects/ipsec/sys/kern/vfs_lookup.c projects/ipsec/sys/kern/vfs_subr.c projects/ipsec/sys/kern/vfs_syscalls.c projects/ipsec/sys/mips/atheros/ar531x/ar5315_spi.c projects/ipsec/sys/mips/atheros/ar71xx_spi.c projects/ipsec/sys/mips/broadcom/bcm_nvram_cfe.c projects/ipsec/sys/mips/conf/CANNA projects/ipsec/sys/mips/conf/CI20 projects/ipsec/sys/mips/conf/JZ4780 projects/ipsec/sys/mips/conf/std.AR933X projects/ipsec/sys/mips/ingenic/files.jz4780 projects/ipsec/sys/mips/ingenic/files.x1000 projects/ipsec/sys/mips/ingenic/jz4780_clk_gen.c projects/ipsec/sys/mips/ingenic/jz4780_clock.c projects/ipsec/sys/mips/ingenic/jz4780_codec.c projects/ipsec/sys/mips/mediatek/mtk_spi_v1.c projects/ipsec/sys/mips/mediatek/mtk_spi_v2.c projects/ipsec/sys/mips/mips/cpu.c projects/ipsec/sys/mips/mips/db_trace.c projects/ipsec/sys/mips/mips/pm_machdep.c projects/ipsec/sys/mips/rt305x/rt305x_spi.c projects/ipsec/sys/modules/bhnd/Makefile projects/ipsec/sys/modules/hyperv/utilities/Makefile projects/ipsec/sys/net/if_lagg.c projects/ipsec/sys/net/if_media.h projects/ipsec/sys/net80211/_ieee80211.h projects/ipsec/sys/net80211/ieee80211.c projects/ipsec/sys/net80211/ieee80211_node.h projects/ipsec/sys/net80211/ieee80211_var.h projects/ipsec/sys/netinet/sctp_indata.c projects/ipsec/sys/netinet/sctputil.c projects/ipsec/sys/netinet/tcp_output.c projects/ipsec/sys/netinet/tcp_syncache.c projects/ipsec/sys/netinet6/in6_var.h projects/ipsec/sys/netinet6/ip6_input.c projects/ipsec/sys/netinet6/nd6_rtr.c projects/ipsec/sys/powerpc/powerpc/db_disasm.c projects/ipsec/sys/powerpc/powerpc/trap.c projects/ipsec/sys/sys/param.h projects/ipsec/sys/sys/sysctl.h projects/ipsec/sys/sys/systm.h projects/ipsec/sys/sys/vdso.h projects/ipsec/sys/sys/vnode.h projects/ipsec/sys/vm/default_pager.c projects/ipsec/sys/vm/swap_pager.c projects/ipsec/sys/vm/swap_pager.h projects/ipsec/sys/vm/vm_map.c projects/ipsec/sys/vm/vm_object.c projects/ipsec/sys/vm/vm_object.h projects/ipsec/sys/vm/vm_page.c projects/ipsec/sys/vm/vm_page.h projects/ipsec/sys/vm/vm_reserv.c projects/ipsec/sys/x86/acpica/srat.c projects/ipsec/sys/x86/include/vdso.h projects/ipsec/sys/x86/x86/mca.c projects/ipsec/tests/sys/kern/Makefile projects/ipsec/tests/sys/vfs/Makefile projects/ipsec/tools/build/mk/OptionalObsoleteFiles.inc projects/ipsec/tools/tools/locale/Makefile projects/ipsec/tools/tools/locale/README projects/ipsec/tools/tools/locale/etc/charmaps.xml projects/ipsec/tools/tools/locale/etc/common.UTF-8.src (contents, props changed) projects/ipsec/tools/tools/locale/etc/final-maps/map.GB2312 projects/ipsec/tools/tools/locale/etc/final-maps/map.UTF-8 (contents, props changed) projects/ipsec/tools/tools/locale/etc/unicode.conf projects/ipsec/tools/tools/locale/tools/extract-colldef.awk projects/ipsec/tools/tools/locale/tools/finalize projects/ipsec/usr.bin/bmake/Makefile projects/ipsec/usr.bin/hexdump/display.c projects/ipsec/usr.bin/hexdump/hexdump.c projects/ipsec/usr.bin/iconv/iconv.c projects/ipsec/usr.bin/ident/ident.c projects/ipsec/usr.bin/ktrdump/ktrdump.c projects/ipsec/usr.bin/last/last.c projects/ipsec/usr.bin/ministat/ministat.c projects/ipsec/usr.sbin/Makefile projects/ipsec/usr.sbin/bsdinstall/scripts/wlanconfig projects/ipsec/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt projects/ipsec/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c projects/ipsec/usr.sbin/cron/crontab/crontab.1 projects/ipsec/usr.sbin/cron/crontab/crontab.c projects/ipsec/usr.sbin/ctladm/ctladm.8 projects/ipsec/usr.sbin/portsnap/portsnap/portsnap.sh projects/ipsec/usr.sbin/syslogd/Makefile projects/ipsec/usr.sbin/syslogd/syslogd.8 projects/ipsec/usr.sbin/syslogd/syslogd.c Directory Properties: projects/ipsec/ (props changed) projects/ipsec/cddl/ (props changed) projects/ipsec/cddl/contrib/opensolaris/ (props changed) projects/ipsec/contrib/binutils/ (props changed) projects/ipsec/contrib/bmake/ (props changed) projects/ipsec/contrib/byacc/ (props changed) projects/ipsec/contrib/compiler-rt/ (props changed) projects/ipsec/contrib/dma/ (props changed) projects/ipsec/contrib/elftoolchain/ (props changed) projects/ipsec/contrib/groff/ (props changed) projects/ipsec/contrib/libarchive/ (props changed) projects/ipsec/contrib/libc++/ (props changed) projects/ipsec/contrib/libc-vis/ (props changed) projects/ipsec/contrib/llvm/ (props changed) projects/ipsec/contrib/llvm/projects/libunwind/ (props changed) projects/ipsec/contrib/llvm/tools/clang/ (props changed) projects/ipsec/contrib/llvm/tools/lld/ (props changed) projects/ipsec/contrib/llvm/tools/lldb/ (props changed) projects/ipsec/contrib/netbsd-tests/ (props changed) projects/ipsec/contrib/subversion/ (props changed) projects/ipsec/contrib/tcpdump/ (props changed) projects/ipsec/contrib/tzdata/ (props changed) projects/ipsec/sys/amd64/amd64/efirt.c (props changed) projects/ipsec/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/ipsec/Makefile.inc1 ============================================================================== --- projects/ipsec/Makefile.inc1 Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/Makefile.inc1 Thu Dec 22 15:19:31 2016 (r310415) @@ -1379,7 +1379,8 @@ packages: .PHONY package-pkg: .PHONY rm -rf /tmp/ports.${TARGET} || : env ${WMAKEENV:Q} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR} REVISION=${_REVISION} \ - PKG_VERSION=${PKG_VERSION} REPODIR=${REPODIR} WSTAGEDIR=${WSTAGEDIR} \ + PKG_CMD=${PKG_CMD} PKG_VERSION=${PKG_VERSION} REPODIR=${REPODIR} \ + WSTAGEDIR=${WSTAGEDIR} \ sh ${.CURDIR}/release/scripts/make-pkg-package.sh real-packages: stage-packages create-packages sign-packages .PHONY @@ -1417,11 +1418,11 @@ create-world-packages: _pkgbootstrap .PH /^name/ { printf("===> Creating %s-", $$2); next } \ /^version/ { print $$2; next } \ ' ${WSTAGEDIR}/$${pkgname}.ucl ; \ - pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \ + ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \ create -M ${WSTAGEDIR}/$${pkgname}.ucl \ -p ${WSTAGEDIR}/$${pkgname}.plist \ -r ${WSTAGEDIR} \ - -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} ; \ + -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} ; \ done create-kernel-packages: _pkgbootstrap .PHONY @@ -1445,11 +1446,11 @@ create-kernel-packages: _pkgbootstrap .P /name/ { printf("===> Creating %s-", $$2); next } \ /version/ {print $$2; next } ' \ ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \ - pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \ + ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \ create -M ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \ -p ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \ -r ${KSTAGEDIR}/${DISTDIR} \ - -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} + -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} .endfor .endif .if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" @@ -1474,25 +1475,25 @@ create-kernel-packages: _pkgbootstrap .P /name/ { printf("===> Creating %s-", $$2); next } \ /version/ {print $$2; next } ' \ ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \ - pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \ + ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \ create -M ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl \ -p ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.plist \ -r ${KSTAGEDIR}/kernel.${_kernel} \ - -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} + -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} .endfor .endif .endfor .endif sign-packages: _pkgbootstrap .PHONY - @[ -L "${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest" ] && \ - unlink ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest ; \ - pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh repo \ - -o ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \ - ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \ + @[ -L "${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest" ] && \ + unlink ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest ; \ + ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh repo \ + -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \ + ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \ ${PKGSIGNKEY} ; \ - ln -s ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \ - ${REPODIR}/$$(pkg -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest + ln -s ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} \ + ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest # # Modified: projects/ipsec/ObsoleteFiles.inc ============================================================================== --- projects/ipsec/ObsoleteFiles.inc Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/ObsoleteFiles.inc Thu Dec 22 15:19:31 2016 (r310415) @@ -38,6 +38,115 @@ # xargs -n1 | sort | uniq -d; # done +# 20161217: new clang import which bumps version from 3.9.0 to 3.9.1. +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/allocator_interface.h +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/asan_interface.h +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/common_interface_defs.h +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/coverage_interface.h +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/dfsan_interface.h +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/esan_interface.h +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/linux_syscall_hooks.h +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/lsan_interface.h +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/msan_interface.h +OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/tsan_interface_atomic.h +OLD_DIRS+=usr/lib/clang/3.9.0/include/sanitizer +OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_cmath.h +OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_intrinsics.h +OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_math_forward_declares.h +OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_runtime_wrapper.h +OLD_FILES+=usr/lib/clang/3.9.0/include/__stddef_max_align_t.h +OLD_FILES+=usr/lib/clang/3.9.0/include/__wmmintrin_aes.h +OLD_FILES+=usr/lib/clang/3.9.0/include/__wmmintrin_pclmul.h +OLD_FILES+=usr/lib/clang/3.9.0/include/adxintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/altivec.h +OLD_FILES+=usr/lib/clang/3.9.0/include/ammintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/arm_acle.h +OLD_FILES+=usr/lib/clang/3.9.0/include/arm_neon.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx2intrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512bwintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512cdintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512dqintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512erintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512fintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512ifmaintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512ifmavlintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512pfintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vbmiintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vbmivlintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vlbwintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vlcdintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vldqintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vlintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/avxintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/bmi2intrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/bmiintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/clflushoptintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/cpuid.h +OLD_FILES+=usr/lib/clang/3.9.0/include/cuda_builtin_vars.h +OLD_FILES+=usr/lib/clang/3.9.0/include/emmintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/f16cintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/fma4intrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/fmaintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/fxsrintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/htmintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/htmxlintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/ia32intrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/immintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/lzcntintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/mm3dnow.h +OLD_FILES+=usr/lib/clang/3.9.0/include/mm_malloc.h +OLD_FILES+=usr/lib/clang/3.9.0/include/mmintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/module.modulemap +OLD_FILES+=usr/lib/clang/3.9.0/include/mwaitxintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/nmmintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/opencl-c.h +OLD_FILES+=usr/lib/clang/3.9.0/include/pkuintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/pmmintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/popcntintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/prfchwintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/rdseedintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/rtmintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/s390intrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/shaintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/smmintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/tbmintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/tmmintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/vadefs.h +OLD_FILES+=usr/lib/clang/3.9.0/include/vecintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/wmmintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/x86intrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/xmmintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/xopintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/xsavecintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/xsaveintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/xsaveoptintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/xsavesintrin.h +OLD_FILES+=usr/lib/clang/3.9.0/include/xtestintrin.h +OLD_DIRS+=usr/lib/clang/3.9.0/include +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-i386.a +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-i386.so +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-preinit-i386.a +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-x86_64.a +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-x86_64.so +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan_cxx-i386.a +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.profile-arm.a +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.profile-i386.a +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.profile-x86_64.a +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.safestack-i386.a +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.safestack-x86_64.a +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats-i386.a +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats-x86_64.a +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats_client-i386.a +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats_client-x86_64.a +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a +OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a +OLD_DIRS+=usr/lib/clang/3.9.0/lib/freebsd +OLD_DIRS+=usr/lib/clang/3.9.0/lib +OLD_DIRS+=usr/lib/clang/3.9.0 # 20161205: libproc version bump OLD_LIBS+=usr/lib/libproc.so.3 OLD_LIBS+=usr/lib32/libproc.so.3 @@ -533,6 +642,8 @@ OLD_FILES+=usr/share/mdocml/style.css OLD_DIRS+=usr/share/mdocml # 20160114: SA-16:06.snmpd OLD_FILES+=usr/share/examples/etc/snmpd.config +# 20160107: GNU ld installed as ld.bfd and linked as ld +OLD_FILES+=usr/lib/debug/usr/bin/ld.debug # 20151225: new clang import which bumps version from 3.7.0 to 3.7.1. OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/allocator_interface.h OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/asan_interface.h @@ -2939,7 +3050,6 @@ OLD_FILES+=usr/lib32/libftpio_p.a OLD_FILES+=usr/include/ftpio.h OLD_FILES+=usr/share/man/man3/ftpio.3.gz # 20110915: rename congestion control manpages -OLD_FILES+=usr/share/man/man4/cc.4.gz OLD_FILES+=usr/share/man/man9/cc.9.gz # 20110831: atomic page flags operations OLD_FILES+=usr/share/man/man9/vm_page_flag.9.gz Modified: projects/ipsec/UPDATING ============================================================================== --- projects/ipsec/UPDATING Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/UPDATING Thu Dec 22 15:19:31 2016 (r310415) @@ -51,6 +51,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12 ****************************** SPECIAL WARNING: ****************************** +20161217: + Clang, llvm, lldb, compiler-rt and libc++ have been upgraded to 3.9.1. + Please see the 20141231 entry below for information about prerequisites + and upgrading, if you are not already using clang 3.5.0 or higher. + 20161124: Clang, llvm, lldb, compiler-rt and libc++ have been upgraded to 3.9.0. Please see the 20141231 entry below for information about prerequisites Modified: projects/ipsec/bin/dd/dd.c ============================================================================== --- projects/ipsec/bin/dd/dd.c Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/bin/dd/dd.c Thu Dec 22 15:19:31 2016 (r310415) @@ -142,8 +142,6 @@ setup(void) in.fd = open(in.name, O_RDONLY, 0); if (in.fd == -1) err(1, "%s", in.name); - if (caph_limit_stdin() == -1) - err(1, "unable to limit capability rights"); } getfdtype(&in); @@ -176,8 +174,6 @@ setup(void) } if (out.fd == -1) err(1, "%s", out.name); - if (caph_limit_stdout() == -1) - err(1, "unable to limit capability rights"); } getfdtype(&out); @@ -188,6 +184,16 @@ setup(void) errno != ENOSYS) err(1, "unable to limit capability rights"); + if (in.fd != STDIN_FILENO && out.fd != STDIN_FILENO) { + if (caph_limit_stdin() == -1) + err(1, "unable to limit capability rights"); + } + + if (in.fd != STDOUT_FILENO && out.fd != STDOUT_FILENO) { + if (caph_limit_stdout() == -1) + err(1, "unable to limit capability rights"); + } + if (in.fd != STDERR_FILENO && out.fd != STDERR_FILENO) { if (caph_limit_stderr() == -1) err(1, "unable to limit capability rights"); Modified: projects/ipsec/bin/df/Makefile ============================================================================== --- projects/ipsec/bin/df/Makefile Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/bin/df/Makefile Thu Dec 22 15:19:31 2016 (r310415) @@ -10,6 +10,9 @@ SRCS= df.c vfslist.c CFLAGS+= -I${MOUNT} +CFLAGS+= -DMOUNT_CHAR_DEVS +SRCS+= getmntopts.c + LIBADD= xo util .include <bsd.prog.mk> Modified: projects/ipsec/bin/df/df.c ============================================================================== --- projects/ipsec/bin/df/df.c Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/bin/df/df.c Thu Dec 22 15:19:31 2016 (r310415) @@ -50,10 +50,15 @@ __FBSDID("$FreeBSD$"); #include <sys/stat.h> #include <sys/mount.h> #include <sys/sysctl.h> +#ifdef MOUNT_CHAR_DEVS #include <ufs/ufs/ufsmount.h> +#endif #include <err.h> #include <libutil.h> #include <locale.h> +#ifdef MOUNT_CHAR_DEVS +#include <mntopts.h> +#endif #include <stdint.h> #include <stdio.h> #include <stdlib.h> @@ -98,7 +103,9 @@ imax(int a, int b) static int aflag = 0, cflag, hflag, iflag, kflag, lflag = 0, nflag, Tflag; static int thousands; +#ifdef MOUNT_CHAR_DEVS static struct ufs_args mdev; +#endif int main(int argc, char *argv[]) @@ -107,11 +114,21 @@ main(int argc, char *argv[]) struct statfs statfsbuf, totalbuf; struct maxwidths maxwidths; struct statfs *mntbuf; +#ifdef MOUNT_CHAR_DEVS + struct iovec *iov = NULL; +#endif const char *fstype; - char *mntpath, *mntpt; +#ifdef MOUNT_CHAR_DEVS + char *mntpath; + char errmsg[255] = {0}; +#endif + char *mntpt; const char **vfslist; int i, mntsize; int ch, rv; +#ifdef MOUNT_CHAR_DEVS + int iovlen = 0; +#endif fstype = "ufs"; (void)setlocale(LC_ALL, ""); @@ -227,6 +244,7 @@ main(int argc, char *argv[]) rv = 1; continue; } +#ifdef MOUNT_CHAR_DEVS } else if (S_ISCHR(stbuf.st_mode)) { if ((mntpt = getmntpt(*argv)) == NULL) { mdev.fspec = *argv; @@ -243,9 +261,23 @@ main(int argc, char *argv[]) free(mntpath); continue; } - if (mount(fstype, mntpt, MNT_RDONLY, - &mdev) != 0) { - xo_warn("%s", *argv); + if (iov != NULL) + free_iovec(&iov, &iovlen); + build_iovec_argf(&iov, &iovlen, "fstype", "%s", + fstype); + build_iovec_argf(&iov, &iovlen, "fspath", "%s", + mntpath); + build_iovec_argf(&iov, &iovlen, "from", "%s", + *argv); + build_iovec(&iov, &iovlen, "errmsg", errmsg, + sizeof(errmsg)); + if (nmount(iov, iovlen, + MNT_RDONLY|MNT_NOEXEC) < 0) { + if (errmsg[0]) + xo_warn("%s: %s", *argv, + errmsg); + else + xo_warn("%s", *argv); rv = 1; (void)rmdir(mntpt); free(mntpath); @@ -264,6 +296,7 @@ main(int argc, char *argv[]) free(mntpath); continue; } +#endif } else mntpt = *argv; Modified: projects/ipsec/bin/ed/buf.c ============================================================================== --- projects/ipsec/bin/ed/buf.c Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/bin/ed/buf.c Thu Dec 22 15:19:31 2016 (r310415) @@ -46,9 +46,9 @@ char * get_sbuf_line(line_t *lp) { static char *sfbuf = NULL; /* buffer */ - static int sfbufsz = 0; /* buffer size */ + static size_t sfbufsz; /* buffer size */ - int len, ct; + size_t len; if (lp == &buffer_head) return NULL; @@ -64,7 +64,7 @@ get_sbuf_line(line_t *lp) } len = lp->len; REALLOC(sfbuf, sfbufsz, len + 1, NULL); - if ((ct = fread(sfbuf, sizeof(char), len, sfp)) < 0 || ct != len) { + if (fread(sfbuf, sizeof(char), len, sfp) != len) { fprintf(stderr, "%s\n", strerror(errno)); errmsg = "cannot read temp file"; return NULL; @@ -81,7 +81,7 @@ const char * put_sbuf_line(const char *cs) { line_t *lp; - int len, ct; + size_t len; const char *s; if ((lp = (line_t *) malloc(sizeof(line_t))) == NULL) { @@ -110,7 +110,7 @@ put_sbuf_line(const char *cs) seek_write = 0; } /* assert: SPL1() */ - if ((ct = fwrite(cs, sizeof(char), len, sfp)) < 0 || ct != len) { + if (fwrite(cs, sizeof(char), len, sfp) != len) { sfseek = -1; fprintf(stderr, "%s\n", strerror(errno)); errmsg = "cannot write temp file"; Modified: projects/ipsec/bin/ed/ed.h ============================================================================== --- projects/ipsec/bin/ed/ed.h Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/bin/ed/ed.h Thu Dec 22 15:19:31 2016 (r310415) @@ -115,7 +115,7 @@ if (--mutex == 0) { \ /* REALLOC: assure at least a minimum size for buffer b */ #define REALLOC(b,n,i,err) \ if ((i) > (n)) { \ - int ti = (n); \ + size_t ti = (n); \ char *ts; \ SPL1(); \ if ((b) != NULL) { \ @@ -141,7 +141,7 @@ if ((i) > (n)) { \ /* REALLOC: assure at least a minimum size for buffer b */ #define REALLOC(b,n,i,err) \ if ((i) > (n)) { \ - int ti = (n); \ + size_t ti = (n); \ char *ts; \ SPL1(); \ if ((ts = (char *) realloc((b), ti += max((i), MINBUFSZ))) == NULL) { \ Modified: projects/ipsec/bin/ed/glbl.c ============================================================================== --- projects/ipsec/bin/ed/glbl.c Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/bin/ed/glbl.c Thu Dec 22 15:19:31 2016 (r310415) @@ -146,7 +146,7 @@ int set_active_node(line_t *lp) { if (active_last + 1 > active_size) { - int ti = active_size; + size_t ti = active_size; line_t **ts; SPL1(); #if defined(sun) || defined(NO_REALLOC_NULL) Modified: projects/ipsec/bin/ed/main.c ============================================================================== --- projects/ipsec/bin/ed/main.c Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/bin/ed/main.c Thu Dec 22 15:19:31 2016 (r310415) @@ -1356,7 +1356,7 @@ handle_hup(int signo) char *hup = NULL; /* hup filename */ char *s; char ed_hup[] = "ed.hup"; - int n; + size_t n; if (!sigactive) quit(1); Modified: projects/ipsec/bin/ls/tests/ls_tests.sh ============================================================================== --- projects/ipsec/bin/ls/tests/ls_tests.sh Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/bin/ls/tests/ls_tests.sh Thu Dec 22 15:19:31 2016 (r310415) @@ -697,7 +697,6 @@ atf_test_case o_flag o_flag_head() { atf_set "descr" "Verify that the output from ls -o prints out the chflag values or '-' if none are set" - atf_set "require.user" "root" } o_flag_body() @@ -711,6 +710,7 @@ o_flag_body() atf_check -e ignore -o empty -s exit:0 dd if=/dev/zero of=b.file \ bs=$size count=1 atf_check -e empty -o empty -s exit:0 chflags uarch a.file + atf_check -e empty -o empty -s exit:0 chflags 0 b.file atf_check -e empty -o match:"[[:space:]]+uarch[[:space:]]$size+.+a\\.file" \ -s exit:0 ls -lo a.file Modified: projects/ipsec/bin/pax/buf_subs.c ============================================================================== --- projects/ipsec/bin/pax/buf_subs.c Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/bin/pax/buf_subs.c Thu Dec 22 15:19:31 2016 (r310415) @@ -852,10 +852,13 @@ buf_fill(void) /* * errors require resync, EOF goes to next archive + * but in case we have not determined yet the format, + * this means that we have a very short file, so we + * are done again. */ if (cnt < 0) break; - if (ar_next() < 0) { + if (frmt == NULL || ar_next() < 0) { fini = 1; return(0); } Modified: projects/ipsec/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c ============================================================================== --- projects/ipsec/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c Thu Dec 22 15:19:31 2016 (r310415) @@ -499,7 +499,7 @@ dt_dis(const dtrace_difo_t *dp, FILE *fp if (v->dtdv_flags & DIFV_F_MOD) (void) strcat(flags, "/w"); - (void) fprintf(fp, "%-16s %-4x %-3s %-3s %-4s %s\n", + (void) fprintf(fp, "%-16s %-4u %-3s %-3s %-4s %s\n", &dp->dtdo_strtab[v->dtdv_name], v->dtdv_id, kind, scope, flags + 1, dt_dis_typestr(&v->dtdv_type, type, sizeof (type))); Modified: projects/ipsec/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/ipsec/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Thu Dec 22 15:19:31 2016 (r310415) @@ -1223,6 +1223,7 @@ process_obj(dtrace_hdl_t *dtp, const cha static const char dt_enabled[] = "enabled"; static const char dt_symprefix[] = "$dtrace"; static const char dt_symfmt[] = "%s%ld.%s"; + char probename[DTRACE_NAMELEN]; int fd, i, ndx, eprobe, mod = 0; Elf *elf = NULL; GElf_Ehdr ehdr; @@ -1576,8 +1577,6 @@ process_obj(dtrace_hdl_t *dtp, const cha bcopy(s, pname, p - s); pname[p - s] = '\0'; - p = strhyphenate(p + 3); /* strlen("___") */ - if (dt_symtab_lookup(data_sym, isym, rela.r_offset, shdr_rel.sh_info, &fsym, (emachine1 == EM_PPC64), elf) != 0) @@ -1628,10 +1627,14 @@ process_obj(dtrace_hdl_t *dtp, const cha "no such provider %s", pname)); } - if ((prp = dt_probe_lookup(pvp, p)) == NULL) { + if (strlcpy(probename, p + 3, sizeof (probename)) >= + sizeof (probename)) return (dt_link_error(dtp, elf, fd, bufs, - "no such probe %s", p)); - } + "invalid probe name %s", probename)); + (void) strhyphenate(probename); + if ((prp = dt_probe_lookup(pvp, probename)) == NULL) + return (dt_link_error(dtp, elf, fd, bufs, + "no such probe %s", probename)); assert(fsym.st_value <= rela.r_offset); Modified: projects/ipsec/cddl/usr.sbin/dtrace/tests/tools/exclude.sh ============================================================================== --- projects/ipsec/cddl/usr.sbin/dtrace/tests/tools/exclude.sh Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/cddl/usr.sbin/dtrace/tests/tools/exclude.sh Thu Dec 22 15:19:31 2016 (r310415) @@ -188,3 +188,6 @@ exclude EXFAIL common/usdt/tst.static2.k # Uses the Solaris-specific ppriv(1). exclude EXFAIL common/usdt/tst.user.ksh + +# Triggers a lock assertion by using the raise() action from a profile probe. +exclude SKIP common/ustack/tst.spin.ksh Modified: projects/ipsec/contrib/binutils/bfd/elf.c ============================================================================== --- projects/ipsec/contrib/binutils/bfd/elf.c Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/contrib/binutils/bfd/elf.c Thu Dec 22 15:19:31 2016 (r310415) @@ -8826,7 +8826,7 @@ _bfd_elf_get_synthetic_symtab (bfd *abfd count = relplt->size / hdr->sh_entsize; size = count * sizeof (asymbol); p = relplt->relocation; - for (i = 0; i < count; i++, s++, p++) + for (i = 0; i < count; i++, p++) size += strlen ((*p->sym_ptr_ptr)->name) + sizeof ("@plt"); s = *ret = bfd_malloc (size); Modified: projects/ipsec/contrib/binutils/bfd/elflink.c ============================================================================== --- projects/ipsec/contrib/binutils/bfd/elflink.c Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/contrib/binutils/bfd/elflink.c Thu Dec 22 15:19:31 2016 (r310415) @@ -11487,7 +11487,7 @@ _bfd_elf_section_already_linked (bfd *ab abfd, sec); else if (sec->size != 0) { - bfd_byte *sec_contents, *l_sec_contents; + bfd_byte *sec_contents, *l_sec_contents = NULL; if (!bfd_malloc_and_get_section (abfd, sec, &sec_contents)) (*_bfd_error_handler) Modified: projects/ipsec/contrib/bmake/ChangeLog ============================================================================== --- projects/ipsec/contrib/bmake/ChangeLog Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/contrib/bmake/ChangeLog Thu Dec 22 15:19:31 2016 (r310415) @@ -1,3 +1,32 @@ +2016-12-12 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (_MAKE_VERSION): 20161212 + Merge with NetBSD make, pick up + o main.c: look for obj.${MACHINE}-${MACHINE_ARCH} too. + +2016-12-09 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (_MAKE_VERSION): 20161209 + Merge with NetBSD make, pick up + o main.c: cleanup setting of .OBJDIR + o parse.c: avoid coredump from (var)=val + +2016-11-26 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (_MAKE_VERSION): 20161126 + Merge with NetBSD make, pick up + o make.c: Make_OODate: report src node name if path not set + +2016-09-26 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile (_MAKE_VERSION): 20160926 + Merge with NetBSD make, pick up + o support for .DELETE_ON_ERROR: (remove targets that fail) + +2016-09-26 Simon J. Gerraty <sjg@bad.crufty.net> + + * Makefile MAN: tweak .Dt to match ${PROG} + 2016-08-18 Simon J. Gerraty <sjg@bad.crufty.net> * Makefile (_MAKE_VERSION): 20160818 Modified: projects/ipsec/contrib/bmake/Makefile ============================================================================== --- projects/ipsec/contrib/bmake/Makefile Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/contrib/bmake/Makefile Thu Dec 22 15:19:31 2016 (r310415) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.72 2016/08/18 23:02:26 sjg Exp $ +# $Id: Makefile,v 1.77 2016/12/12 07:34:19 sjg Exp $ # Base version on src date -_MAKE_VERSION= 20160818 +_MAKE_VERSION= 20161212 PROG= bmake @@ -156,7 +156,10 @@ my.history: ${MAKEFILE} .NOPATH: ${MAN} ${MAN}: make.1 my.history @echo making $@ - @sed -e 's/^.Nx/NetBSD/' -e '/^.Nm/s/make/${PROG}/' \ + @sed \ + -e '/^.Dt/s/MAKE/${PROG:tu}/' \ + -e 's/^.Nx/NetBSD/' \ + -e '/^.Nm/s/make/${PROG}/' \ -e '/^.Sh HISTORY/rmy.history' \ -e '/^.Sh HISTORY/,$$s,^.Nm,make,' ${srcdir}/make.1 > $@ Modified: projects/ipsec/contrib/bmake/bmake.1 ============================================================================== --- projects/ipsec/contrib/bmake/bmake.1 Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/contrib/bmake/bmake.1 Thu Dec 22 15:19:31 2016 (r310415) @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.262 2016/08/18 19:23:20 wiz Exp $ +.\" $NetBSD: make.1,v 1.263 2016/08/26 23:37:54 dholland Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,8 +29,8 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd August 15, 2016 -.Dt MAKE 1 +.Dd August 26, 2016 +.Dt BMAKE 1 .Os .Sh NAME .Nm bmake @@ -2011,6 +2011,14 @@ variable of a target that inherits .Ic .DEFAULT Ns 's commands is set to the target's own name. +.It Ic .DELETE_ON_ERROR +If this target is present in the makefile, it globally causes make to +delete targets whose commands fail. +(By default, only targets whose commands are interrupted during +execution are deleted. +This is the historical behavior.) +This setting can be used to help prevent half-finished or malformed +targets from being left around and corrupting future rebuilds. .It Ic .END Any command lines attached to this target are executed after everything else is done. Modified: projects/ipsec/contrib/bmake/bmake.cat1 ============================================================================== --- projects/ipsec/contrib/bmake/bmake.cat1 Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/contrib/bmake/bmake.cat1 Thu Dec 22 15:19:31 2016 (r310415) @@ -1,4 +1,4 @@ -MAKE(1) NetBSD General Commands Manual MAKE(1) +BMAKE(1) NetBSD General Commands Manual BMAKE(1) NNAAMMEE bbmmaakkee -- maintain program dependencies @@ -1285,6 +1285,14 @@ SSPPEECCIIAALL TTAARRGGEETT target that inherits ..DDEEFFAAUULLTT's commands is set to the target's own name. + ..DDEELLEETTEE__OONN__EERRRROORR + If this target is present in the makefile, it globally causes + make to delete targets whose commands fail. (By default, only + targets whose commands are interrupted during execution are + deleted. This is the historical behavior.) This setting can be + used to help prevent half-finished or malformed targets from + being left around and corrupting future rebuilds. + ..EENNDD Any command lines attached to this target are executed after everything else is done. @@ -1498,4 +1506,4 @@ BBUUGGSS There is no way of escaping a space character in a filename. -NetBSD 5.1 August 15, 2016 NetBSD 5.1 +NetBSD 5.1 August 26, 2016 NetBSD 5.1 Modified: projects/ipsec/contrib/bmake/compat.c ============================================================================== --- projects/ipsec/contrib/bmake/compat.c Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/contrib/bmake/compat.c Thu Dec 22 15:19:31 2016 (r310415) @@ -1,4 +1,4 @@ -/* $NetBSD: compat.c,v 1.105 2016/05/12 20:28:34 sjg Exp $ */ +/* $NetBSD: compat.c,v 1.106 2016/08/26 23:28:39 dholland Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: compat.c,v 1.105 2016/05/12 20:28:34 sjg Exp $"; +static char rcsid[] = "$NetBSD: compat.c,v 1.106 2016/08/26 23:28:39 dholland Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)compat.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: compat.c,v 1.105 2016/05/12 20:28:34 sjg Exp $"); +__RCSID("$NetBSD: compat.c,v 1.106 2016/08/26 23:28:39 dholland Exp $"); #endif #endif /* not lint */ #endif @@ -119,6 +119,25 @@ static GNode *curTarg = NULL; static GNode *ENDNode; static void CompatInterrupt(int); +/* + * CompatDeleteTarget -- delete a failed, interrupted, or otherwise + * duffed target if not inhibited by .PRECIOUS. + */ +static void +CompatDeleteTarget(GNode *gn) +{ + if ((gn != NULL) && !Targ_Precious (gn)) { + char *p1; + char *file = Var_Value(TARGET, gn, &p1); + + if (!noExecute && eunlink(file) != -1) { + Error("*** %s removed", file); + } + + free(p1); + } +} + /*- *----------------------------------------------------------------------- * CompatInterrupt -- @@ -132,6 +151,9 @@ static void CompatInterrupt(int); * The target is removed and the process exits. If .INTERRUPT exists, * its commands are run first WITH INTERRUPTS IGNORED.. * + * XXX: is .PRECIOUS supposed to inhibit .INTERRUPT? I doubt it, but I've + * left the logic alone for now. - dholland 20160826 + * *----------------------------------------------------------------------- */ static void @@ -139,16 +161,9 @@ CompatInterrupt(int signo) { GNode *gn; - if ((curTarg != NULL) && !Targ_Precious (curTarg)) { - char *p1; - char *file = Var_Value(TARGET, curTarg, &p1); - - if (!noExecute && eunlink(file) != -1) { - Error("*** %s removed", file); - } - - free(p1); + CompatDeleteTarget(curTarg); + if ((curTarg != NULL) && !Targ_Precious (curTarg)) { /* * Run .INTERRUPT only if hit with interrupt signal */ @@ -158,7 +173,6 @@ CompatInterrupt(int signo) Compat_Make(gn, gn); } } - } if (signo == SIGQUIT) _exit(signo); @@ -447,6 +461,11 @@ again: * continue. */ printf(" (continuing)\n"); + } else { + printf("\n"); + } + if (deleteOnError) { + CompatDeleteTarget(gn); } } else { /* @@ -607,7 +626,7 @@ Compat_Make(void *gnp, void *pgnp) } else if (keepgoing) { pgn->flags &= ~REMAKE; } else { - PrintOnError(gn, "\n\nStop."); + PrintOnError(gn, "\nStop."); exit(1); } } else if (gn->made == ERROR) { @@ -698,7 +717,7 @@ Compat_Run(Lst targs) if (gn != NULL) { Compat_Make(gn, gn); if (gn->made == ERROR) { - PrintOnError(gn, "\n\nStop."); + PrintOnError(gn, "\nStop."); exit(1); } } @@ -739,7 +758,7 @@ Compat_Run(Lst targs) if (errors == 0) { Compat_Make(ENDNode, ENDNode); if (gn->made == ERROR) { - PrintOnError(gn, "\n\nStop."); + PrintOnError(gn, "\nStop."); exit(1); } } Modified: projects/ipsec/contrib/bmake/job.c ============================================================================== --- projects/ipsec/contrib/bmake/job.c Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/contrib/bmake/job.c Thu Dec 22 15:19:31 2016 (r310415) @@ -1,4 +1,4 @@ -/* $NetBSD: job.c,v 1.187 2016/05/12 20:28:34 sjg Exp $ */ +/* $NetBSD: job.c,v 1.188 2016/08/26 23:28:39 dholland Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -70,14 +70,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: job.c,v 1.187 2016/05/12 20:28:34 sjg Exp $"; +static char rcsid[] = "$NetBSD: job.c,v 1.188 2016/08/26 23:28:39 dholland Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: job.c,v 1.187 2016/05/12 20:28:34 sjg Exp $"); +__RCSID("$NetBSD: job.c,v 1.188 2016/08/26 23:28:39 dholland Exp $"); #endif #endif /* not lint */ #endif @@ -404,6 +404,21 @@ job_table_dump(const char *where) } /* + * Delete the target of a failed, interrupted, or otherwise + * unsuccessful job unless inhibited by .PRECIOUS. + */ +static void +JobDeleteTarget(GNode *gn) +{ + if ((gn->type & (OP_JOIN|OP_PHONY)) == 0 && !Targ_Precious(gn)) { + char *file = (gn->path == NULL ? gn->name : gn->path); + if (!noExecute && eunlink(file) != -1) { + Error("*** %s removed", file); + } + } +} + +/* * JobSigLock/JobSigUnlock * * Signal lock routines to get exclusive access. Currently used to @@ -1049,6 +1064,9 @@ JobFinish (Job *job, WAIT_T status) if (job->flags & JOB_IGNERR) { WAIT_STATUS(status) = 0; } else { + if (deleteOnError) { + JobDeleteTarget(job->node); + } PrintOnError(job->node, NULL); } } else if (DEBUG(JOB)) { @@ -1066,6 +1084,9 @@ JobFinish (Job *job, WAIT_T status) } (void)printf("*** [%s] Signal %d\n", job->node->name, WTERMSIG(status)); + if (deleteOnError) { + JobDeleteTarget(job->node); + } } (void)fflush(stdout); } @@ -2601,12 +2622,7 @@ JobInterrupt(int runINTERRUPT, int signo gn = job->node; - if ((gn->type & (OP_JOIN|OP_PHONY)) == 0 && !Targ_Precious(gn)) { - char *file = (gn->path == NULL ? gn->name : gn->path); - if (!noExecute && eunlink(file) != -1) { - Error("*** %s removed", file); - } - } + JobDeleteTarget(gn); if (job->pid) { if (DEBUG(JOB)) { (void)fprintf(debug_file, Modified: projects/ipsec/contrib/bmake/main.c ============================================================================== --- projects/ipsec/contrib/bmake/main.c Thu Dec 22 15:01:06 2016 (r310414) +++ projects/ipsec/contrib/bmake/main.c Thu Dec 22 15:19:31 2016 (r310415) @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.250 2016/08/11 19:53:17 sjg Exp $ */ +/* $NetBSD: main.c,v 1.254 2016/12/10 23:12:39 christos Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: main.c,v 1.250 2016/08/11 19:53:17 sjg Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.254 2016/12/10 23:12:39 christos Exp $"; #else #include <sys/cdefs.h> #ifndef lint @@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19 #if 0 static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: main.c,v 1.250 2016/08/11 19:53:17 sjg Exp $"); +__RCSID("$NetBSD: main.c,v 1.254 2016/12/10 23:12:39 christos Exp $"); #endif #endif /* not lint */ #endif @@ -155,6 +155,7 @@ Lst create; /* Targets to be made */ time_t now; /* Time at start of make */ GNode *DEFAULT; /* .DEFAULT node */ Boolean allPrecious; /* .PRECIOUS given on line by itself */ +Boolean deleteOnError; /* .DELETE_ON_ERROR: set */ static Boolean noBuiltins; /* -r flag */ static Lst makefiles; /* ordered list of makefiles to read */ @@ -711,18 +712,24 @@ Main_ParseArgLine(const char *line) } Boolean -Main_SetObjdir(const char *path) +Main_SetObjdir(const char *fmt, ...) { struct stat sb; - char *p = NULL; - char buf[MAXPATHLEN + 1]; + char *p, *path; + char buf[MAXPATHLEN + 1], pbuf[MAXPATHLEN + 1]; Boolean rc = FALSE; + va_list ap; + + va_start(ap, fmt); + vsnprintf(path = pbuf, MAXPATHLEN, fmt, ap); + va_end(ap); /* expand variable substitutions */ if (strchr(path, '$') != 0) { snprintf(buf, MAXPATHLEN, "%s", path); path = p = Var_Subst(NULL, buf, VAR_GLOBAL, VARF_WANTRES); - } + } else + p = NULL; if (path[0] != '/') { snprintf(buf, MAXPATHLEN, "%s/%s", curdir, path); @@ -749,6 +756,18 @@ Main_SetObjdir(const char *path) return rc; } +static Boolean +Main_SetVarObjdir(const char *var, const char *suffix) +{ + char *p1, *path; + if ((path = Var_Value(var, VAR_CMD, &p1)) == NULL) + return FALSE; + + (void)Main_SetObjdir("%s%s", path, suffix); + free(p1); + return TRUE; +} + /*- * ReadAllMakefiles -- * wrapper around ReadMakefile() to read all. @@ -979,6 +998,7 @@ main(int argc, char **argv) noRecursiveExecute = FALSE; /* Execute all .MAKE targets */ keepgoing = FALSE; /* Stop on error */ allPrecious = FALSE; /* Remove targets when interrupted */ + deleteOnError = FALSE; /* Historical default behavior */ queryFlag = FALSE; /* This is not just a check-run */ noBuiltins = FALSE; /* Read the built-in rules */ touchFlag = FALSE; /* Actually update targets */ @@ -1128,28 +1148,19 @@ main(int argc, char **argv) * MAKEOBJDIR is set in the environment, try only that value * and fall back to .CURDIR if it does not exist. * - * Otherwise, try _PATH_OBJDIR.MACHINE, _PATH_OBJDIR, and - * finally _PATH_OBJDIRPREFIX`pwd`, in that order. If none + * Otherwise, try _PATH_OBJDIR.MACHINE-MACHINE_ARCH, _PATH_OBJDIR.MACHINE, + * and * finally _PATH_OBJDIRPREFIX`pwd`, in that order. If none * of these paths exist, just use .CURDIR. */ Dir_Init(curdir); - (void)Main_SetObjdir(curdir); + (void)Main_SetObjdir("%s", curdir); - if ((path = Var_Value("MAKEOBJDIRPREFIX", VAR_CMD, &p1)) != NULL) { - (void)snprintf(mdpath, MAXPATHLEN, "%s%s", path, curdir); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612221519.uBMFJW0Z098170>