Date: Wed, 16 Aug 2017 06:43:52 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r322568 - in projects/krb5: . bin/cat bin/chmod bin/date bin/dd bin/df bin/echo bin/expr bin/ln bin/ls bin/mv bin/pax bin/pkill bin/pwait bin/sh bin/sh/tests bin/sh/tests/invocation bin... Message-ID: <201708160643.v7G6hqV6084347@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Wed Aug 16 06:43:50 2017 New Revision: 322568 URL: https://svnweb.freebsd.org/changeset/base/322568 Log: MFH r320793-r322566 inclusive, bringing in the latest llvm updates. Added: projects/krb5/bin/sh/tests/invocation/ - copied from r322566, head/bin/sh/tests/invocation/ projects/krb5/contrib/gcc/config/riscv/ - copied from r322566, head/contrib/gcc/config/riscv/ projects/krb5/contrib/mdocml/compat_recallocarray.c - copied unchanged from r321810, head/contrib/mdocml/compat_recallocarray.c projects/krb5/contrib/mdocml/mandoc_xr.c - copied unchanged from r321810, head/contrib/mdocml/mandoc_xr.c projects/krb5/contrib/mdocml/mandoc_xr.h - copied unchanged from r321810, head/contrib/mdocml/mandoc_xr.h projects/krb5/contrib/mdocml/test-recallocarray.c - copied unchanged from r321810, head/contrib/mdocml/test-recallocarray.c projects/krb5/lib/libcasper/services/tests/ - copied from r322566, head/lib/libcasper/services/tests/ projects/krb5/lib/libcasper/tests/ - copied from r322566, head/lib/libcasper/tests/ projects/krb5/sys/dev/iicbus/ds13rtc.c - copied unchanged from r322566, head/sys/dev/iicbus/ds13rtc.c projects/krb5/sys/modules/i2c/ds1307/ - copied from r321831, head/sys/modules/i2c/ds1307/ projects/krb5/sys/modules/i2c/ds13rtc/ - copied from r322566, head/sys/modules/i2c/ds13rtc/ projects/krb5/sys/modules/i2c/ds3231/ - copied from r321831, head/sys/modules/i2c/ds3231/ projects/krb5/sys/modules/i2c/nxprtc/ - copied from r321831, head/sys/modules/i2c/nxprtc/ projects/krb5/sys/modules/i2c/s35390a/ - copied from r322566, head/sys/modules/i2c/s35390a/ projects/krb5/tests/Makefile.inc0 - copied unchanged from r322566, head/tests/Makefile.inc0 projects/krb5/tests/etc/Makefile.inc - copied unchanged from r322566, head/tests/etc/Makefile.inc projects/krb5/tests/sys/geom/class/Makefile.inc - copied unchanged from r322566, head/tests/sys/geom/class/Makefile.inc projects/krb5/tests/sys/pjdfstest/Makefile.inc - copied unchanged from r322566, head/tests/sys/pjdfstest/Makefile.inc projects/krb5/tests/sys/pjdfstest/tests/Makefile.inc - copied unchanged from r322566, head/tests/sys/pjdfstest/tests/Makefile.inc projects/krb5/tools/build/options/WITHOUT_MAKE_CHECK_USE_SANDBOX - copied unchanged from r322566, head/tools/build/options/WITHOUT_MAKE_CHECK_USE_SANDBOX Deleted: projects/krb5/contrib/gcc/config/riscv64/ projects/krb5/contrib/jemalloc/src/spin.c projects/krb5/sys/boot/fdt/dts/riscv/ projects/krb5/sys/dev/iicbus/ds133x.c projects/krb5/sys/dev/iicbus/ds1374.c projects/krb5/sys/riscv/conf/LOWRISC projects/krb5/sys/riscv/conf/LOWRISC.hints projects/krb5/sys/riscv/conf/QEMU projects/krb5/sys/riscv/conf/ROCKET projects/krb5/sys/riscv/conf/SPIKE projects/krb5/sys/riscv/riscv/sbi.S Modified: projects/krb5/Makefile projects/krb5/Makefile.inc1 projects/krb5/Makefile.libcompat projects/krb5/UPDATING projects/krb5/bin/cat/Makefile projects/krb5/bin/cat/cat.c projects/krb5/bin/chmod/Makefile projects/krb5/bin/date/Makefile projects/krb5/bin/dd/Makefile projects/krb5/bin/df/df.1 projects/krb5/bin/df/df.c projects/krb5/bin/echo/Makefile projects/krb5/bin/expr/Makefile projects/krb5/bin/ln/Makefile projects/krb5/bin/ls/Makefile projects/krb5/bin/mv/Makefile projects/krb5/bin/pax/Makefile projects/krb5/bin/pkill/Makefile projects/krb5/bin/pkill/pkill.c projects/krb5/bin/pwait/Makefile projects/krb5/bin/sh/Makefile projects/krb5/bin/sh/tests/Makefile projects/krb5/bin/sleep/Makefile projects/krb5/bin/test/Makefile projects/krb5/cddl/contrib/opensolaris/cmd/ztest/ztest.c projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/krb5/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c projects/krb5/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h projects/krb5/contrib/compiler-rt/lib/builtins/int_lib.h projects/krb5/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h projects/krb5/contrib/elftoolchain/libelf/_libelf_config.h projects/krb5/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h projects/krb5/contrib/jemalloc/include/jemalloc/internal/spin.h projects/krb5/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h projects/krb5/contrib/libc++/include/__bsd_locale_defaults.h projects/krb5/contrib/libc++/include/__bsd_locale_fallbacks.h projects/krb5/contrib/libc++/include/__locale projects/krb5/contrib/libc++/include/mutex projects/krb5/contrib/libc++/include/sstream projects/krb5/contrib/llvm/include/llvm/Analysis/ValueTracking.h projects/krb5/contrib/llvm/include/llvm/CodeGen/MachineFunction.h projects/krb5/contrib/llvm/include/llvm/CodeGen/MachineInstr.h projects/krb5/contrib/llvm/lib/Analysis/ValueTracking.cpp projects/krb5/contrib/llvm/lib/CodeGen/BranchFolding.cpp projects/krb5/contrib/llvm/lib/CodeGen/MachineFunction.cpp projects/krb5/contrib/llvm/lib/CodeGen/MachineInstr.cpp projects/krb5/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp projects/krb5/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp projects/krb5/contrib/llvm/lib/CodeGen/StackColoring.cpp projects/krb5/contrib/llvm/lib/IR/ConstantFold.cpp projects/krb5/contrib/llvm/lib/Object/COFFImportFile.cpp projects/krb5/contrib/llvm/lib/Target/AArch64/AArch64ExpandPseudoInsts.cpp projects/krb5/contrib/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp projects/krb5/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp projects/krb5/contrib/llvm/lib/Target/AArch64/AArch64InstrInfo.td projects/krb5/contrib/llvm/lib/Target/AArch64/AArch64MacroFusion.cpp projects/krb5/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp projects/krb5/contrib/llvm/lib/Target/X86/X86InstrSSE.td projects/krb5/contrib/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp projects/krb5/contrib/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp projects/krb5/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp projects/krb5/contrib/llvm/lib/Transforms/Utils/CloneModule.cpp projects/krb5/contrib/llvm/projects/libunwind/include/__libunwind_config.h projects/krb5/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S projects/krb5/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S projects/krb5/contrib/llvm/projects/libunwind/src/config.h projects/krb5/contrib/llvm/projects/libunwind/src/libunwind.cpp projects/krb5/contrib/llvm/tools/clang/include/clang/AST/StmtCXX.h projects/krb5/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsX86.def projects/krb5/contrib/llvm/tools/clang/include/clang/Driver/Options.td projects/krb5/contrib/llvm/tools/clang/include/clang/Serialization/ASTBitCodes.h projects/krb5/contrib/llvm/tools/clang/lib/AST/ODRHash.cpp projects/krb5/contrib/llvm/tools/clang/lib/AST/StmtCXX.cpp projects/krb5/contrib/llvm/tools/clang/lib/Basic/Targets.cpp projects/krb5/contrib/llvm/tools/clang/lib/Driver/ToolChains/Arch/Mips.cpp projects/krb5/contrib/llvm/tools/clang/lib/Driver/ToolChains/OpenBSD.cpp projects/krb5/contrib/llvm/tools/clang/lib/Headers/avx2intrin.h projects/krb5/contrib/llvm/tools/clang/lib/Headers/avx512fintrin.h projects/krb5/contrib/llvm/tools/clang/lib/Headers/avxintrin.h projects/krb5/contrib/llvm/tools/clang/lib/Headers/float.h projects/krb5/contrib/llvm/tools/clang/lib/Sema/Sema.cpp projects/krb5/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp projects/krb5/contrib/llvm/tools/clang/lib/Serialization/ASTReaderStmt.cpp projects/krb5/contrib/llvm/tools/clang/lib/Serialization/ASTWriterStmt.cpp projects/krb5/contrib/llvm/tools/lld/ELF/Driver.cpp projects/krb5/contrib/llvm/tools/lldb/include/lldb/Target/Platform.h projects/krb5/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-i386/ABISysV_i386.cpp projects/krb5/contrib/llvm/tools/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp projects/krb5/contrib/llvm/tools/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h projects/krb5/contrib/llvm/tools/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp projects/krb5/contrib/llvm/tools/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.h projects/krb5/contrib/llvm/tools/lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.cpp projects/krb5/contrib/llvm/tools/lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.h projects/krb5/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp projects/krb5/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/POSIXStopInfo.cpp projects/krb5/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/POSIXStopInfo.h projects/krb5/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp projects/krb5/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp projects/krb5/contrib/llvm/tools/lldb/source/Target/Platform.cpp projects/krb5/contrib/mdocml/INSTALL projects/krb5/contrib/mdocml/LICENSE projects/krb5/contrib/mdocml/Makefile projects/krb5/contrib/mdocml/Makefile.depend projects/krb5/contrib/mdocml/NEWS projects/krb5/contrib/mdocml/TODO projects/krb5/contrib/mdocml/apropos.1 projects/krb5/contrib/mdocml/att.c projects/krb5/contrib/mdocml/cgi.c projects/krb5/contrib/mdocml/chars.c projects/krb5/contrib/mdocml/config.h projects/krb5/contrib/mdocml/configure projects/krb5/contrib/mdocml/configure.local.example projects/krb5/contrib/mdocml/demandoc.c projects/krb5/contrib/mdocml/eqn.7 projects/krb5/contrib/mdocml/eqn.c projects/krb5/contrib/mdocml/eqn_html.c projects/krb5/contrib/mdocml/eqn_term.c projects/krb5/contrib/mdocml/gmdiff projects/krb5/contrib/mdocml/html.c projects/krb5/contrib/mdocml/html.h projects/krb5/contrib/mdocml/lib.c projects/krb5/contrib/mdocml/libmandoc.h projects/krb5/contrib/mdocml/libroff.h projects/krb5/contrib/mdocml/main.c projects/krb5/contrib/mdocml/man.7 projects/krb5/contrib/mdocml/man.c projects/krb5/contrib/mdocml/man.options.1 projects/krb5/contrib/mdocml/man_html.c projects/krb5/contrib/mdocml/man_macro.c projects/krb5/contrib/mdocml/man_term.c projects/krb5/contrib/mdocml/man_validate.c projects/krb5/contrib/mdocml/manconf.h projects/krb5/contrib/mdocml/mandoc.1 projects/krb5/contrib/mdocml/mandoc.3 projects/krb5/contrib/mdocml/mandoc.c projects/krb5/contrib/mdocml/mandoc.css projects/krb5/contrib/mdocml/mandoc.h projects/krb5/contrib/mdocml/mandoc_aux.c projects/krb5/contrib/mdocml/mandoc_aux.h projects/krb5/contrib/mdocml/mandoc_char.7 projects/krb5/contrib/mdocml/mandoc_escape.3 projects/krb5/contrib/mdocml/mandoc_headers.3 projects/krb5/contrib/mdocml/mandoc_html.3 projects/krb5/contrib/mdocml/mandocd.c projects/krb5/contrib/mdocml/mandocdb.c projects/krb5/contrib/mdocml/manpath.c projects/krb5/contrib/mdocml/mansearch.c projects/krb5/contrib/mdocml/mdoc.7 projects/krb5/contrib/mdocml/mdoc.c projects/krb5/contrib/mdocml/mdoc_html.c projects/krb5/contrib/mdocml/mdoc_man.c projects/krb5/contrib/mdocml/mdoc_markdown.c projects/krb5/contrib/mdocml/mdoc_term.c projects/krb5/contrib/mdocml/mdoc_validate.c projects/krb5/contrib/mdocml/msec.in projects/krb5/contrib/mdocml/out.c projects/krb5/contrib/mdocml/out.h projects/krb5/contrib/mdocml/read.c projects/krb5/contrib/mdocml/roff.7 projects/krb5/contrib/mdocml/roff.c projects/krb5/contrib/mdocml/roff.h projects/krb5/contrib/mdocml/roff_html.c projects/krb5/contrib/mdocml/roff_int.h projects/krb5/contrib/mdocml/roff_term.c projects/krb5/contrib/mdocml/roff_validate.c projects/krb5/contrib/mdocml/soelim.1 projects/krb5/contrib/mdocml/st.c projects/krb5/contrib/mdocml/st.in projects/krb5/contrib/mdocml/tbl.7 projects/krb5/contrib/mdocml/tbl.c projects/krb5/contrib/mdocml/tbl_data.c projects/krb5/contrib/mdocml/tbl_html.c projects/krb5/contrib/mdocml/tbl_layout.c projects/krb5/contrib/mdocml/tbl_term.c projects/krb5/contrib/mdocml/term.c projects/krb5/contrib/mdocml/term.h projects/krb5/contrib/mdocml/term_ascii.c projects/krb5/contrib/mdocml/term_tab.c projects/krb5/contrib/mdocml/tree.c projects/krb5/contrib/netbsd-tests/lib/libc/gen/t_dir.c projects/krb5/contrib/netbsd-tests/lib/libc/regex/data/repet_bounded.in projects/krb5/contrib/netbsd-tests/lib/libc/regex/data/repet_multi.in projects/krb5/contrib/netbsd-tests/lib/libc/sys/t_mlock.c projects/krb5/contrib/sqlite3/Makefile.msc projects/krb5/contrib/sqlite3/configure projects/krb5/contrib/sqlite3/configure.ac projects/krb5/contrib/sqlite3/shell.c projects/krb5/contrib/sqlite3/sqlite3.c projects/krb5/contrib/sqlite3/sqlite3.h projects/krb5/contrib/sqlite3/sqlite3ext.h projects/krb5/contrib/sqlite3/tea/configure projects/krb5/contrib/sqlite3/tea/configure.ac projects/krb5/contrib/sqlite3/tea/generic/tclsqlite3.c projects/krb5/contrib/subversion/CHANGES projects/krb5/contrib/subversion/NOTICE projects/krb5/contrib/subversion/build-outputs.mk projects/krb5/contrib/subversion/configure projects/krb5/contrib/subversion/subversion/include/svn_version.h projects/krb5/contrib/subversion/subversion/libsvn_client/copy.c projects/krb5/contrib/subversion/subversion/libsvn_client/merge.c projects/krb5/contrib/subversion/subversion/libsvn_fs_fs/cached_data.c projects/krb5/contrib/subversion/subversion/libsvn_fs_fs/cached_data.h projects/krb5/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h projects/krb5/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.c projects/krb5/contrib/subversion/subversion/libsvn_fs_fs/transaction.c projects/krb5/contrib/subversion/subversion/libsvn_fs_x/rep-cache-db.h projects/krb5/contrib/subversion/subversion/libsvn_ra_svn/client.c projects/krb5/contrib/subversion/subversion/libsvn_repos/dump.c projects/krb5/contrib/subversion/subversion/libsvn_subr/config_file.c projects/krb5/contrib/subversion/subversion/libsvn_subr/internal_statements.h projects/krb5/contrib/subversion/subversion/libsvn_subr/io.c projects/krb5/contrib/subversion/subversion/libsvn_subr/version.c projects/krb5/contrib/subversion/subversion/libsvn_wc/wc-checks.h projects/krb5/contrib/subversion/subversion/libsvn_wc/wc-metadata.h projects/krb5/contrib/subversion/subversion/libsvn_wc/wc-queries.h projects/krb5/contrib/subversion/subversion/svnadmin/svnadmin.c projects/krb5/contrib/subversion/win-tests.py projects/krb5/contrib/top/machine.h projects/krb5/contrib/top/top.c projects/krb5/contrib/top/top.xs projects/krb5/contrib/zstd/lib/common/xxhash.c projects/krb5/etc/mtree/BSD.tests.dist projects/krb5/etc/periodic/daily/Makefile projects/krb5/etc/rc.d/Makefile projects/krb5/gnu/usr.bin/binutils/Makefile.inc0 projects/krb5/gnu/usr.bin/binutils/ld/Makefile.arm projects/krb5/gnu/usr.bin/binutils/libbfd/Makefile.arm projects/krb5/gnu/usr.bin/cc/Makefile.inc projects/krb5/gnu/usr.bin/cc/Makefile.tgt projects/krb5/gnu/usr.bin/gdb/Makefile.inc projects/krb5/gnu/usr.bin/gdb/libgdb/Makefile projects/krb5/lib/atf/libatf-c++/Makefile projects/krb5/lib/atf/libatf-c/Makefile projects/krb5/lib/clang/include/clang/Basic/Version.inc projects/krb5/lib/clang/include/lld/Config/Version.inc projects/krb5/lib/clang/include/llvm/Support/VCSRevision.h projects/krb5/lib/csu/riscv/crt1.c projects/krb5/lib/csu/riscv/crti.S projects/krb5/lib/libarchive/Makefile projects/krb5/lib/libc/Makefile projects/krb5/lib/libc/gen/fnmatch.c projects/krb5/lib/libc/gen/tls.c projects/krb5/lib/libc/regex/engine.c projects/krb5/lib/libc/regex/regcomp.c projects/krb5/lib/libc/riscv/gen/fabs.S projects/krb5/lib/libc/stdlib/jemalloc/Makefile.inc projects/krb5/lib/libc/stdlib/set_constraint_handler_s.c projects/krb5/lib/libc/string/memset_s.c projects/krb5/lib/libc/sys/getsockopt.2 projects/krb5/lib/libc/sys/shmget.2 projects/krb5/lib/libc/tests/gen/fnmatch_testcases.h projects/krb5/lib/libc/tests/string/memset_s_test.c projects/krb5/lib/libc/x86/sys/__vdso_gettc.c projects/krb5/lib/libcam/Makefile projects/krb5/lib/libcapsicum/capsicum_helpers.h projects/krb5/lib/libcasper/Makefile projects/krb5/lib/libcasper/services/Makefile projects/krb5/lib/libcasper/services/cap_dns/Makefile projects/krb5/lib/libcasper/services/cap_dns/tests/dns_test.c projects/krb5/lib/libcasper/services/cap_grp/Makefile projects/krb5/lib/libcasper/services/cap_grp/tests/grp_test.c projects/krb5/lib/libcasper/services/cap_pwd/Makefile projects/krb5/lib/libcasper/services/cap_pwd/tests/pwd_test.c projects/krb5/lib/libcasper/services/cap_sysctl/Makefile projects/krb5/lib/libcasper/services/cap_sysctl/tests/Makefile projects/krb5/lib/libcasper/services/cap_sysctl/tests/sysctl_test.c projects/krb5/lib/libcompiler_rt/Makefile.inc projects/krb5/lib/libcrypt/Makefile projects/krb5/lib/libkvm/Makefile projects/krb5/lib/libmp/Makefile projects/krb5/lib/libnv/Makefile projects/krb5/lib/libpathconv/Makefile projects/krb5/lib/libproc/Makefile projects/krb5/lib/libproc/proc_bkpt.c projects/krb5/lib/libproc/proc_regs.c projects/krb5/lib/librt/Makefile projects/krb5/lib/libsbuf/Makefile projects/krb5/lib/libthr/Makefile projects/krb5/lib/libusb/libusb.h projects/krb5/lib/libusb/libusb10_desc.c projects/krb5/lib/libutil/Makefile projects/krb5/lib/libutil/pidfile.c projects/krb5/lib/libxo/Makefile projects/krb5/lib/msun/Makefile projects/krb5/lib/ncurses/ncurses/termcap.c projects/krb5/libexec/atf/atf-check/Makefile projects/krb5/libexec/atf/atf-sh/Makefile projects/krb5/libexec/rtld-elf/Makefile projects/krb5/libexec/rtld-elf/riscv/reloc.c projects/krb5/libexec/rtld-elf/rtld.c projects/krb5/release/packages/kernel.ucl projects/krb5/release/packages/runtime.ucl projects/krb5/release/release.sh projects/krb5/sbin/devd/Makefile projects/krb5/sbin/dhclient/Makefile projects/krb5/sbin/fsck_ffs/setup.c projects/krb5/sbin/growfs/Makefile projects/krb5/sbin/ifconfig/Makefile projects/krb5/sbin/ifconfig/ifconfig.c projects/krb5/sbin/mdconfig/Makefile projects/krb5/sbin/newfs/mkfs.c projects/krb5/sbin/pfctl/Makefile projects/krb5/sbin/route/route.8 projects/krb5/share/examples/Makefile projects/krb5/share/man/man4/enc.4 projects/krb5/share/man/man4/geom.4 projects/krb5/share/man/man4/geom_fox.4 projects/krb5/share/man/man5/src.conf.5 projects/krb5/share/man/man7/arch.7 projects/krb5/share/man/man9/Makefile projects/krb5/share/man/man9/config_intrhook.9 projects/krb5/share/man/man9/disk.9 projects/krb5/share/misc/pci_vendors projects/krb5/share/mk/bsd.README projects/krb5/share/mk/bsd.cpu.mk projects/krb5/share/mk/bsd.lib.mk projects/krb5/share/mk/bsd.links.mk projects/krb5/share/mk/bsd.opts.mk projects/krb5/share/mk/bsd.own.mk projects/krb5/share/mk/bsd.prog.mk projects/krb5/share/mk/bsd.stand.mk projects/krb5/share/mk/src.opts.mk projects/krb5/share/mk/suite.test.mk projects/krb5/share/mk/sys.mk projects/krb5/share/zoneinfo/Makefile projects/krb5/sys/amd64/amd64/efirt.c (contents, props changed) projects/krb5/sys/amd64/amd64/machdep.c projects/krb5/sys/amd64/amd64/pmap.c projects/krb5/sys/amd64/amd64/trap.c projects/krb5/sys/amd64/include/cpufunc.h projects/krb5/sys/amd64/include/efi.h projects/krb5/sys/arm/at91/at91_pmc.c projects/krb5/sys/arm/conf/GENERIC projects/krb5/sys/arm/conf/NOTES projects/krb5/sys/arm/mv/armada38x/armada38x_pl310.c projects/krb5/sys/arm/mv/mv_machdep.c projects/krb5/sys/arm/ti/am335x/am335x_prcm.c projects/krb5/sys/arm64/arm64/debug_monitor.c projects/krb5/sys/arm64/arm64/gic_v3.c projects/krb5/sys/arm64/arm64/gic_v3_fdt.c projects/krb5/sys/arm64/arm64/gicv3_its.c projects/krb5/sys/arm64/arm64/machdep.c projects/krb5/sys/arm64/arm64/mp_machdep.c projects/krb5/sys/arm64/arm64/vfp.c projects/krb5/sys/arm64/include/machdep.h projects/krb5/sys/boot/efi/loader/arch/amd64/trap.c projects/krb5/sys/boot/fdt/dts/arm/armada-385-db-ap.dts projects/krb5/sys/boot/fdt/dts/arm/armada-388-gp.dts projects/krb5/sys/boot/fdt/dts/arm/armada-38x-solidrun-microsom.dtsi projects/krb5/sys/boot/fdt/dts/arm/armada-38x.dtsi projects/krb5/sys/boot/i386/boot2/Makefile projects/krb5/sys/cam/ctl/scsi_ctl.c projects/krb5/sys/cam/nvme/nvme_da.c projects/krb5/sys/cddl/compat/opensolaris/sys/atomic.h projects/krb5/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/krb5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/krb5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/krb5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/krb5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c projects/krb5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/krb5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/abd.h projects/krb5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h projects/krb5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h projects/krb5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/krb5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c projects/krb5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/krb5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/krb5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/krb5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/krb5/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/krb5/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h projects/krb5/sys/cddl/dev/profile/profile.c projects/krb5/sys/compat/linuxkpi/common/include/linux/completion.h projects/krb5/sys/compat/linuxkpi/common/include/linux/device.h projects/krb5/sys/compat/linuxkpi/common/include/linux/hrtimer.h projects/krb5/sys/compat/linuxkpi/common/include/linux/jiffies.h projects/krb5/sys/compat/linuxkpi/common/include/linux/page.h projects/krb5/sys/compat/linuxkpi/common/include/linux/pci.h projects/krb5/sys/compat/linuxkpi/common/include/linux/sched.h projects/krb5/sys/compat/linuxkpi/common/include/linux/sysfs.h projects/krb5/sys/compat/linuxkpi/common/include/linux/timer.h projects/krb5/sys/compat/linuxkpi/common/include/linux/wait.h projects/krb5/sys/compat/linuxkpi/common/src/linux_compat.c projects/krb5/sys/compat/linuxkpi/common/src/linux_hrtimer.c projects/krb5/sys/compat/linuxkpi/common/src/linux_page.c projects/krb5/sys/compat/linuxkpi/common/src/linux_pci.c projects/krb5/sys/compat/linuxkpi/common/src/linux_schedule.c projects/krb5/sys/compat/linuxkpi/common/src/linux_work.c projects/krb5/sys/conf/Makefile.riscv projects/krb5/sys/conf/NOTES projects/krb5/sys/conf/files projects/krb5/sys/conf/files.riscv projects/krb5/sys/conf/kern.mk projects/krb5/sys/dev/ahci/ahci_pci.c projects/krb5/sys/dev/ata/ata-pci.h projects/krb5/sys/dev/ata/chipsets/ata-intel.c projects/krb5/sys/dev/cxgbe/adapter.h projects/krb5/sys/dev/cxgbe/common/t4_hw.c projects/krb5/sys/dev/cxgbe/t4_main.c projects/krb5/sys/dev/cxgbe/t4_sched.c projects/krb5/sys/dev/cxgbe/tom/t4_listen.c projects/krb5/sys/dev/cyapa/cyapa.c projects/krb5/sys/dev/e1000/if_em.h projects/krb5/sys/dev/efidev/efidev.c projects/krb5/sys/dev/fdt/fdt_common.c projects/krb5/sys/dev/hwpmc/hwpmc_piv.c projects/krb5/sys/dev/hyperv/include/hyperv.h projects/krb5/sys/dev/hyperv/netvsc/hn_nvs.c projects/krb5/sys/dev/hyperv/netvsc/hn_nvs.h projects/krb5/sys/dev/hyperv/netvsc/hn_rndis.c projects/krb5/sys/dev/hyperv/netvsc/hn_rndis.h projects/krb5/sys/dev/hyperv/netvsc/if_hn.c projects/krb5/sys/dev/hyperv/netvsc/if_hnreg.h projects/krb5/sys/dev/hyperv/netvsc/if_hnvar.h projects/krb5/sys/dev/hyperv/pcib/vmbus_pcib.c projects/krb5/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c projects/krb5/sys/dev/hyperv/storvsc/hv_vstorage.h projects/krb5/sys/dev/hyperv/utilities/hv_kvp.c projects/krb5/sys/dev/hyperv/utilities/vmbus_timesync.c projects/krb5/sys/dev/hyperv/vmbus/amd64/hyperv_machdep.c projects/krb5/sys/dev/hyperv/vmbus/hyperv.c projects/krb5/sys/dev/hyperv/vmbus/vmbus.c projects/krb5/sys/dev/hyperv/vmbus/vmbus_et.c projects/krb5/sys/dev/iicbus/ds1307.c projects/krb5/sys/dev/iicbus/ds3231.c projects/krb5/sys/dev/iicbus/ds3231reg.h projects/krb5/sys/dev/iicbus/nxprtc.c projects/krb5/sys/dev/iicbus/s35390a.c projects/krb5/sys/dev/mlx4/mlx4_en/en.h projects/krb5/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c projects/krb5/sys/dev/mlx4/mlx4_en/mlx4_en_port.c projects/krb5/sys/dev/mlx4/mlx4_en/mlx4_en_tx.c projects/krb5/sys/dev/mlx4/stats.h projects/krb5/sys/dev/mlx5/mlx5_en/mlx5_en_main.c projects/krb5/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c projects/krb5/sys/dev/mly/mly.c projects/krb5/sys/dev/mmc/bridge.h projects/krb5/sys/dev/mmc/mmc.c projects/krb5/sys/dev/mmc/mmcreg.h projects/krb5/sys/dev/mmc/mmcsd.c projects/krb5/sys/dev/mmc/mmcvar.h projects/krb5/sys/dev/mpr/mpr.c projects/krb5/sys/dev/mpr/mpr_config.c projects/krb5/sys/dev/mpr/mpr_sas.c projects/krb5/sys/dev/mpr/mpr_sas_lsi.c projects/krb5/sys/dev/mpr/mpr_user.c projects/krb5/sys/dev/mpr/mprvar.h projects/krb5/sys/dev/mps/mps.c projects/krb5/sys/dev/mps/mps_config.c projects/krb5/sys/dev/mps/mps_sas.c projects/krb5/sys/dev/mps/mps_sas_lsi.c projects/krb5/sys/dev/mps/mps_user.c projects/krb5/sys/dev/mps/mpsvar.h projects/krb5/sys/dev/nvme/nvme.c projects/krb5/sys/dev/nvme/nvme_sim.c projects/krb5/sys/dev/ofw/ofw_bus_subr.c projects/krb5/sys/dev/ofw/ofw_fdt.c projects/krb5/sys/dev/qlnx/qlnxe/qlnx_def.h projects/krb5/sys/dev/qlnx/qlnxe/qlnx_os.c projects/krb5/sys/dev/qlnx/qlnxe/qlnx_ver.h projects/krb5/sys/dev/sound/pci/hda/hdac.c projects/krb5/sys/dev/sound/pci/hda/hdac.h projects/krb5/sys/dev/sym/sym_hipd.c projects/krb5/sys/dev/usb/controller/xhci_pci.c projects/krb5/sys/dev/usb/quirk/usb_quirk.c projects/krb5/sys/dev/xen/timer/timer.c projects/krb5/sys/geom/geom.h projects/krb5/sys/geom/geom_bsd.c projects/krb5/sys/geom/geom_dev.c projects/krb5/sys/geom/geom_disk.c projects/krb5/sys/geom/geom_disk.h projects/krb5/sys/geom/geom_dump.c projects/krb5/sys/geom/geom_fox.c projects/krb5/sys/geom/geom_mbr.c projects/krb5/sys/geom/geom_subr.c projects/krb5/sys/geom/geom_sunlabel.c projects/krb5/sys/geom/geom_vol_ffs.c projects/krb5/sys/geom/journal/g_journal.c projects/krb5/sys/geom/journal/g_journal.h projects/krb5/sys/geom/part/g_part.c projects/krb5/sys/i386/include/md_var.h projects/krb5/sys/isa/rtc.h projects/krb5/sys/kern/kern_ktr.c projects/krb5/sys/kern/kern_sendfile.c projects/krb5/sys/kern/posix4_mib.c projects/krb5/sys/kern/subr_autoconf.c projects/krb5/sys/kern/subr_blist.c projects/krb5/sys/kern/subr_devmap.c projects/krb5/sys/kern/subr_intr.c projects/krb5/sys/kern/subr_smp.c projects/krb5/sys/kern/vfs_aio.c projects/krb5/sys/kern/vfs_bio.c projects/krb5/sys/libkern/x86/crc32_sse42.c projects/krb5/sys/mips/atheros/if_arge.c projects/krb5/sys/mips/conf/XLP.hints projects/krb5/sys/mips/conf/XLR projects/krb5/sys/mips/conf/XLR64 projects/krb5/sys/mips/conf/XLRN32 projects/krb5/sys/mips/conf/std.XLP projects/krb5/sys/mips/rmi/xlr_i2c.c projects/krb5/sys/modules/dtrace/dtraceall/dtraceall.c projects/krb5/sys/modules/i2c/Makefile projects/krb5/sys/modules/qlnx/qlnxe/Makefile projects/krb5/sys/net/if_enc.c projects/krb5/sys/net/if_vlan.c projects/krb5/sys/net/iflib.c projects/krb5/sys/netinet/if_ether.c projects/krb5/sys/netinet/in.h projects/krb5/sys/netipsec/key.c projects/krb5/sys/netpfil/pf/pf_lb.c projects/krb5/sys/riscv/conf/GENERIC projects/krb5/sys/riscv/include/machdep.h projects/krb5/sys/riscv/include/riscvreg.h projects/krb5/sys/riscv/include/sbi.h projects/krb5/sys/riscv/riscv/cpufunc_asm.S projects/krb5/sys/riscv/riscv/exception.S projects/krb5/sys/riscv/riscv/intr_machdep.c projects/krb5/sys/riscv/riscv/locore.S projects/krb5/sys/riscv/riscv/machdep.c projects/krb5/sys/riscv/riscv/nexus.c projects/krb5/sys/riscv/riscv/pmap.c projects/krb5/sys/riscv/riscv/riscv_console.c projects/krb5/sys/riscv/riscv/swtch.S projects/krb5/sys/riscv/riscv/timer.c projects/krb5/sys/riscv/riscv/trap.c projects/krb5/sys/riscv/riscv/vm_machdep.c projects/krb5/sys/sparc64/sparc64/pmap.c projects/krb5/sys/sys/blist.h projects/krb5/sys/sys/cdefs.h projects/krb5/sys/sys/kernel.h projects/krb5/sys/sys/kerneldump.h projects/krb5/sys/sys/types.h projects/krb5/sys/ufs/ffs/ffs_snapshot.c projects/krb5/sys/ufs/ffs/fs.h projects/krb5/sys/vm/vm_glue.c projects/krb5/sys/vm/vm_kern.c projects/krb5/sys/vm/vm_page.c projects/krb5/sys/vm/vm_page.h projects/krb5/sys/x86/acpica/madt.c projects/krb5/sys/x86/acpica/srat.c projects/krb5/sys/x86/include/apicvar.h projects/krb5/sys/x86/include/x86_smp.h projects/krb5/sys/x86/include/x86_var.h projects/krb5/sys/x86/isa/atrtc.c projects/krb5/sys/x86/x86/identcpu.c projects/krb5/sys/x86/x86/local_apic.c projects/krb5/sys/x86/x86/mp_x86.c projects/krb5/sys/x86/x86/mptable.c projects/krb5/sys/x86/xen/pvcpu_enum.c projects/krb5/tests/Makefile projects/krb5/tests/sys/Makefile.inc projects/krb5/tests/sys/file/newfileops_on_fork_test.c projects/krb5/tests/sys/netinet/fibs_test.sh (contents, props changed) projects/krb5/tools/build/mk/OptionalObsoleteFiles.inc projects/krb5/usr.bin/apply/Makefile projects/krb5/usr.bin/basename/Makefile projects/krb5/usr.bin/bsdcat/Makefile projects/krb5/usr.bin/calendar/Makefile projects/krb5/usr.bin/calendar/calendars/calendar.freebsd projects/krb5/usr.bin/cmp/Makefile projects/krb5/usr.bin/col/Makefile projects/krb5/usr.bin/comm/Makefile projects/krb5/usr.bin/compress/Makefile projects/krb5/usr.bin/cpio/Makefile projects/krb5/usr.bin/csplit/Makefile projects/krb5/usr.bin/cut/Makefile projects/krb5/usr.bin/diff/Makefile projects/krb5/usr.bin/diff3/Makefile projects/krb5/usr.bin/dirname/Makefile projects/krb5/usr.bin/du/Makefile projects/krb5/usr.bin/du/du.1 projects/krb5/usr.bin/du/du.c projects/krb5/usr.bin/du/tests/du_test.sh projects/krb5/usr.bin/file2c/Makefile projects/krb5/usr.bin/getconf/Makefile projects/krb5/usr.bin/grep/Makefile projects/krb5/usr.bin/gzip/Makefile projects/krb5/usr.bin/hexdump/Makefile projects/krb5/usr.bin/ident/Makefile projects/krb5/usr.bin/indent/Makefile projects/krb5/usr.bin/indent/indent.1 projects/krb5/usr.bin/indent/indent.c projects/krb5/usr.bin/join/Makefile projects/krb5/usr.bin/jot/Makefile projects/krb5/usr.bin/lastcomm/Makefile projects/krb5/usr.bin/ldd/ldd.c projects/krb5/usr.bin/limits/Makefile projects/krb5/usr.bin/m4/Makefile projects/krb5/usr.bin/mandoc/Makefile projects/krb5/usr.bin/mkesdb/yacc.y projects/krb5/usr.bin/mkimg/Makefile projects/krb5/usr.bin/mt/mt.1 projects/krb5/usr.bin/ncal/Makefile projects/krb5/usr.bin/pr/Makefile projects/krb5/usr.bin/printf/Makefile projects/krb5/usr.bin/procstat/Makefile projects/krb5/usr.bin/sdiff/Makefile projects/krb5/usr.bin/sed/Makefile projects/krb5/usr.bin/soelim/Makefile projects/krb5/usr.bin/stat/Makefile projects/krb5/usr.bin/tail/Makefile projects/krb5/usr.bin/tar/Makefile projects/krb5/usr.bin/timeout/Makefile projects/krb5/usr.bin/top/machine.c projects/krb5/usr.bin/tr/Makefile projects/krb5/usr.bin/truncate/Makefile projects/krb5/usr.bin/uniq/Makefile projects/krb5/usr.bin/units/Makefile projects/krb5/usr.bin/units/units.1 projects/krb5/usr.bin/uudecode/Makefile projects/krb5/usr.bin/uuencode/Makefile projects/krb5/usr.bin/vmstat/vmstat.c projects/krb5/usr.bin/xargs/Makefile projects/krb5/usr.bin/xinstall/Makefile projects/krb5/usr.bin/xlint/lint1/param.h projects/krb5/usr.bin/xo/Makefile projects/krb5/usr.bin/yacc/Makefile projects/krb5/usr.sbin/acpi/acpidump/acpi.c projects/krb5/usr.sbin/bluetooth/bthidcontrol/sdp.c projects/krb5/usr.sbin/bluetooth/bthidd/bthid_config.h projects/krb5/usr.sbin/bluetooth/bthidd/bthidd.conf.sample projects/krb5/usr.sbin/bluetooth/bthidd/bthidd.h projects/krb5/usr.sbin/bluetooth/bthidd/hid.c projects/krb5/usr.sbin/bluetooth/bthidd/lexer.l projects/krb5/usr.sbin/bluetooth/bthidd/parser.y projects/krb5/usr.sbin/bluetooth/bthidd/server.c projects/krb5/usr.sbin/bluetooth/bthidd/session.c projects/krb5/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8 projects/krb5/usr.sbin/bsdinstall/scripts/netconfig_ipv4 projects/krb5/usr.sbin/chown/Makefile projects/krb5/usr.sbin/cpucontrol/cpucontrol.8 projects/krb5/usr.sbin/etcupdate/Makefile projects/krb5/usr.sbin/extattr/Makefile projects/krb5/usr.sbin/fstyp/Makefile projects/krb5/usr.sbin/makefs/Makefile projects/krb5/usr.sbin/newsyslog/Makefile projects/krb5/usr.sbin/nmtree/Makefile projects/krb5/usr.sbin/pw/Makefile projects/krb5/usr.sbin/rpcbind/Makefile projects/krb5/usr.sbin/sa/Makefile projects/krb5/usr.sbin/tzsetup/tzsetup.c Directory Properties: projects/krb5/ (props changed) projects/krb5/cddl/ (props changed) projects/krb5/cddl/contrib/opensolaris/ (props changed) projects/krb5/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/krb5/contrib/compiler-rt/ (props changed) projects/krb5/contrib/elftoolchain/ (props changed) projects/krb5/contrib/gcc/ (props changed) projects/krb5/contrib/libc++/ (props changed) projects/krb5/contrib/llvm/ (props changed) projects/krb5/contrib/llvm/projects/libunwind/ (props changed) projects/krb5/contrib/llvm/tools/clang/ (props changed) projects/krb5/contrib/llvm/tools/lld/ (props changed) projects/krb5/contrib/llvm/tools/lldb/ (props changed) projects/krb5/contrib/mdocml/ (props changed) projects/krb5/contrib/netbsd-tests/ (props changed) projects/krb5/contrib/sqlite3/ (props changed) projects/krb5/contrib/subversion/ (props changed) projects/krb5/contrib/top/ (props changed) projects/krb5/contrib/zstd/ (props changed) projects/krb5/gnu/usr.bin/binutils/ (props changed) projects/krb5/gnu/usr.bin/gdb/ (props changed) projects/krb5/sys/cddl/contrib/opensolaris/ (props changed) projects/krb5/tests/etc/rc.d/routing_test.sh (props changed) projects/krb5/tests/sys/acl/aclfuzzer.sh (props changed) projects/krb5/tests/sys/acl/mktrivial.sh (props changed) projects/krb5/tests/sys/file/flock_test.sh (props changed) projects/krb5/tests/sys/geom/class/eli/conf.sh (props changed) projects/krb5/tests/sys/geom/class/eli/init_alias_test.sh (props changed) projects/krb5/tests/sys/geom/class/gate/ggate_test.sh (props changed) projects/krb5/tests/sys/geom/class/mirror/8_test.sh (props changed) projects/krb5/tests/sys/geom/class/mirror/9_test.sh (props changed) projects/krb5/tests/sys/geom/class/nop/nop_test.sh (props changed) projects/krb5/tests/sys/geom/class/uzip/conf.sh (props changed) projects/krb5/tests/sys/kern/coredump_phnum_test.sh (props changed) projects/krb5/tests/sys/kqueue/libkqueue/kqueue_test.sh (props changed) projects/krb5/tests/sys/mac/portacl/misc.sh (props changed) projects/krb5/tests/sys/mac/portacl/nobody_test.sh (props changed) projects/krb5/tests/sys/mac/portacl/root_test.sh (props changed) projects/krb5/tests/sys/mqueue/mqueue_test.sh (props changed) projects/krb5/tests/sys/opencrypto/runtests.sh (props changed) projects/krb5/tests/sys/vfs/trailing_slash.sh (props changed) Modified: projects/krb5/Makefile ============================================================================== --- projects/krb5/Makefile Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/Makefile Wed Aug 16 06:43:50 2017 (r322568) @@ -245,12 +245,17 @@ _MAKE+= MK_META_MODE=no .endif # !exists(/dev/filemon) && !defined(NO_FILEMON) .endif # !defined(_CAN_USE_META_MODE) -# Guess machine architecture from machine type, and vice versa. +# Guess target architecture from target type, and vice versa, based on +# historic FreeBSD practice of tending to have TARGET == TARGET_ARCH +# expanding to TARGET == TARGET_CPUARCH in recent times, with known +# exceptions. .if !defined(TARGET_ARCH) && defined(TARGET) +# T->TA mapping is usually TARGET with arm64 the odd man out _TARGET_ARCH= ${TARGET:S/arm64/aarch64/} .elif !defined(TARGET) && defined(TARGET_ARCH) && \ ${TARGET_ARCH} != ${MACHINE_ARCH} -_TARGET= ${TARGET_ARCH:C/mips(n32|64)?(el)?(hf)?/mips/:C/arm(v6)?(eb)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/:C/powerpcspe/powerpc/:C/riscv64(sf)?/riscv/} +# TA->T mapping is accidentally CPUARCH with aarch64 the odd man out +_TARGET= ${TARGET_ARCH:${__TO_CPUARCH}:C/aarch64/arm64/} .endif .if defined(TARGET) && !defined(_TARGET) _TARGET=${TARGET} Modified: projects/krb5/Makefile.inc1 ============================================================================== --- projects/krb5/Makefile.inc1 Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/Makefile.inc1 Wed Aug 16 06:43:50 2017 (r322568) @@ -346,6 +346,12 @@ SVN= ${_P}/${_S} . endfor .endif SVNFLAGS?= -r HEAD +.if !defined(VCS_REVISION) && empty(VCS_REVISION) +_VCS_REVISION?= $$(eval ${SVNVERSION_CMD} ${SRCDIR}) +. if !empty(_VCS_REVISION) +VCS_REVISION= $$(echo r${_VCS_REVISION}) +. endif +.endif .if !defined(OSRELDATE) .if exists(/usr/include/osreldate.h) @@ -1493,20 +1499,24 @@ packagekernel: .PHONY @${DESTDIR}/${DISTDIR}/kernel.meta | \ ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz .endif +.if ${MK_DEBUG_FILES} != "no" cd ${DESTDIR}/${DISTDIR}/kernel; \ tar cvf - --include '*/*/*.debug' \ @${DESTDIR}/${DISTDIR}/kernel.meta | \ ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz +.endif .if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" .for _kernel in ${BUILDKERNELS:[2..-1]} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ tar cvf - --exclude '*.debug' \ @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ ${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz +.if ${MK_DEBUG_FILES} != "no" cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ tar cvf - --include '*/*/*.debug' \ @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \ ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz +.endif .endfor .endif .else @@ -1515,17 +1525,21 @@ packagekernel: .PHONY tar cvf - --exclude '*.debug' . | \ ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz .endif +.if ${MK_DEBUG_FILES} != "no" cd ${DESTDIR}/${DISTDIR}/kernel; \ tar cvf - --include '*/*/*.debug' $$(eval find .) | \ ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz +.endif .if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" .for _kernel in ${BUILDKERNELS:[2..-1]} cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ tar cvf - --exclude '*.debug' . | \ ${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz +.if ${MK_DEBUG_FILES} != "no" cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \ tar cvf - --include '*/*/*.debug' $$(eval find .) | \ ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz +.endif .endfor .endif .endif @@ -1618,7 +1632,10 @@ create-world-package-${pkgname}: .PHONY @awk -F\" ' \ /^name/ { printf("===> Creating %s-", $$2); next } \ /^version/ { print $$2; next } \ - ' ${WSTAGEDIR}/${pkgname}.ucl ; \ + ' ${WSTAGEDIR}/${pkgname}.ucl + @if [ "${pkgname}" == "runtime" ]; then \ + sed -i '' -e "s/%VCS_REVISION%/${VCS_REVISION}/" ${WSTAGEDIR}/${pkgname}.ucl ; \ + fi ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \ create -M ${WSTAGEDIR}/${pkgname}.ucl \ -p ${WSTAGEDIR}/${pkgname}.plist \ @@ -1629,7 +1646,10 @@ create-world-package-${pkgname}: .PHONY create-kernel-packages: .PHONY _default_flavor= -default .if exists(${KSTAGEDIR}/kernel.meta) -.for flavor in "" -debug +. if ${MK_DEBUG_FILES} != "no" +_debug=-debug +. endif +. for flavor in "" ${_debug} create-kernel-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},} create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap .PHONY @cd ${KSTAGEDIR}/${DISTDIR} ; \ @@ -1644,6 +1664,7 @@ create-kernel-packages-flavor${flavor:C,^""$,${_defaul -e "s/%DESC%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \ -e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \ -e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \ + -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ ${SRCDIR}/release/packages/kernel.ucl \ > ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \ awk -F\" ' \ @@ -1655,12 +1676,15 @@ create-kernel-packages-flavor${flavor:C,^""$,${_defaul -p ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \ -r ${KSTAGEDIR}/${DISTDIR} \ -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} -.endfor +. endfor .endif .if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes" -.for _kernel in ${BUILDKERNELS:[2..-1]} -.if exists(${KSTAGEDIR}/kernel.${_kernel}.meta) -.for flavor in "" -debug +. for _kernel in ${BUILDKERNELS:[2..-1]} +. if exists(${KSTAGEDIR}/kernel.${_kernel}.meta) +. if ${MK_DEBUG_FILES} != "no" +_debug=-debug +. endif +. for flavor in "" ${_debug} create-kernel-packages: create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kernel} create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kernel}: _pkgbootstrap .PHONY @cd ${KSTAGEDIR}/kernel.${_kernel} ; \ @@ -1675,6 +1699,7 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_ -e "s/%DESC%/FreeBSD ${_kernel} kernel ${flavor}/" \ -e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \ -e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \ + -e "s/ %VCS_REVISION%/${VCS_REVISION}/" \ ${SRCDIR}/release/packages/kernel.ucl \ > ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \ awk -F\" ' \ @@ -1686,10 +1711,10 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_ -p ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.plist \ -r ${KSTAGEDIR}/kernel.${_kernel} \ -o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION} -.endfor +. endfor +. endif +. endfor .endif -.endfor -.endif sign-packages: _pkgbootstrap .PHONY @[ -L "${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest" ] && \ @@ -2742,8 +2767,7 @@ CD2CFLAGS+= -isystem ${XDDESTDIR}/usr/include -L${XDDE # combined with --sysroot. CD2CFLAGS+= -B${XDDESTDIR}/usr/lib # Force using libc++ for external GCC. -# XXX: This should be checking MK_GNUCXX == no -.if ${X_COMPILER_VERSION} >= 40800 +.if ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800 CD2CXXFLAGS+= -isystem ${XDDESTDIR}/usr/include/c++/v1 -std=c++11 \ -nostdinc++ .endif Modified: projects/krb5/Makefile.libcompat ============================================================================== --- projects/krb5/Makefile.libcompat Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/Makefile.libcompat Wed Aug 16 06:43:50 2017 (r322568) @@ -99,8 +99,7 @@ LIBCOMPATCFLAGS+= -B${LIBCOMPATTMP}/usr/lib${libcompat # sysroot path which --sysroot does not actually do for headers. LIBCOMPATCFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include # Force using libc++ for external GCC. -# XXX: This should be checking MK_GNUCXX == no -.if ${X_COMPILER_VERSION} >= 40800 && \ +.if ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800 && \ (${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no") LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \ -nostdinc++ Modified: projects/krb5/UPDATING ============================================================================== --- projects/krb5/UPDATING Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/UPDATING Wed Aug 16 06:43:50 2017 (r322568) @@ -51,6 +51,40 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: ****************************** SPECIAL WARNING: ****************************** +20170814: + "make check" behavior (made in ^/head@r295380) has been changed to + execute from a limited sandbox, as opposed to executing from + ${TESTSDIR}. + + Behavioral changes: + - The "beforecheck" and "aftercheck" targets are now specified. + - ${CHECKDIR} (added in commit noted above) has been removed. + - Legacy behavior can be enabled by setting + WITHOUT_MAKE_CHECK_USE_SANDBOX in src.conf(5) or the environment. + + If the limited sandbox mode is enabled, "make check" will execute + "make distribution", then install, execute the tests, and clean up the + sandbox if successful. + + The "make distribution" and "make install" targets are typically run as + root to set appropriate permissions and ownership at installation time. + The end-user should set "WITH_INSTALL_AS_USER" in src.conf(5) or the + environment if executing "make check" with limited sandbox mode using + an unprivileged user. + +20170808: + Since the switch to GPT disk labels, fsck for UFS/FFS has been + unable to automatically find alternate superblocks. As of r322297, + the information needed to find alternate superblocks has been + moved to the end of the area reserved for the boot block. + Filesystems created with a newfs of this vintage or later + will create the recovery information. If you have a filesystem + created prior to this change and wish to have a recovery block + created for your filesystem, you can do so by running fsck in + forground mode (i.e., do not use the -p or -y options). As it + starts, fsck will ask ``SAVE DATA TO FIND ALTERNATE SUPERBLOCKS'' + to which you should answer yes. + 20170728: As of r321665, an NFSv4 server configuration that services Kerberos mounts or clients that do not support the uid/gid in @@ -64,8 +98,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: and upgrading, if you are not already using clang 3.5.0 or higher. 20170701: - WITHOUT_RCMDS is now the default. Set WITH_RCMDS if you need them to be - built with the base system. + WITHOUT_RCMDS is now the default. Set WITH_RCMDS if you need the + r-commands (rlogin, rsh, etc.) to be built with the base system. 20170625: The FreeBSD/powerpc platform now uses a 64-bit type for time_t. This is Modified: projects/krb5/bin/cat/Makefile ============================================================================== --- projects/krb5/bin/cat/Makefile Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/cat/Makefile Wed Aug 16 06:43:50 2017 (r322568) @@ -6,6 +6,7 @@ PACKAGE=runtime PROG= cat +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/krb5/bin/cat/cat.c ============================================================================== --- projects/krb5/bin/cat/cat.c Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/cat/cat.c Wed Aug 16 06:43:50 2017 (r322568) @@ -51,12 +51,12 @@ __FBSDID("$FreeBSD$"); #ifndef NO_UDOM_SUPPORT #include <sys/socket.h> #include <sys/un.h> -#include <errno.h> #include <netdb.h> #endif #include <ctype.h> #include <err.h> +#include <errno.h> #include <fcntl.h> #include <locale.h> #include <stddef.h> Modified: projects/krb5/bin/chmod/Makefile ============================================================================== --- projects/krb5/bin/chmod/Makefile Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/chmod/Makefile Wed Aug 16 06:43:50 2017 (r322568) @@ -6,6 +6,7 @@ PACKAGE=runtime PROG= chmod +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/krb5/bin/date/Makefile ============================================================================== --- projects/krb5/bin/date/Makefile Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/date/Makefile Wed Aug 16 06:43:50 2017 (r322568) @@ -7,6 +7,7 @@ PACKAGE=runtime PROG= date SRCS= date.c netdate.c vary.c +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/krb5/bin/dd/Makefile ============================================================================== --- projects/krb5/bin/dd/Makefile Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/dd/Makefile Wed Aug 16 06:43:50 2017 (r322568) @@ -38,6 +38,7 @@ test: ${PROG} gen @rm -f gen 1M_zeroes* obs_zeroes +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/krb5/bin/df/df.1 ============================================================================== --- projects/krb5/bin/df/df.1 Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/df/df.1 Wed Aug 16 06:43:50 2017 (r322568) @@ -29,7 +29,7 @@ .\" @(#)df.1 8.3 (Berkeley) 5/8/95 .\" $FreeBSD$ .\" -.Dd December 1, 2015 +.Dd August 8, 2017 .Dt DF 1 .Os .Sh NAME @@ -97,7 +97,7 @@ output. Use unit suffixes: Byte, Kibibyte, Mebibyte, Gibibyte, Tebibyte and Pebibyte (based on powers of 1024) in order to reduce the number of digits to four or fewer. -.It Fl H +.It Fl H , Fl Fl si .Dq Human-readable output. Use unit suffixes: Byte, Kilobyte, Megabyte, Modified: projects/krb5/bin/df/df.c ============================================================================== --- projects/krb5/bin/df/df.c Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/df/df.c Wed Aug 16 06:43:50 2017 (r322568) @@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$"); #include <ufs/ufs/ufsmount.h> #endif #include <err.h> +#include <getopt.h> #include <libutil.h> #include <locale.h> #ifdef MOUNT_CHAR_DEVS @@ -107,6 +108,12 @@ static int thousands; static struct ufs_args mdev; #endif +static const struct option long_options[] = +{ + { "si", no_argument, NULL, 'H' }, + { NULL, no_argument, NULL, 0 }, +}; + int main(int argc, char *argv[]) { @@ -142,7 +149,8 @@ main(int argc, char *argv[]) if (argc < 0) exit(1); - while ((ch = getopt(argc, argv, "abcgHhiklmnPt:T,")) != -1) + while ((ch = getopt_long(argc, argv, "+abcgHhiklmnPt:T,", long_options, + NULL)) != -1) switch (ch) { case 'a': aflag = 1; Modified: projects/krb5/bin/echo/Makefile ============================================================================== --- projects/krb5/bin/echo/Makefile Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/echo/Makefile Wed Aug 16 06:43:50 2017 (r322568) @@ -6,6 +6,7 @@ PACKAGE=runtime PROG= echo +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/krb5/bin/expr/Makefile ============================================================================== --- projects/krb5/bin/expr/Makefile Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/expr/Makefile Wed Aug 16 06:43:50 2017 (r322568) @@ -12,6 +12,7 @@ CFLAGS+= -fwrapv NO_WMISSING_VARIABLE_DECLARATIONS= +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/krb5/bin/ln/Makefile ============================================================================== --- projects/krb5/bin/ln/Makefile Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/ln/Makefile Wed Aug 16 06:43:50 2017 (r322568) @@ -10,6 +10,7 @@ MAN= ln.1 symlink.7 LINKS= ${BINDIR}/ln ${BINDIR}/link MLINKS= ln.1 link.1 +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/krb5/bin/ls/Makefile ============================================================================== --- projects/krb5/bin/ls/Makefile Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/ls/Makefile Wed Aug 16 06:43:50 2017 (r322568) @@ -14,6 +14,7 @@ CFLAGS+= -DCOLORLS LIBADD+= termcapw .endif +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/krb5/bin/mv/Makefile ============================================================================== --- projects/krb5/bin/mv/Makefile Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/mv/Makefile Wed Aug 16 06:43:50 2017 (r322568) @@ -6,6 +6,7 @@ PACKAGE=runtime PROG= mv +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/krb5/bin/pax/Makefile ============================================================================== --- projects/krb5/bin/pax/Makefile Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/pax/Makefile Wed Aug 16 06:43:50 2017 (r322568) @@ -33,6 +33,7 @@ SRCS= ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \ tables.c tar.c tty_subs.c +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/krb5/bin/pkill/Makefile ============================================================================== --- projects/krb5/bin/pkill/Makefile Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/pkill/Makefile Wed Aug 16 06:43:50 2017 (r322568) @@ -19,6 +19,7 @@ MLINKS= pkill.1 pgrep.1 SYMLINKS= ../..${BINDIR}/pkill /usr/bin/pkill SYMLINKS+= ../..${BINDIR}/pgrep /usr/bin/pgrep +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/krb5/bin/pkill/pkill.c ============================================================================== --- projects/krb5/bin/pkill/pkill.c Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/pkill/pkill.c Wed Aug 16 06:43:50 2017 (r322568) @@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$"); #include <sys/user.h> #include <assert.h> +#include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <limits.h> @@ -656,10 +657,12 @@ killact(const struct kinfo_proc *kp) static int grepact(const struct kinfo_proc *kp) { + static bool first = true; - show_process(kp); - if (!quiet) + if (!quiet && !first) printf("%s", delim); + show_process(kp); + first = false; return (1); } Modified: projects/krb5/bin/pwait/Makefile ============================================================================== --- projects/krb5/bin/pwait/Makefile Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/pwait/Makefile Wed Aug 16 06:43:50 2017 (r322568) @@ -5,6 +5,7 @@ PACKAGE=runtime PROG= pwait +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/krb5/bin/sh/Makefile ============================================================================== --- projects/krb5/bin/sh/Makefile Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/sh/Makefile Wed Aug 16 06:43:50 2017 (r322568) @@ -64,6 +64,7 @@ syntax.c syntax.h: mksyntax token.h: mktokens sh ${.CURDIR}/mktokens +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/krb5/bin/sh/tests/Makefile ============================================================================== --- projects/krb5/bin/sh/tests/Makefile Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/sh/tests/Makefile Wed Aug 16 06:43:50 2017 (r322568) @@ -6,6 +6,7 @@ TESTS_SUBDIRS+= builtins TESTS_SUBDIRS+= errors TESTS_SUBDIRS+= execution TESTS_SUBDIRS+= expansion +TESTS_SUBDIRS+= invocation TESTS_SUBDIRS+= parameters TESTS_SUBDIRS+= parser TESTS_SUBDIRS+= set-e Modified: projects/krb5/bin/sleep/Makefile ============================================================================== --- projects/krb5/bin/sleep/Makefile Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/sleep/Makefile Wed Aug 16 06:43:50 2017 (r322568) @@ -6,6 +6,7 @@ PACKAGE=runtime PROG= sleep +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/krb5/bin/test/Makefile ============================================================================== --- projects/krb5/bin/test/Makefile Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/bin/test/Makefile Wed Aug 16 06:43:50 2017 (r322568) @@ -8,6 +8,7 @@ PROG= test LINKS= ${BINDIR}/test ${BINDIR}/[ MLINKS= test.1 [.1 +HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include <bsd.prog.mk> Modified: projects/krb5/cddl/contrib/opensolaris/cmd/ztest/ztest.c ============================================================================== --- projects/krb5/cddl/contrib/opensolaris/cmd/ztest/ztest.c Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/cddl/contrib/opensolaris/cmd/ztest/ztest.c Wed Aug 16 06:43:50 2017 (r322568) @@ -1838,7 +1838,6 @@ ztest_get_data(void *arg, lr_write_t *lr, char *buf, z uint64_t object = lr->lr_foid; uint64_t offset = lr->lr_offset; uint64_t size = lr->lr_length; - blkptr_t *bp = &lr->lr_blkptr; uint64_t txg = lr->lr_common.lrc_txg; uint64_t crtxg; dmu_object_info_t doi; @@ -1892,11 +1891,7 @@ ztest_get_data(void *arg, lr_write_t *lr, char *buf, z DMU_READ_NO_PREFETCH); if (error == 0) { - blkptr_t *obp = dmu_buf_get_blkptr(db); - if (obp) { - ASSERT(BP_IS_HOLE(bp)); - *bp = *obp; - } + blkptr_t *bp = &lr->lr_blkptr; zgd->zgd_db = db; zgd->zgd_bp = bp; Modified: projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Wed Aug 16 06:43:50 2017 (r322568) @@ -250,7 +250,7 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__L dofr[j].dofr_offset + 4; rel->r_info = ELF32_R_INFO(count + dep->de_global, R_PPC_REL32); -#elif defined(__riscv__) +#elif defined(__riscv) /* XXX */ printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); #else @@ -430,7 +430,7 @@ prepare_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, dofr[j].dofr_offset; rel->r_info = ELF64_R_INFO(count + dep->de_global, R_PPC64_REL64); -#elif defined(__riscv__) +#elif defined(__riscv) /* XXX */ #elif defined(__i386) || defined(__amd64) rel->r_offset = s->dofs_offset + @@ -904,7 +904,7 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, return (0); } -#elif defined(__riscv__) +#elif defined(__riscv) /* XXX */ static int dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela, Modified: projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c ============================================================================== --- projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c Wed Aug 16 06:43:50 2017 (r322568) @@ -311,7 +311,7 @@ pfprint_fp(dtrace_hdl_t *dtp, FILE *fp, const char *fo return (dt_printf(dtp, fp, format, *((double *)addr) / n)); #if !defined(__arm__) && !defined(__powerpc__) && \ - !defined(__mips__) && !defined(__riscv__) + !defined(__mips__) && !defined(__riscv) case sizeof (long double): return (dt_printf(dtp, fp, format, *((long double *)addr) / ldn)); Modified: projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Wed Aug 16 06:43:50 2017 (r322568) @@ -103,7 +103,6 @@ zfs_validate_name(libzfs_handle_t *hdl, const char *pa namecheck_err_t why; char what; - (void) zfs_prop_get_table(); if (entity_namecheck(path, &why, &what) != 0) { if (hdl != NULL) { switch (why) { @@ -3958,14 +3957,19 @@ zfs_rollback(zfs_handle_t *zhp, zfs_handle_t *snap, bo } /* - * We rely on zfs_iter_children() to verify that there are no - * newer snapshots for the given dataset. Therefore, we can - * simply pass the name on to the ioctl() call. There is still - * an unlikely race condition where the user has taken a - * snapshot since we verified that this was the most recent. + * Pass both the filesystem and the wanted snapshot names, + * we would get an error back if the snapshot is destroyed or + * a new snapshot is created before this request is processed. */ - err = lzc_rollback(zhp->zfs_name, NULL, 0); - if (err != 0) { + err = lzc_rollback_to(zhp->zfs_name, snap->zfs_name); + if (err == EXDEV) { + zfs_error_aux(zhp->zfs_hdl, dgettext(TEXT_DOMAIN, + "'%s' is not the latest snapshot"), snap->zfs_name); + (void) zfs_error_fmt(zhp->zfs_hdl, EZFS_BUSY, + dgettext(TEXT_DOMAIN, "cannot rollback '%s'"), + zhp->zfs_name); + return (err); + } else if (err != 0) { (void) zfs_standard_error_fmt(zhp->zfs_hdl, errno, dgettext(TEXT_DOMAIN, "cannot rollback '%s'"), zhp->zfs_name); Modified: projects/krb5/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c ============================================================================== --- projects/krb5/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c Wed Aug 16 06:43:50 2017 (r322568) @@ -765,6 +765,9 @@ lzc_receive_with_header(const char *snapname, nvlist_t * Roll back this filesystem or volume to its most recent snapshot. * If snapnamebuf is not NULL, it will be filled in with the name * of the most recent snapshot. + * Note that the latest snapshot may change if a new one is concurrently + * created or the current one is destroyed. lzc_rollback_to can be used + * to roll back to a specific latest snapshot. * * Return 0 on success or an errno on failure. */ @@ -784,6 +787,27 @@ lzc_rollback(const char *fsname, char *snapnamebuf, in } nvlist_free(result); + return (err); +} + +/* + * Roll back this filesystem or volume to the specified snapshot, + * if possible. + * + * Return 0 on success or an errno on failure. + */ +int +lzc_rollback_to(const char *fsname, const char *snapname) +{ + nvlist_t *args; + nvlist_t *result; + int err; + + args = fnvlist_alloc(); + fnvlist_add_string(args, "target", snapname); + err = lzc_ioctl(ZFS_IOC_ROLLBACK, fsname, args, &result); + nvlist_free(args); + nvlist_free(result); return (err); } Modified: projects/krb5/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h ============================================================================== --- projects/krb5/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h Wed Aug 16 06:43:50 2017 (r322568) @@ -84,6 +84,7 @@ int lzc_receive_with_header(const char *, nvlist_t *, boolean_t lzc_exists(const char *); int lzc_rollback(const char *, char *, int); +int lzc_rollback_to(const char *, const char *); #ifdef __cplusplus } Modified: projects/krb5/contrib/compiler-rt/lib/builtins/int_lib.h ============================================================================== --- projects/krb5/contrib/compiler-rt/lib/builtins/int_lib.h Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/contrib/compiler-rt/lib/builtins/int_lib.h Wed Aug 16 06:43:50 2017 (r322568) @@ -92,7 +92,7 @@ * does not have dedicated bit counting instructions. */ #if defined(__FreeBSD__) && (defined(__sparc64__) || \ - defined(__mips_n64) || defined(__mips_o64) || defined(__riscv__)) + defined(__mips_n64) || defined(__mips_o64) || defined(__riscv)) si_int __clzsi2(si_int); si_int __ctzsi2(si_int); #define __builtin_clz __clzsi2 Modified: projects/krb5/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h ============================================================================== --- projects/krb5/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h Wed Aug 16 06:43:50 2017 (r322568) @@ -83,7 +83,7 @@ namespace __sanitizer { #elif defined(__powerpc64__) const unsigned struct_kernel_stat_sz = 144; const unsigned struct_kernel_stat64_sz = 104; -#elif defined(__riscv__) +#elif defined(__riscv) /* RISCVTODO: check that these values are correct */ const unsigned struct_kernel_stat_sz = 128; const unsigned struct_kernel_stat64_sz = 128; @@ -126,7 +126,7 @@ namespace __sanitizer { #if SANITIZER_LINUX || SANITIZER_FREEBSD -#if defined(__powerpc64__) || defined(__riscv__) || defined(__s390__) +#if defined(__powerpc64__) || defined(__riscv) || defined(__s390__) const unsigned struct___old_kernel_stat_sz = 0; #elif !defined(__sparc__) const unsigned struct___old_kernel_stat_sz = 32; @@ -554,7 +554,7 @@ namespace __sanitizer { typedef long __sanitizer___kernel_off_t; #endif -#if defined(__powerpc__) || defined(__mips__) || defined(__riscv__) +#if defined(__powerpc__) || defined(__mips__) || defined(__riscv) typedef unsigned int __sanitizer___kernel_old_uid_t; typedef unsigned int __sanitizer___kernel_old_gid_t; #else Modified: projects/krb5/contrib/elftoolchain/libelf/_libelf_config.h ============================================================================== --- projects/krb5/contrib/elftoolchain/libelf/_libelf_config.h Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/contrib/elftoolchain/libelf/_libelf_config.h Wed Aug 16 06:43:50 2017 (r322568) @@ -97,7 +97,7 @@ #define LIBELF_BYTEORDER ELFDATA2MSB #define LIBELF_CLASS ELFCLASS32 -#elif defined(__riscv64) +#elif defined(__riscv) && (__riscv_xlen == 64) #define LIBELF_ARCH EM_RISCV #define LIBELF_BYTEORDER ELFDATA2LSB Modified: projects/krb5/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h ============================================================================== --- projects/krb5/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h Wed Aug 16 06:43:50 2017 (r322568) @@ -88,7 +88,7 @@ typedef int malloc_cpuid_t; # ifdef __powerpc__ # define LG_QUANTUM 4 # endif -# ifdef __riscv__ +# ifdef __riscv # define LG_QUANTUM 4 # endif # ifdef __s390__ Modified: projects/krb5/contrib/jemalloc/include/jemalloc/internal/spin.h ============================================================================== --- projects/krb5/contrib/jemalloc/include/jemalloc/internal/spin.h Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/contrib/jemalloc/include/jemalloc/internal/spin.h Wed Aug 16 06:43:50 2017 (r322568) @@ -1,19 +1,13 @@ #ifndef JEMALLOC_INTERNAL_SPIN_H #define JEMALLOC_INTERNAL_SPIN_H -#ifdef JEMALLOC_SPIN_C_ -# define SPIN_INLINE extern inline -#else -# define SPIN_INLINE inline -#endif - #define SPIN_INITIALIZER {0U} typedef struct { unsigned iteration; } spin_t; -SPIN_INLINE void +static inline void spin_adaptive(spin_t *spin) { volatile uint32_t i; Modified: projects/krb5/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h ============================================================================== --- projects/krb5/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h Wed Aug 16 06:43:50 2017 (r322568) @@ -67,7 +67,7 @@ # define LG_VADDR 32 # define LG_SIZEOF_PTR 2 #endif -#ifdef __riscv__ +#ifdef __riscv # define LG_VADDR 64 # define LG_SIZEOF_PTR 3 #endif Modified: projects/krb5/contrib/libc++/include/__bsd_locale_defaults.h ============================================================================== --- projects/krb5/contrib/libc++/include/__bsd_locale_defaults.h Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/contrib/libc++/include/__bsd_locale_defaults.h Wed Aug 16 06:43:50 2017 (r322568) @@ -15,6 +15,10 @@ #ifndef _LIBCPP_BSD_LOCALE_DEFAULTS_H #define _LIBCPP_BSD_LOCALE_DEFAULTS_H +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +#pragma GCC system_header +#endif + #define __libcpp_mb_cur_max_l(loc) MB_CUR_MAX_L(loc) #define __libcpp_btowc_l(ch, loc) btowc_l(ch, loc) #define __libcpp_wctob_l(wch, loc) wctob_l(wch, loc) Modified: projects/krb5/contrib/libc++/include/__bsd_locale_fallbacks.h ============================================================================== --- projects/krb5/contrib/libc++/include/__bsd_locale_fallbacks.h Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/contrib/libc++/include/__bsd_locale_fallbacks.h Wed Aug 16 06:43:50 2017 (r322568) @@ -18,6 +18,10 @@ #include <stdarg.h> #include <memory> +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +#pragma GCC system_header +#endif + _LIBCPP_BEGIN_NAMESPACE_STD inline _LIBCPP_ALWAYS_INLINE Modified: projects/krb5/contrib/libc++/include/__locale ============================================================================== --- projects/krb5/contrib/libc++/include/__locale Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/contrib/libc++/include/__locale Wed Aug 16 06:43:50 2017 (r322568) @@ -34,7 +34,7 @@ # include <support/solaris/xlocale.h> #elif defined(_NEWLIB_VERSION) # include <support/newlib/xlocale.h> -#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \ +#elif (defined(__APPLE__) || defined(__FreeBSD__) \ || defined(__EMSCRIPTEN__) || defined(__IBMCPP__)) # include <xlocale.h> #elif defined(__Fuchsia__) Modified: projects/krb5/contrib/libc++/include/mutex ============================================================================== --- projects/krb5/contrib/libc++/include/mutex Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/contrib/libc++/include/mutex Wed Aug 16 06:43:50 2017 (r322568) @@ -116,7 +116,7 @@ class scoped_lock // C++17 (public) using mutex_type = Mutex; // If MutexTypes... consists of the single type Mutex explicit scoped_lock(MutexTypes&... m); - scoped_lock(MutexTypes&... m, adopt_lock_t); + scoped_lock(adopt_lock_t, MutexTypes&... m); ~scoped_lock(); scoped_lock(scoped_lock const&) = delete; scoped_lock& operator=(scoped_lock const&) = delete; @@ -500,7 +500,7 @@ class _LIBCPP_TEMPLATE_VIS scoped_lock<_Mutex> { (publ ~scoped_lock() _LIBCPP_THREAD_SAFETY_ANNOTATION(release_capability()) {__m_.unlock();} _LIBCPP_INLINE_VISIBILITY - explicit scoped_lock(mutex_type& __m, adopt_lock_t) _LIBCPP_THREAD_SAFETY_ANNOTATION(requires_capability(__m)) + explicit scoped_lock(adopt_lock_t, mutex_type& __m) _LIBCPP_THREAD_SAFETY_ANNOTATION(requires_capability(__m)) : __m_(__m) {} scoped_lock(scoped_lock const&) = delete; @@ -522,7 +522,7 @@ class _LIBCPP_TEMPLATE_VIS scoped_lock (public) } _LIBCPP_INLINE_VISIBILITY - scoped_lock(_MArgs&... __margs, adopt_lock_t) + scoped_lock(adopt_lock_t, _MArgs&... __margs) : __t_(__margs...) { } Modified: projects/krb5/contrib/libc++/include/sstream ============================================================================== --- projects/krb5/contrib/libc++/include/sstream Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/contrib/libc++/include/sstream Wed Aug 16 06:43:50 2017 (r322568) @@ -249,7 +249,8 @@ basic_stringbuf<_CharT, _Traits, _Allocator>::basic_st template <class _CharT, class _Traits, class _Allocator> basic_stringbuf<_CharT, _Traits, _Allocator>::basic_stringbuf(const string_type& __s, ios_base::openmode __wch) - : __hm_(0), + : __str_(__s.get_allocator()), + __hm_(0), __mode_(__wch) { str(__s); Modified: projects/krb5/contrib/llvm/include/llvm/Analysis/ValueTracking.h ============================================================================== --- projects/krb5/contrib/llvm/include/llvm/Analysis/ValueTracking.h Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/contrib/llvm/include/llvm/Analysis/ValueTracking.h Wed Aug 16 06:43:50 2017 (r322568) @@ -312,6 +312,12 @@ template <typename T> class ArrayRef; const DataLayout &DL, LoopInfo *LI = nullptr, unsigned MaxLookup = 6); + /// This is a wrapper around GetUnderlyingObjects and adds support for basic + /// ptrtoint+arithmetic+inttoptr sequences. + void getUnderlyingObjectsForCodeGen(const Value *V, + SmallVectorImpl<Value *> &Objects, + const DataLayout &DL); + /// Return true if the only users of this pointer are lifetime markers. bool onlyUsedByLifetimeMarkers(const Value *V); Modified: projects/krb5/contrib/llvm/include/llvm/CodeGen/MachineFunction.h ============================================================================== --- projects/krb5/contrib/llvm/include/llvm/CodeGen/MachineFunction.h Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/contrib/llvm/include/llvm/CodeGen/MachineFunction.h Wed Aug 16 06:43:50 2017 (r322568) @@ -661,6 +661,12 @@ class MachineFunction { (public) MachineMemOperand *getMachineMemOperand(const MachineMemOperand *MMO, int64_t Offset, uint64_t Size); + /// Allocate a new MachineMemOperand by copying an existing one, + /// replacing only AliasAnalysis information. MachineMemOperands are owned + /// by the MachineFunction and need not be explicitly deallocated. + MachineMemOperand *getMachineMemOperand(const MachineMemOperand *MMO, + const AAMDNodes &AAInfo); + using OperandCapacity = ArrayRecycler<MachineOperand>::Capacity; /// Allocate an array of MachineOperands. This is only intended for use by Modified: projects/krb5/contrib/llvm/include/llvm/CodeGen/MachineInstr.h ============================================================================== --- projects/krb5/contrib/llvm/include/llvm/CodeGen/MachineInstr.h Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/contrib/llvm/include/llvm/CodeGen/MachineInstr.h Wed Aug 16 06:43:50 2017 (r322568) @@ -379,6 +379,9 @@ class MachineInstr (public) return NumMemRefs == 1; } + /// Return the number of memory operands. + unsigned getNumMemOperands() const { return NumMemRefs; } + /// API for querying MachineInstr properties. They are the same as MCInstrDesc /// queries but they are bundle aware. Modified: projects/krb5/contrib/llvm/lib/Analysis/ValueTracking.cpp ============================================================================== --- projects/krb5/contrib/llvm/lib/Analysis/ValueTracking.cpp Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/contrib/llvm/lib/Analysis/ValueTracking.cpp Wed Aug 16 06:43:50 2017 (r322568) @@ -3277,6 +3277,69 @@ void llvm::GetUnderlyingObjects(Value *V, SmallVectorI } while (!Worklist.empty()); } +/// This is the function that does the work of looking through basic +/// ptrtoint+arithmetic+inttoptr sequences. +static const Value *getUnderlyingObjectFromInt(const Value *V) { + do { + if (const Operator *U = dyn_cast<Operator>(V)) { + // If we find a ptrtoint, we can transfer control back to the + // regular getUnderlyingObjectFromInt. + if (U->getOpcode() == Instruction::PtrToInt) + return U->getOperand(0); + // If we find an add of a constant, a multiplied value, or a phi, it's + // likely that the other operand will lead us to the base + // object. We don't have to worry about the case where the + // object address is somehow being computed by the multiply, + // because our callers only care when the result is an + // identifiable object. + if (U->getOpcode() != Instruction::Add || + (!isa<ConstantInt>(U->getOperand(1)) && + Operator::getOpcode(U->getOperand(1)) != Instruction::Mul && + !isa<PHINode>(U->getOperand(1)))) + return V; + V = U->getOperand(0); + } else { + return V; + } + assert(V->getType()->isIntegerTy() && "Unexpected operand type!"); + } while (true); +} + +/// This is a wrapper around GetUnderlyingObjects and adds support for basic +/// ptrtoint+arithmetic+inttoptr sequences. +void llvm::getUnderlyingObjectsForCodeGen(const Value *V, + SmallVectorImpl<Value *> &Objects, + const DataLayout &DL) { + SmallPtrSet<const Value *, 16> Visited; + SmallVector<const Value *, 4> Working(1, V); + do { + V = Working.pop_back_val(); + + SmallVector<Value *, 4> Objs; + GetUnderlyingObjects(const_cast<Value *>(V), Objs, DL); + + for (Value *V : Objs) { + if (!Visited.insert(V).second) + continue; + if (Operator::getOpcode(V) == Instruction::IntToPtr) { + const Value *O = + getUnderlyingObjectFromInt(cast<User>(V)->getOperand(0)); + if (O->getType()->isPointerTy()) { + Working.push_back(O); + continue; + } + } + // If GetUnderlyingObjects fails to find an identifiable object, + // getUnderlyingObjectsForCodeGen also fails for safety. + if (!isIdentifiedObject(V)) { + Objects.clear(); + return; + } + Objects.push_back(const_cast<Value *>(V)); + } + } while (!Working.empty()); +} + /// Return true if the only users of this pointer are lifetime markers. bool llvm::onlyUsedByLifetimeMarkers(const Value *V) { for (const User *U : V->users()) { Modified: projects/krb5/contrib/llvm/lib/CodeGen/BranchFolding.cpp ============================================================================== --- projects/krb5/contrib/llvm/lib/CodeGen/BranchFolding.cpp Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/contrib/llvm/lib/CodeGen/BranchFolding.cpp Wed Aug 16 06:43:50 2017 (r322568) @@ -1475,13 +1475,14 @@ ReoptimizeBlock: bool PredAnalyzable = !TII->analyzeBranch(*Pred, PredTBB, PredFBB, PredCond, true); - if (PredAnalyzable && !PredCond.empty() && PredTBB == MBB) { + if (PredAnalyzable && !PredCond.empty() && PredTBB == MBB && + PredTBB != PredFBB) { // The predecessor has a conditional branch to this block which consists // of only a tail call. Try to fold the tail call into the conditional // branch. if (TII->canMakeTailCallConditional(PredCond, TailCall)) { // TODO: It would be nice if analyzeBranch() could provide a pointer - // to the branch insturction so replaceBranchWithTailCall() doesn't + // to the branch instruction so replaceBranchWithTailCall() doesn't // have to search for it. TII->replaceBranchWithTailCall(*Pred, PredCond, TailCall); ++NumTailCalls; Modified: projects/krb5/contrib/llvm/lib/CodeGen/MachineFunction.cpp ============================================================================== --- projects/krb5/contrib/llvm/lib/CodeGen/MachineFunction.cpp Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/contrib/llvm/lib/CodeGen/MachineFunction.cpp Wed Aug 16 06:43:50 2017 (r322568) @@ -330,6 +330,20 @@ MachineFunction::getMachineMemOperand(const MachineMem MMO->getOrdering(), MMO->getFailureOrdering()); } +MachineMemOperand * +MachineFunction::getMachineMemOperand(const MachineMemOperand *MMO, + const AAMDNodes &AAInfo) { + MachinePointerInfo MPI = MMO->getValue() ? + MachinePointerInfo(MMO->getValue(), MMO->getOffset()) : + MachinePointerInfo(MMO->getPseudoValue(), MMO->getOffset()); + + return new (Allocator) + MachineMemOperand(MPI, MMO->getFlags(), MMO->getSize(), + MMO->getBaseAlignment(), AAInfo, + MMO->getRanges(), MMO->getSyncScopeID(), + MMO->getOrdering(), MMO->getFailureOrdering()); +} + MachineInstr::mmo_iterator MachineFunction::allocateMemRefsArray(unsigned long Num) { return Allocator.Allocate<MachineMemOperand *>(Num); Modified: projects/krb5/contrib/llvm/lib/CodeGen/MachineInstr.cpp ============================================================================== --- projects/krb5/contrib/llvm/lib/CodeGen/MachineInstr.cpp Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/contrib/llvm/lib/CodeGen/MachineInstr.cpp Wed Aug 16 06:43:50 2017 (r322568) @@ -578,10 +578,8 @@ bool MachinePointerInfo::isDereferenceable(unsigned Si if (BasePtr == nullptr) return false; - return isDereferenceableAndAlignedPointer(BasePtr, 1, - APInt(DL.getPointerSize(), - Offset + Size), - DL); + return isDereferenceableAndAlignedPointer( + BasePtr, 1, APInt(DL.getPointerSizeInBits(), Offset + Size), DL); } /// getConstantPool - Return a MachinePointerInfo record that refers to the Modified: projects/krb5/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp ============================================================================== --- projects/krb5/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp Wed Aug 16 06:33:48 2017 (r322567) +++ projects/krb5/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp Wed Aug 16 06:43:50 2017 (r322568) @@ -121,63 +121,6 @@ ScheduleDAGInstrs::ScheduleDAGInstrs(MachineFunction & SchedModel.init(ST.getSchedModel(), &ST, TII); } -/// This is the function that does the work of looking through basic -/// ptrtoint+arithmetic+inttoptr sequences. -static const Value *getUnderlyingObjectFromInt(const Value *V) { - do { - if (const Operator *U = dyn_cast<Operator>(V)) { - // If we find a ptrtoint, we can transfer control back to the - // regular getUnderlyingObjectFromInt. - if (U->getOpcode() == Instruction::PtrToInt) - return U->getOperand(0); - // If we find an add of a constant, a multiplied value, or a phi, it's - // likely that the other operand will lead us to the base *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708160643.v7G6hqV6084347>