From owner-svn-src-projects@freebsd.org Sun Sep 4 16:54:56 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C2EB8A9DAED for ; Sun, 4 Sep 2016 16:54:56 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 85F1DA63; Sun, 4 Sep 2016 16:54:56 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u84Gst7s037443; Sun, 4 Sep 2016 16:54:55 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u84GstEE037441; Sun, 4 Sep 2016 16:54:55 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201609041654.u84GstEE037441@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 4 Sep 2016 16:54:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305387 - in projects/clang390-import: lib/clang/libllvm usr.bin/clang/lldb X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Sep 2016 16:54:56 -0000 Author: dim Date: Sun Sep 4 16:54:55 2016 New Revision: 305387 URL: https://svnweb.freebsd.org/changeset/base/305387 Log: Some further micro-optimizations for the libllvm and lldb build. Modified: projects/clang390-import/lib/clang/libllvm/Makefile projects/clang390-import/usr.bin/clang/lldb/Makefile Modified: projects/clang390-import/lib/clang/libllvm/Makefile ============================================================================== --- projects/clang390-import/lib/clang/libllvm/Makefile Sun Sep 4 16:52:14 2016 (r305386) +++ projects/clang390-import/lib/clang/libllvm/Makefile Sun Sep 4 16:54:55 2016 (r305387) @@ -88,7 +88,6 @@ SRCS_MIN+= Analysis/ScopedNoAliasAA.cpp SRCS_MIN+= Analysis/SparsePropagation.cpp SRCS_MIN+= Analysis/TargetLibraryInfo.cpp SRCS_MIN+= Analysis/TargetTransformInfo.cpp -#SRCS_EXT+= Analysis/Trace.cpp SRCS_MIN+= Analysis/TypeBasedAliasAnalysis.cpp SRCS_MIN+= Analysis/TypeMetadataUtils.cpp SRCS_MIN+= Analysis/ValueTracking.cpp @@ -96,10 +95,8 @@ SRCS_MIN+= Analysis/VectorUtils.cpp SRCS_MIN+= AsmParser/LLLexer.cpp SRCS_MIN+= AsmParser/LLParser.cpp SRCS_MIN+= AsmParser/Parser.cpp -#SRCS_EXT+= Bitcode/Reader/BitReader.cpp SRCS_MIN+= Bitcode/Reader/BitcodeReader.cpp SRCS_MIN+= Bitcode/Reader/BitstreamReader.cpp -#SRCS_EXT+= Bitcode/Writer/BitWriter.cpp SRCS_MIN+= Bitcode/Writer/BitcodeWriter.cpp SRCS_MIN+= Bitcode/Writer/BitcodeWriterPass.cpp SRCS_MIN+= Bitcode/Writer/ValueEnumerator.cpp @@ -300,7 +297,6 @@ SRCS_MIN+= DebugInfo/CodeView/FieldListR SRCS_MIN+= DebugInfo/CodeView/Line.cpp SRCS_MIN+= DebugInfo/CodeView/ListRecordBuilder.cpp SRCS_MIN+= DebugInfo/CodeView/MemoryTypeTableBuilder.cpp -#SRCS_EXT+= DebugInfo/CodeView/MethodListRecordBuilder.cpp SRCS_MIN+= DebugInfo/CodeView/ModuleSubstream.cpp SRCS_MIN+= DebugInfo/CodeView/ModuleSubstreamVisitor.cpp SRCS_MIN+= DebugInfo/CodeView/RecordSerialization.cpp @@ -331,7 +327,6 @@ SRCS_EXT+= DebugInfo/DWARF/DWARFUnit.cpp SRCS_EXT+= DebugInfo/DWARF/DWARFUnitIndex.cpp SRCS_EXT+= DebugInfo/DWARF/SyntaxHighlighting.cpp SRCS_EXT+= DebugInfo/PDB/GenericError.cpp -#SRCS_EXT+= DebugInfo/PDB/IPDBSourceFile.cpp SRCS_EXT+= DebugInfo/PDB/PDB.cpp SRCS_EXT+= DebugInfo/PDB/PDBContext.cpp SRCS_EXT+= DebugInfo/PDB/PDBExtras.cpp @@ -408,7 +403,6 @@ SRCS_EXT+= ExecutionEngine/Orc/OrcABISup SRCS_EXT+= ExecutionEngine/Orc/OrcCBindings.cpp SRCS_EXT+= ExecutionEngine/Orc/OrcError.cpp SRCS_EXT+= ExecutionEngine/Orc/OrcMCJITReplacement.cpp -#SRCS_EXT+= ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.cpp SRCS_XDB+= ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp SRCS_XDB+= ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp SRCS_XDB+= ExecutionEngine/RuntimeDyld/RuntimeDyldCOFF.cpp @@ -490,10 +484,10 @@ SRCS_MIN+= MC/MCCodeEmitter.cpp SRCS_MIN+= MC/MCCodeView.cpp SRCS_MIN+= MC/MCContext.cpp SRCS_XDL+= MC/MCDisassembler/Disassembler.cpp -SRCS_XDL+= MC/MCDisassembler/MCDisassembler.cpp -SRCS_XDL+= MC/MCDisassembler/MCExternalSymbolizer.cpp +SRCS_XDB+= MC/MCDisassembler/MCDisassembler.cpp +SRCS_XDB+= MC/MCDisassembler/MCExternalSymbolizer.cpp SRCS_MIN+= MC/MCDisassembler/MCRelocationInfo.cpp -SRCS_XDL+= MC/MCDisassembler/MCSymbolizer.cpp +SRCS_XDB+= MC/MCDisassembler/MCSymbolizer.cpp SRCS_MIN+= MC/MCDwarf.cpp SRCS_MIN+= MC/MCELFObjectTargetWriter.cpp SRCS_MIN+= MC/MCELFStreamer.cpp @@ -503,7 +497,6 @@ SRCS_MIN+= MC/MCInst.cpp SRCS_MIN+= MC/MCInstPrinter.cpp SRCS_MIN+= MC/MCInstrAnalysis.cpp SRCS_MIN+= MC/MCInstrDesc.cpp -#SRCS_EXT+= MC/MCLabel.cpp SRCS_MIN+= MC/MCLinkerOptimizationHint.cpp SRCS_MIN+= MC/MCMachOStreamer.cpp SRCS_MIN+= MC/MCMachObjectTargetWriter.cpp @@ -558,8 +551,6 @@ SRCS_MIN+= Object/SymbolicFile.cpp SRCS_MIN+= ObjectYAML/COFFYAML.cpp SRCS_MIN+= ObjectYAML/ELFYAML.cpp SRCS_MIN+= ObjectYAML/MachOYAML.cpp -#SRCS_EXT+= ObjectYAML/ObjectYAML.cpp -#SRCS_EXT+= ObjectYAML/YAML.cpp SRCS_MIN+= Option/Arg.cpp SRCS_MIN+= Option/ArgList.cpp SRCS_MIN+= Option/OptTable.cpp @@ -579,7 +570,6 @@ SRCS_MIN+= Support/APFloat.cpp SRCS_MIN+= Support/APInt.cpp SRCS_MIN+= Support/APSInt.cpp SRCS_MIN+= Support/ARMBuildAttrs.cpp -#SRCS_EXT+= Support/ARMWinEH.cpp SRCS_MIN+= Support/Allocator.cpp SRCS_MIN+= Support/Atomic.cpp SRCS_MIN+= Support/BlockFrequency.cpp @@ -660,7 +650,6 @@ SRCS_MIN+= Support/Triple.cpp SRCS_MIN+= Support/Twine.cpp SRCS_MIN+= Support/Unicode.cpp SRCS_MIN+= Support/Valgrind.cpp -#SRCS_EXT+= Support/Watchdog.cpp SRCS_MIN+= Support/YAMLParser.cpp SRCS_MIN+= Support/YAMLTraits.cpp SRCS_MIN+= Support/circular_raw_ostream.cpp @@ -709,8 +698,8 @@ SRCS_MIN+= Target/AArch64/AArch64TargetM SRCS_MIN+= Target/AArch64/AArch64TargetObjectFile.cpp SRCS_MIN+= Target/AArch64/AArch64TargetTransformInfo.cpp SRCS_MIN+= Target/AArch64/AsmParser/AArch64AsmParser.cpp -SRCS_XDL+= Target/AArch64/Disassembler/AArch64Disassembler.cpp -SRCS_MIN+= Target/AArch64/Disassembler/AArch64ExternalSymbolizer.cpp +SRCS_XDB+= Target/AArch64/Disassembler/AArch64Disassembler.cpp +SRCS_XDB+= Target/AArch64/Disassembler/AArch64ExternalSymbolizer.cpp SRCS_MIN+= Target/AArch64/InstPrinter/AArch64InstPrinter.cpp SRCS_MIN+= Target/AArch64/MCTargetDesc/AArch64AsmBackend.cpp SRCS_MIN+= Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp @@ -771,7 +760,7 @@ SRCS_MIN+= Target/ARM/Thumb2InstrInfo.cp SRCS_MIN+= Target/ARM/Thumb2SizeReduction.cpp SRCS_MIN+= Target/ARM/ThumbRegisterInfo.cpp SRCS_MIN+= Target/Mips/AsmParser/MipsAsmParser.cpp -SRCS_XDL+= Target/Mips/Disassembler/MipsDisassembler.cpp +SRCS_XDB+= Target/Mips/Disassembler/MipsDisassembler.cpp SRCS_MIN+= Target/Mips/InstPrinter/MipsInstPrinter.cpp SRCS_MIN+= Target/Mips/MCTargetDesc/MipsABIFlagsSection.cpp SRCS_MIN+= Target/Mips/MCTargetDesc/MipsABIInfo.cpp @@ -860,7 +849,7 @@ SRCS_MIN+= Target/PowerPC/PPCVSXSwapRemo SRCS_MIN+= Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp SRCS_MIN+= Target/Sparc/AsmParser/SparcAsmParser.cpp SRCS_MIN+= Target/Sparc/DelaySlotFiller.cpp -SRCS_XDL+= Target/Sparc/Disassembler/SparcDisassembler.cpp +SRCS_XDB+= Target/Sparc/Disassembler/SparcDisassembler.cpp SRCS_MIN+= Target/Sparc/InstPrinter/SparcInstPrinter.cpp SRCS_MIN+= Target/Sparc/LeonPasses.cpp SRCS_MIN+= Target/Sparc/MCTargetDesc/SparcAsmBackend.cpp @@ -883,7 +872,6 @@ SRCS_MIN+= Target/Sparc/SparcTargetMachi SRCS_MIN+= Target/Sparc/SparcTargetObjectFile.cpp SRCS_MIN+= Target/Sparc/TargetInfo/SparcTargetInfo.cpp SRCS_MIN+= Target/Target.cpp -#SRCS_EXT+= Target/TargetIntrinsicInfo.cpp SRCS_MIN+= Target/TargetLoweringObjectFile.cpp SRCS_MIN+= Target/TargetMachine.cpp SRCS_MIN+= Target/TargetMachineC.cpp @@ -891,8 +879,8 @@ SRCS_MIN+= Target/TargetRecip.cpp SRCS_MIN+= Target/TargetSubtargetInfo.cpp SRCS_MIN+= Target/X86/AsmParser/X86AsmInstrumentation.cpp SRCS_MIN+= Target/X86/AsmParser/X86AsmParser.cpp -SRCS_XDL+= Target/X86/Disassembler/X86Disassembler.cpp -SRCS_XDL+= Target/X86/Disassembler/X86DisassemblerDecoder.cpp +SRCS_XDB+= Target/X86/Disassembler/X86Disassembler.cpp +SRCS_XDB+= Target/X86/Disassembler/X86DisassemblerDecoder.cpp SRCS_MIN+= Target/X86/InstPrinter/X86ATTInstPrinter.cpp SRCS_MIN+= Target/X86/InstPrinter/X86InstComments.cpp SRCS_MIN+= Target/X86/InstPrinter/X86IntelInstPrinter.cpp Modified: projects/clang390-import/usr.bin/clang/lldb/Makefile ============================================================================== --- projects/clang390-import/usr.bin/clang/lldb/Makefile Sun Sep 4 16:52:14 2016 (r305386) +++ projects/clang390-import/usr.bin/clang/lldb/Makefile Sun Sep 4 16:54:55 2016 (r305387) @@ -10,7 +10,6 @@ CFLAGS+= -I${LLDB_SRCS}/include SRCDIR= tools/lldb/tools/driver SRCS+= Driver.cpp -SRCS+= Platform.cpp .include "${SRCTOP}/lib/clang/clang.build.mk" From owner-svn-src-projects@freebsd.org Sun Sep 4 17:26:44 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77530B71344 for ; Sun, 4 Sep 2016 17:26:44 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 29A6DBA0; Sun, 4 Sep 2016 17:26:44 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u84HQhmn048872; Sun, 4 Sep 2016 17:26:43 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u84HQggi048862; Sun, 4 Sep 2016 17:26:42 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201609041726.u84HQggi048862@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 4 Sep 2016 17:26:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305390 - in projects/clang390-import: contrib/one-true-awk contrib/unbound contrib/unbound/cachedb contrib/unbound/compat contrib/unbound/daemon contrib/unbound/dns64 contrib/unbound/d... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Sep 2016 17:26:44 -0000 Author: dim Date: Sun Sep 4 17:26:42 2016 New Revision: 305390 URL: https://svnweb.freebsd.org/changeset/base/305390 Log: Merge ^/head r305361 through r305389. Added: projects/clang390-import/contrib/unbound/cachedb/ - copied from r305389, head/contrib/unbound/cachedb/ projects/clang390-import/contrib/unbound/compat/strsep.c - copied unchanged from r305389, head/contrib/unbound/compat/strsep.c projects/clang390-import/contrib/unbound/util/ub_event.c - copied unchanged from r305389, head/contrib/unbound/util/ub_event.c projects/clang390-import/contrib/unbound/util/ub_event.h - copied unchanged from r305389, head/contrib/unbound/util/ub_event.h projects/clang390-import/contrib/unbound/util/ub_event_pluggable.c - copied unchanged from r305389, head/contrib/unbound/util/ub_event_pluggable.c projects/clang390-import/lib/msun/amd64/e_fmod.S - copied unchanged from r305389, head/lib/msun/amd64/e_fmod.S projects/clang390-import/lib/msun/amd64/e_fmodf.S - copied unchanged from r305389, head/lib/msun/amd64/e_fmodf.S projects/clang390-import/lib/msun/amd64/e_fmodl.S - copied unchanged from r305389, head/lib/msun/amd64/e_fmodl.S projects/clang390-import/lib/msun/i387/e_fmodf.S - copied unchanged from r305389, head/lib/msun/i387/e_fmodf.S projects/clang390-import/lib/msun/i387/e_fmodl.S - copied unchanged from r305389, head/lib/msun/i387/e_fmodl.S projects/clang390-import/sys/dev/bhnd/bhnd_erom.c - copied unchanged from r305389, head/sys/dev/bhnd/bhnd_erom.c projects/clang390-import/sys/dev/bhnd/bhnd_erom.h - copied unchanged from r305389, head/sys/dev/bhnd/bhnd_erom.h projects/clang390-import/sys/dev/bhnd/bhnd_erom_if.m - copied unchanged from r305389, head/sys/dev/bhnd/bhnd_erom_if.m projects/clang390-import/sys/dev/bhnd/bhnd_erom_types.h - copied unchanged from r305389, head/sys/dev/bhnd/bhnd_erom_types.h projects/clang390-import/sys/dev/bhnd/siba/siba_erom.c - copied unchanged from r305389, head/sys/dev/bhnd/siba/siba_erom.c Deleted: projects/clang390-import/sys/dev/bhnd/pmu/ projects/clang390-import/sys/dev/bhnd/soc/ projects/clang390-import/sys/mips/broadcom/bcm_bcma.c projects/clang390-import/sys/mips/broadcom/bcm_siba.c projects/clang390-import/sys/mips/sentry5/ projects/clang390-import/sys/modules/bhnd/nvram/ projects/clang390-import/sys/vm/vm_zeroidle.c Modified: projects/clang390-import/contrib/one-true-awk/b.c projects/clang390-import/contrib/unbound/Makefile.in projects/clang390-import/contrib/unbound/acx_nlnetlabs.m4 projects/clang390-import/contrib/unbound/compat/explicit_bzero.c projects/clang390-import/contrib/unbound/compat/getentropy_linux.c projects/clang390-import/contrib/unbound/config.h projects/clang390-import/contrib/unbound/config.h.in projects/clang390-import/contrib/unbound/configure projects/clang390-import/contrib/unbound/configure.ac projects/clang390-import/contrib/unbound/daemon/daemon.c projects/clang390-import/contrib/unbound/daemon/daemon.h projects/clang390-import/contrib/unbound/daemon/remote.c projects/clang390-import/contrib/unbound/daemon/unbound.c projects/clang390-import/contrib/unbound/daemon/worker.c projects/clang390-import/contrib/unbound/dns64/dns64.c projects/clang390-import/contrib/unbound/dnstap/dnstap.c projects/clang390-import/contrib/unbound/doc/Changelog projects/clang390-import/contrib/unbound/doc/README projects/clang390-import/contrib/unbound/doc/example.conf projects/clang390-import/contrib/unbound/doc/example.conf.in projects/clang390-import/contrib/unbound/doc/libunbound.3 projects/clang390-import/contrib/unbound/doc/libunbound.3.in projects/clang390-import/contrib/unbound/doc/unbound-anchor.8 projects/clang390-import/contrib/unbound/doc/unbound-anchor.8.in projects/clang390-import/contrib/unbound/doc/unbound-checkconf.8 projects/clang390-import/contrib/unbound/doc/unbound-checkconf.8.in projects/clang390-import/contrib/unbound/doc/unbound-control.8 projects/clang390-import/contrib/unbound/doc/unbound-control.8.in projects/clang390-import/contrib/unbound/doc/unbound-host.1 projects/clang390-import/contrib/unbound/doc/unbound-host.1.in projects/clang390-import/contrib/unbound/doc/unbound.8 projects/clang390-import/contrib/unbound/doc/unbound.8.in projects/clang390-import/contrib/unbound/doc/unbound.conf.5 projects/clang390-import/contrib/unbound/doc/unbound.conf.5.in projects/clang390-import/contrib/unbound/iterator/iter_fwd.c projects/clang390-import/contrib/unbound/iterator/iter_utils.c projects/clang390-import/contrib/unbound/iterator/iter_utils.h projects/clang390-import/contrib/unbound/iterator/iterator.c projects/clang390-import/contrib/unbound/iterator/iterator.h projects/clang390-import/contrib/unbound/libunbound/context.h projects/clang390-import/contrib/unbound/libunbound/libunbound.c projects/clang390-import/contrib/unbound/libunbound/libworker.c projects/clang390-import/contrib/unbound/libunbound/libworker.h projects/clang390-import/contrib/unbound/libunbound/python/libunbound.i projects/clang390-import/contrib/unbound/libunbound/ubsyms.def projects/clang390-import/contrib/unbound/libunbound/unbound-event.h projects/clang390-import/contrib/unbound/libunbound/worker.h projects/clang390-import/contrib/unbound/services/cache/dns.c projects/clang390-import/contrib/unbound/services/listen_dnsport.c projects/clang390-import/contrib/unbound/services/listen_dnsport.h projects/clang390-import/contrib/unbound/services/localzone.c projects/clang390-import/contrib/unbound/services/localzone.h projects/clang390-import/contrib/unbound/services/mesh.c projects/clang390-import/contrib/unbound/services/modstack.c projects/clang390-import/contrib/unbound/services/outside_network.c projects/clang390-import/contrib/unbound/services/outside_network.h projects/clang390-import/contrib/unbound/sldns/keyraw.c projects/clang390-import/contrib/unbound/sldns/parseutil.c projects/clang390-import/contrib/unbound/sldns/rrdef.h projects/clang390-import/contrib/unbound/sldns/str2wire.c projects/clang390-import/contrib/unbound/sldns/wire2str.c projects/clang390-import/contrib/unbound/smallapp/unbound-checkconf.c projects/clang390-import/contrib/unbound/smallapp/unbound-control.c projects/clang390-import/contrib/unbound/smallapp/worker_cb.c projects/clang390-import/contrib/unbound/util/config_file.c projects/clang390-import/contrib/unbound/util/config_file.h projects/clang390-import/contrib/unbound/util/configlexer.lex projects/clang390-import/contrib/unbound/util/configparser.y projects/clang390-import/contrib/unbound/util/data/dname.c projects/clang390-import/contrib/unbound/util/data/msgencode.c projects/clang390-import/contrib/unbound/util/data/msgparse.c projects/clang390-import/contrib/unbound/util/data/msgparse.h projects/clang390-import/contrib/unbound/util/data/msgreply.c projects/clang390-import/contrib/unbound/util/data/msgreply.h projects/clang390-import/contrib/unbound/util/fptr_wlist.c projects/clang390-import/contrib/unbound/util/fptr_wlist.h projects/clang390-import/contrib/unbound/util/iana_ports.inc projects/clang390-import/contrib/unbound/util/module.h projects/clang390-import/contrib/unbound/util/net_help.c projects/clang390-import/contrib/unbound/util/netevent.c projects/clang390-import/contrib/unbound/util/netevent.h projects/clang390-import/contrib/unbound/util/tube.c projects/clang390-import/contrib/unbound/util/tube.h projects/clang390-import/contrib/unbound/validator/autotrust.c projects/clang390-import/contrib/unbound/validator/val_anchor.c projects/clang390-import/contrib/unbound/validator/val_secalgo.c projects/clang390-import/contrib/unbound/validator/val_secalgo.h projects/clang390-import/lib/libunbound/Makefile projects/clang390-import/lib/msun/amd64/Makefile.inc projects/clang390-import/lib/msun/i387/Makefile.inc projects/clang390-import/lib/msun/src/e_fmod.c projects/clang390-import/share/dtrace/mbuf.d projects/clang390-import/share/man/man9/Makefile projects/clang390-import/share/man/man9/pmap.9 projects/clang390-import/share/man/man9/pmap_zero_page.9 projects/clang390-import/sys/amd64/amd64/pmap.c projects/clang390-import/sys/arm/arm/pmap-v4.c projects/clang390-import/sys/arm/arm/pmap-v6.c projects/clang390-import/sys/arm64/arm64/pmap.c projects/clang390-import/sys/conf/files projects/clang390-import/sys/dev/bhnd/bcma/bcma.c projects/clang390-import/sys/dev/bhnd/bcma/bcma.h projects/clang390-import/sys/dev/bhnd/bcma/bcma_bhndb.c projects/clang390-import/sys/dev/bhnd/bcma/bcma_erom.c projects/clang390-import/sys/dev/bhnd/bcma/bcma_eromvar.h projects/clang390-import/sys/dev/bhnd/bcma/bcma_nexus.c projects/clang390-import/sys/dev/bhnd/bcma/bcma_subr.c projects/clang390-import/sys/dev/bhnd/bcma/bcmavar.h projects/clang390-import/sys/dev/bhnd/bhnd.h projects/clang390-import/sys/dev/bhnd/bhnd_bus_if.m projects/clang390-import/sys/dev/bhnd/bhnd_match.h projects/clang390-import/sys/dev/bhnd/bhnd_nexus.c projects/clang390-import/sys/dev/bhnd/bhnd_subr.c projects/clang390-import/sys/dev/bhnd/bhndb/bhnd_bhndb.c projects/clang390-import/sys/dev/bhnd/bhndb/bhndb.c projects/clang390-import/sys/dev/bhnd/bhndb/bhndb_bus_if.m projects/clang390-import/sys/dev/bhnd/bhndb/bhndb_if.m projects/clang390-import/sys/dev/bhnd/bhndb/bhndb_pci.c projects/clang390-import/sys/dev/bhnd/bhndb/bhndb_pci_sprom.c projects/clang390-import/sys/dev/bhnd/bhndb/bhndb_private.h projects/clang390-import/sys/dev/bhnd/bhndb/bhndb_subr.c projects/clang390-import/sys/dev/bhnd/bhndb/bhndbvar.h projects/clang390-import/sys/dev/bhnd/cores/chipc/chipcreg.h projects/clang390-import/sys/dev/bhnd/siba/siba.c projects/clang390-import/sys/dev/bhnd/siba/siba.h projects/clang390-import/sys/dev/bhnd/siba/siba_bhndb.c projects/clang390-import/sys/dev/bhnd/siba/siba_nexus.c projects/clang390-import/sys/dev/bhnd/siba/siba_subr.c projects/clang390-import/sys/dev/bhnd/siba/sibareg.h projects/clang390-import/sys/dev/bhnd/siba/sibavar.h projects/clang390-import/sys/dev/bwn/if_bwn_pci.c projects/clang390-import/sys/dev/bwn/if_bwn_pcivar.h projects/clang390-import/sys/dev/usb/serial/uplcom.c projects/clang390-import/sys/i386/i386/pmap.c projects/clang390-import/sys/i386/include/pmap.h projects/clang390-import/sys/kern/subr_sleepqueue.c projects/clang390-import/sys/kern/vfs_cache.c projects/clang390-import/sys/mips/broadcom/bcm_machdep.c projects/clang390-import/sys/mips/broadcom/bcm_machdep.h projects/clang390-import/sys/mips/broadcom/bcm_pmu.c projects/clang390-import/sys/mips/broadcom/files.broadcom projects/clang390-import/sys/mips/mips/pmap.c projects/clang390-import/sys/modules/bhnd/Makefile projects/clang390-import/sys/modules/bhnd/bcma/Makefile projects/clang390-import/sys/modules/bhnd/bcma_bhndb/Makefile projects/clang390-import/sys/modules/bhnd/bhndb/Makefile projects/clang390-import/sys/modules/bhnd/siba/Makefile projects/clang390-import/sys/modules/bhnd/siba_bhndb/Makefile projects/clang390-import/sys/netinet/igmp.c projects/clang390-import/sys/powerpc/aim/mmu_oea.c projects/clang390-import/sys/powerpc/aim/mmu_oea64.c projects/clang390-import/sys/powerpc/booke/pmap.c projects/clang390-import/sys/powerpc/powerpc/mmu_if.m projects/clang390-import/sys/powerpc/powerpc/pmap_dispatch.c projects/clang390-import/sys/riscv/riscv/pmap.c projects/clang390-import/sys/sparc64/sparc64/pmap.c projects/clang390-import/sys/sys/filedesc.h projects/clang390-import/sys/vm/pmap.h projects/clang390-import/sys/vm/swap_pager.c projects/clang390-import/sys/vm/vm_meter.c projects/clang390-import/sys/vm/vm_page.c projects/clang390-import/sys/vm/vm_page.h projects/clang390-import/sys/vm/vm_phys.c projects/clang390-import/sys/vm/vm_phys.h projects/clang390-import/usr.sbin/unbound/checkconf/Makefile projects/clang390-import/usr.sbin/unbound/control/Makefile projects/clang390-import/usr.sbin/unbound/daemon/Makefile Directory Properties: projects/clang390-import/ (props changed) projects/clang390-import/contrib/one-true-awk/ (props changed) projects/clang390-import/contrib/unbound/ (props changed) Modified: projects/clang390-import/contrib/one-true-awk/b.c ============================================================================== --- projects/clang390-import/contrib/one-true-awk/b.c Sun Sep 4 17:23:10 2016 (r305389) +++ projects/clang390-import/contrib/one-true-awk/b.c Sun Sep 4 17:26:42 2016 (r305390) @@ -841,7 +841,7 @@ int relex(void) /* lexical analyzer for if (cc->cc_name != NULL && prestr[1 + cc->cc_namelen] == ':' && prestr[2 + cc->cc_namelen] == ']') { prestr += cc->cc_namelen + 3; - for (i = 0; i < NCHARS; i++) { + for (i = 1; i < NCHARS; i++) { if (!adjbuf((char **) &buf, &bufsz, bp-buf+1, 100, (char **) &bp, "relex2")) FATAL("out of space for reg expr %.10s...", lastre); if (cc->cc_func(i)) { Modified: projects/clang390-import/contrib/unbound/Makefile.in ============================================================================== --- projects/clang390-import/contrib/unbound/Makefile.in Sun Sep 4 17:23:10 2016 (r305389) +++ projects/clang390-import/contrib/unbound/Makefile.in Sun Sep 4 17:26:42 2016 (r305390) @@ -108,11 +108,12 @@ util/fptr_wlist.c util/locks.c util/log. util/netevent.c util/net_help.c util/random.c util/rbtree.c util/regional.c \ util/rtt.c util/storage/dnstree.c util/storage/lookup3.c \ util/storage/lruhash.c util/storage/slabhash.c util/timehist.c util/tube.c \ -util/winsock_event.c validator/autotrust.c validator/val_anchor.c \ -validator/validator.c validator/val_kcache.c validator/val_kentry.c \ -validator/val_neg.c validator/val_nsec3.c validator/val_nsec.c \ -validator/val_secalgo.c validator/val_sigcrypt.c \ -validator/val_utils.c dns64/dns64.c $(CHECKLOCK_SRC) $(DNSTAP_SRC) +util/ub_event.c util/ub_event_pluggable.c util/winsock_event.c \ +validator/autotrust.c validator/val_anchor.c validator/validator.c \ +validator/val_kcache.c validator/val_kentry.c validator/val_neg.c \ +validator/val_nsec3.c validator/val_nsec.c validator/val_secalgo.c \ +validator/val_sigcrypt.c validator/val_utils.c dns64/dns64.c cachedb/cachedb.c $(CHECKLOCK_SRC) \ +$(DNSTAP_SRC) COMMON_OBJ_WITHOUT_NETCALL=dns.lo infra.lo rrset.lo dname.lo msgencode.lo \ as112.lo msgparse.lo msgreply.lo packed_rrset.lo iterator.lo iter_delegpt.lo \ iter_donotq.lo iter_fwd.lo iter_hints.lo iter_priv.lo iter_resptype.lo \ @@ -122,10 +123,11 @@ fptr_wlist.lo locks.lo log.lo mini_event random.lo rbtree.lo regional.lo rtt.lo dnstree.lo lookup3.lo lruhash.lo \ slabhash.lo timehist.lo tube.lo winsock_event.lo autotrust.lo val_anchor.lo \ validator.lo val_kcache.lo val_kentry.lo val_neg.lo val_nsec3.lo val_nsec.lo \ -val_secalgo.lo val_sigcrypt.lo val_utils.lo dns64.lo \ +val_secalgo.lo val_sigcrypt.lo val_utils.lo dns64.lo cachedb.lo \ $(PYTHONMOD_OBJ) $(CHECKLOCK_OBJ) $(DNSTAP_OBJ) -COMMON_OBJ=$(COMMON_OBJ_WITHOUT_NETCALL) netevent.lo listen_dnsport.lo \ +COMMON_OBJ_WITHOUT_UB_EVENT=$(COMMON_OBJ_WITHOUT_NETCALL) netevent.lo listen_dnsport.lo \ outside_network.lo +COMMON_OBJ=$(COMMON_OBJ_WITHOUT_UB_EVENT) ub_event.lo # set to $COMMON_OBJ or to "" if --enableallsymbols COMMON_OBJ_ALL_SYMBOLS=@COMMON_OBJ_ALL_SYMBOLS@ COMPAT_SRC=compat/ctime_r.c compat/fake-rfc2553.c compat/gmtime_r.c \ @@ -134,7 +136,8 @@ compat/memcmp.c compat/memmove.c compat/ compat/strlcpy.c compat/strptime.c compat/getentropy_linux.c \ compat/getentropy_osx.c compat/getentropy_solaris.c compat/getentropy_win.c \ compat/explicit_bzero.c compat/arc4random.c compat/arc4random_uniform.c \ -compat/arc4_lock.c compat/sha512.c compat/reallocarray.c compat/isblank.c +compat/arc4_lock.c compat/sha512.c compat/reallocarray.c compat/isblank.c \ +compat/strsep.c COMPAT_OBJ=$(LIBOBJS:.o=.lo) COMPAT_OBJ_WITHOUT_CTIME=$(LIBOBJ_WITHOUT_CTIME:.o=.lo) COMPAT_OBJ_WITHOUT_CTIMEARC4=$(LIBOBJ_WITHOUT_CTIMEARC4:.o=.lo) @@ -177,7 +180,8 @@ daemon/worker.c daemon/acl_list.c daemon testcode/replay.c testcode/fake_event.c TESTBOUND_OBJ=testbound.lo replay.lo fake_event.lo TESTBOUND_OBJ_LINK=$(TESTBOUND_OBJ) testpkts.lo worker.lo acl_list.lo \ -daemon.lo stats.lo $(COMMON_OBJ_WITHOUT_NETCALL) $(SLDNS_OBJ) $(COMPAT_OBJ) +daemon.lo stats.lo $(COMMON_OBJ_WITHOUT_NETCALL) ub_event.lo $(SLDNS_OBJ) \ +$(COMPAT_OBJ) LOCKVERIFY_SRC=testcode/lock_verify.c LOCKVERIFY_OBJ=lock_verify.lo LOCKVERIFY_OBJ_LINK=$(LOCKVERIFY_OBJ) worker_cb.lo $(COMMON_OBJ) $(COMPAT_OBJ) \ @@ -209,8 +213,8 @@ DELAYER_OBJ_LINK=$(DELAYER_OBJ) worker_c $(SLDNS_OBJ) LIBUNBOUND_SRC=libunbound/context.c libunbound/libunbound.c \ libunbound/libworker.c -LIBUNBOUND_OBJ=context.lo libunbound.lo libworker.lo -LIBUNBOUND_OBJ_LINK=$(LIBUNBOUND_OBJ) $(COMMON_OBJ) $(SLDNS_OBJ) $(COMPAT_OBJ) +LIBUNBOUND_OBJ=context.lo libunbound.lo libworker.lo ub_event_pluggable.lo +LIBUNBOUND_OBJ_LINK=$(LIBUNBOUND_OBJ) $(COMMON_OBJ_WITHOUT_UB_EVENT) $(SLDNS_OBJ) $(COMPAT_OBJ) # win apps or "" if not on windows WINAPPS=@WINAPPS@ @@ -552,7 +556,7 @@ uninstall: $(PYTHONMOD_UNINSTALL) $(PYUN @echo "You still need to remove "`dirname $(DESTDIR)$(configfile)`" , $(DESTDIR)$(configfile) by hand" iana_update: - curl -o port-numbers.tmp http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xml --compressed + curl -o port-numbers.tmp https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xml --compressed if file port-numbers.tmp | grep 'gzip' >/dev/null; then zcat port-numbers.tmp; else cat port-numbers.tmp; fi | awk '// {p=0;} /udp/ {p=1;} /[^u]/ {p=0;} /Decomissioned|Decommissioned|Removed|De-registered|unassigned|Unassigned|Reserved/ {u=1;} // { if(u==1) {u=0;} else { if(p==1) { match($$0,/[0-9]+/); print substr($$0, RSTART, RLENGTH) ","}}}' | sort -nu > util/iana_ports.inc rm -f port-numbers.tmp @@ -596,7 +600,6 @@ depend: rm -f $(DEPEND_TMP) $(DEPEND_TMP2) # Dependencies -as112.lo as112.o: $(srcdir)/util/as112.c $(srcdir)/util/as112.h dns.lo dns.o: $(srcdir)/services/cache/dns.c config.h $(srcdir)/iterator/iter_delegpt.h $(srcdir)/util/log.h \ $(srcdir)/validator/val_nsec.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/locks.h $(srcdir)/services/cache/dns.h $(srcdir)/util/data/msgreply.h \ @@ -614,6 +617,7 @@ rrset.lo rrset.o: $(srcdir)/services/cac $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/storage/slabhash.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/config_file.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/regional.h $(srcdir)/util/alloc.h +as112.lo as112.o: $(srcdir)/util/as112.c $(srcdir)/util/as112.h dname.lo dname.o: $(srcdir)/util/data/dname.c config.h $(srcdir)/util/data/dname.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/msgparse.h \ $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/storage/lookup3.h $(srcdir)/sldns/sbuffer.h @@ -624,9 +628,9 @@ msgencode.lo msgencode.o: $(srcdir)/util $(srcdir)/sldns/sbuffer.h msgparse.lo msgparse.o: $(srcdir)/util/data/msgparse.c config.h $(srcdir)/util/data/msgparse.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/sldns/pkthdr.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/dname.h $(srcdir)/util/data/packed_rrset.h \ - $(srcdir)/util/storage/lookup3.h $(srcdir)/util/regional.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/parseutil.h \ - $(srcdir)/sldns/wire2str.h + $(srcdir)/sldns/rrdef.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ + $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lookup3.h $(srcdir)/util/regional.h $(srcdir)/sldns/sbuffer.h \ + $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h msgreply.lo msgreply.o: $(srcdir)/util/data/msgreply.c config.h $(srcdir)/util/data/msgreply.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/packed_rrset.h \ $(srcdir)/util/storage/lookup3.h $(srcdir)/util/alloc.h $(srcdir)/util/netevent.h $(srcdir)/util/net_help.h \ @@ -718,7 +722,7 @@ modstack.lo modstack.o: $(srcdir)/servic $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/netevent.h \ $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/dns64/dns64.h \ $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/validator/validator.h \ - $(srcdir)/validator/val_utils.h + $(srcdir)/validator/val_utils.h $(PYTHONMOD_HEADER) $(srcdir)/cachedb/cachedb.h outbound_list.lo outbound_list.o: $(srcdir)/services/outbound_list.c config.h \ $(srcdir)/services/outbound_list.h $(srcdir)/services/outside_network.h $(srcdir)/util/rbtree.h \ $(srcdir)/util/netevent.h @@ -762,7 +766,8 @@ fptr_wlist.lo fptr_wlist.o: $(srcdir)/ut $(srcdir)/validator/val_nsec3.h $(srcdir)/validator/val_sigcrypt.h $(srcdir)/validator/val_kentry.h \ $(srcdir)/validator/val_neg.h $(srcdir)/validator/autotrust.h $(srcdir)/libunbound/libworker.h \ $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h $(srcdir)/libunbound/unbound.h \ - $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h + $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h $(srcdir)/util/config_file.h \ + $(PYTHONMOD_HEADER) $(srcdir)/cachedb/cachedb.h locks.lo locks.o: $(srcdir)/util/locks.c config.h $(srcdir)/util/locks.h $(srcdir)/util/log.h log.lo log.o: $(srcdir)/util/log.c config.h $(srcdir)/util/log.h $(srcdir)/util/locks.h $(srcdir)/sldns/sbuffer.h mini_event.lo mini_event.o: $(srcdir)/util/mini_event.c config.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h \ @@ -773,12 +778,12 @@ mini_event.lo mini_event.o: $(srcdir)/ut module.lo module.o: $(srcdir)/util/module.c config.h $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h -netevent.lo netevent.o: $(srcdir)/util/netevent.c config.h $(srcdir)/util/netevent.h $(srcdir)/util/log.h \ - $(srcdir)/util/net_help.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ - $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ +netevent.lo netevent.o: $(srcdir)/util/netevent.c config.h $(srcdir)/util/netevent.h $(srcdir)/util/ub_event.h \ + $(srcdir)/util/log.h $(srcdir)/util/net_help.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/storage/lruhash.h \ + $(srcdir)/util/locks.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \ $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/sldns/sbuffer.h \ - $(srcdir)/dnstap/dnstap.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h + $(srcdir)/dnstap/dnstap.h net_help.lo net_help.o: $(srcdir)/util/net_help.c config.h $(srcdir)/util/net_help.h $(srcdir)/util/log.h \ $(srcdir)/util/data/dname.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/module.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ @@ -808,7 +813,15 @@ tube.lo tube.o: $(srcdir)/util/tube.c co $(srcdir)/util/netevent.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h \ $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/services/mesh.h \ - $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h + $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h $(srcdir)/util/ub_event.h +ub_event.lo ub_event.o: $(srcdir)/util/ub_event.c config.h $(srcdir)/util/ub_event.h $(srcdir)/util/log.h \ + $(srcdir)/util/netevent.h $(srcdir)/util/tube.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h +ub_event_pluggable.lo ub_event_pluggable.o: $(srcdir)/util/ub_event_pluggable.c config.h $(srcdir)/util/ub_event.h \ + $(srcdir)/libunbound/unbound-event.h $(srcdir)/util/netevent.h $(srcdir)/util/log.h $(srcdir)/util/fptr_wlist.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ + $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ + $(srcdir)/services/modstack.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h winsock_event.lo winsock_event.o: $(srcdir)/util/winsock_event.c config.h autotrust.lo autotrust.o: $(srcdir)/validator/autotrust.c config.h $(srcdir)/validator/autotrust.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ @@ -822,8 +835,8 @@ autotrust.lo autotrust.o: $(srcdir)/vali val_anchor.lo val_anchor.o: $(srcdir)/validator/val_anchor.c config.h $(srcdir)/validator/val_anchor.h \ $(srcdir)/util/rbtree.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/validator/val_sigcrypt.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/validator/autotrust.h \ - $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/util/config_file.h $(srcdir)/sldns/sbuffer.h \ - $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/str2wire.h $(srcdir)/util/as112.h + $(srcdir)/util/data/dname.h $(srcdir)/util/net_help.h $(srcdir)/util/config_file.h $(srcdir)/util/as112.h \ + $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/str2wire.h validator.lo validator.o: $(srcdir)/validator/validator.c config.h $(srcdir)/validator/validator.h \ $(srcdir)/util/module.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h \ @@ -880,7 +893,7 @@ val_utils.lo val_utils.o: $(srcdir)/vali $(srcdir)/validator/val_sigcrypt.h $(srcdir)/validator/val_anchor.h $(srcdir)/util/rbtree.h \ $(srcdir)/validator/val_nsec.h $(srcdir)/validator/val_neg.h $(srcdir)/services/cache/rrset.h \ $(srcdir)/util/storage/slabhash.h $(srcdir)/services/cache/dns.h $(srcdir)/util/data/dname.h \ - $(srcdir)/util/net_help.h $(srcdir)/util/regional.h + $(srcdir)/util/net_help.h $(srcdir)/util/regional.h $(srcdir)/sldns/wire2str.h $(srcdir)/sldns/parseutil.h dns64.lo dns64.o: $(srcdir)/dns64/dns64.c config.h $(srcdir)/dns64/dns64.h $(srcdir)/util/module.h \ $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/msgreply.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ @@ -888,6 +901,14 @@ dns64.lo dns64.o: $(srcdir)/dns64/dns64. $(srcdir)/util/storage/slabhash.h $(srcdir)/util/config_file.h $(srcdir)/util/fptr_wlist.h \ $(srcdir)/util/netevent.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/rbtree.h \ $(srcdir)/services/modstack.h $(srcdir)/util/net_help.h $(srcdir)/util/regional.h +cachedb.lo cachedb.o: $(srcdir)/cachedb/cachedb.c config.h $(srcdir)/cachedb/cachedb.h $(srcdir)/util/module.h \ + $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/data/msgreply.h \ + $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ + $(srcdir)/sldns/rrdef.h $(srcdir)/util/regional.h $(srcdir)/util/net_help.h $(srcdir)/util/config_file.h \ + $(srcdir)/util/data/msgencode.h $(srcdir)/services/cache/dns.h $(srcdir)/validator/val_neg.h \ + $(srcdir)/util/rbtree.h $(srcdir)/validator/val_secalgo.h $(srcdir)/iterator/iter_utils.h \ + $(srcdir)/iterator/iter_resptype.h $(srcdir)/sldns/parseutil.h $(srcdir)/sldns/wire2str.h \ + $(srcdir)/sldns/sbuffer.h checklocks.lo checklocks.o: $(srcdir)/testcode/checklocks.c config.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ $(srcdir)/testcode/checklocks.h unitanchor.lo unitanchor.o: $(srcdir)/testcode/unitanchor.c config.h $(srcdir)/util/log.h $(srcdir)/util/data/dname.h \ @@ -994,7 +1015,7 @@ unbound.lo unbound.o: $(srcdir)/daemon/u $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rbtree.h $(srcdir)/util/rtt.h $(srcdir)/util/fptr_wlist.h \ $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h $(srcdir)/services/mesh.h $(srcdir)/util/net_help.h \ - $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h + $(srcdir)/util/ub_event.h worker.lo worker.o: $(srcdir)/daemon/worker.c config.h $(srcdir)/util/log.h $(srcdir)/util/net_help.h \ $(srcdir)/util/random.h $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h $(srcdir)/sldns/sbuffer.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h \ @@ -1020,7 +1041,7 @@ testbound.lo testbound.o: $(srcdir)/test $(srcdir)/util/data/packed_rrset.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/util/rtt.h $(srcdir)/util/fptr_wlist.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/tube.h \ - $(srcdir)/services/mesh.h $(srcdir)/util/net_help.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h + $(srcdir)/services/mesh.h $(srcdir)/util/net_help.h $(srcdir)/util/ub_event.h testpkts.lo testpkts.o: $(srcdir)/testcode/testpkts.c config.h $(srcdir)/testcode/testpkts.h \ $(srcdir)/util/net_help.h $(srcdir)/util/log.h $(srcdir)/sldns/sbuffer.h $(srcdir)/sldns/rrdef.h $(srcdir)/sldns/pkthdr.h \ $(srcdir)/sldns/str2wire.h $(srcdir)/sldns/wire2str.h @@ -1101,7 +1122,7 @@ unbound-checkconf.lo unbound-checkconf.o $(srcdir)/iterator/iterator.h $(srcdir)/services/outbound_list.h $(srcdir)/iterator/iter_fwd.h \ $(srcdir)/util/rbtree.h $(srcdir)/iterator/iter_hints.h $(srcdir)/util/storage/dnstree.h \ $(srcdir)/validator/validator.h $(srcdir)/validator/val_utils.h $(srcdir)/services/localzone.h \ - $(srcdir)/sldns/sbuffer.h + $(srcdir)/sldns/sbuffer.h $(PYTHONMOD_HEADER) worker_cb.lo worker_cb.o: $(srcdir)/smallapp/worker_cb.c config.h $(srcdir)/libunbound/context.h \ $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \ $(srcdir)/libunbound/unbound.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ @@ -1121,9 +1142,10 @@ libunbound.lo libunbound.o: $(srcdir)/li $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/libunbound/libworker.h \ $(srcdir)/util/config_file.h $(srcdir)/util/module.h $(srcdir)/util/data/msgreply.h \ $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h $(srcdir)/sldns/rrdef.h $(srcdir)/util/regional.h \ - $(srcdir)/util/random.h $(srcdir)/util/net_help.h $(srcdir)/util/tube.h $(srcdir)/services/localzone.h \ - $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h $(srcdir)/util/rtt.h \ - $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/sldns/sbuffer.h + $(srcdir)/util/random.h $(srcdir)/util/net_help.h $(srcdir)/util/tube.h $(srcdir)/util/ub_event.h \ + $(srcdir)/services/localzone.h $(srcdir)/services/cache/infra.h $(srcdir)/util/storage/dnstree.h \ + $(srcdir)/util/rtt.h $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h \ + $(srcdir)/sldns/sbuffer.h libworker.lo libworker.o: $(srcdir)/libunbound/libworker.c config.h $(srcdir)/libunbound/libworker.h \ $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h $(srcdir)/util/locks.h $(srcdir)/util/log.h \ $(srcdir)/libunbound/context.h $(srcdir)/util/alloc.h $(srcdir)/util/rbtree.h $(srcdir)/services/modstack.h \ @@ -1163,14 +1185,15 @@ pythonmod_utils.lo pythonmod_utils.o: $( $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ $(srcdir)/sldns/rrdef.h $(srcdir)/util/netevent.h $(srcdir)/util/net_help.h $(srcdir)/services/cache/dns.h \ $(srcdir)/services/cache/rrset.h $(srcdir)/util/storage/slabhash.h $(srcdir)/util/regional.h \ - $(srcdir)/iterator/iter_delegpt.h $(srcdir)/sldns/sbuffer.h + $(srcdir)/iterator/iter_delegpt.h $(srcdir)/sldns/sbuffer.h \ + win_svc.lo win_svc.o: $(srcdir)/winrc/win_svc.c config.h $(srcdir)/winrc/win_svc.h $(srcdir)/winrc/w_inst.h \ $(srcdir)/daemon/daemon.h $(srcdir)/util/locks.h $(srcdir)/util/log.h $(srcdir)/util/alloc.h $(srcdir)/services/modstack.h \ $(srcdir)/daemon/worker.h $(srcdir)/libunbound/worker.h \ $(srcdir)/sldns/sbuffer.h $(srcdir)/util/data/packed_rrset.h $(srcdir)/util/storage/lruhash.h \ $(srcdir)/util/netevent.h $(srcdir)/util/data/msgreply.h $(srcdir)/util/data/msgparse.h $(srcdir)/sldns/pkthdr.h \ $(srcdir)/sldns/rrdef.h $(srcdir)/daemon/stats.h $(srcdir)/util/timehist.h $(srcdir)/util/module.h \ - $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h $(srcdir)/util/config_file.h $(srcdir)/util/winsock_event.h + $(srcdir)/dnstap/dnstap.h $(srcdir)/daemon/remote.h $(srcdir)/util/config_file.h $(srcdir)/util/ub_event.h w_inst.lo w_inst.o: $(srcdir)/winrc/w_inst.c config.h $(srcdir)/winrc/w_inst.h $(srcdir)/winrc/win_svc.h unbound-service-install.lo unbound-service-install.o: $(srcdir)/winrc/unbound-service-install.c config.h \ $(srcdir)/winrc/w_inst.h @@ -1202,6 +1225,7 @@ snprintf.lo snprintf.o: $(srcdir)/compat strlcat.lo strlcat.o: $(srcdir)/compat/strlcat.c config.h strlcpy.lo strlcpy.o: $(srcdir)/compat/strlcpy.c config.h strptime.lo strptime.o: $(srcdir)/compat/strptime.c config.h +strsep.lo strsep.o: $(srcdir)/compat/strsep.c config.h getentropy_linux.lo getentropy_linux.o: $(srcdir)/compat/getentropy_linux.c config.h getentropy_osx.lo getentropy_osx.o: $(srcdir)/compat/getentropy_osx.c config.h getentropy_solaris.lo getentropy_solaris.o: $(srcdir)/compat/getentropy_solaris.c config.h Modified: projects/clang390-import/contrib/unbound/acx_nlnetlabs.m4 ============================================================================== --- projects/clang390-import/contrib/unbound/acx_nlnetlabs.m4 Sun Sep 4 17:23:10 2016 (r305389) +++ projects/clang390-import/contrib/unbound/acx_nlnetlabs.m4 Sun Sep 4 17:26:42 2016 (r305390) @@ -2,7 +2,9 @@ # Copyright 2009, Wouter Wijngaards, NLnet Labs. # BSD licensed. # -# Version 32 +# Version 34 +# 2016-03-21 Check -ldl -pthread for libcrypto for ldns and openssl 1.1.0. +# 2016-03-21 Use HMAC_Update instead of HMAC_CTX_Init (for openssl-1.1.0). # 2016-01-04 -D_DEFAULT_SOURCE defined with -D_BSD_SOURCE for Linux glibc 2.20 # 2015-12-11 FLTO check for new OSX, clang. # 2015-11-18 spelling check fix. @@ -671,16 +673,16 @@ AC_DEFUN([ACX_SSL_CHECKS], [ ACX_RUNTIME_PATH_ADD([$ssldir/lib]) fi - AC_MSG_CHECKING([for HMAC_CTX_init in -lcrypto]) + AC_MSG_CHECKING([for HMAC_Update in -lcrypto]) LIBS="$LIBS -lcrypto" LIBSSL_LIBS="$LIBSSL_LIBS -lcrypto" AC_TRY_LINK(, [ - int HMAC_CTX_init(void); - (void)HMAC_CTX_init(); + int HMAC_Update(void); + (void)HMAC_Update(); ], [ AC_MSG_RESULT(yes) - AC_DEFINE([HAVE_HMAC_CTX_INIT], 1, - [If you have HMAC_CTX_init]) + AC_DEFINE([HAVE_HMAC_UPDATE], 1, + [If you have HMAC_Update]) ], [ AC_MSG_RESULT(no) # check if -lwsock32 or -lgdi32 are needed. @@ -690,11 +692,11 @@ AC_DEFUN([ACX_SSL_CHECKS], [ LIBSSL_LIBS="$LIBSSL_LIBS -lgdi32" AC_MSG_CHECKING([if -lcrypto needs -lgdi32]) AC_TRY_LINK([], [ - int HMAC_CTX_init(void); - (void)HMAC_CTX_init(); + int HMAC_Update(void); + (void)HMAC_Update(); ],[ - AC_DEFINE([HAVE_HMAC_CTX_INIT], 1, - [If you have HMAC_CTX_init]) + AC_DEFINE([HAVE_HMAC_UPDATE], 1, + [If you have HMAC_Update]) AC_MSG_RESULT(yes) ],[ AC_MSG_RESULT(no) @@ -704,15 +706,30 @@ AC_DEFUN([ACX_SSL_CHECKS], [ LIBSSL_LIBS="$LIBSSL_LIBS -ldl" AC_MSG_CHECKING([if -lcrypto needs -ldl]) AC_TRY_LINK([], [ - int HMAC_CTX_init(void); - (void)HMAC_CTX_init(); + int HMAC_Update(void); + (void)HMAC_Update(); ],[ - AC_DEFINE([HAVE_HMAC_CTX_INIT], 1, - [If you have HMAC_CTX_init]) + AC_DEFINE([HAVE_HMAC_UPDATE], 1, + [If you have HMAC_Update]) AC_MSG_RESULT(yes) ],[ AC_MSG_RESULT(no) - AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required]) + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + LIBS="$LIBS -ldl -pthread" + LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread" + AC_MSG_CHECKING([if -lcrypto needs -ldl -pthread]) + AC_TRY_LINK([], [ + int HMAC_Update(void); + (void)HMAC_Update(); + ],[ + AC_DEFINE([HAVE_HMAC_UPDATE], 1, + [If you have HMAC_Update]) + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required]) + ]) ]) ]) ]) Modified: projects/clang390-import/contrib/unbound/compat/explicit_bzero.c ============================================================================== --- projects/clang390-import/contrib/unbound/compat/explicit_bzero.c Sun Sep 4 17:23:10 2016 (r305389) +++ projects/clang390-import/contrib/unbound/compat/explicit_bzero.c Sun Sep 4 17:26:42 2016 (r305390) @@ -6,7 +6,11 @@ #include "config.h" #include +#ifdef HAVE_ATTR_WEAK __attribute__((weak)) void +#else +void +#endif __explicit_bzero_hook(void *ATTR_UNUSED(buf), size_t ATTR_UNUSED(len)) { } Modified: projects/clang390-import/contrib/unbound/compat/getentropy_linux.c ============================================================================== --- projects/clang390-import/contrib/unbound/compat/getentropy_linux.c Sun Sep 4 17:23:10 2016 (r305389) +++ projects/clang390-import/contrib/unbound/compat/getentropy_linux.c Sun Sep 4 17:26:42 2016 (r305390) @@ -94,7 +94,7 @@ int getentropy(void *buf, size_t len); extern int main(int, char *argv[]); #endif static int gotdata(char *buf, size_t len); -#ifdef SYS_getrandom +#if defined(SYS_getrandom) && defined(__NR_getrandom) static int getentropy_getrandom(void *buf, size_t len); #endif static int getentropy_urandom(void *buf, size_t len); @@ -113,7 +113,7 @@ getentropy(void *buf, size_t len) return -1; } -#ifdef SYS_getrandom +#if defined(SYS_getrandom) && defined(__NR_getrandom) /* * Try descriptor-less getrandom() */ @@ -209,7 +209,7 @@ gotdata(char *buf, size_t len) return 0; } -#ifdef SYS_getrandom +#if defined(SYS_getrandom) && defined(__NR_getrandom) static int getentropy_getrandom(void *buf, size_t len) { Copied: projects/clang390-import/contrib/unbound/compat/strsep.c (from r305389, head/contrib/unbound/compat/strsep.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang390-import/contrib/unbound/compat/strsep.c Sun Sep 4 17:26:42 2016 (r305390, copy of r305389, head/contrib/unbound/compat/strsep.c) @@ -0,0 +1,65 @@ +/** + * strsep implementation for compatibility. + * + * LICENSE + * Copyright (c) 2016, NLnet Labs + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of NLnetLabs nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + **/ + +#include "config.h" + +/** see if character is in the delimiter array */ +static int +in_delim(char c, const char* delim) +{ + const char* p; + if(!delim) + return 0; + for(p=delim; *p; p++) { + if(*p == c) + return 1; + } + return 0; +} + +char *strsep(char **stringp, const char *delim) +{ + char* s; + char* orig; + if(stringp == NULL || *stringp == NULL) + return NULL; + orig = *stringp; + s = *stringp; + while(*s && !in_delim(*s, delim)) + s++; + if(*s) { + *s = 0; + *stringp = s+1; + } else { + *stringp = NULL; + } + return orig; +} Modified: projects/clang390-import/contrib/unbound/config.h ============================================================================== --- projects/clang390-import/contrib/unbound/config.h Sun Sep 4 17:23:10 2016 (r305389) +++ projects/clang390-import/contrib/unbound/config.h Sun Sep 4 17:26:42 2016 (r305390) @@ -43,6 +43,9 @@ /* Whether the C compiler accepts the "unused" attribute */ #define HAVE_ATTR_UNUSED 1 +/* Whether the C compiler accepts the "weak" attribute */ +#define HAVE_ATTR_WEAK 1 + /* Define to 1 if you have the `chown' function. */ #define HAVE_CHOWN 1 @@ -126,6 +129,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_EVENT_H */ +/* Define to 1 if you have the `EVP_MD_CTX_new' function. */ +/* #undef HAVE_EVP_MD_CTX_NEW */ + /* Define to 1 if you have the `EVP_sha1' function. */ #define HAVE_EVP_SHA1 1 @@ -189,8 +195,8 @@ /* Define to 1 if you have the header file. */ #define HAVE_GRP_H 1 -/* If you have HMAC_CTX_init */ -#define HAVE_HMAC_CTX_INIT 1 +/* If you have HMAC_Update */ +#define HAVE_HMAC_UPDATE 1 /* Define to 1 if you have the `inet_aton' function. */ #define HAVE_INET_ATON 1 @@ -378,6 +384,9 @@ /* Define to 1 if you have the `strptime' function. */ #define HAVE_STRPTIME 1 +/* Define to 1 if you have the `strsep' function. */ +#define HAVE_STRSEP 1 + /* Define to 1 if `ipi_spec_dst' is a member of `struct in_pktinfo'. */ /* #undef HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST */ @@ -515,7 +524,7 @@ #define PACKAGE_NAME "unbound" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "unbound 1.5.8" +#define PACKAGE_STRING "unbound 1.5.9" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "unbound" @@ -524,7 +533,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.5.8" +#define PACKAGE_VERSION "1.5.9" /* default pidfile location */ #define PIDFILE "/var/unbound/unbound.pid" @@ -543,7 +552,7 @@ #define ROOT_CERT_FILE "/var/unbound/icannbundle.pem" /* version number for resource files */ -#define RSRC_PACKAGE_VERSION 1,5,8,0 +#define RSRC_PACKAGE_VERSION 1,5,9,0 /* Directory to chdir to */ #define RUN_DIR "/var/unbound" @@ -581,9 +590,15 @@ /* define this to enable debug checks. */ /* #undef UNBOUND_DEBUG */ +/* Define to 1 to use cachedb support */ +/* #undef USE_CACHEDB */ + /* Define to 1 to enable dnstap support */ /* #undef USE_DNSTAP */ +/* Define this to enable DSA support. */ +#define USE_DSA 1 + /* Define this to enable ECDSA support. */ #define USE_ECDSA 1 @@ -980,6 +995,11 @@ int memcmp(const void *x, const void *y, char *ctime_r(const time_t *timep, char *buf); #endif +#ifndef HAVE_STRSEP +#define strsep unbound_strsep +char *strsep(char **stringp, const char *delim); +#endif + #ifndef HAVE_ISBLANK #define isblank unbound_isblank int isblank(int c); Modified: projects/clang390-import/contrib/unbound/config.h.in ============================================================================== --- projects/clang390-import/contrib/unbound/config.h.in Sun Sep 4 17:23:10 2016 (r305389) +++ projects/clang390-import/contrib/unbound/config.h.in Sun Sep 4 17:26:42 2016 (r305390) @@ -42,6 +42,9 @@ /* Whether the C compiler accepts the "unused" attribute */ #undef HAVE_ATTR_UNUSED +/* Whether the C compiler accepts the "weak" attribute */ +#undef HAVE_ATTR_WEAK + /* Define to 1 if you have the `chown' function. */ #undef HAVE_CHOWN @@ -125,6 +128,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_EVENT_H +/* Define to 1 if you have the `EVP_MD_CTX_new' function. */ +#undef HAVE_EVP_MD_CTX_NEW + /* Define to 1 if you have the `EVP_sha1' function. */ #undef HAVE_EVP_SHA1 @@ -188,8 +194,8 @@ /* Define to 1 if you have the header file. */ #undef HAVE_GRP_H -/* If you have HMAC_CTX_init */ -#undef HAVE_HMAC_CTX_INIT +/* If you have HMAC_Update */ +#undef HAVE_HMAC_UPDATE /* Define to 1 if you have the `inet_aton' function. */ #undef HAVE_INET_ATON @@ -377,6 +383,9 @@ /* Define to 1 if you have the `strptime' function. */ #undef HAVE_STRPTIME +/* Define to 1 if you have the `strsep' function. */ +#undef HAVE_STRSEP + /* Define to 1 if `ipi_spec_dst' is a member of `struct in_pktinfo'. */ #undef HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST @@ -580,9 +589,15 @@ /* define this to enable debug checks. */ #undef UNBOUND_DEBUG +/* Define to 1 to use cachedb support */ +#undef USE_CACHEDB + /* Define to 1 to enable dnstap support */ #undef USE_DNSTAP +/* Define this to enable DSA support. */ +#undef USE_DSA + /* Define this to enable ECDSA support. */ #undef USE_ECDSA @@ -979,6 +994,11 @@ int memcmp(const void *x, const void *y, char *ctime_r(const time_t *timep, char *buf); #endif +#ifndef HAVE_STRSEP +#define strsep unbound_strsep +char *strsep(char **stringp, const char *delim); +#endif + #ifndef HAVE_ISBLANK #define isblank unbound_isblank int isblank(int c); Modified: projects/clang390-import/contrib/unbound/configure ============================================================================== --- projects/clang390-import/contrib/unbound/configure Sun Sep 4 17:23:10 2016 (r305389) +++ projects/clang390-import/contrib/unbound/configure Sun Sep 4 17:26:42 2016 (r305390) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for unbound 1.5.8. +# Generated by GNU Autoconf 2.69 for unbound 1.5.9. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='unbound' PACKAGE_TARNAME='unbound' -PACKAGE_VERSION='1.5.8' -PACKAGE_STRING='unbound 1.5.8' +PACKAGE_VERSION='1.5.9' +PACKAGE_STRING='unbound 1.5.9' PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl' PACKAGE_URL='' @@ -832,6 +832,7 @@ with_ssl enable_sha2 enable_gost enable_ecdsa +enable_dsa enable_event_api with_libevent with_libexpat @@ -842,6 +843,7 @@ enable_dnstap with_dnstap_socket_path with_protobuf_c with_libfstrm +enable_cachedb with_libunbound_only ' ac_precious_vars='build_alias @@ -1397,7 +1399,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures unbound 1.5.8 to adapt to many kinds of systems. +\`configure' configures unbound 1.5.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1462,7 +1464,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unbound 1.5.8:";; + short | recursive ) echo "Configuration of unbound 1.5.9:";; esac cat <<\_ACEOF @@ -1495,8 +1497,9 @@ Optional Features: --disable-sha2 Disable SHA256 and SHA512 RRSIG support --disable-gost Disable GOST support --disable-ecdsa Disable ECDSA support - --enable-event-api Enable (experimental) libevent-based libunbound API - installed to unbound-event.h + --disable-dsa Disable DSA support + --enable-event-api Enable (experimental) pluggable event base + libunbound API installed to unbound-event.h --enable-static-exe enable to compile executables statically against (event) libs, for debug purposes --enable-lock-checks enable to check lock and unlock calls, for debug @@ -1505,6 +1508,8 @@ Optional Features: to it, smaller install size but libunbound export table is polluted by internal symbols --enable-dnstap Enable dnstap support (requires fstrm, protobuf-c) + --enable-cachedb enable cachedb module that can use external cache + storage Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1647,7 +1652,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unbound configure 1.5.8 +unbound configure 1.5.9 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2356,7 +2361,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by unbound $as_me 1.5.8, which was +It was created by unbound $as_me 1.5.9, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2708,11 +2713,11 @@ UNBOUND_VERSION_MAJOR=1 UNBOUND_VERSION_MINOR=5 -UNBOUND_VERSION_MICRO=8 +UNBOUND_VERSION_MICRO=9 LIBUNBOUND_CURRENT=6 -LIBUNBOUND_REVISION=0 +LIBUNBOUND_REVISION=1 LIBUNBOUND_AGE=4 # 1.0.0 had 0:12:0 # 1.0.1 had 0:13:0 @@ -2760,6 +2765,7 @@ LIBUNBOUND_AGE=4 # 1.5.6 had 5:9:3 # 1.5.7 had 5:10:3 # 1.5.8 had 6:0:4 # adds ub_ctx_set_stub +# 1.5.9 had 6:1:4 # Current -- the number of the binary API that we're implementing # Revision -- which iteration of the implementation of the binary @@ -6117,6 +6123,48 @@ $as_echo "#define HAVE_ATTR_UNUSED 1" >> fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler (${CC-cc}) accepts the \"weak\" attribute" >&5 +$as_echo_n "checking whether the C compiler (${CC-cc}) accepts the \"weak\" attribute... " >&6; } +if ${ac_cv_c_weak_attribute+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_c_weak_attribute=no +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #include +__attribute__((weak)) void f(int x) { printf("%d", x); } + +int +main () +{ + + f(1); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_weak_attribute="yes" +else + ac_cv_c_weak_attribute="no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_weak_attribute" >&5 +$as_echo "$ac_cv_c_weak_attribute" >&6; } +if test $ac_cv_c_weak_attribute = yes; then + +$as_echo "#define HAVE_ATTR_WEAK 1" >>confdefs.h + +fi + + if test "$srcdir" != "."; then CPPFLAGS="$CPPFLAGS -I$srcdir" fi @@ -17064,8 +17112,8 @@ $as_echo "found in $ssldir" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HMAC_CTX_init in -lcrypto" >&5 -$as_echo_n "checking for HMAC_CTX_init in -lcrypto... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HMAC_Update in -lcrypto" >&5 +$as_echo_n "checking for HMAC_Update in -lcrypto... " >&6; } LIBS="$LIBS -lcrypto" LIBSSL_LIBS="$LIBSSL_LIBS -lcrypto" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17075,8 +17123,8 @@ int main () { - int HMAC_CTX_init(void); - (void)HMAC_CTX_init(); + int HMAC_Update(void); + (void)HMAC_Update(); ; return 0; @@ -17087,7 +17135,7 @@ if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } -$as_echo "#define HAVE_HMAC_CTX_INIT 1" >>confdefs.h +$as_echo "#define HAVE_HMAC_UPDATE 1" >>confdefs.h else @@ -17108,8 +17156,8 @@ int main () { - int HMAC_CTX_init(void); - (void)HMAC_CTX_init(); + int HMAC_Update(void); + (void)HMAC_Update(); ; return 0; @@ -17118,7 +17166,7 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : -$as_echo "#define HAVE_HMAC_CTX_INIT 1" >>confdefs.h +$as_echo "#define HAVE_HMAC_UPDATE 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -17140,8 +17188,8 @@ int main () { - int HMAC_CTX_init(void); - (void)HMAC_CTX_init(); + int HMAC_Update(void); + (void)HMAC_Update(); ; return 0; @@ -17150,7 +17198,7 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : -$as_echo "#define HAVE_HMAC_CTX_INIT 1" >>confdefs.h +$as_echo "#define HAVE_HMAC_UPDATE 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -17159,7 +17207,43 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "OpenSSL found in $ssldir, but version 0.9.7 or higher is required" "$LINENO" 5 + LIBS="$BAKLIBS" + LIBSSL_LIBS="$BAKSSLLIBS" + LIBS="$LIBS -ldl -pthread" + LIBSSL_LIBS="$LIBSSL_LIBS -ldl -pthread" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -lcrypto needs -ldl -pthread" >&5 +$as_echo_n "checking if -lcrypto needs -ldl -pthread... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + int HMAC_Update(void); + (void)HMAC_Update(); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + +$as_echo "#define HAVE_HMAC_UPDATE 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "OpenSSL found in $ssldir, but version 0.9.7 or higher is required" "$LINENO" 5 + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi rm -f core conftest.err conftest.$ac_objext \ @@ -17404,7 +17488,7 @@ fi done -for ac_func in OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode +for ac_func in OPENSSL_config EVP_sha1 EVP_sha256 EVP_sha512 FIPS_mode EVP_MD_CTX_new do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -17771,15 +17855,46 @@ _ACEOF ;; esac +# Check whether --enable-dsa was given. +if test "${enable_dsa+set}" = set; then : + enableval=$enable_dsa; +fi + +use_dsa="no" +case "$enable_ecdsa" in + no) + ;; + *) + # detect if DSA is supported, and turn it off if not. + ac_fn_c_check_func "$LINENO" "EVP_dss1" "ac_cv_func_EVP_dss1" +if test "x$ac_cv_func_EVP_dss1" = xyes; then : + + +cat >>confdefs.h <<_ACEOF +#define USE_DSA 1 +_ACEOF + + +else + if test "x$enable_dsa" = "xyes"; then as_fn_error $? "OpenSSL does not support DSA and you used --enable-dsa." "$LINENO" 5 + fi +fi + + ;; +esac + + # Check whether --enable-event-api was given. if test "${enable_event_api+set}" = set; then : enableval=$enable_event_api; fi -use_unbound_event="no" case "$enable_event_api" in yes) - use_unbound_event="yes" + UNBOUND_EVENT_INSTALL=unbound-event-install + + UNBOUND_EVENT_UNINSTALL=unbound-event-uninstall + ;; *) ;; @@ -18126,12 +18241,6 @@ done if test -n "$BAK_LDFLAGS_SET"; then LDFLAGS="$BAK_LDFLAGS" fi - if test "$use_unbound_event" = "yes"; then - UNBOUND_EVENT_INSTALL=unbound-event-install - - UNBOUND_EVENT_UNINSTALL=unbound-event-uninstall - - fi else $as_echo "#define USE_MINI_EVENT 1" >>confdefs.h @@ -19237,6 +19346,20 @@ esac fi +ac_fn_c_check_func "$LINENO" "strsep" "ac_cv_func_strsep" +if test "x$ac_cv_func_strsep" = xyes; then : + $as_echo "#define HAVE_STRSEP 1" >>confdefs.h + +else + case " $LIBOBJS " in + *" strsep.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS strsep.$ac_objext" *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Sun Sep 4 18:00:15 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 81AF3B71B23 for ; Sun, 4 Sep 2016 18:00:15 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5CBF1F03; Sun, 4 Sep 2016 18:00:15 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u84I0E4r060368; Sun, 4 Sep 2016 18:00:14 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u84I0Eg2060364; Sun, 4 Sep 2016 18:00:14 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201609041800.u84I0Eg2060364@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 4 Sep 2016 18:00:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305394 - in projects/clang390-import/sys: arm64/arm64 conf modules/bwn X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Sep 2016 18:00:15 -0000 Author: dim Date: Sun Sep 4 18:00:14 2016 New Revision: 305394 URL: https://svnweb.freebsd.org/changeset/base/305394 Log: Merge ^/head r305390 through r305393. Modified: projects/clang390-import/sys/arm64/arm64/pmap.c projects/clang390-import/sys/conf/files projects/clang390-import/sys/conf/kern.mk projects/clang390-import/sys/modules/bwn/Makefile Directory Properties: projects/clang390-import/ (props changed) Modified: projects/clang390-import/sys/arm64/arm64/pmap.c ============================================================================== --- projects/clang390-import/sys/arm64/arm64/pmap.c Sun Sep 4 17:56:55 2016 (r305393) +++ projects/clang390-import/sys/arm64/arm64/pmap.c Sun Sep 4 18:00:14 2016 (r305394) @@ -242,7 +242,7 @@ extern pt_entry_t pagetable_dmap[]; static SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters"); -static int superpages_enabled = 0; +static int superpages_enabled = 1; SYSCTL_INT(_vm_pmap, OID_AUTO, superpages_enabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &superpages_enabled, 0, "Are large page mappings enabled?"); Modified: projects/clang390-import/sys/conf/files ============================================================================== --- projects/clang390-import/sys/conf/files Sun Sep 4 17:56:55 2016 (r305393) +++ projects/clang390-import/sys/conf/files Sun Sep 4 18:00:14 2016 (r305394) @@ -1211,13 +1211,13 @@ dev/bwi/bwiphy.c optional bwi dev/bwi/bwirf.c optional bwi dev/bwi/if_bwi.c optional bwi dev/bwi/if_bwi_pci.c optional bwi pci -# XXX Work around clang warning, until maintainer approves fix. +# XXX Work around clang warnings, until maintainer approves fix. dev/bwn/if_bwn.c optional bwn siba_bwn \ compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}" dev/bwn/if_bwn_pci.c optional bwn pci bhnd dev/bwn/if_bwn_phy_common.c optional bwn siba_bwn dev/bwn/if_bwn_phy_g.c optional bwn siba_bwn \ - compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}" + compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED} ${NO_WCONSTANT_CONVERSION}" dev/bwn/if_bwn_phy_lp.c optional bwn siba_bwn \ compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}" dev/bwn/if_bwn_phy_n.c optional bwn siba_bwn Modified: projects/clang390-import/sys/conf/kern.mk ============================================================================== --- projects/clang390-import/sys/conf/kern.mk Sun Sep 4 17:56:55 2016 (r305393) +++ projects/clang390-import/sys/conf/kern.mk Sun Sep 4 18:00:14 2016 (r305394) @@ -17,13 +17,13 @@ CWARNFLAGS?= -Wall -Wredundant-decls -Wn # kernel where fixing them is more trouble than it is worth, or where there is # a false positive. .if ${COMPILER_TYPE} == "clang" -NO_WCONSTANT_CONVERSION= -Wno-constant-conversion -NO_WSHIFT_COUNT_NEGATIVE= -Wno-shift-count-negative -NO_WSHIFT_COUNT_OVERFLOW= -Wno-shift-count-overflow -NO_WSELF_ASSIGN= -Wno-self-assign -NO_WUNNEEDED_INTERNAL_DECL= -Wno-unneeded-internal-declaration +NO_WCONSTANT_CONVERSION= -Wno-error-constant-conversion +NO_WSHIFT_COUNT_NEGATIVE= -Wno-error-shift-count-negative +NO_WSHIFT_COUNT_OVERFLOW= -Wno-error-shift-count-overflow +NO_WSELF_ASSIGN= -Wno-error-self-assign +NO_WUNNEEDED_INTERNAL_DECL= -Wno-error-unneeded-internal-declaration NO_WSOMETIMES_UNINITIALIZED= -Wno-error-sometimes-uninitialized -NO_WCAST_QUAL= -Wno-cast-qual +NO_WCAST_QUAL= -Wno-error-cast-qual # Several other warnings which might be useful in some cases, but not severe # enough to error out the whole kernel build. Display them anyway, so there is # some incentive to fix them eventually. Modified: projects/clang390-import/sys/modules/bwn/Makefile ============================================================================== --- projects/clang390-import/sys/modules/bwn/Makefile Sun Sep 4 17:56:55 2016 (r305393) +++ projects/clang390-import/sys/modules/bwn/Makefile Sun Sep 4 18:00:14 2016 (r305394) @@ -28,7 +28,7 @@ SRCS+= device_if.h bus_if.h pci_if.h opt .include -# XXX Work around clang warning, until maintainer approves fix. +# XXX Work around clang warnings, until maintainer approves fix. CWARNFLAGS.if_bwn.c= ${NO_WSOMETIMES_UNINITIALIZED} -CWARNFLAGS.if_bwn_phy_g.c= ${NO_WSOMETIMES_UNINITIALIZED} +CWARNFLAGS.if_bwn_phy_g.c= ${NO_WSOMETIMES_UNINITIALIZED} ${NO_WCONSTANT_CONVERSION} CWARNFLAGS.if_bwn_phy_lp.c= ${NO_WSOMETIMES_UNINITIALIZED} From owner-svn-src-projects@freebsd.org Sun Sep 4 21:54:26 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 65841A9D7B3 for ; Sun, 4 Sep 2016 21:54:26 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 350BCC30; Sun, 4 Sep 2016 21:54:26 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u84LsPd8049688; Sun, 4 Sep 2016 21:54:25 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u84LsOJ6049679; Sun, 4 Sep 2016 21:54:24 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201609042154.u84LsOJ6049679@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 4 Sep 2016 21:54:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305397 - in projects/clang390-import: contrib/libcxxrt lib/libifconfig share/examples/libifconfig X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Sep 2016 21:54:26 -0000 Author: dim Date: Sun Sep 4 21:54:24 2016 New Revision: 305397 URL: https://svnweb.freebsd.org/changeset/base/305397 Log: Merge ^/head r305394 through r305396. Modified: projects/clang390-import/contrib/libcxxrt/unwind-arm.h projects/clang390-import/lib/libifconfig/libifconfig.c projects/clang390-import/lib/libifconfig/libifconfig.h projects/clang390-import/lib/libifconfig/libifconfig_internal.c projects/clang390-import/lib/libifconfig/libifconfig_internal.h projects/clang390-import/share/examples/libifconfig/ifcreate.c projects/clang390-import/share/examples/libifconfig/ifdestroy.c projects/clang390-import/share/examples/libifconfig/setdescription.c projects/clang390-import/share/examples/libifconfig/setmtu.c Directory Properties: projects/clang390-import/ (props changed) projects/clang390-import/contrib/libcxxrt/ (props changed) Modified: projects/clang390-import/contrib/libcxxrt/unwind-arm.h ============================================================================== --- projects/clang390-import/contrib/libcxxrt/unwind-arm.h Sun Sep 4 21:48:58 2016 (r305396) +++ projects/clang390-import/contrib/libcxxrt/unwind-arm.h Sun Sep 4 21:54:24 2016 (r305397) @@ -28,7 +28,7 @@ { _URC_OK = 0, /* operation completed successfully */ _URC_FOREIGN_EXCEPTION_CAUGHT = 1, - _URC_END_OF_STACK = 5, + _URC_END_OF_STACK = 5, _URC_HANDLER_FOUND = 6, _URC_INSTALL_CONTEXT = 7, _URC_CONTINUE_UNWIND = 8, @@ -43,10 +43,12 @@ typedef uint32_t _Unwind_State; static const _Unwind_State _US_VIRTUAL_UNWIND_FRAME = 0; static const _Unwind_State _US_UNWIND_FRAME_STARTING = 1; static const _Unwind_State _US_UNWIND_FRAME_RESUME = 2; +static const _Unwind_State _US_ACTION_MASK = 3; #else // GCC fails at knowing what a constant expression is # define _US_VIRTUAL_UNWIND_FRAME 0 # define _US_UNWIND_FRAME_STARTING 1 -# define _US_UNWIND_FRAME_RESUME 2 +# define _US_UNWIND_FRAME_RESUME 2 +# define _US_ACTION_MASK 3 #endif typedef struct _Unwind_Context _Unwind_Context; Modified: projects/clang390-import/lib/libifconfig/libifconfig.c ============================================================================== --- projects/clang390-import/lib/libifconfig/libifconfig.c Sun Sep 4 21:48:58 2016 (r305396) +++ projects/clang390-import/lib/libifconfig/libifconfig.c Sun Sep 4 21:54:24 2016 (r305397) @@ -57,6 +57,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD$ */ #include @@ -80,19 +82,17 @@ ifconfig_open(void) { struct ifconfig_handle *h; - h = calloc(1, sizeof(struct ifconfig_handle)); - + h = calloc(1, sizeof(*h)); for (int i = 0; i <= AF_MAX; i++) { h->sockets[i] = -1; } - return (h); } - void ifconfig_close(ifconfig_handle_t *h) { + for (int i = 0; i <= AF_MAX; i++) { if (h->sockets[i] != -1) { (void)close(h->sockets[i]); @@ -101,37 +101,40 @@ ifconfig_close(ifconfig_handle_t *h) free(h); } - ifconfig_errtype ifconfig_err_errtype(ifconfig_handle_t *h) { + return (h->error.errtype); } - int ifconfig_err_errno(ifconfig_handle_t *h) { + return (h->error.errcode); } - unsigned long ifconfig_err_ioctlreq(ifconfig_handle_t *h) { + return (h->error.ioctl_request); } - int -ifconfig_get_description(ifconfig_handle_t *h, const char *name, char **description) +ifconfig_get_description(ifconfig_handle_t *h, const char *name, + char **description) { struct ifreq ifr; - char *descr = NULL; - size_t descrlen = 64; + char *descr; + size_t descrlen; - memset(&ifr, 0, sizeof(struct ifreq)); + descr = NULL; + descrlen = 64; + memset(&ifr, 0, sizeof(ifr)); (void)strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); + for (;;) { if ((descr = reallocf(descr, descrlen)) == NULL) { h->error.errtype = OTHER; @@ -141,8 +144,7 @@ ifconfig_get_description(ifconfig_handle ifr.ifr_buffer.buffer = descr; ifr.ifr_buffer.length = descrlen; - if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCGIFDESCR, - &ifr) != 0) { + if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCGIFDESCR, &ifr) != 0) { return (-1); } @@ -164,7 +166,6 @@ ifconfig_get_description(ifconfig_handle return (-1); } - int ifconfig_set_description(ifconfig_handle_t *h, const char *name, const char *newdescription) @@ -172,7 +173,7 @@ ifconfig_set_description(ifconfig_handle struct ifreq ifr; int desclen; - memset(&ifr, 0, sizeof(struct ifreq)); + memset(&ifr, 0, sizeof(ifr)); desclen = strlen(newdescription); /* @@ -184,46 +185,49 @@ ifconfig_set_description(ifconfig_handle } (void)strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); - ifr.ifr_buffer.length = desclen + 1; ifr.ifr_buffer.buffer = strdup(newdescription); + if (ifr.ifr_buffer.buffer == NULL) { h->error.errtype = OTHER; h->error.errcode = ENOMEM; return (-1); } - if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCSIFDESCR, &ifr) != 0) { + if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCSIFDESCR, + &ifr) != 0) { free(ifr.ifr_buffer.buffer); return (-1); } + free(ifr.ifr_buffer.buffer); return (0); } - -int ifconfig_unset_description(ifconfig_handle_t *h, const char *name) +int +ifconfig_unset_description(ifconfig_handle_t *h, const char *name) { struct ifreq ifr; - memset(&ifr, 0, sizeof(struct ifreq)); + memset(&ifr, 0, sizeof(ifr)); (void)strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); ifr.ifr_buffer.length = 0; ifr.ifr_buffer.buffer = NULL; - if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCSIFDESCR, &ifr) < 0) { + if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCSIFDESCR, + &ifr) < 0) { return (-1); } return (0); } - -int ifconfig_set_name(ifconfig_handle_t *h, const char *name, const char *newname) +int +ifconfig_set_name(ifconfig_handle_t *h, const char *name, const char *newname) { struct ifreq ifr; char *tmpname; - memset(&ifr, 0, sizeof(struct ifreq)); + memset(&ifr, 0, sizeof(ifr)); tmpname = strdup(newname); if (tmpname == NULL) { h->error.errtype = OTHER; @@ -233,82 +237,96 @@ int ifconfig_set_name(ifconfig_handle_t (void)strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); ifr.ifr_data = tmpname; - - if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCSIFNAME, &ifr) != 0) { + if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCSIFNAME, + &ifr) != 0) { free(tmpname); return (-1); } + free(tmpname); return (0); } - -int ifconfig_set_mtu(ifconfig_handle_t *h, const char *name, const int mtu) +int +ifconfig_set_mtu(ifconfig_handle_t *h, const char *name, const int mtu) { struct ifreq ifr; - memset(&ifr, 0, sizeof(struct ifreq)); + memset(&ifr, 0, sizeof(ifr)); (void)strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); ifr.ifr_mtu = mtu; - if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCSIFMTU, &ifr) < 0) { + + if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCSIFMTU, + &ifr) < 0) { return (-1); } + return (0); } - -int ifconfig_get_mtu(ifconfig_handle_t *h, const char *name, int *mtu) +int +ifconfig_get_mtu(ifconfig_handle_t *h, const char *name, int *mtu) { struct ifreq ifr; - memset(&ifr, 0, sizeof(struct ifreq)); + memset(&ifr, 0, sizeof(ifr)); (void)strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); - if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCGIFMTU, &ifr) == -1) { + + if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCGIFMTU, + &ifr) == -1) { return (-1); } + *mtu = ifr.ifr_mtu; return (0); } - -int ifconfig_set_metric(ifconfig_handle_t *h, const char *name, const int mtu) +int +ifconfig_set_metric(ifconfig_handle_t *h, const char *name, const int mtu) { struct ifreq ifr; - memset(&ifr, 0, sizeof(struct ifreq)); + memset(&ifr, 0, sizeof(ifr)); (void)strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); ifr.ifr_mtu = mtu; - if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCSIFMETRIC, &ifr) < 0) { + + if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCSIFMETRIC, + &ifr) < 0) { return (-1); } + return (0); } - -int ifconfig_get_metric(ifconfig_handle_t *h, const char *name, int *metric) +int +ifconfig_get_metric(ifconfig_handle_t *h, const char *name, int *metric) { struct ifreq ifr; - memset(&ifr, 0, sizeof(struct ifreq)); + memset(&ifr, 0, sizeof(ifr)); (void)strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); - if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCGIFMETRIC, &ifr) == -1) { + + if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCGIFMETRIC, + &ifr) == -1) { return (-1); } + *metric = ifr.ifr_metric; return (0); } - -int ifconfig_set_capability(ifconfig_handle_t *h, const char *name, +int +ifconfig_set_capability(ifconfig_handle_t *h, const char *name, const int capability) { struct ifreq ifr; struct ifconfig_capabilities ifcap; - int flags; - int value; + int flags, value; - memset(&ifr, 0, sizeof(struct ifreq)); - if (ifconfig_get_capability(h, name, &ifcap) != 0) { + memset(&ifr, 0, sizeof(ifr)); + + if (ifconfig_get_capability(h, name, + &ifcap) != 0) { return (-1); } @@ -329,22 +347,24 @@ int ifconfig_set_capability(ifconfig_han * set for this request. */ ifr.ifr_reqcap = flags; - if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCSIFCAP, &ifr) < 0) { + if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCSIFCAP, + &ifr) < 0) { return (-1); } return (0); } - -int ifconfig_get_capability(ifconfig_handle_t *h, const char *name, +int +ifconfig_get_capability(ifconfig_handle_t *h, const char *name, struct ifconfig_capabilities *capability) { struct ifreq ifr; - memset(&ifr, 0, sizeof(struct ifreq)); + memset(&ifr, 0, sizeof(ifr)); (void)strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); - if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCGIFCAP, &ifr) < 0) { + if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCGIFCAP, + &ifr) < 0) { return (-1); } capability->curcap = ifr.ifr_curcap; @@ -352,26 +372,27 @@ int ifconfig_get_capability(ifconfig_han return (0); } - -int ifconfig_destroy_interface(ifconfig_handle_t *h, const char *name) +int +ifconfig_destroy_interface(ifconfig_handle_t *h, const char *name) { struct ifreq ifr; - memset(&ifr, 0, sizeof(struct ifreq)); + memset(&ifr, 0, sizeof(ifr)); (void)strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); - if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCIFDESTROY, &ifr) < 0) { + if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCIFDESTROY, + &ifr) < 0) { return (-1); } return (0); } - -int ifconfig_create_interface(ifconfig_handle_t *h, const char *name, char **ifname) +int +ifconfig_create_interface(ifconfig_handle_t *h, const char *name, char **ifname) { struct ifreq ifr; - memset(&ifr, 0, sizeof(struct ifreq)); + memset(&ifr, 0, sizeof(ifr)); (void)strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); /* @@ -379,19 +400,22 @@ int ifconfig_create_interface(ifconfig_h * Insert special snowflake handling here. See GitHub issue #12 for details. * In the meantime, hard-nosupport interfaces that need special handling. */ - if ((strncmp(name, "wlan", strlen("wlan")) == 0) || - (strncmp(name, "vlan", strlen("vlan")) == 0) || - (strncmp(name, "vxlan", strlen("vxlan")) == 0)) { + if ((strncmp(name, "wlan", + strlen("wlan")) == 0) || + (strncmp(name, "vlan", + strlen("vlan")) == 0) || + (strncmp(name, "vxlan", + strlen("vxlan")) == 0)) { h->error.errtype = OTHER; h->error.errcode = ENOSYS; return (-1); } /* No special handling for this interface type. */ - if (ifconfig_ioctlwrap(h, AF_LOCAL, SIOCIFCREATE2, &ifr) < 0) { return (-1); } + *ifname = strdup(ifr.ifr_name); return (0); } Modified: projects/clang390-import/lib/libifconfig/libifconfig.h ============================================================================== --- projects/clang390-import/lib/libifconfig/libifconfig.h Sun Sep 4 21:48:58 2016 (r305396) +++ projects/clang390-import/lib/libifconfig/libifconfig.h Sun Sep 4 21:54:24 2016 (r305397) @@ -12,10 +12,6 @@ * this list of conditions and the following disclaimer in the documentation and/or * other materials provided with the distribution. * - * 3. Neither the name of the copyright holder nor the names of its contributors - * may be used to endorse or promote products derived from this software without - * specific prior written permission. - * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -50,7 +46,6 @@ struct ifconfig_capabilities { int reqcap; }; - /** Retrieves a new state object for use in other API calls. * Example usage: *{@code @@ -80,19 +75,18 @@ int ifconfig_err_errno(ifconfig_handle_t /** If error type was IOCTL, this identifies which request failed. */ unsigned long ifconfig_err_ioctlreq(ifconfig_handle_t *h); - int ifconfig_get_description(ifconfig_handle_t *h, const char *name, char **description); int ifconfig_set_description(ifconfig_handle_t *h, const char *name, const char *newdescription); int ifconfig_unset_description(ifconfig_handle_t *h, const char *name); -int ifconfig_set_name(ifconfig_handle_t *h, const char *name, const char *newname); +int ifconfig_set_name(ifconfig_handle_t *h, const char *name, + const char *newname); int ifconfig_set_mtu(ifconfig_handle_t *h, const char *name, const int mtu); int ifconfig_get_mtu(ifconfig_handle_t *h, const char *name, int *mtu); - -int ifconfig_set_metric(ifconfig_handle_t *h, const char *name, const int metric); +int ifconfig_set_metric(ifconfig_handle_t *h, const char *name, + const int metric); int ifconfig_get_metric(ifconfig_handle_t *h, const char *name, int *metric); - int ifconfig_set_capability(ifconfig_handle_t *h, const char *name, const int capability); int ifconfig_get_capability(ifconfig_handle_t *h, const char *name, Modified: projects/clang390-import/lib/libifconfig/libifconfig_internal.c ============================================================================== --- projects/clang390-import/lib/libifconfig/libifconfig_internal.c Sun Sep 4 21:48:58 2016 (r305396) +++ projects/clang390-import/lib/libifconfig/libifconfig_internal.c Sun Sep 4 21:54:24 2016 (r305397) @@ -12,10 +12,6 @@ * this list of conditions and the following disclaimer in the documentation and/or * other materials provided with the distribution. * - * 3. Neither the name of the copyright holder nor the names of its contributors - * may be used to endorse or promote products derived from this software without - * specific prior written permission. - * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -30,31 +26,32 @@ * $FreeBSD$ */ +#include #include #include #include #include -#include #include - #include "libifconfig.h" // Needed for ifconfig_errstate #include "libifconfig_internal.h" + int ifconfig_ioctlwrap_ret(ifconfig_handle_t *h, unsigned long request, int rcode) { + if (rcode != 0) { h->error.errtype = IOCTL; h->error.ioctl_request = request; h->error.errcode = errno; } + return (rcode); } - int ifconfig_ioctlwrap(ifconfig_handle_t *h, const int addressfamily, unsigned long request, struct ifreq *ifr) @@ -69,13 +66,14 @@ ifconfig_ioctlwrap(ifconfig_handle_t *h, return (ifconfig_ioctlwrap_ret(h, request, rcode)); } - /* * Function to get socket for the specified address family. * If the socket doesn't already exist, attempt to create it. */ -int ifconfig_socket(ifconfig_handle_t *h, const int addressfamily, int *s) +int +ifconfig_socket(ifconfig_handle_t *h, const int addressfamily, int *s) { + if (addressfamily > AF_MAX) { h->error.errtype = SOCKET; h->error.errcode = EINVAL; Modified: projects/clang390-import/lib/libifconfig/libifconfig_internal.h ============================================================================== --- projects/clang390-import/lib/libifconfig/libifconfig_internal.h Sun Sep 4 21:48:58 2016 (r305396) +++ projects/clang390-import/lib/libifconfig/libifconfig_internal.h Sun Sep 4 21:54:24 2016 (r305397) @@ -12,10 +12,6 @@ * this list of conditions and the following disclaimer in the documentation and/or * other materials provided with the distribution. * - * 3. Neither the name of the copyright holder nor the names of its contributors - * may be used to endorse or promote products derived from this software without - * specific prior written permission. - * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -80,7 +76,8 @@ struct ifconfig_handle { int ifconfig_socket(ifconfig_handle_t *h, const int addressfamily, int *s); /** Function used by other wrapper functions to populate _errstate when appropriate.*/ -int ifconfig_ioctlwrap_ret(ifconfig_handle_t *h, unsigned long request, int rcode); +int ifconfig_ioctlwrap_ret(ifconfig_handle_t *h, unsigned long request, + int rcode); /** Function to wrap ioctl() and automatically populate ifconfig_errstate when appropriate.*/ int ifconfig_ioctlwrap(ifconfig_handle_t *h, const int addressfamily, Modified: projects/clang390-import/share/examples/libifconfig/ifcreate.c ============================================================================== --- projects/clang390-import/share/examples/libifconfig/ifcreate.c Sun Sep 4 21:48:58 2016 (r305396) +++ projects/clang390-import/share/examples/libifconfig/ifcreate.c Sun Sep 4 21:54:24 2016 (r305397) @@ -12,10 +12,6 @@ * this list of conditions and the following disclaimer in the documentation and/or * other materials provided with the distribution. * - * 3. Neither the name of the copyright holder nor the names of its contributors - * may be used to endorse or promote products derived from this software without - * specific prior written permission. - * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -40,16 +36,17 @@ #include -int main(int argc, char *argv[]) +int +main(int argc, char *argv[]) { + char *ifname, *ifactualname; + if (argc != 2) { errx(EINVAL, "Invalid number of arguments." " Only one argument is accepted, and it should be the name" " of the interface to be created."); } - char *ifname, *ifactualname; - /* We have a static number of arguments. Therefore we can do it simple. */ ifname = strdup(argv[1]); @@ -63,31 +60,31 @@ int main(int argc, char *argv[]) free(ifname); free(ifactualname); return (0); - } else { - switch (ifconfig_err_errtype(lifh)) { - case SOCKET: - warnx("couldn't create socket. This shouldn't happen.\n"); - break; - case IOCTL: - if (ifconfig_err_ioctlreq(lifh) == SIOCIFCREATE2) { - warnx( - "Failed to create interface (SIOCIFCREATE2)\n"); - } - break; - default: + } + + switch (ifconfig_err_errtype(lifh)) { + case SOCKET: + warnx("couldn't create socket. This shouldn't happen.\n"); + break; + case IOCTL: + if (ifconfig_err_ioctlreq(lifh) == SIOCIFCREATE2) { warnx( - "This is a thorough example accommodating for temporary" - " 'not implemented yet' errors. That's likely what happened" - " now. If not, your guess is as good as mine. ;)" - " Error code: %d\n", ifconfig_err_errno( - lifh)); - break; + "Failed to create interface (SIOCIFCREATE2)\n"); } - - ifconfig_close(lifh); - lifh = NULL; - free(ifname); - free(ifactualname); - return (-1); + break; + default: + warnx( + "This is a thorough example accommodating for temporary" + " 'not implemented yet' errors. That's likely what happened" + " now. If not, your guess is as good as mine. ;)" + " Error code: %d\n", ifconfig_err_errno( + lifh)); + break; } + + ifconfig_close(lifh); + lifh = NULL; + free(ifname); + free(ifactualname); + return (-1); } Modified: projects/clang390-import/share/examples/libifconfig/ifdestroy.c ============================================================================== --- projects/clang390-import/share/examples/libifconfig/ifdestroy.c Sun Sep 4 21:48:58 2016 (r305396) +++ projects/clang390-import/share/examples/libifconfig/ifdestroy.c Sun Sep 4 21:54:24 2016 (r305397) @@ -12,10 +12,6 @@ * this list of conditions and the following disclaimer in the documentation and/or * other materials provided with the distribution. * - * 3. Neither the name of the copyright holder nor the names of its contributors - * may be used to endorse or promote products derived from this software without - * specific prior written permission. - * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -40,16 +36,17 @@ #include -int main(int argc, char *argv[]) +int +main(int argc, char *argv[]) { + char *ifname; + if (argc != 2) { errx(EINVAL, "Invalid number of arguments." " Only one argument is accepted, and it should be the name" " of the interface to be destroyed."); } - char *ifname; - /* We have a static number of arguments. Therefore we can do it simple. */ ifname = strdup(argv[1]); @@ -62,26 +59,26 @@ int main(int argc, char *argv[]) lifh = NULL; free(ifname); return (0); - } else { - switch (ifconfig_err_errtype(lifh)) { - case SOCKET: - warnx("couldn't create socket. This shouldn't happen.\n"); - break; - case IOCTL: - if (ifconfig_err_ioctlreq(lifh) == SIOCIFDESTROY) { - warnx( - "Failed to destroy interface (SIOCIFDESTROY)\n"); - } - break; - default: + } + + switch (ifconfig_err_errtype(lifh)) { + case SOCKET: + warnx("couldn't create socket. This shouldn't happen.\n"); + break; + case IOCTL: + if (ifconfig_err_ioctlreq(lifh) == SIOCIFDESTROY) { warnx( - "Should basically never end up here in this example.\n"); - break; + "Failed to destroy interface (SIOCIFDESTROY)\n"); } - - ifconfig_close(lifh); - lifh = NULL; - free(ifname); - return (-1); + break; + default: + warnx( + "Should basically never end up here in this example.\n"); + break; } + + ifconfig_close(lifh); + lifh = NULL; + free(ifname); + return (-1); } Modified: projects/clang390-import/share/examples/libifconfig/setdescription.c ============================================================================== --- projects/clang390-import/share/examples/libifconfig/setdescription.c Sun Sep 4 21:48:58 2016 (r305396) +++ projects/clang390-import/share/examples/libifconfig/setdescription.c Sun Sep 4 21:54:24 2016 (r305397) @@ -12,10 +12,6 @@ * this list of conditions and the following disclaimer in the documentation and/or * other materials provided with the distribution. * - * 3. Neither the name of the copyright holder nor the names of its contributors - * may be used to endorse or promote products derived from this software without - * specific prior written permission. - * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -38,15 +34,17 @@ #include -int main(int argc, char *argv[]) +int +main(int argc, char *argv[]) { + char *ifname, *ifdescr, *curdescr; + if (argc != 3) { errx(EINVAL, "Invalid number of arguments." " First argument should be interface name, second argument" " should be the description to set."); } - char *ifname, *ifdescr, *curdescr; /* We have a static number of arguments. Therefore we can do it simple. */ ifname = strdup(argv[1]); ifdescr = strdup(argv[2]); Modified: projects/clang390-import/share/examples/libifconfig/setmtu.c ============================================================================== --- projects/clang390-import/share/examples/libifconfig/setmtu.c Sun Sep 4 21:48:58 2016 (r305396) +++ projects/clang390-import/share/examples/libifconfig/setmtu.c Sun Sep 4 21:54:24 2016 (r305397) @@ -12,9 +12,6 @@ * this list of conditions and the following disclaimer in the documentation and/or * other materials provided with the distribution. * - * 3. Neither the name of the copyright holder nor the names of its contributors - * may be used to endorse or promote products derived from this software without - * specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, @@ -40,17 +37,18 @@ #include -int main(int argc, char *argv[]) +int +main(int argc, char *argv[]) { + char *ifname, *ptr; + int mtu; + if (argc != 3) { errx(EINVAL, "Invalid number of arguments." " First argument should be interface name, second argument" " should be the MTU to set."); } - char *ifname, *ptr; - int mtu; - /* We have a static number of arguments. Therefore we can do it simple. */ ifname = strdup(argv[1]); mtu = (int)strtol(argv[2], &ptr, 10); @@ -65,30 +63,30 @@ int main(int argc, char *argv[]) lifh = NULL; free(ifname); return (0); - } else { - switch (ifconfig_err_errtype(lifh)) { - case SOCKET: - warnx("couldn't create socket. This shouldn't happen.\n"); - break; - case IOCTL: - if (ifconfig_err_ioctlreq(lifh) == SIOCSIFMTU) { - warnx("Failed to set MTU (SIOCSIFMTU)\n"); - } else { - warnx( - "Failed to set MTU due to error in unexpected ioctl() call %lu. Error code: %i.\n", - ifconfig_err_ioctlreq(lifh), - ifconfig_err_errno(lifh)); - } - break; - default: + } + + switch (ifconfig_err_errtype(lifh)) { + case SOCKET: + warnx("couldn't create socket. This shouldn't happen.\n"); + break; + case IOCTL: + if (ifconfig_err_ioctlreq(lifh) == SIOCSIFMTU) { + warnx("Failed to set MTU (SIOCSIFMTU)\n"); + } else { warnx( - "Should basically never end up here in this example.\n"); - break; + "Failed to set MTU due to error in unexpected ioctl() call %lu. Error code: %i.\n", + ifconfig_err_ioctlreq(lifh), + ifconfig_err_errno(lifh)); } - - ifconfig_close(lifh); - lifh = NULL; - free(ifname); - return (-1); + break; + default: + warnx( + "Should basically never end up here in this example.\n"); + break; } + + ifconfig_close(lifh); + lifh = NULL; + free(ifname); + return (-1); } From owner-svn-src-projects@freebsd.org Mon Sep 5 17:20:13 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 717D8B96CE8 for ; Mon, 5 Sep 2016 17:20:13 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3FA1AB3D; Mon, 5 Sep 2016 17:20:13 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u85HKCap087765; Mon, 5 Sep 2016 17:20:12 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u85HKCrG087764; Mon, 5 Sep 2016 17:20:12 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201609051720.u85HKCrG087764@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 5 Sep 2016 17:20:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305428 - projects/clang390-import/lib/libcompiler_rt X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Sep 2016 17:20:13 -0000 Author: dim Date: Mon Sep 5 17:20:12 2016 New Revision: 305428 URL: https://svnweb.freebsd.org/changeset/base/305428 Log: Fix building some arm-specific primitives for libcompiler_rt. This was an unfortunate search and replace error. Modified: projects/clang390-import/lib/libcompiler_rt/Makefile Modified: projects/clang390-import/lib/libcompiler_rt/Makefile ============================================================================== --- projects/clang390-import/lib/libcompiler_rt/Makefile Mon Sep 5 16:43:57 2016 (r305427) +++ projects/clang390-import/lib/libcompiler_rt/Makefile Mon Sep 5 17:20:12 2016 (r305428) @@ -214,22 +214,22 @@ SRCS+= ${file}.c .endfor .if ${MACHINE_CPUARCH} == "arm" -SRCF+= aeabi_div0.c -SRCF+= aeabi_idivmod.S -SRCF+= aeabi_ldivmod.S -SRCF+= aeabi_memcmp.S -SRCF+= aeabi_memcpy.S -SRCF+= aeabi_memmove.S -SRCF+= aeabi_memset.S -SRCF+= aeabi_uidivmod.S -SRCF+= aeabi_uldivmod.S -SRCF+= bswapdi2.S -SRCF+= bswapsi2.S -SRCF+= switch16.S -SRCF+= switch32.S -SRCF+= switch8.S -SRCF+= switchu8.S -SRCF+= sync_synchronize.S +SRCS+= aeabi_div0.c +SRCS+= aeabi_idivmod.S +SRCS+= aeabi_ldivmod.S +SRCS+= aeabi_memcmp.S +SRCS+= aeabi_memcpy.S +SRCS+= aeabi_memmove.S +SRCS+= aeabi_memset.S +SRCS+= aeabi_uidivmod.S +SRCS+= aeabi_uldivmod.S +SRCS+= bswapdi2.S +SRCS+= bswapsi2.S +SRCS+= switch16.S +SRCS+= switch32.S +SRCS+= switch8.S +SRCS+= switchu8.S +SRCS+= sync_synchronize.S .endif .if ${MK_INSTALLLIB} != "no" From owner-svn-src-projects@freebsd.org Mon Sep 5 18:05:48 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8DE81B96BB2 for ; Mon, 5 Sep 2016 18:05:48 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E5327FA8; Mon, 5 Sep 2016 18:05:47 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u85I5kf6006939; Mon, 5 Sep 2016 18:05:46 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u85I5jQx006924; Mon, 5 Sep 2016 18:05:45 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201609051805.u85I5jQx006924@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 5 Sep 2016 18:05:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305431 - in projects/clang390-import: contrib/gcclibs/libcpp contrib/libarchive contrib/libarchive/libarchive contrib/libarchive/libarchive/test contrib/top lib/libarchive lib/libc/std... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Sep 2016 18:05:48 -0000 Author: dim Date: Mon Sep 5 18:05:45 2016 New Revision: 305431 URL: https://svnweb.freebsd.org/changeset/base/305431 Log: Merge ^/head r305397 through r305430. Added: projects/clang390-import/contrib/libarchive/README.md - copied unchanged from r305430, head/contrib/libarchive/README.md projects/clang390-import/sys/dev/bhnd/cores/usb/ - copied from r305430, head/sys/dev/bhnd/cores/usb/ projects/clang390-import/sys/dev/iicbus/sy8106a.c - copied unchanged from r305430, head/sys/dev/iicbus/sy8106a.c Deleted: projects/clang390-import/contrib/libarchive/README Modified: projects/clang390-import/contrib/gcclibs/libcpp/system.h projects/clang390-import/contrib/libarchive/libarchive/archive_acl.c projects/clang390-import/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c projects/clang390-import/contrib/libarchive/libarchive/archive_read_disk_posix.c projects/clang390-import/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c projects/clang390-import/contrib/top/commands.c projects/clang390-import/contrib/top/machine.h projects/clang390-import/contrib/top/top.c projects/clang390-import/contrib/top/top.xs projects/clang390-import/lib/libarchive/config_freebsd.h projects/clang390-import/lib/libc/stdio/fgets.c projects/clang390-import/lib/libc/stdio/fgetws.c projects/clang390-import/sys/arm/allwinner/aw_thermal.c projects/clang390-import/sys/arm/allwinner/clk/aw_pll.c projects/clang390-import/sys/arm/allwinner/clk/aw_thsclk.c projects/clang390-import/sys/arm/allwinner/files.allwinner projects/clang390-import/sys/arm/arm/minidump_machdep.c projects/clang390-import/sys/arm/conf/ALLWINNER projects/clang390-import/sys/boot/fdt/dts/arm64/a64.dtsi projects/clang390-import/sys/dev/hyperv/netvsc/hv_net_vsc.c projects/clang390-import/sys/dev/hyperv/netvsc/hv_rndis_filter.c projects/clang390-import/sys/dev/hyperv/netvsc/hv_rndis_filter.h projects/clang390-import/sys/dev/hyperv/vmbus/vmbus_chan.c projects/clang390-import/sys/dev/hyperv/vmbus/vmbus_reg.h projects/clang390-import/sys/dev/usb/template/usb_template.c projects/clang390-import/sys/dev/usb/usb_device.c projects/clang390-import/sys/dev/usb/usb_device.h projects/clang390-import/sys/dev/usb/usb_generic.c projects/clang390-import/sys/dev/usb/usb_request.c projects/clang390-import/sys/dev/usb/usb_transfer.c projects/clang390-import/sys/dev/usb/usb_util.c projects/clang390-import/sys/mips/broadcom/files.broadcom projects/clang390-import/sys/mips/conf/BCM projects/clang390-import/sys/net/rndis.h projects/clang390-import/sys/sparc64/sparc64/pmap.c projects/clang390-import/sys/sys/param.h projects/clang390-import/usr.bin/top/machine.c projects/clang390-import/usr.sbin/bsdinstall/partedit/gpart_ops.c Directory Properties: projects/clang390-import/ (props changed) projects/clang390-import/contrib/libarchive/ (props changed) projects/clang390-import/contrib/libarchive/libarchive/ (props changed) projects/clang390-import/contrib/top/ (props changed) Modified: projects/clang390-import/contrib/gcclibs/libcpp/system.h ============================================================================== --- projects/clang390-import/contrib/gcclibs/libcpp/system.h Mon Sep 5 18:02:37 2016 (r305430) +++ projects/clang390-import/contrib/gcclibs/libcpp/system.h Mon Sep 5 18:05:45 2016 (r305431) @@ -347,9 +347,12 @@ extern void abort (void); ??? C99 designated initializers are not supported by most C++ compilers, including G++. -- gdr, 2005-05-18 */ #if !defined(HAVE_DESIGNATED_INITIALIZERS) -#define HAVE_DESIGNATED_INITIALIZERS \ - ((!defined(__cplusplus) && (GCC_VERSION >= 2007)) \ - || (__STDC_VERSION__ >= 199901L)) +# if (!defined(__cplusplus) && (GCC_VERSION >= 2007)) \ + ||(__STDC_VERSION__ >= 199901L) +# define HAVE_DESIGNATED_INITIALIZERS 1 +# else +# define HAVE_DESIGNATED_INITIALIZERS 0 +# endif #endif /* Be conservative and only use enum bitfields with GCC. Copied: projects/clang390-import/contrib/libarchive/README.md (from r305430, head/contrib/libarchive/README.md) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang390-import/contrib/libarchive/README.md Mon Sep 5 18:05:45 2016 (r305431, copy of r305430, head/contrib/libarchive/README.md) @@ -0,0 +1,222 @@ +# Welcome to libarchive! + +The libarchive project develops a portable, efficient C library that +can read and write streaming archives in a variety of formats. It +also includes implementations of the common `tar`, `cpio`, and `zcat` +command-line tools that use the libarchive library. + +## Questions? Issues? + +* http://www.libarchive.org is the home for ongoing + libarchive development, including documentation, + and links to the libarchive mailing lists. +* To report an issue, use the issue tracker at + https://github.com/libarchive/libarchive/issues +* To submit an enhancement to libarchive, please + submit a pull request via GitHub: https://github.com/libarchive/libarchive/pulls + +## Contents of the Distribution + +This distribution bundle includes the following major components: + +* **libarchive**: a library for reading and writing streaming archives +* **tar**: the 'bsdtar' program is a full-featured 'tar' implementation built on libarchive +* **cpio**: the 'bsdcpio' program is a different interface to essentially the same functionality +* **cat**: the 'bsdcat' program is a simple replacement tool for zcat, bzcat, xzcat, and such +* **examples**: Some small example programs that you may find useful. +* **examples/minitar**: a compact sample demonstrating use of libarchive. +* **contrib**: Various items sent to me by third parties; please contact the authors with any questions. + +The top-level directory contains the following information files: + +* **NEWS** - highlights of recent changes +* **COPYING** - what you can do with this +* **INSTALL** - installation instructions +* **README** - this file +* **CMakeLists.txt** - input for "cmake" build tool, see INSTALL +* **configure** - configuration script, see INSTALL for details. If your copy of the source lacks a `configure` script, you can try to construct it by running the script in `build/autogen.sh` (or use `cmake`). + +The following files in the top-level directory are used by the 'configure' script: +* `Makefile.am`, `aclocal.m4`, `configure.ac` - used to build this distribution, only needed by maintainers +* `Makefile.in`, `config.h.in` - templates used by configure script + +## Documentation + +In addition to the informational articles and documentation +in the online [libarchive Wiki](https://github.com/libarchive/libarchive/wiki), +the distribution also includes a number of manual pages: + + * bsdtar.1 explains the use of the bsdtar program + * bsdcpio.1 explains the use of the bsdcpio program + * bsdcat.1 explains the use of the bsdcat program + * libarchive.3 gives an overview of the library as a whole + * archive_read.3, archive_write.3, archive_write_disk.3, and + archive_read_disk.3 provide detailed calling sequences for the read + and write APIs + * archive_entry.3 details the "struct archive_entry" utility class + * archive_internals.3 provides some insight into libarchive's + internal structure and operation. + * libarchive-formats.5 documents the file formats supported by the library + * cpio.5, mtree.5, and tar.5 provide detailed information about these + popular archive formats, including hard-to-find details about + modern cpio and tar variants. + +The manual pages above are provided in the 'doc' directory in +a number of different formats. + +You should also read the copious comments in `archive.h` and the +source code for the sample programs for more details. Please let us +know about any errors or omissions you find. + +## Supported Formats + +Currently, the library automatically detects and reads the following fomats: + * Old V7 tar archives + * POSIX ustar + * GNU tar format (including GNU long filenames, long link names, and sparse files) + * Solaris 9 extended tar format (including ACLs) + * POSIX pax interchange format + * POSIX octet-oriented cpio + * SVR4 ASCII cpio + * POSIX octet-oriented cpio + * Binary cpio (big-endian or little-endian) + * ISO9660 CD-ROM images (with optional Rockridge or Joliet extensions) + * ZIP archives (with uncompressed or "deflate" compressed entries, including support for encrypted Zip archives) + * GNU and BSD 'ar' archives + * 'mtree' format + * 7-Zip archives + * Microsoft CAB format + * LHA and LZH archives + * RAR archives (with some limitations due to RAR's proprietary status) + * XAR archives + +The library also detects and handles any of the following before evaluating the archive: + * uuencoded files + * files with RPM wrapper + * gzip compression + * bzip2 compression + * compress/LZW compression + * lzma, lzip, and xz compression + * lz4 compression + * lzop compression + +The library can create archives in any of the following formats: + * POSIX ustar + * POSIX pax interchange format + * "restricted" pax format, which will create ustar archives except for + entries that require pax extensions (for long filenames, ACLs, etc). + * Old GNU tar format + * Old V7 tar format + * POSIX octet-oriented cpio + * SVR4 "newc" cpio + * shar archives + * ZIP archives (with uncompressed or "deflate" compressed entries) + * GNU and BSD 'ar' archives + * 'mtree' format + * ISO9660 format + * 7-Zip archives + * XAR archives + +When creating archives, the result can be filtered with any of the following: + * uuencode + * gzip compression + * bzip2 compression + * compress/LZW compression + * lzma, lzip, and xz compression + * lz4 compression + * lzop compression + +## Notes about the Library Design + +The following notes address many of the most common +questions we are asked about libarchive: + +* This is a heavily stream-oriented system. That means that + it is optimized to read or write the archive in a single + pass from beginning to end. For example, this allows + libarchive to process archives too large to store on disk + by processing them on-the-fly as they are read from or + written to a network or tape drive. This also makes + libarchive useful for tools that need to produce + archives on-the-fly (such as webservers that provide + archived contents of a users account). + +* In-place modification and random access to the contents + of an archive are not directly supported. For some formats, + this is not an issue: For example, tar.gz archives are not + designed for random access. In some other cases, libarchive + can re-open an archive and scan it from the beginning quickly + enough to provide the needed abilities even without true + random access. Of course, some applications do require true + random access; those applications should consider alternatives + to libarchive. + +* The library is designed to be extended with new compression and + archive formats. The only requirement is that the format be + readable or writable as a stream and that each archive entry be + independent. There are articles on the libarchive Wiki explaining + how to extend libarchive. + +* On read, compression and format are always detected automatically. + +* The same API is used for all formats; in particular, it's very + easy for software using libarchive to transparently handle + any of libarchive's archiving formats. + +* Libarchive's automatic support for decompression can be used + without archiving by explicitly selecting the "raw" and "empty" + formats. + +* I've attempted to minimize static link pollution. If you don't + explicitly invoke a particular feature (such as support for a + particular compression or format), it won't get pulled in to + statically-linked programs. In particular, if you don't explicitly + enable a particular compression or decompression support, you won't + need to link against the corresponding compression or decompression + libraries. This also reduces the size of statically-linked + binaries in environments where that matters. + +* The library is generally _thread safe_ depending on the platform: + it does not define any global variables of its own. However, some + platforms do not provide fully thread-safe versions of key C library + functions. On those platforms, libarchive will use the non-thread-safe + functions. Patches to improve this are of great interest to us. + +* In particular, libarchive's modules to read or write a directory + tree do use `chdir()` to optimize the directory traversals. This + can cause problems for programs that expect to do disk access from + multiple threads. Of course, those modules are completely + optional and you can use the rest of libarchive without them. + +* The library is _not_ thread aware, however. It does no locking + or thread management of any kind. If you create a libarchive + object and need to access it from multiple threads, you will + need to provide your own locking. + +* On read, the library accepts whatever blocks you hand it. + Your read callback is free to pass the library a byte at a time + or mmap the entire archive and give it to the library at once. + On write, the library always produces correctly-blocked output. + +* The object-style approach allows you to have multiple archive streams + open at once. bsdtar uses this in its "@archive" extension. + +* The archive itself is read/written using callback functions. + You can read an archive directly from an in-memory buffer or + write it to a socket, if you wish. There are some utility + functions to provide easy-to-use "open file," etc, capabilities. + +* The read/write APIs are designed to allow individual entries + to be read or written to any data source: You can create + a block of data in memory and add it to a tar archive without + first writing a temporary file. You can also read an entry from + an archive and write the data directly to a socket. If you want + to read/write entries to disk, there are convenience functions to + make this especially easy. + +* Note: The "pax interchange format" is a POSIX standard extended tar + format that should be used when the older _ustar_ format is not + appropriate. It has many advantages over other tar formats + (including the legacy GNU tar format) and is widely supported by + current tar implementations. + Modified: projects/clang390-import/contrib/libarchive/libarchive/archive_acl.c ============================================================================== --- projects/clang390-import/contrib/libarchive/libarchive/archive_acl.c Mon Sep 5 18:02:37 2016 (r305430) +++ projects/clang390-import/contrib/libarchive/libarchive/archive_acl.c Mon Sep 5 18:05:45 2016 (r305431) @@ -707,10 +707,11 @@ archive_acl_text_l(struct archive_acl *a if (r != 0) return (-1); *p++ = separator; - if (flags & ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID) + if (name == NULL || (flags & ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID)) { id = ap->id; - else + } else { id = -1; + } append_entry(&p, NULL, ap->tag, name, ap->permset, id); count++; Modified: projects/clang390-import/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c ============================================================================== --- projects/clang390-import/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c Mon Sep 5 18:02:37 2016 (r305430) +++ projects/clang390-import/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c Mon Sep 5 18:05:45 2016 (r305431) @@ -419,12 +419,32 @@ setup_acls(struct archive_read_disk *a, if (accpath == NULL) accpath = archive_entry_pathname(entry); + if (*fd < 0 && a->tree != NULL) { + if (a->follow_symlinks || + archive_entry_filetype(entry) != AE_IFLNK) + *fd = a->open_on_current_dir(a->tree, + accpath, O_RDONLY | O_NONBLOCK); + if (*fd < 0) { + if (a->tree_enter_working_dir(a->tree) != 0) { + archive_set_error(&a->archive, errno, + "Couldn't access %s", accpath); + return (ARCHIVE_FAILED); + } + } + } + archive_entry_acl_clear(entry); + acl = NULL; + #ifdef ACL_TYPE_NFS4 /* Try NFS4 ACL first. */ if (*fd >= 0) +#if HAVE_ACL_GET_FD_NP + acl = acl_get_fd_np(*fd, ACL_TYPE_NFS4); +#else acl = acl_get_fd(*fd); +#endif #if HAVE_ACL_GET_LINK_NP else if (!a->follow_symlinks) acl = acl_get_link_np(accpath, ACL_TYPE_NFS4); @@ -437,12 +457,19 @@ setup_acls(struct archive_read_disk *a, #endif else acl = acl_get_file(accpath, ACL_TYPE_NFS4); + #if HAVE_ACL_IS_TRIVIAL_NP - /* Ignore "trivial" ACLs that just mirror the file mode. */ - acl_is_trivial_np(acl, &r); - if (r) { - acl_free(acl); - acl = NULL; + if (acl != NULL && acl_is_trivial_np(acl, &r) == 0) { + /* Ignore "trivial" ACLs that just mirror the file mode. */ + if (r) { + acl_free(acl); + acl = NULL; + /* + * Simultaneous NFSv4 and POSIX.1e ACLs for the same + * entry are not allowed, so we should return here + */ + return (ARCHIVE_OK); + } } #endif if (acl != NULL) { @@ -450,7 +477,7 @@ setup_acls(struct archive_read_disk *a, acl_free(acl); return (ARCHIVE_OK); } -#endif +#endif /* ACL_TYPE_NFS4 */ /* Retrieve access ACL from file. */ if (*fd >= 0) @@ -467,10 +494,22 @@ setup_acls(struct archive_read_disk *a, #endif else acl = acl_get_file(accpath, ACL_TYPE_ACCESS); + +#if HAVE_ACL_IS_TRIVIAL_NP + /* Ignore "trivial" ACLs that just mirror the file mode. */ + if (acl != NULL && acl_is_trivial_np(acl, &r) == 0) { + if (r) { + acl_free(acl); + acl = NULL; + } + } +#endif + if (acl != NULL) { translate_acl(a, entry, acl, ARCHIVE_ENTRY_ACL_TYPE_ACCESS); acl_free(acl); + acl = NULL; } /* Only directories can have default ACLs. */ Modified: projects/clang390-import/contrib/libarchive/libarchive/archive_read_disk_posix.c ============================================================================== --- projects/clang390-import/contrib/libarchive/libarchive/archive_read_disk_posix.c Mon Sep 5 18:02:37 2016 (r305430) +++ projects/clang390-import/contrib/libarchive/libarchive/archive_read_disk_posix.c Mon Sep 5 18:05:45 2016 (r305431) @@ -1504,10 +1504,19 @@ setup_current_filesystem(struct archive_ struct tree *t = a->tree; struct statfs sfs; #if defined(HAVE_GETVFSBYNAME) && defined(VFCF_SYNTHETIC) -# if defined(HAVE_STRUCT_VFSCONF) - struct vfsconf vfc; -# else +/* TODO: configure should set GETVFSBYNAME_ARG_TYPE to make + * this accurate; some platforms have both and we need the one that's + * used by getvfsbyname() + * + * Then the following would become: + * #if defined(GETVFSBYNAME_ARG_TYPE) + * GETVFSBYNAME_ARG_TYPE vfc; + * #endif + */ +# if defined(HAVE_STRUCT_XVFSCONF) struct xvfsconf vfc; +# else + struct vfsconf vfc; # endif #endif int r, xr = 0; Modified: projects/clang390-import/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c ============================================================================== --- projects/clang390-import/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c Mon Sep 5 18:02:37 2016 (r305430) +++ projects/clang390-import/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c Mon Sep 5 18:05:45 2016 (r305431) @@ -70,15 +70,9 @@ set_acls(struct archive_entry *ae, struc } static int -acl_match(acl_entry_t aclent, struct myacl_t *myacl) -{ - gid_t g, *gp; - uid_t u, *up; - acl_tag_t tag_type; - acl_permset_t opaque_ps; +acl_entry_get_perm(acl_entry_t aclent) { int permset = 0; - - acl_get_tag_type(aclent, &tag_type); + acl_permset_t opaque_ps; /* translate the silly opaque permset to a bitmap */ acl_get_permset(aclent, &opaque_ps); @@ -88,10 +82,61 @@ acl_match(acl_entry_t aclent, struct mya permset |= ARCHIVE_ENTRY_ACL_WRITE; if (acl_get_perm_np(opaque_ps, ACL_READ)) permset |= ARCHIVE_ENTRY_ACL_READ; + return permset; +} + +#if 0 +static int +acl_get_specific_entry(acl_t acl, acl_tag_t requested_tag_type, int requested_tag) { + int entry_id = ACL_FIRST_ENTRY; + acl_entry_t acl_entry; + acl_tag_t acl_tag_type; + + while (1 == acl_get_entry(acl, entry_id, &acl_entry)) { + /* After the first time... */ + entry_id = ACL_NEXT_ENTRY; + + /* If this matches, return perm mask */ + acl_get_tag_type(acl_entry, &acl_tag_type); + if (acl_tag_type == requested_tag_type) { + switch (acl_tag_type) { + case ACL_USER_OBJ: + if ((uid_t)requested_tag == *(uid_t *)(acl_get_qualifier(acl_entry))) { + return acl_entry_get_perm(acl_entry); + } + break; + case ACL_GROUP_OBJ: + if ((gid_t)requested_tag == *(gid_t *)(acl_get_qualifier(acl_entry))) { + return acl_entry_get_perm(acl_entry); + } + break; + case ACL_USER: + case ACL_GROUP: + case ACL_OTHER: + return acl_entry_get_perm(acl_entry); + default: + failure("Unexpected ACL tag type"); + assert(0); + } + } + - if (permset != myacl->permset) + } + return -1; +} +#endif + +static int +acl_match(acl_entry_t aclent, struct myacl_t *myacl) +{ + gid_t g, *gp; + uid_t u, *up; + acl_tag_t tag_type; + + if (myacl->permset != acl_entry_get_perm(aclent)) return (0); + acl_get_tag_type(aclent, &tag_type); switch (tag_type) { case ACL_USER_OBJ: if (myacl->tag != ARCHIVE_ENTRY_ACL_USER_OBJ) return (0); @@ -190,7 +235,7 @@ compare_acls(acl_t acl, struct myacl_t * * Verify ACL restore-to-disk. This test is FreeBSD-specific. */ -DEFINE_TEST(test_acl_freebsd_posix1e) +DEFINE_TEST(test_acl_freebsd_posix1e_restore) { #if !defined(__FreeBSD__) skipping("FreeBSD-specific ACL restore test"); @@ -263,3 +308,111 @@ DEFINE_TEST(test_acl_freebsd_posix1e) acl_free(acl); #endif } + +/* + * Verify ACL reaed-from-disk. This test is FreeBSD-specific. + */ +DEFINE_TEST(test_acl_freebsd_posix1e_read) +{ +#if !defined(__FreeBSD__) + skipping("FreeBSD-specific ACL read test"); +#elif __FreeBSD__ < 5 + skipping("ACL read supported only on FreeBSD 5.0 and later"); +#else + struct archive *a; + struct archive_entry *ae; + int n, fd; + const char *acl1_text, *acl2_text; + acl_t acl1, acl2; + + /* + * Manually construct a directory and two files with + * different ACLs. This also serves to verify that ACLs + * are supported on the local filesystem. + */ + + /* Create a test file f1 with acl1 */ + acl1_text = "user::rwx,group::rwx,other::rwx,user:1:rw-,group:15:r-x,mask::rwx"; + acl1 = acl_from_text(acl1_text); + assert((void *)acl1 != NULL); + fd = open("f1", O_WRONLY | O_CREAT | O_EXCL, 0777); + failure("Could not create test file?!"); + if (!assert(fd >= 0)) { + acl_free(acl1); + return; + } + n = acl_set_fd(fd, acl1); + acl_free(acl1); + if (n != 0 && errno == EOPNOTSUPP) { + close(fd); + skipping("ACL tests require that ACL support be enabled on the filesystem"); + return; + } + if (n != 0 && errno == EINVAL) { + close(fd); + skipping("This filesystem does not support POSIX.1e ACLs"); + return; + } + failure("acl_set_fd(): errno = %d (%s)", + errno, strerror(errno)); + assertEqualInt(0, n); + close(fd); + + assertMakeDir("d", 0700); + + /* + * Create file d/f1 with acl2 + * + * This differs from acl1 in the u:1: and g:15: permissions. + * + * This file deliberately has the same name but a different ACL. + * Github Issue #777 explains how libarchive's directory traversal + * did not always correctly enter directories before attempting + * to read ACLs, resulting in reading the ACL from a like-named + * file in the wrong directory. + */ + acl2_text = "user::rwx,group::rwx,other::---,user:1:r--,group:15:r--,mask::rwx"; + acl2 = acl_from_text(acl2_text); + assert((void *)acl2 != NULL); + fd = open("d/f1", O_WRONLY | O_CREAT | O_EXCL, 0777); + failure("Could not create test file?!"); + if (!assert(fd >= 0)) { + acl_free(acl2); + return; + } + n = acl_set_fd(fd, acl2); + acl_free(acl2); + if (n != 0 && errno == EOPNOTSUPP) { + close(fd); + skipping("ACL tests require that ACL support be enabled on the filesystem"); + return; + } + if (n != 0 && errno == EINVAL) { + close(fd); + skipping("This filesystem does not support POSIX.1e ACLs"); + return; + } + failure("acl_set_fd(): errno = %d (%s)", + errno, strerror(errno)); + assertEqualInt(0, n); + close(fd); + + /* Create a read-from-disk object. */ + assert(NULL != (a = archive_read_disk_new())); + assertEqualIntA(a, ARCHIVE_OK, archive_read_disk_open(a, ".")); + assert(NULL != (ae = archive_entry_new())); + + /* Walk the dir until we see both of the files */ + while (ARCHIVE_OK == archive_read_next_header2(a, ae)) { + archive_read_disk_descend(a); + if (strcmp(archive_entry_pathname(ae), "./f1") == 0) { + assertEqualString(archive_entry_acl_text(ae, ARCHIVE_ENTRY_ACL_TYPE_ACCESS), acl1_text); + + } else if (strcmp(archive_entry_pathname(ae), "./d/f1") == 0) { + assertEqualString(archive_entry_acl_text(ae, ARCHIVE_ENTRY_ACL_TYPE_ACCESS), acl2_text); + } + } + + archive_free(a); +#endif +} Modified: projects/clang390-import/contrib/top/commands.c ============================================================================== --- projects/clang390-import/contrib/top/commands.c Mon Sep 5 18:02:37 2016 (r305430) +++ projects/clang390-import/contrib/top/commands.c Mon Sep 5 18:05:45 2016 (r305431) @@ -104,6 +104,7 @@ S - toggle the displaying of syste a - toggle the displaying of process titles\n\ t - toggle the display of this process\n\ u - display processes for only one user (+ selects all users)\n\ +w - toggle the display of swap use for each process\n\ z - toggle the displaying of the system idle process\n\ \n\ \n", stdout); Modified: projects/clang390-import/contrib/top/machine.h ============================================================================== --- projects/clang390-import/contrib/top/machine.h Mon Sep 5 18:02:37 2016 (r305430) +++ projects/clang390-import/contrib/top/machine.h Mon Sep 5 18:05:45 2016 (r305431) @@ -72,6 +72,7 @@ struct process_select int wcpu; /* show weighted cpu */ int jid; /* only this jid (unless jid == -1) */ int jail; /* show jail ID */ + int swap; /* show swap usage */ int kidle; /* show per-CPU idle threads */ char *command; /* only this command (unless == NULL) */ }; @@ -82,8 +83,8 @@ char *format_header(); char *format_next_process(); void toggle_pcpustats(void); void get_system_info(struct system_info *si); -int machine_init(struct statics *statics, char do_unames); -int proc_owner(int pid); +int machine_init(struct statics *statics, char do_unames); +int proc_owner(int pid); /* non-int routines typically used by the machine dependent module */ char *printable(); Modified: projects/clang390-import/contrib/top/top.c ============================================================================== --- projects/clang390-import/contrib/top/top.c Mon Sep 5 18:02:37 2016 (r305430) +++ projects/clang390-import/contrib/top/top.c Mon Sep 5 18:05:45 2016 (r305431) @@ -188,9 +188,9 @@ char *argv[]; fd_set readfds; #ifdef ORDER - static char command_chars[] = "\f qh?en#sdkriIutHmSCajzPJo"; + static char command_chars[] = "\f qh?en#sdkriIutHmSCajzPJwo"; #else - static char command_chars[] = "\f qh?en#sdkriIutHmSCajzPJ"; + static char command_chars[] = "\f qh?en#sdkriIutHmSCajzPJw"; #endif /* these defines enumerate the "strchr"s of the commands in command_chars */ #define CMD_redraw 0 @@ -219,8 +219,9 @@ char *argv[]; #define CMD_kidletog 22 #define CMD_pcputog 23 #define CMD_jail 24 +#define CMD_swaptog 25 #ifdef ORDER -#define CMD_order 25 +#define CMD_order 26 #endif /* set the buffer for stdout */ @@ -254,6 +255,7 @@ char *argv[]; ps.wcpu = 1; ps.jid = -1; ps.jail = No; + ps.swap = No; ps.kidle = Yes; ps.command = NULL; @@ -280,7 +282,7 @@ char *argv[]; optind = 1; } - while ((i = getopt(ac, av, "CSIHPabijJ:nquvzs:d:U:m:o:t")) != EOF) + while ((i = getopt(ac, av, "CSIHPabijJ:nquvzs:d:U:m:o:tw")) != EOF) { switch(i) { @@ -418,6 +420,10 @@ char *argv[]; pcpu_stats = !pcpu_stats; break; + case 'w': + ps.swap = 1; + break; + case 'z': ps.kidle = !ps.kidle; break; @@ -1141,6 +1147,15 @@ restart: reset_display(); putchar('\r'); break; + case CMD_swaptog: + ps.swap = !ps.swap; + new_message(MT_standout | MT_delayed, + " %sisplaying per-process swap usage.", + ps.swap ? "D" : "Not d"); + header_text = format_header(uname_field); + reset_display(); + putchar('\r'); + break; default: new_message(MT_standout, " BAD CASE IN SWITCH!"); putchar('\r'); Modified: projects/clang390-import/contrib/top/top.xs ============================================================================== --- projects/clang390-import/contrib/top/top.xs Mon Sep 5 18:02:37 2016 (r305430) +++ projects/clang390-import/contrib/top/top.xs Mon Sep 5 18:05:45 2016 (r305431) @@ -10,7 +10,7 @@ top \- display and update information ab .SH SYNOPSIS .B top [ -.B \-abCHIijnPqStuvz +.B \-abCHIijnPqStuvwz ] [ .BI \-d count ] [ @@ -148,6 +148,9 @@ Write version number information to stde No other processing takes place when this option is used. To see current revision information while top is running, use the help command \*(lq?\*(rq. .TP +.B \-w +Display approximate swap usage for each process. +.TP .B \-z Do not display the system idle process. .TP @@ -167,11 +170,12 @@ Set the delay between screen updates to seconds. The default delay between updates is \nD seconds. .TP .BI \-o field -Sort the process display area on the specified field. The field name is -the name of the column as seen in the output, but in lower case. Likely -values are \*(lqcpu\*(rq, \*(lqsize\*(rq, \*(lqres\*(rq, and \*(lqtime\*(rq, -but may vary on different operating systems. Note that -not all operating systems support this option. +Sort the process display area on the specified field. The field name +is the name of the column as seen in the output, but in lower case: +\*(lqcpu\*(lq, \*(rqsize\*(lq, \*(rqres\*(lq, \*(rqtime\*(lq, +\*(rqpri\*(lq, \*(rqthreads\*(lq, \*(lqtotal\*(lq, \*(rqread\*(lq, +\*(rqwrite\*(lq, \*(rqfault\*(lq, \*(rqvcsw\*(lq, \*(rqivcsw\*(lq, +\*(lqjid\*(lq, \*(rqswap\*(lq or \*(rqpid\*(lq. .TP .BI \-J jail Show only those processes owned by @@ -226,6 +230,7 @@ The options .BR \-S , .BR \-t , .BR \-u , +.BR \-w , and .B \-z are actually toggles. A second specification of any of these options @@ -346,6 +351,9 @@ Toggle the display of the .I top process. .TP +.B w +Toggle the display of swap usage. +.TP .B z Toggle the display of the system idle process. .SH "THE DISPLAY" @@ -379,8 +387,9 @@ is specified, a UID column will be subst PRI is the current priority of the process, NICE is the nice amount (in the range \-20 to 20), SIZE is the total size of the process (text, data, and stack), -RES is the current amount of resident memory (both SIZE and RES are -given in kilobytes), +RES is the current amount of resident memory, +SWAP is the approximate amount of swap, if enabled +(SIZE, RES and SWAP are given in kilobytes), STATE is the current state (one of \*(lqSTART\*(rq, \*(lqRUN\*(rq (shown as \*(lqCPUn\*(rq on SMP systems), \*(lqSLEEP\*(rq, \*(lqSTOP\*(rq, \*(lqZOMB\*(rq, \*(lqWAIT\*(rq, \*(lqLOCK\*(rq or the event on which the Modified: projects/clang390-import/lib/libarchive/config_freebsd.h ============================================================================== --- projects/clang390-import/lib/libarchive/config_freebsd.h Mon Sep 5 18:02:37 2016 (r305430) +++ projects/clang390-import/lib/libarchive/config_freebsd.h Mon Sep 5 18:05:45 2016 (r305431) @@ -30,6 +30,7 @@ /* FreeBSD 5.0 and later have ACL and extattr support. */ #if __FreeBSD__ > 4 #define HAVE_ACL_CREATE_ENTRY 1 +#define HAVE_ACL_GET_FD_NP 1 #define HAVE_ACL_GET_LINK_NP 1 #define HAVE_ACL_GET_PERM_NP 1 #define HAVE_ACL_INIT 1 @@ -45,6 +46,7 @@ #define HAVE_EXTATTR_LIST_FILE 1 #define HAVE_EXTATTR_SET_FD 1 #define HAVE_EXTATTR_SET_FILE 1 +#define HAVE_STRUCT_XVFSCONF 1 #define HAVE_SYS_ACL_H 1 #define HAVE_SYS_EXTATTR_H 1 #endif Modified: projects/clang390-import/lib/libc/stdio/fgets.c ============================================================================== --- projects/clang390-import/lib/libc/stdio/fgets.c Mon Sep 5 18:02:37 2016 (r305430) +++ projects/clang390-import/lib/libc/stdio/fgets.c Mon Sep 5 18:05:45 2016 (r305431) @@ -37,6 +37,7 @@ static char sccsid[] = "@(#)fgets.c 8.2 __FBSDID("$FreeBSD$"); #include "namespace.h" +#include #include #include #include "un-namespace.h" @@ -55,11 +56,16 @@ fgets(char * __restrict buf, int n, FILE char *s; unsigned char *p, *t; - if (n <= 0) /* sanity check */ - return (NULL); - FLOCKFILE(fp); ORIENT(fp, -1); + + if (n <= 0) { /* sanity check */ + fp->_flags |= __SERR; + errno = EINVAL; + FUNLOCKFILE(fp); + return (NULL); + } + s = buf; n--; /* leave space for NUL */ while (n != 0) { @@ -69,7 +75,7 @@ fgets(char * __restrict buf, int n, FILE if ((len = fp->_r) <= 0) { if (__srefill(fp)) { /* EOF/error: stop with partial or no line */ - if (s == buf) { + if (!__sfeof(fp) || s == buf) { FUNLOCKFILE(fp); return (NULL); } Modified: projects/clang390-import/lib/libc/stdio/fgetws.c ============================================================================== --- projects/clang390-import/lib/libc/stdio/fgetws.c Mon Sep 5 18:02:37 2016 (r305430) +++ projects/clang390-import/lib/libc/stdio/fgetws.c Mon Sep 5 18:05:45 2016 (r305431) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); wchar_t * fgetws_l(wchar_t * __restrict ws, int n, FILE * __restrict fp, locale_t locale) { + int sret; wchar_t *wsp; size_t nconv; const char *src; @@ -56,23 +57,31 @@ fgetws_l(wchar_t * __restrict ws, int n, ORIENT(fp, 1); if (n <= 0) { + fp->_flags |= __SERR; errno = EINVAL; goto error; } + wsp = ws; + if (n == 1) + goto ok; + if (fp->_r <= 0 && __srefill(fp)) - /* EOF */ + /* EOF or ferror */ goto error; - wsp = ws; + + sret = 0; do { src = fp->_p; nl = memchr(fp->_p, '\n', fp->_r); nconv = l->__mbsnrtowcs(wsp, &src, nl != NULL ? (nl - fp->_p + 1) : fp->_r, n - 1, &fp->_mbstate); - if (nconv == (size_t)-1) + if (nconv == (size_t)-1) { /* Conversion error */ + fp->_flags |= __SERR; goto error; + } if (src == NULL) { /* * We hit a null byte. Increment the character count, @@ -88,23 +97,30 @@ fgetws_l(wchar_t * __restrict ws, int n, fp->_p = (unsigned char *)src; n -= nconv; wsp += nconv; - } while (wsp[-1] != L'\n' && n > 1 && (fp->_r > 0 || - __srefill(fp) == 0)); - if (wsp == ws) - /* EOF */ + } while ((wsp == ws || wsp[-1] != L'\n') && n > 1 && (fp->_r > 0 || + (sret = __srefill(fp)) == 0)); + if (sret && !__sfeof(fp)) + /* ferror */ goto error; - if (!l->__mbsinit(&fp->_mbstate)) + if (!l->__mbsinit(&fp->_mbstate)) { /* Incomplete character */ + fp->_flags |= __SERR; + errno = EILSEQ; goto error; + } + if (wsp == ws) + /* EOF */ + goto error; +ok: *wsp = L'\0'; FUNLOCKFILE(fp); - return (ws); error: FUNLOCKFILE(fp); return (NULL); } + wchar_t * fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp) { Modified: projects/clang390-import/sys/arm/allwinner/aw_thermal.c ============================================================================== --- projects/clang390-import/sys/arm/allwinner/aw_thermal.c Mon Sep 5 18:02:37 2016 (r305430) +++ projects/clang390-import/sys/arm/allwinner/aw_thermal.c Mon Sep 5 18:05:45 2016 (r305431) @@ -82,16 +82,26 @@ __FBSDID("$FreeBSD$"); #define A83T_FILTER 0x4 #define A83T_INTC 0x1000 #define A83T_TEMP_BASE 2719000 +#define A83T_TEMP_MUL 1000 #define A83T_TEMP_DIV 14186 #define A83T_CLK_RATE 24000000 #define A64_ADC_ACQUIRE_TIME 0x190 #define A64_FILTER 0x6 -#define A64_INTC 0x18000 +#define A64_INTC 0x18000 #define A64_TEMP_BASE 2170000 +#define A64_TEMP_MUL 1000 #define A64_TEMP_DIV 8560 #define A64_CLK_RATE 4000000 +#define H3_ADC_ACQUIRE_TIME 0x3f +#define H3_FILTER 0x6 +#define H3_INTC 0x191000 +#define H3_TEMP_BASE 217000000 +#define H3_TEMP_MUL 121168 +#define H3_TEMP_DIV 1000000 +#define H3_CLK_RATE 4000000 + #define TEMP_C_TO_K 273 #define SENSOR_ENABLE_ALL (SENSOR0_EN|SENSOR1_EN|SENSOR2_EN) #define SHUT_INT_ALL (SHUT_INT0_STS|SHUT_INT1_STS|SHUT_INT2_STS) @@ -110,8 +120,10 @@ struct aw_thermal_config { uint32_t adc_acquire_time; uint32_t filter; uint32_t intc; - uint32_t temp_base; - uint32_t temp_div; + int temp_base; + int temp_mul; + int temp_div; + int calib; }; static const struct aw_thermal_config a83t_config = { @@ -135,7 +147,9 @@ static const struct aw_thermal_config a8 .filter = A83T_FILTER, .intc = A83T_INTC, .temp_base = A83T_TEMP_BASE, + .temp_mul = A83T_TEMP_MUL, .temp_div = A83T_TEMP_DIV, + .calib = 1, }; static const struct aw_thermal_config a64_config = { @@ -159,11 +173,30 @@ static const struct aw_thermal_config a6 .filter = A64_FILTER, .intc = A64_INTC, .temp_base = A64_TEMP_BASE, + .temp_mul = A64_TEMP_MUL, .temp_div = A64_TEMP_DIV, }; +static const struct aw_thermal_config h3_config = { + .nsensors = 1, + .sensors = { + [0] = { + .name = "cpu", + .desc = "CPU temperature", + }, + }, + .clk_rate = H3_CLK_RATE, + .adc_acquire_time = H3_ADC_ACQUIRE_TIME, + .filter = H3_FILTER, + .intc = H3_INTC, + .temp_base = H3_TEMP_BASE, + .temp_mul = H3_TEMP_MUL, + .temp_div = H3_TEMP_DIV, +}; + static struct ofw_compat_data compat_data[] = { { "allwinner,sun8i-a83t-ts", (uintptr_t)&a83t_config }, + { "allwinner,sun8i-h3-ts", (uintptr_t)&h3_config }, { "allwinner,sun50i-a64-ts", (uintptr_t)&a64_config }, { NULL, (uintptr_t)NULL } }; @@ -191,14 +224,16 @@ aw_thermal_init(struct aw_thermal_softc uint32_t calib0, calib1; int error; - /* Read calibration settings from SRAM */ - error = aw_sid_read_tscalib(&calib0, &calib1); - if (error != 0) - return (error); - - /* Write calibration settings to thermal controller */ - WR4(sc, THS_CALIB0, calib0); - WR4(sc, THS_CALIB1, calib1); + if (sc->conf->calib) { + /* Read calibration settings from SRAM */ + error = aw_sid_read_tscalib(&calib0, &calib1); + if (error != 0) + return (error); + + /* Write calibration settings to thermal controller */ + WR4(sc, THS_CALIB0, calib0); + WR4(sc, THS_CALIB1, calib1); + } /* Configure ADC acquire time (CLK_IN/(N+1)) and enable sensors */ WR4(sc, THS_CTRL1, ADC_CALI_EN); @@ -221,7 +256,8 @@ aw_thermal_init(struct aw_thermal_softc static int aw_thermal_reg_to_temp(struct aw_thermal_softc *sc, uint32_t val) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Tue Sep 6 17:08:33 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 40AE6BC642B for ; Tue, 6 Sep 2016 17:08:33 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EA837D9A; Tue, 6 Sep 2016 17:08:32 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u86H8WBu033767; Tue, 6 Sep 2016 17:08:32 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u86H8Ws6033765; Tue, 6 Sep 2016 17:08:32 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201609061708.u86H8Ws6033765@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Tue, 6 Sep 2016 17:08:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305481 - projects/netbsd-tests-update-12 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Sep 2016 17:08:33 -0000 Author: ngie Date: Tue Sep 6 17:08:31 2016 New Revision: 305481 URL: https://svnweb.freebsd.org/changeset/base/305481 Log: Remove old project branch integrated into ^/head as r305358 Deleted: projects/netbsd-tests-update-12/ From owner-svn-src-projects@freebsd.org Tue Sep 6 20:01:16 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AC5E3BC736E for ; Tue, 6 Sep 2016 20:01:16 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6983838C; Tue, 6 Sep 2016 20:01:16 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u86K1FE4001105; Tue, 6 Sep 2016 20:01:15 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u86K1FRK001104; Tue, 6 Sep 2016 20:01:15 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201609062001.u86K1FRK001104@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 6 Sep 2016 20:01:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305496 - projects/clang390-import/contrib/libc++/include X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Sep 2016 20:01:16 -0000 Author: dim Date: Tue Sep 6 20:01:15 2016 New Revision: 305496 URL: https://svnweb.freebsd.org/changeset/base/305496 Log: Move inclusion of and in the -fno-exceptions case to the end of libc++'s . This is a workaround for building Firefox, which generates a rather convoluted maze of standard library wrapper headers, and this leads to an unfortunate sequence of: 1. wrapper includes libc++ , 2. which includes wrapper , 3. which includes libc++ , 4. which includes wrapper (because of -fno-exception), 5. which includes libc++ again, 6. which includes mozalloc.h, 7. which tries to declare operator new with std::bad_alloc, 8. which gives an error because std::bad_alloc is not yet defined. The inclusion at step 5 does nothing, because the header guard for was already encountered in step 1. Then when moz_alloc.h tries to use std::bad_alloc, it is not yet defined, because we are still busy processing (where this class is defined) from step 3. Mozilla has https://bugzilla.mozilla.org/show_bug.cgi?id=1269171 for this, reported by Jan Beich (jbeich@), but when the fix for it is applied to Firefox, we get into another, similar problem situation: 1. some header includes wrapper , 2. which includes libc++ , 3. which includes wrapper (because of -fno-exceptions), 4. which includes mozalloc.h, 5. which includes wrapper , 6. which includes libc++ , 7. which gives an error defining std::bad_alloc, because std::exception is not yet defined. At step 3, we were at the top of libc++'s , and at that point std::exception is not yet defined. At step 6, does include again, but similar to step 5 in the previous problem case, the header guard was already encountered, so the whole header is skipped. In upstream libc++'s later revisions r279744 and r279763, the reason for including and was nullified again, but these commits are rather large and intrusive. Therefore, move the includes to the bottom of the file, just before where they are needed. At that point, std::exception is already fully defined. Suggested by: Jörg Sonnenberger Modified: projects/clang390-import/contrib/libc++/include/exception Modified: projects/clang390-import/contrib/libc++/include/exception ============================================================================== --- projects/clang390-import/contrib/libc++/include/exception Tue Sep 6 19:54:52 2016 (r305495) +++ projects/clang390-import/contrib/libc++/include/exception Tue Sep 6 20:01:15 2016 (r305496) @@ -80,10 +80,6 @@ template void rethrow_if_neste #include <__config> #include #include -#if defined(_LIBCPP_NO_EXCEPTIONS) -#include -#include -#endif #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header @@ -255,6 +251,11 @@ rethrow_if_nested(const _Ep&, typename e } // std +#if defined(_LIBCPP_NO_EXCEPTIONS) +#include +#include +#endif + _LIBCPP_BEGIN_NAMESPACE_STD template From owner-svn-src-projects@freebsd.org Wed Sep 7 20:36:15 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3597BBD0A17 for ; Wed, 7 Sep 2016 20:36:15 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 061EB85E; Wed, 7 Sep 2016 20:36:14 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u87KaEC8063546; Wed, 7 Sep 2016 20:36:14 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u87KaEwl063545; Wed, 7 Sep 2016 20:36:14 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201609072036.u87KaEwl063545@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 7 Sep 2016 20:36:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305564 - projects/clang390-import/contrib/llvm/lib/Target/X86 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Sep 2016 20:36:15 -0000 Author: dim Date: Wed Sep 7 20:36:13 2016 New Revision: 305564 URL: https://svnweb.freebsd.org/changeset/base/305564 Log: Pull in r280837 from upstream llvm trunk (by Wei Mi): Don't reduce the width of vector mul if the target doesn't support SSE2. The patch is to fix PR30298, which is caused by rL272694. The solution is to bail out if the target has no SSE2. Differential Revision: https://reviews.llvm.org/D24288 This fixes building the multimedia/libx264 port on i386. Modified: projects/clang390-import/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp Modified: projects/clang390-import/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp ============================================================================== --- projects/clang390-import/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp Wed Sep 7 20:09:24 2016 (r305563) +++ projects/clang390-import/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp Wed Sep 7 20:36:13 2016 (r305564) @@ -27516,7 +27516,8 @@ static SDValue reduceVMULWidth(SDNode *N const X86Subtarget &Subtarget) { // pmulld is supported since SSE41. It is better to use pmulld // instead of pmullw+pmulhw. - if (Subtarget.hasSSE41()) + // pmullw/pmulhw are not supported by SSE. + if (Subtarget.hasSSE41() || !Subtarget.hasSSE2()) return SDValue(); ShrinkMode Mode; From owner-svn-src-projects@freebsd.org Wed Sep 7 20:41:09 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B50EBBD0B68 for ; Wed, 7 Sep 2016 20:41:09 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 83310B79; Wed, 7 Sep 2016 20:41:09 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u87Kf8US066566; Wed, 7 Sep 2016 20:41:08 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u87Kf8pI066565; Wed, 7 Sep 2016 20:41:08 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201609072041.u87Kf8pI066565@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 7 Sep 2016 20:41:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305565 - projects/clang390-import/contrib/libc++/include X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Sep 2016 20:41:09 -0000 Author: dim Date: Wed Sep 7 20:41:08 2016 New Revision: 305565 URL: https://svnweb.freebsd.org/changeset/base/305565 Log: Revert r305496 for now, since jbeich@ found a good upstream fix for the Firefox port. Modified: projects/clang390-import/contrib/libc++/include/exception Modified: projects/clang390-import/contrib/libc++/include/exception ============================================================================== --- projects/clang390-import/contrib/libc++/include/exception Wed Sep 7 20:36:13 2016 (r305564) +++ projects/clang390-import/contrib/libc++/include/exception Wed Sep 7 20:41:08 2016 (r305565) @@ -80,6 +80,10 @@ template void rethrow_if_neste #include <__config> #include #include +#if defined(_LIBCPP_NO_EXCEPTIONS) +#include +#include +#endif #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header @@ -251,11 +255,6 @@ rethrow_if_nested(const _Ep&, typename e } // std -#if defined(_LIBCPP_NO_EXCEPTIONS) -#include -#include -#endif - _LIBCPP_BEGIN_NAMESPACE_STD template From owner-svn-src-projects@freebsd.org Wed Sep 7 21:14:36 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D6E04BD02D1 for ; Wed, 7 Sep 2016 21:14:36 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A6E5A1A5; Wed, 7 Sep 2016 21:14:36 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u87LEZeB078847; Wed, 7 Sep 2016 21:14:35 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u87LEZRS078846; Wed, 7 Sep 2016 21:14:35 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201609072114.u87LEZRS078846@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 7 Sep 2016 21:14:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305570 - projects/clang390-import/tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Sep 2016 21:14:36 -0000 Author: emaste Date: Wed Sep 7 21:14:35 2016 New Revision: 305570 URL: https://svnweb.freebsd.org/changeset/base/305570 Log: Add ld.lld to OptionalObsoleteFiles Modified: projects/clang390-import/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/clang390-import/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/clang390-import/tools/build/mk/OptionalObsoleteFiles.inc Wed Sep 7 21:09:44 2016 (r305569) +++ projects/clang390-import/tools/build/mk/OptionalObsoleteFiles.inc Wed Sep 7 21:14:35 2016 (r305570) @@ -4386,6 +4386,10 @@ OLD_DIRS+=usr/include/c++/v1 # to be filled in #.endif +.if ${MK_LLD} == no +OLD_FILES+=usr/bin/ld.lld +.endif + .if ${MK_LLDB} == no OLD_FILES+=usr/bin/lldb OLD_FILES+=usr/share/man/man1/lldb.1.gz From owner-svn-src-projects@freebsd.org Thu Sep 8 18:15:40 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 75418BD24F4 for ; Thu, 8 Sep 2016 18:15:40 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 191ADEA0; Thu, 8 Sep 2016 18:15:40 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u88IFdhS059760; Thu, 8 Sep 2016 18:15:39 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u88IFaMS059732; Thu, 8 Sep 2016 18:15:36 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201609081815.u88IFaMS059732@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 8 Sep 2016 18:15:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305623 - in projects/clang390-import: . contrib/netbsd-tests/kernel/kqueue contrib/netbsd-tests/kernel/kqueue/read contrib/netbsd-tests/lib/libc/rpc etc/mtree lib/libc/tests/db lib/lib... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Sep 2016 18:15:40 -0000 Author: dim Date: Thu Sep 8 18:15:36 2016 New Revision: 305623 URL: https://svnweb.freebsd.org/changeset/base/305623 Log: Merge ^/head r305431 through r305622. Added: projects/clang390-import/share/man/man4/cxgbev.4 - copied unchanged from r305622, head/share/man/man4/cxgbev.4 projects/clang390-import/sys/arm/annapurna/alpine/alpine_ccu.c - copied unchanged from r305622, head/sys/arm/annapurna/alpine/alpine_ccu.c projects/clang390-import/sys/arm/annapurna/alpine/alpine_nb_service.c - copied unchanged from r305622, head/sys/arm/annapurna/alpine/alpine_nb_service.c projects/clang390-import/sys/contrib/alpine-hal/al_hal_serdes_25g.c - copied unchanged from r305622, head/sys/contrib/alpine-hal/al_hal_serdes_25g.c projects/clang390-import/sys/contrib/alpine-hal/al_hal_serdes_25g.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/al_hal_serdes_25g.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_serdes_25g_internal_regs.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/al_hal_serdes_25g_internal_regs.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_serdes_25g_regs.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/al_hal_serdes_25g_regs.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_serdes_hssp.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/al_hal_serdes_hssp.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_serdes_hssp_internal_regs.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/al_hal_serdes_hssp_internal_regs.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_serdes_hssp_regs.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/al_hal_serdes_hssp_regs.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_serdes_interface.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/al_hal_serdes_interface.h projects/clang390-import/sys/contrib/alpine-hal/al_serdes.c - copied unchanged from r305622, head/sys/contrib/alpine-hal/al_serdes.c projects/clang390-import/sys/contrib/alpine-hal/al_serdes.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/al_serdes.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_common.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_common.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_iofic.c - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_iofic.c projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_iofic.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_iofic.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_iofic_regs.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_iofic_regs.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_nb_regs.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_nb_regs.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_pbs_regs.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_pbs_regs.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_pcie.c - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_pcie.c projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_pcie.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_pcie.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_pcie_axi_reg.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_pcie_axi_reg.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_pcie_interrupts.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_pcie_interrupts.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_pcie_regs.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_pcie_regs.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_pcie_w_reg.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_pcie_w_reg.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_plat_services.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_plat_services.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_plat_types.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_plat_types.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_reg_utils.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_reg_utils.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_serdes.c - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_serdes.c projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_serdes.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_serdes.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_serdes_25g.c - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_serdes_25g.c projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_serdes_25g.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_serdes_25g.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_serdes_25g_internal_regs.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_serdes_25g_internal_regs.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_serdes_25g_regs.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_serdes_25g_regs.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_serdes_hssp.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_serdes_hssp.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_serdes_hssp_internal_regs.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_serdes_hssp_internal_regs.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_serdes_hssp_regs.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_serdes_hssp_regs.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_serdes_interface.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_serdes_interface.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_serdes_internal_regs.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_serdes_internal_regs.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_serdes_regs.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_serdes_regs.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_types.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_types.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_udma.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_udma.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_udma_config.c - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_udma_config.c projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_udma_config.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_udma_config.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_udma_debug.c - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_udma_debug.c projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_udma_debug.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_udma_debug.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_udma_iofic.c - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_udma_iofic.c projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_udma_iofic.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_udma_iofic.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_udma_iofic_regs.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_udma_iofic_regs.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_udma_main.c - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_udma_main.c projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_udma_regs.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_udma_regs.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_udma_regs_gen.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_udma_regs_gen.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_udma_regs_m2s.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_udma_regs_m2s.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_udma_regs_s2m.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_udma_regs_s2m.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_unit_adapter_regs.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_hal_unit_adapter_regs.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_serdes.c - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_serdes.c projects/clang390-import/sys/contrib/alpine-hal/eth/al_serdes.h - copied unchanged from r305622, head/sys/contrib/alpine-hal/eth/al_serdes.h projects/clang390-import/sys/contrib/alpine-hal/eth/eth/ - copied from r305622, head/sys/contrib/alpine-hal/eth/eth/ projects/clang390-import/sys/dev/cpufreq/cpufreq_dt.c - copied unchanged from r305622, head/sys/dev/cpufreq/cpufreq_dt.c projects/clang390-import/sys/dev/cxgbe/common/t4vf_hw.c - copied unchanged from r305622, head/sys/dev/cxgbe/common/t4vf_hw.c projects/clang390-import/sys/dev/cxgbe/if_cxlv.c - copied unchanged from r305622, head/sys/dev/cxgbe/if_cxlv.c projects/clang390-import/sys/dev/cxgbe/t4_vf.c - copied unchanged from r305622, head/sys/dev/cxgbe/t4_vf.c projects/clang390-import/sys/modules/cxgbe/if_cxgbev/ - copied from r305622, head/sys/modules/cxgbe/if_cxgbev/ projects/clang390-import/sys/modules/cxgbe/if_cxlv/ - copied from r305622, head/sys/modules/cxgbe/if_cxlv/ projects/clang390-import/tests/sys/kqueue/libkqueue/ - copied from r305622, head/tests/sys/kqueue/libkqueue/ Replaced: projects/clang390-import/tests/sys/kqueue/Makefile - copied unchanged from r305622, head/tests/sys/kqueue/Makefile Deleted: projects/clang390-import/sys/dev/hyperv/netvsc/hv_rndis.h projects/clang390-import/tests/sys/kqueue/Makefile.depend projects/clang390-import/tests/sys/kqueue/common.h projects/clang390-import/tests/sys/kqueue/config.h projects/clang390-import/tests/sys/kqueue/kqueue_test.sh projects/clang390-import/tests/sys/kqueue/main.c projects/clang390-import/tests/sys/kqueue/proc.c projects/clang390-import/tests/sys/kqueue/read.c projects/clang390-import/tests/sys/kqueue/signal.c projects/clang390-import/tests/sys/kqueue/timer.c projects/clang390-import/tests/sys/kqueue/user.c projects/clang390-import/tests/sys/kqueue/vnode.c Modified: projects/clang390-import/ObsoleteFiles.inc projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/read/t_file.c projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_proc1.c projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_proc2.c projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_proc3.c projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_sig.c projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_vnode.c projects/clang390-import/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c projects/clang390-import/etc/mtree/BSD.tests.dist projects/clang390-import/lib/libc/tests/db/Makefile projects/clang390-import/lib/libstand/nfs.c projects/clang390-import/lib/libstand/ufs.c projects/clang390-import/share/man/man4/Makefile projects/clang390-import/share/man/man4/amdsbwd.4 projects/clang390-import/share/man/man4/cxgbe.4 projects/clang390-import/share/man/man4/intpm.4 projects/clang390-import/share/man/man4/vt.4 projects/clang390-import/share/man/man9/Makefile projects/clang390-import/share/man/man9/pci.9 projects/clang390-import/share/timedef/ko_KR.UTF-8.src projects/clang390-import/share/timedef/ko_KR.eucKR.src projects/clang390-import/sys/amd64/amd64/initcpu.c projects/clang390-import/sys/amd64/amd64/machdep.c projects/clang390-import/sys/amd64/amd64/prof_machdep.c projects/clang390-import/sys/amd64/conf/NOTES projects/clang390-import/sys/amd64/vmm/io/iommu.c projects/clang390-import/sys/amd64/vmm/io/ppt.c projects/clang390-import/sys/arm/allwinner/axp81x.c projects/clang390-import/sys/arm/allwinner/clk/aw_cpuclk.c projects/clang390-import/sys/arm/allwinner/clk/aw_pll.c projects/clang390-import/sys/arm/annapurna/alpine/alpine_machdep.c projects/clang390-import/sys/arm/annapurna/alpine/alpine_machdep_mp.c projects/clang390-import/sys/arm/conf/ALLWINNER projects/clang390-import/sys/arm/conf/ALPINE projects/clang390-import/sys/arm/conf/NOTES projects/clang390-import/sys/arm/ti/am335x/am335x_scm.h projects/clang390-import/sys/arm/ti/cpsw/if_cpsw.c projects/clang390-import/sys/arm/ti/cpsw/if_cpswreg.h projects/clang390-import/sys/arm/ti/ti_pruss.c projects/clang390-import/sys/arm64/arm64/cpufunc_asm.S projects/clang390-import/sys/arm64/arm64/pmap.c projects/clang390-import/sys/arm64/arm64/trap.c projects/clang390-import/sys/arm64/conf/GENERIC projects/clang390-import/sys/boot/efi/loader/copy.c projects/clang390-import/sys/boot/fdt/dts/arm/a83t.dtsi projects/clang390-import/sys/boot/fdt/dts/arm/annapurna-alpine.dts projects/clang390-import/sys/boot/fdt/dts/arm/sinovoip-bpi-m3.dts projects/clang390-import/sys/boot/fdt/dts/riscv/qemu.dts projects/clang390-import/sys/boot/i386/pxeldr/pxeboot.8 projects/clang390-import/sys/cam/cam_periph.c projects/clang390-import/sys/cam/scsi/scsi_all.c projects/clang390-import/sys/cam/scsi/scsi_all.h projects/clang390-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/clang390-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h projects/clang390-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/clang390-import/sys/compat/freebsd32/freebsd32_ioctl.c projects/clang390-import/sys/compat/freebsd32/freebsd32_ioctl.h projects/clang390-import/sys/conf/NOTES projects/clang390-import/sys/conf/files projects/clang390-import/sys/conf/files.arm projects/clang390-import/sys/conf/files.arm64 projects/clang390-import/sys/conf/options.amd64 projects/clang390-import/sys/contrib/alpine-hal/al_hal_iofic.c projects/clang390-import/sys/contrib/alpine-hal/al_hal_iofic.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_iofic_regs.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_nb_regs.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_pbs_regs.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_pcie.c projects/clang390-import/sys/contrib/alpine-hal/al_hal_pcie.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_pcie_axi_reg.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_pcie_interrupts.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_pcie_regs.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_pcie_w_reg.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_plat_services.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_plat_types.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_reg_utils.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_serdes.c projects/clang390-import/sys/contrib/alpine-hal/al_hal_serdes.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_udma.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_udma_config.c projects/clang390-import/sys/contrib/alpine-hal/al_hal_udma_config.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_udma_debug.c projects/clang390-import/sys/contrib/alpine-hal/al_hal_udma_iofic.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_udma_main.c projects/clang390-import/sys/contrib/alpine-hal/al_hal_udma_regs_gen.h projects/clang390-import/sys/contrib/alpine-hal/al_hal_unit_adapter_regs.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_eth.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_eth_mac_regs.h projects/clang390-import/sys/contrib/alpine-hal/eth/al_hal_eth_main.c projects/clang390-import/sys/crypto/skein/amd64/skein_block_asm.s (contents, props changed) projects/clang390-import/sys/dev/ahci/ahci.c projects/clang390-import/sys/dev/amdsbwd/amdsbwd.c projects/clang390-import/sys/dev/bhnd/bcma/bcma.c projects/clang390-import/sys/dev/bhnd/bcma/bcma_dmp.h projects/clang390-import/sys/dev/bhnd/bcma/bcmavar.h projects/clang390-import/sys/dev/bhnd/bhnd.c projects/clang390-import/sys/dev/bhnd/bhnd.h projects/clang390-import/sys/dev/bhnd/bhnd_bus_if.m projects/clang390-import/sys/dev/bhnd/bhnd_nexus.c projects/clang390-import/sys/dev/bhnd/bhnd_subr.c projects/clang390-import/sys/dev/bhnd/bhnd_types.h projects/clang390-import/sys/dev/bhnd/bhndb/bhnd_bhndb.c projects/clang390-import/sys/dev/bhnd/bhndb/bhndb.c projects/clang390-import/sys/dev/bhnd/bhndb/bhndb_pci.c projects/clang390-import/sys/dev/bhnd/bhndb/bhndb_pcivar.h projects/clang390-import/sys/dev/bhnd/cores/pmu/bhnd_pmu_subr.c projects/clang390-import/sys/dev/bhnd/siba/siba.c projects/clang390-import/sys/dev/bhnd/siba/siba_bhndb.c projects/clang390-import/sys/dev/bhnd/siba/sibareg.h projects/clang390-import/sys/dev/bhnd/siba/sibavar.h projects/clang390-import/sys/dev/bwn/bwn_mac.c projects/clang390-import/sys/dev/bwn/if_bwn_pci.c projects/clang390-import/sys/dev/bwn/if_bwn_pcivar.h projects/clang390-import/sys/dev/cxgbe/adapter.h projects/clang390-import/sys/dev/cxgbe/common/common.h projects/clang390-import/sys/dev/cxgbe/common/t4_hw.c projects/clang390-import/sys/dev/cxgbe/t4_main.c projects/clang390-import/sys/dev/cxgbe/t4_sge.c projects/clang390-import/sys/dev/cxgbe/tom/t4_connect.c projects/clang390-import/sys/dev/hyperv/netvsc/hv_net_vsc.c projects/clang390-import/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/clang390-import/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/clang390-import/sys/dev/hyperv/netvsc/hv_rndis_filter.c projects/clang390-import/sys/dev/hyperv/netvsc/hv_rndis_filter.h projects/clang390-import/sys/dev/hyperv/netvsc/if_hnreg.h projects/clang390-import/sys/dev/hyperv/netvsc/if_hnvar.h projects/clang390-import/sys/dev/hyperv/netvsc/ndis.h projects/clang390-import/sys/dev/hyperv/utilities/hv_kvp.c projects/clang390-import/sys/dev/intpm/intpm.c projects/clang390-import/sys/dev/iscsi/iscsi.c projects/clang390-import/sys/dev/iwm/if_iwm_scan.c projects/clang390-import/sys/dev/iwm/if_iwmreg.h projects/clang390-import/sys/dev/pci/pci.c projects/clang390-import/sys/dev/pci/pci_host_generic.c projects/clang390-import/sys/dev/pci/pci_host_generic.h projects/clang390-import/sys/dev/pci/pcireg.h projects/clang390-import/sys/dev/pci/pcivar.h projects/clang390-import/sys/dev/rtwn/if_rtwn.c projects/clang390-import/sys/dev/usb/input/ums.c projects/clang390-import/sys/dev/usb/wlan/if_rum.c projects/clang390-import/sys/fs/nullfs/null_vnops.c projects/clang390-import/sys/geom/mirror/g_mirror.c projects/clang390-import/sys/i386/i386/trap.c projects/clang390-import/sys/i386/i386/vm86.c projects/clang390-import/sys/kern/capabilities.conf projects/clang390-import/sys/kern/kern_condvar.c projects/clang390-import/sys/kern/kern_sig.c projects/clang390-import/sys/kern/uipc_mbuf.c projects/clang390-import/sys/mips/cavium/octeon_mp.c projects/clang390-import/sys/mips/gxemul/gxemul_machdep.c projects/clang390-import/sys/mips/include/hwfunc.h projects/clang390-import/sys/mips/include/intr.h projects/clang390-import/sys/mips/mips/mips_pic.c projects/clang390-import/sys/mips/mips/mp_machdep.c projects/clang390-import/sys/mips/mips/nexus.c projects/clang390-import/sys/mips/nlm/xlp_machdep.c projects/clang390-import/sys/mips/rmi/xlr_machdep.c projects/clang390-import/sys/mips/sibyte/sb_machdep.c projects/clang390-import/sys/mips/sibyte/sb_scd.c projects/clang390-import/sys/modules/cxgbe/Makefile projects/clang390-import/sys/net/rndis.h projects/clang390-import/sys/powerpc/booke/pmap.c projects/clang390-import/sys/powerpc/conf/NOTES projects/clang390-import/sys/powerpc/mpc85xx/platform_mpc85xx.c projects/clang390-import/sys/sparc64/conf/GENERIC projects/clang390-import/sys/ufs/ffs/ffs_balloc.c projects/clang390-import/sys/ufs/ffs/ffs_extern.h projects/clang390-import/sys/ufs/ffs/ffs_inode.c projects/clang390-import/sys/ufs/ffs/ffs_softdep.c projects/clang390-import/sys/ufs/ffs/ffs_suspend.c projects/clang390-import/sys/ufs/ffs/ffs_vfsops.c projects/clang390-import/sys/ufs/ffs/ffs_vnops.c projects/clang390-import/sys/ufs/ffs/fs.h projects/clang390-import/sys/ufs/ufs/dir.h projects/clang390-import/sys/ufs/ufs/ufs_lookup.c projects/clang390-import/sys/ufs/ufs/ufs_quota.c projects/clang390-import/sys/ufs/ufs/ufs_vnops.c projects/clang390-import/sys/x86/x86/cpu_machdep.c projects/clang390-import/tools/tools/locale/Makefile projects/clang390-import/usr.bin/bsdiff/bspatch/bspatch.c projects/clang390-import/usr.bin/sort/sort.1.in projects/clang390-import/usr.sbin/acpi/acpidump/acpi.c projects/clang390-import/usr.sbin/etcupdate/etcupdate.sh projects/clang390-import/usr.sbin/portsnap/portsnap/portsnap.sh Directory Properties: projects/clang390-import/ (props changed) projects/clang390-import/contrib/netbsd-tests/ (props changed) projects/clang390-import/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/clang390-import/ObsoleteFiles.inc ============================================================================== --- projects/clang390-import/ObsoleteFiles.inc Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/ObsoleteFiles.inc Thu Sep 8 18:15:36 2016 (r305623) @@ -130,6 +130,9 @@ OLD_FILES+=usr/lib/clang/3.8.0/lib/freeb OLD_DIRS+=usr/lib/clang/3.8.0/lib/freebsd OLD_DIRS+=usr/lib/clang/3.8.0/lib OLD_DIRS+=usr/lib/clang/3.8.0 +# 20160906: libkqueue tests moved to /usr/tests/sys/kqueue/libkqueue +OLD_FILES+=usr/tests/sys/kqueue/kqtest +OLD_FILES+=usr/tests/sys/kqueue/kqueue_test # 20160901: Remove digi(4) OLD_FILES+=usr/share/man/man4/digi.4.gz # 20160819: Remove ie(4) Modified: projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c ============================================================================== --- projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c Thu Sep 8 18:15:36 2016 (r305623) @@ -78,7 +78,11 @@ ATF_TC_BODY(fifo, tc) RL(n = kevent(kq, NULL, 0, event, 1, NULL)); (void)printf("kevent num %d filt %d flags: %#x, fflags: %#x, " +#ifdef __FreeBSD__ + "data: %" PRIdPTR "\n", n, event[0].filter, event[0].flags, +#else "data: %" PRId64 "\n", n, event[0].filter, event[0].flags, +#endif event[0].fflags, event[0].data); ATF_REQUIRE_EQ(event[0].filter, EVFILT_READ); Modified: projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/read/t_file.c ============================================================================== --- projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/read/t_file.c Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/read/t_file.c Thu Sep 8 18:15:36 2016 (r305623) @@ -111,7 +111,11 @@ ATF_TC_BODY(file, tc) num += n; (void)printf("kevent num %d flags: %#x, fflags: %#x, data: " +#ifdef __FreeBSD__ + "%" PRIdPTR "\n", n, event[0].flags, event[0].fflags, +#else "%" PRId64 "\n", n, event[0].flags, event[0].fflags, +#endif event[0].data); if (event[0].data < 0) Modified: projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c ============================================================================== --- projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c Thu Sep 8 18:15:36 2016 (r305623) @@ -67,7 +67,11 @@ ATF_TC_BODY(pipe, tc) RL(n = kevent(kq, NULL, 0, event, 1, NULL)); (void)printf("kevent num %d flags: %#x, fflags: %#x, data: " +#ifdef __FreeBSD__ + "%" PRIdPTR "\n", n, event[0].flags, event[0].fflags, event[0].data); +#else "%" PRId64 "\n", n, event[0].flags, event[0].fflags, event[0].data); +#endif RL(n = read(fds[0], buffer, event[0].data)); buffer[n] = '\0'; Modified: projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c ============================================================================== --- projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c Thu Sep 8 18:15:36 2016 (r305623) @@ -103,7 +103,11 @@ h_check(bool check_master) RL(n = kevent(kq, NULL, 0, event, 1, NULL)); (void)printf("kevent num %d filt %d flags: %#x, fflags: %#x, " +#ifdef __FreeBSD__ + "data: %" PRIdPTR "\n", n, event[0].filter, event[0].flags, +#else "data: %" PRId64 "\n", n, event[0].filter, event[0].flags, +#endif event[0].fflags, event[0].data); ATF_REQUIRE_EQ(event[0].filter, EVFILT_READ); Modified: projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_proc1.c ============================================================================== --- projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_proc1.c Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_proc1.c Thu Sep 8 18:15:36 2016 (r305623) @@ -139,7 +139,11 @@ ATF_TC_BODY(proc1, tc) printf(" NOTE_FORK"); } if (event[0].fflags & NOTE_CHILD) +#ifdef __FreeBSD__ + printf(" NOTE_CHILD, parent = %" PRIdPTR, event[0].data); +#else printf(" NOTE_CHILD, parent = %" PRId64, event[0].data); +#endif printf("\n"); } Modified: projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_proc2.c ============================================================================== --- projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_proc2.c Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_proc2.c Thu Sep 8 18:15:36 2016 (r305623) @@ -34,6 +34,9 @@ __COPYRIGHT("@(#) Copyright (c) 2008\ The NetBSD Foundation, inc. All rights reserved."); __RCSID("$NetBSD: t_proc2.c,v 1.2 2015/01/14 22:22:32 christos Exp $"); +#ifdef __FreeBSD__ +#include +#endif #include #include #include Modified: projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_proc3.c ============================================================================== --- projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_proc3.c Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_proc3.c Thu Sep 8 18:15:36 2016 (r305623) @@ -32,6 +32,9 @@ #include __RCSID("$NetBSD: t_proc3.c,v 1.2 2015/01/14 22:22:32 christos Exp $"); +#ifdef __FreeBSD__ +#include +#endif #include #include #include Modified: projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_sig.c ============================================================================== --- projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_sig.c Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_sig.c Thu Sep 8 18:15:36 2016 (r305623) @@ -34,6 +34,9 @@ __COPYRIGHT("@(#) Copyright (c) 2008\ The NetBSD Foundation, inc. All rights reserved."); __RCSID("$NetBSD: t_sig.c,v 1.2 2010/11/03 16:10:20 christos Exp $"); +#ifdef __FreeBSD__ +#include +#endif #include #include #include @@ -60,9 +63,13 @@ ATF_TC_HEAD(sig, tc) ATF_TC_BODY(sig, tc) { struct timespec timeout; +#ifdef __NetBSD__ struct kfilter_mapping km; +#endif struct kevent event[1]; +#ifdef __NetBSD__ char namebuf[32]; +#endif pid_t pid, child; int kq, n, num, status; @@ -84,16 +91,22 @@ ATF_TC_BODY(sig, tc) RL(kq = kqueue()); +#ifdef __NetBSD__ (void)strlcpy(namebuf, "EVFILT_SIGNAL", sizeof(namebuf)); km.name = namebuf; RL(ioctl(kq, KFILTER_BYNAME, &km)); (void)printf("got %d as filter number for `%s'.\n", km.filter, km.name); +#endif /* ignore the signal to avoid taking it for real */ REQUIRE_LIBC(signal(SIGUSR1, SIG_IGN), SIG_ERR); event[0].ident = SIGUSR1; +#ifdef __NetBSD__ event[0].filter = km.filter; +#else + event[0].filter = EVFILT_SIGNAL; +#endif event[0].flags = EV_ADD | EV_ENABLE; RL(kevent(kq, event, 1, NULL, 0, NULL)); @@ -117,7 +130,11 @@ ATF_TC_BODY(sig, tc) if (n == 0) continue; +#ifdef __FreeBSD__ + (void)printf("sig: kevent flags: 0x%x, data: %" PRIdPTR " (# " +#else (void)printf("sig: kevent flags: 0x%x, data: %" PRId64 " (# " +#endif "times signal posted)\n", event[0].flags, event[0].data); } Modified: projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_vnode.c ============================================================================== --- projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_vnode.c Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/contrib/netbsd-tests/kernel/kqueue/t_vnode.c Thu Sep 8 18:15:36 2016 (r305623) @@ -1,3 +1,6 @@ +#ifdef __FreeBSD__ +#include +#endif #include #include #include Modified: projects/clang390-import/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c ============================================================================== --- projects/clang390-import/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c Thu Sep 8 18:15:36 2016 (r305623) @@ -24,6 +24,13 @@ __RCSID("$NetBSD: t_rpc.c,v 1.9 2015/11/ return; \ } while(/*CONSTCOND*/0) +#ifdef __FreeBSD__ +#define SKIPXI(ev, msg, ...) do { \ + atf_tc_skip(msg, __VA_ARGS__); \ + return ev; \ +} while(/*CONSTCOND*/0) +#endif + #else #define ERRX(ev, msg, ...) errx(ev, msg, __VA_ARGS__) #define SKIPX(ev, msg, ...) errx(ev, msg, __VA_ARGS__) @@ -188,7 +195,13 @@ regtest(const char *hostname, const char svc_fdset_init(p ? SVC_FDSET_POLL : 0); #endif if (!svc_create(server, PROGNUM, VERSNUM, transp)) +#ifdef __NetBSD__ ERRX(EXIT_FAILURE, "Cannot create server %d", num); +#else + { + SKIPXI(EXIT_FAILURE, "Cannot create server %d", num); + } +#endif switch ((pid = fork())) { case 0: @@ -335,6 +348,9 @@ ATF_TC(tcp); ATF_TC_HEAD(tcp, tc) { atf_tc_set_md_var(tc, "descr", "Checks svc tcp (select)"); +#ifdef __FreeBSD__ + atf_tc_set_md_var(tc, "require.user", "root"); +#endif } ATF_TC_BODY(tcp, tc) @@ -347,6 +363,9 @@ ATF_TC(udp); ATF_TC_HEAD(udp, tc) { atf_tc_set_md_var(tc, "descr", "Checks svc udp (select)"); +#ifdef __FreeBSD__ + atf_tc_set_md_var(tc, "require.user", "root"); +#endif } ATF_TC_BODY(udp, tc) @@ -359,6 +378,9 @@ ATF_TC(tcp_poll); ATF_TC_HEAD(tcp_poll, tc) { atf_tc_set_md_var(tc, "descr", "Checks svc tcp (poll)"); +#ifdef __FreeBSD__ + atf_tc_set_md_var(tc, "require.user", "root"); +#endif } ATF_TC_BODY(tcp_poll, tc) @@ -371,6 +393,9 @@ ATF_TC(udp_poll); ATF_TC_HEAD(udp_poll, tc) { atf_tc_set_md_var(tc, "descr", "Checks svc udp (poll)"); +#ifdef __FreeBSD__ + atf_tc_set_md_var(tc, "require.user", "root"); +#endif } ATF_TC_BODY(udp_poll, tc) Modified: projects/clang390-import/etc/mtree/BSD.tests.dist ============================================================================== --- projects/clang390-import/etc/mtree/BSD.tests.dist Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/etc/mtree/BSD.tests.dist Thu Sep 8 18:15:36 2016 (r305623) @@ -419,6 +419,8 @@ .. .. kqueue + libkqueue + .. .. mac bsdextended Modified: projects/clang390-import/lib/libc/tests/db/Makefile ============================================================================== --- projects/clang390-import/lib/libc/tests/db/Makefile Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/lib/libc/tests/db/Makefile Thu Sep 8 18:15:36 2016 (r305623) @@ -5,7 +5,7 @@ PACKAGE= tests BINDIR= ${TESTSDIR} PROGS= h_db -PROGS= h_lfsr +PROGS+= h_lfsr ${PACKAGE}FILES+= README Modified: projects/clang390-import/lib/libstand/nfs.c ============================================================================== --- projects/clang390-import/lib/libstand/nfs.c Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/lib/libstand/nfs.c Thu Sep 8 18:15:36 2016 (r305623) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -50,7 +51,8 @@ __FBSDID("$FreeBSD$"); #define NFS_DEBUGxx -#define NFSREAD_SIZE 1024 +#define NFSREAD_MIN_SIZE 1024 +#define NFSREAD_MAX_SIZE 4096 /* Define our own NFS attributes without NQNFS stuff. */ #ifdef OLD_NFSV2 @@ -83,7 +85,7 @@ struct nfs_read_repl { n_long errno; struct nfsv2_fattrs fa; n_long count; - u_char data[NFSREAD_SIZE]; + u_char data[NFSREAD_MAX_SIZE]; }; #ifndef NFS_NOSYMLINK @@ -210,6 +212,8 @@ struct fs_ops nfs_fsops = { nfs_readdir }; +static int nfs_read_size = NFSREAD_MIN_SIZE; + #ifdef OLD_NFSV2 /* * Fetch the root file handle (call mount daemon) @@ -264,6 +268,17 @@ nfs_getrootfh(struct iodesc *d, char *pa if (repl->errno) return (ntohl(repl->errno)); bcopy(repl->fh, fhp, sizeof(repl->fh)); + + /* + * Improve boot performance over NFS + */ + if (getenv("nfs.read_size") != NULL) + nfs_read_size = strtol(getenv("nfs.read_size"), NULL, 0); + if (nfs_read_size < NFSREAD_MIN_SIZE) + nfs_read_size = NFSREAD_MIN_SIZE; + if (nfs_read_size > NFSREAD_MAX_SIZE) + nfs_read_size = NFSREAD_MAX_SIZE; + return (0); } @@ -401,11 +416,11 @@ nfs_readdata(struct nfs_iodesc *d, off_t bcopy(d->fh, args->fh, NFS_FHSIZE); args->off = htonl((n_long)off); - if (len > NFSREAD_SIZE) - len = NFSREAD_SIZE; + if (len > nfs_read_size) + len = nfs_read_size; args->len = htonl((n_long)len); args->xxx = htonl((n_long)0); - hlen = sizeof(*repl) - NFSREAD_SIZE; + hlen = offsetof(struct nfs_read_rpl, data[0]); cc = rpc_call(d->iodesc, NFS_PROG, NFS_VER2, NFSPROC_READ, args, sizeof(*args), @@ -1025,7 +1040,7 @@ nfs_readdata(struct nfs_iodesc *d, off_t uint32_t count; uint32_t eof; uint32_t len; - u_char data[NFSREAD_SIZE]; + u_char data[NFSREAD_MAX_SIZE]; } *repl; struct { uint32_t h[RPC_HEADER_WORDS]; @@ -1048,10 +1063,10 @@ nfs_readdata(struct nfs_iodesc *d, off_t pos = roundup(d->fhsize, sizeof(uint32_t)) / sizeof(uint32_t); args->fhoffcnt[pos++] = 0; args->fhoffcnt[pos++] = htonl((uint32_t)off); - if (len > NFSREAD_SIZE) - len = NFSREAD_SIZE; + if (len > nfs_read_size) + len = nfs_read_size; args->fhoffcnt[pos] = htonl((uint32_t)len); - hlen = sizeof(*repl) - NFSREAD_SIZE; + hlen = offsetof(struct repl, data[0]); cc = rpc_call(d->iodesc, NFS_PROG, NFS_VER3, NFSPROCV3_READ, args, 4 * sizeof(uint32_t) + roundup(d->fhsize, sizeof(uint32_t)), Modified: projects/clang390-import/lib/libstand/ufs.c ============================================================================== --- projects/clang390-import/lib/libstand/ufs.c Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/lib/libstand/ufs.c Thu Sep 8 18:15:36 2016 (r305623) @@ -24,7 +24,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Modified: projects/clang390-import/share/man/man4/Makefile ============================================================================== --- projects/clang390-import/share/man/man4/Makefile Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/share/man/man4/Makefile Thu Sep 8 18:15:36 2016 (r305623) @@ -113,6 +113,7 @@ MAN= aac.4 \ cue.4 \ cxgb.4 \ cxgbe.4 \ + cxgbev.4 \ cy.4 \ cyapa.4 \ da.4 \ @@ -602,6 +603,9 @@ MLINKS+=cxgb.4 if_cxgb.4 MLINKS+=cxgbe.4 if_cxgbe.4 \ cxgbe.4 cxl.4 \ cxgbe.4 if_cxl.4 +MLINKS+=cxgbev.4 if_cxgbev.4 \ + cxgbev.4 cxlv.4 \ + cxgbev.4 if_cxlv.4 MLINKS+=dc.4 if_dc.4 MLINKS+=de.4 if_de.4 MLINKS+=disc.4 if_disc.4 Modified: projects/clang390-import/share/man/man4/amdsbwd.4 ============================================================================== --- projects/clang390-import/share/man/man4/amdsbwd.4 Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/share/man/man4/amdsbwd.4 Thu Sep 8 18:15:36 2016 (r305623) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 29, 2016 +.Dd September 8, 2016 .Dt AMDSBWD 4 .Os .Sh NAME @@ -51,7 +51,22 @@ The driver provides .Xr watchdog 4 support for the watchdog timers present on -AMD SB600, SB7xx, SB8xx and SB9xx southbridges and Axx FCHs. +the supported chipsets. +.Sh HARDWARE +The +.Nm +driver supports the following chipsets: +.Pp +.Bl -bullet -compact +.It +AMD SB600/7x0/8x0/9x0 southbridges +.It +AMD Axx/Hudson/Bolton FCHs +.It +AMD FCHs integrated into Family 15h Models 60h-6Fh, 70h-7Fh Processors +.It +AMD FCHs integrated into Family 16h Models 00h-0Fh, 30h-3Fh Processors +.El .Sh SEE ALSO .Xr watchdog 4 , .Xr watchdog 8 , Modified: projects/clang390-import/share/man/man4/cxgbe.4 ============================================================================== --- projects/clang390-import/share/man/man4/cxgbe.4 Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/share/man/man4/cxgbe.4 Thu Sep 8 18:15:36 2016 (r305623) @@ -77,8 +77,7 @@ For more information on configuring this .Sh HARDWARE The .Nm -driver supports 40Gb, 10Gb and 1Gb Ethernet adapters based on the T5 ASIC -(ports will be named cxl): +driver supports 40Gb, 10Gb and 1Gb Ethernet adapters based on the T5 ASIC: .Pp .Bl -bullet -compact .It @@ -320,6 +319,7 @@ email all the specific information relat .Xr altq 4 , .Xr arp 4 , .Xr cxgb 4 , +.Xr cxgbev 4 , .Xr netintro 4 , .Xr ng_ether 4 , .Xr ifconfig 8 Copied: projects/clang390-import/share/man/man4/cxgbev.4 (from r305622, head/share/man/man4/cxgbev.4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/clang390-import/share/man/man4/cxgbev.4 Thu Sep 8 18:15:36 2016 (r305623, copy of r305622, head/share/man/man4/cxgbev.4) @@ -0,0 +1,290 @@ +.\" Copyright (c) 2011-2016, Chelsio Inc +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions are met: +.\" +.\" 1. Redistributions of source code must retain the above copyright notice, +.\" this list of conditions and the following disclaimer. +.\" +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" 3. Neither the name of the Chelsio Inc nor the names of its +.\" contributors may be used to endorse or promote products derived from +.\" this software without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +.\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" POSSIBILITY OF SUCH DAMAGE. +.\" +.\" * Other names and brands may be claimed as the property of others. +.\" +.\" $FreeBSD$ +.\" +.Dd August 22, 2016 +.Dt CXGBEV 4 +.Os +.Sh NAME +.Nm cxgbev +.Nd "Chelsio T4 and T5 based 40Gb, 10Gb, and 1Gb Ethernet VF driver" +.Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device cxgbe" +.Cd "device cxgbev" +.Ed +.Pp +To load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +if_cxgbev_load="YES" +.Ed +.Sh DESCRIPTION +The +.Nm +driver provides support for Virtual Functions on PCI Express Ethernet adapters +based on the Chelsio Terminator 4 and Terminator 5 ASICs (T4 and T5). +The driver supports Jumbo Frames, Transmit/Receive checksum offload, +TCP segmentation offload (TSO), Large Receive Offload (LRO), VLAN +tag insertion/extraction, VLAN checksum offload, VLAN TSO, and +Receive Side Steering (RSS). +For further hardware information and questions related to hardware +requirements, see +.Pa http://www.chelsio.com/ . +.Pp +Note that ports of T5 VFs are named cxlv and attach to a t5vf parent device +(in contrast to ports named cxgbev that attach to a t4vf parent for a T4 VF). +Loader tunables with the hw.cxgbe prefix apply to both T4 and T5 VFs. +The Physical Function driver for T4 and T5 adapters shares these tunables. +The sysctl MIBs are at dev.t5vf and dev.cxlv for T5 cards and at dev.t4vf and +dev.cxgbev for T4 cards. +.Pp +For more information on configuring this device, see +.Xr ifconfig 8 . +.Sh HARDWARE +The +.Nm +driver supports Virtual Functions on 40Gb, 10Gb and 1Gb Ethernet adapters +based on the T5 ASIC: +.Pp +.Bl -bullet -compact +.It +Chelsio T580-CR +.It +Chelsio T580-LP-CR +.It +Chelsio T580-LP-SO-CR +.It +Chelsio T560-CR +.It +Chelsio T540-CR +.It +Chelsio T540-LP-CR +.It +Chelsio T522-CR +.It +Chelsio T520-LL-CR +.It +Chelsio T520-CR +.It +Chelsio T520-SO +.It +Chelsio T520-BT +.It +Chelsio T504-BT +.El +.Pp +The +.Nm +driver supports Virtual Functions on 10Gb and 1Gb Ethernet adapters based +on the T4 ASIC: +.Pp +.Bl -bullet -compact +.It +Chelsio T420-CR +.It +Chelsio T422-CR +.It +Chelsio T440-CR +.It +Chelsio T420-BCH +.It +Chelsio T440-BCH +.It +Chelsio T440-CH +.It +Chelsio T420-SO +.It +Chelsio T420-CX +.It +Chelsio T420-BT +.It +Chelsio T404-BT +.El +.Sh LOADER TUNABLES +Tunables can be set at the +.Xr loader 8 +prompt before booting the kernel or stored in +.Xr loader.conf 5 . +.Bl -tag -width indent +.It Va hw.cxgbe.ntxq10g +The number of tx queues to use for a 10Gb or 40Gb port. +The default is 16 or the number +of CPU cores in the system, whichever is less. +.It Va hw.cxgbe.nrxq10g +The number of rx queues to use for a 10Gb or 40Gb port. +The default is 8 or the number +of CPU cores in the system, whichever is less. +.It Va hw.cxgbe.ntxq1g +The number of tx queues to use for a 1Gb port. +The default is 4 or the number +of CPU cores in the system, whichever is less. +.It Va hw.cxgbe.nrxq1g +The number of rx queues to use for a 1Gb port. +The default is 2 or the number +of CPU cores in the system, whichever is less. +.It Va hw.cxgbe.holdoff_timer_idx_10G +.It Va hw.cxgbe.holdoff_timer_idx_1G +The timer index value to use to delay interrupts. +The holdoff timer list has the values 1, 5, 10, 50, 100, and 200 +by default (all values are in microseconds) and the index selects a +value from this list. +The default value is 1 which means the timer value is 5us. +Different interfaces can be assigned different values at any time via the +dev.cxgbev.X.holdoff_tmr_idx or dev.cxlv.X.holdoff_tmr_idx sysctl. +.It Va hw.cxgbe.holdoff_pktc_idx_10G +.It Va hw.cxgbe.holdoff_pktc_idx_1G +The packet-count index value to use to delay interrupts. +The packet-count list has the values 1, 8, 16, and 32 by default +and the index selects a value from this list. +The default value is -1 which means packet counting is disabled and interrupts +are generated based solely on the holdoff timer value. +Different interfaces can be assigned different values via the +dev.cxgbev.X.holdoff_pktc_idx or dev.cxlv.X.holdoff_pktc_idx sysctl. +This sysctl works only when the interface has never been marked up (as done by +ifconfig up). +.It Va hw.cxgbe.qsize_txq +The size, in number of entries, of the descriptor ring used for a tx +queue. +A buf_ring of the same size is also allocated for additional +software queuing. +See +.Xr ifnet 9 . +The default value is 1024. +Different interfaces can be assigned different values via the +dev.cxgbev.X.qsize_txq sysctl or dev.cxlv.X.qsize_txq sysctl. +This sysctl works only when the interface has never been marked up (as done by +ifconfig up). +.It Va hw.cxgbe.qsize_rxq +The size, in number of entries, of the descriptor ring used for an +rx queue. +The default value is 1024. +Different interfaces can be assigned different values via the +dev.cxgbev.X.qsize_rxq or dev.cxlv.X.qsize_rxq sysctl. +This sysctl works only when the interface has never been marked up (as done by +ifconfig up). +.It Va hw.cxgbe.interrupt_types +The interrupt types that the driver is allowed to use. +Bit 0 represents INTx (line interrupts), bit 1 MSI, bit 2 MSI-X. +The default is 7 (all allowed). +The driver will select the best possible type out of the allowed types by +itself. +.It Va hw.cxgbe.fl_pktshift +The number of bytes of padding inserted before the beginning of an Ethernet +frame in the receive buffer. +The default value of 2 ensures that the Ethernet payload (usually the IP header) +is at a 4 byte aligned address. +0-7 are all valid values. +.It Va hw.cxgbe.fl_pad +A non-zero value ensures that writes from the hardware to a receive buffer are +padded up to the specified boundary. +The default is -1 which lets the driver pick a pad boundary. +0 disables trailer padding completely. +.It Va hw.cxgbe.buffer_packing +Allow the hardware to deliver multiple frames in the same receive buffer +opportunistically. +The default is -1 which lets the driver decide. +0 or 1 explicitly disable or enable this feature. +.It Va hw.cxgbe.allow_mbufs_in_cluster +1 allows the driver to lay down one or more mbufs within the receive buffer +opportunistically. +This is the default. +0 prohibits the driver from doing so. +.It Va hw.cxgbe.largest_rx_cluster +.It Va hw.cxgbe.safest_rx_cluster +Sizes of rx clusters. +Each of these must be set to one of the sizes available +(usually 2048, 4096, 9216, and 16384) and largest_rx_cluster must be greater +than or equal to safest_rx_cluster. +The defaults are 16384 and 4096 respectively. +The driver will never attempt to allocate a receive buffer larger than +largest_rx_cluster and will fall back to allocating buffers of +safest_rx_cluster size if an allocation larger than safest_rx_cluster fails. +Note that largest_rx_cluster merely establishes a ceiling -- the driver is +allowed to allocate buffers of smaller sizes. +.El +.Pp +Certain settings and resources for Virtual Functions are dictated +by the parent Physical Function driver. +For example, the Physical Function driver limits the number of queues a +Virtual Function is permitted to use. +Some of these limits can be adjusted in the firmware configuration file +used with the Physical Function driver. +.Pp +The PAUSE settings on the port of a Virtual Function are inherited from +the settings of the same port on the Physical Function. +Virtual Functions cannot modify the setting and track changes made to +the associated port's setting by the Physical Function driver. +.Pp +Receive queues on a Virtual Function always drop packets in response to +congestion +.Po +equivalent to setting +.Va hw.cxgbe.cong_drop +to 1 +.Pc . +.Pp +The VF driver currently depends on the PF driver. +As a result, loading the VF driver will also load the PF driver as a +dependency. +.Sh SUPPORT +For general information and support, +go to the Chelsio support website at: +.Pa http://www.chelsio.com/ . +.Pp +If an issue is identified with this driver with a supported adapter, +email all the specific information related to the issue to +.Aq Mt support@chelsio.com . +.Sh SEE ALSO +.Xr altq 4 , +.Xr arp 4 , +.Xr cxgbe 4 , +.Xr netintro 4 , +.Xr ng_ether 4 , +.Xr ifconfig 8 +.Sh HISTORY +The +.Nm +device driver first appeared in +.Fx 12.0 . +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was written by +.An Navdeep Parhar Aq Mt np@FreeBSD.org +and +.An John Baldwin Aq Mt jhb@FreeBSD.org . Modified: projects/clang390-import/share/man/man4/intpm.4 ============================================================================== --- projects/clang390-import/share/man/man4/intpm.4 Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/share/man/man4/intpm.4 Thu Sep 8 18:15:36 2016 (r305623) @@ -55,7 +55,11 @@ Intel 82371AB/82443MX .It ATI IXP400 .It -AMD SB600/700/710/750 +AMD SB600/7x0/8x0/9x0 southbridges +.It +AMD Axx/Hudson/Bolton FCHs +.It +AMD FCH integrated into Family 16h Models 00h-0Fh Processors .El .Sh SEE ALSO .Xr amdpm 4 , Modified: projects/clang390-import/share/man/man4/vt.4 ============================================================================== --- projects/clang390-import/share/man/man4/vt.4 Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/share/man/man4/vt.4 Thu Sep 8 18:15:36 2016 (r305623) @@ -250,7 +250,7 @@ command. Enable halt keyboard combination. .It Va kern.vt.kbd_poweroff Enable power off key combination. -.It Va kern.vt.kbd_reboot. +.It Va kern.vt.kbd_reboot Enable reboot key combination, usually Ctrl+Alt+Del. .It Va kern.vt.kbd_debug Enable debug request key combination, usually Ctrl+Alt+Esc. Modified: projects/clang390-import/share/man/man9/Makefile ============================================================================== --- projects/clang390-import/share/man/man9/Makefile Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/share/man/man9/Makefile Thu Sep 8 18:15:36 2016 (r305623) @@ -1354,7 +1354,10 @@ MLINKS+=pci.9 pci_alloc_msi.9 \ pci.9 pci_set_max_read_req.9 \ pci.9 pci_write_config.9 \ pci.9 pcie_adjust_config.9 \ + pci.9 pcie_flr.9 \ + pci.9 pcie_max_completion_timeout.9 \ pci.9 pcie_read_config.9 \ + pci.9 pcie_wait_for_pending_transactions.9 \ pci.9 pcie_write_config.9 MLINKS+=pci_iov_schema.9 pci_iov_schema_alloc_node.9 \ pci_iov_schema.9 pci_iov_schema_add_bool.9 \ Modified: projects/clang390-import/share/man/man9/pci.9 ============================================================================== --- projects/clang390-import/share/man/man9/pci.9 Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/share/man/man9/pci.9 Thu Sep 8 18:15:36 2016 (r305623) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 1, 2016 +.Dd September 6, 2016 .Dt PCI 9 .Os .Sh NAME @@ -66,7 +66,10 @@ .Nm pci_set_powerstate , .Nm pci_write_config , .Nm pcie_adjust_config , +.Nm pcie_flr , +.Nm pcie_get_max_completion_timeout , .Nm pcie_read_config , +.Nm pcie_wait_for_pending_transactions , .Nm pcie_write_config .Nd PCI bus interface .Sh SYNOPSIS @@ -145,10 +148,20 @@ .Fa "uint32_t val" .Fa "int width" .Fc +.Ft bool +.Fn pcie_flr "device_t dev" "u_int max_delay" "bool force" +.Ft int +.Fn pcie_get_max_completion_timeout "device_t dev" .Ft uint32_t .Fn pcie_read_config "device_t dev" "int reg" "int width" +.Ft bool +.Fn pcie_wait_for_pending_transactions "device_t dev" "u_int max_delay" .Ft void .Fn pcie_write_config "device_t dev" "int reg" "uint32_t val" "int width" +.Ft void +.Fn pci_event_fn "void *arg" "device_t dev" +.Fn EVENTHANDLER_REGISTER "pci_add_device" "pci_event_fn" +.Fn EVENTHANDLER_DEREGISTER "pci_delete_resource" "pci_event_fn" .In dev/pci/pci_iov.h .Ft int .Fn pci_iov_attach "device_t dev" "nvlist_t *pf_schema" "nvlist_t *vf_schema" @@ -427,6 +440,51 @@ keyword, then .Fn pci_get_vpd_readonly returns an error. +.Pp +The +.Fn pcie_get_max_completion_timeout +function returns the maximum completion timeout configured for the device +.Fa dev +in microseconds. +If the +.Fa dev +device is not a PCI-express device, +.Fn pcie_get_max_completion_timeout +returns zero. +When completion timeouts are disabled for +.Fa dev , +this function returns the maxmimum timeout that would be used if timeouts +were enabled. +.Pp +The +.Fn pcie_wait_for_pending_transactions +function waits for any pending transactions initiated by the +.Fa dev +device to complete. +The function checks for pending transactions by polling the transactions +pending flag in the PCI-express device status register. +It returns +.Dv true +once the transaction pending flag is clear. +If transactions are still pending after +.Fa max_delay +milliseconds, +.Fn pcie_wait_for_pending_transactions +returns +.Dv false . +If +.Fa max_delay +is set to zero, +.Fn pcie_wait_for_pending_transactions +performs a single check; +otherwise, +this function may sleep while polling the transactions pending flag. +.Nm pcie_wait_for_pending_transactions +returns +.Dv true +if +.Fa dev +is not a PCI-express device. .Ss Device Configuration The .Fn pci_enable_busmaster @@ -658,6 +716,51 @@ is invoked, then the device will be transitioned to .Dv PCI_POWERSTATE_D0 before any config registers are restored. +.Pp +The +.Fn pcie_flr +function requests a Function Level Reset +.Pq FLR +of +.Fa dev . +If +.Fa dev +is not a PCI-express device or does not support Function Level Resets via +the PCI-express device control register, +.Dv false +is returned. +Pending transactions are drained by disabling busmastering and calling +.Fn pcie_wait_for_pending_transactions +before resetting the device. +The +.Fa max_delay +argument specifies the maximum timeout to wait for pending transactions as +described for +.Fn pcie_wait_for_pending_transactions . +If +.Fn pcie_wait_for_pending_transactions +fails with a timeout and +.Fa force +is +.Dv false , +busmastering is re-enabled and +.Dv false +is returned. +If +.Fn pcie_wait_for_pending_transactions +fails with a timeout and +.Fa force +is +.Dv true , +the device is reset despite the timeout. +After the reset has been requested, +.Nm pcie_flr +sleeps for at least 100 milliseconds before returning +.Dv true . +Note that +.Nm pcie_flr +does not save and restore any state around the reset. +The caller should save and restore state as needed. .Ss Message Signaled Interrupts Message Signaled Interrupts .Pq MSI @@ -910,6 +1013,24 @@ with one in the new distribution. The .Fn pci_remap_msix function will fail if this condition is not met. +.Ss Device Events +The +.Va pci_add_device +event handler is invoked every time a new PCI device is added to the system. +This includes the creation of Virtual Functions via SR-IOV. +.Pp +The +.Va pci_delete_device +event handler is invoked every time a PCI device is removed from the system. +.Pp +Both event handlers pass the +.Vt device_t +object of the relevant PCI device as +.Fa dev +to each callback function. +Both event handlers are invoked while +.Fa dev +is unattached but with valid instance variables. .Sh SEE ALSO .Xr pci 4 , .Xr pciconf 8 , @@ -921,6 +1042,7 @@ function will fail if this condition is .Xr devclass 9 , .Xr device 9 , .Xr driver 9 , +.Xr eventhandler 9 , .Xr rman 9 .Rs .%B FreeBSD Developers' Handbook Modified: projects/clang390-import/share/timedef/ko_KR.UTF-8.src ============================================================================== --- projects/clang390-import/share/timedef/ko_KR.UTF-8.src Thu Sep 8 17:40:40 2016 (r305622) +++ projects/clang390-import/share/timedef/ko_KR.UTF-8.src Thu Sep 8 18:15:36 2016 (r305623) @@ -4,18 +4,18 @@ # ----------------------------------------------------------------------------- # # Short month names - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -10 -11 -12 + 1월 + 2월 + 3월 + 4월 + 5월 + 6월 + 7월 + 8월 + 9월 +10월 +11월 +12월 # # Long month names (as in a date) 1월 @@ -53,7 +53,7 @@ %H시 %M분 %S초 # # x_fmt -%Y년 %b월 %e일 +%Y년 %_m월 %e일 # *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Fri Sep 9 18:18:42 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 354ABBD4302 for ; Fri, 9 Sep 2016 18:18:42 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A4E3DCF5; Fri, 9 Sep 2016 18:18:41 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u89IIffr004087; Fri, 9 Sep 2016 18:18:41 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u89IIcn6004063; Fri, 9 Sep 2016 18:18:38 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201609091818.u89IIcn6004063@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Fri, 9 Sep 2016 18:18:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305669 - in projects/mips64-clang: . bin/cat/tests bin/df bin/sh/tests/builtins cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zhack cdd... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Sep 2016 18:18:42 -0000 Author: sbruno Date: Fri Sep 9 18:18:37 2016 New Revision: 305669 URL: https://svnweb.freebsd.org/changeset/base/305669 Log: MFC r305666 Added: projects/mips64-clang/bin/sh/tests/builtins/echo1.0 - copied unchanged from r305394, head/bin/sh/tests/builtins/echo1.0 projects/mips64-clang/bin/sh/tests/builtins/echo2.0 - copied unchanged from r305394, head/bin/sh/tests/builtins/echo2.0 projects/mips64-clang/bin/sh/tests/builtins/echo3.0 - copied unchanged from r305394, head/bin/sh/tests/builtins/echo3.0 projects/mips64-clang/cddl/usr.sbin/zfsd/Makefile.depend - copied unchanged from r305394, head/cddl/usr.sbin/zfsd/Makefile.depend projects/mips64-clang/contrib/elftoolchain/libelftc/elftc_timestamp.3 - copied unchanged from r305394, head/contrib/elftoolchain/libelftc/elftc_timestamp.3 projects/mips64-clang/contrib/elftoolchain/libelftc/elftc_timestamp.c - copied unchanged from r305394, head/contrib/elftoolchain/libelftc/elftc_timestamp.c projects/mips64-clang/contrib/gcc/config/i386/cpuid.h - copied unchanged from r305394, head/contrib/gcc/config/i386/cpuid.h projects/mips64-clang/contrib/libarchive/README.md - copied unchanged from r305666, head/contrib/libarchive/README.md projects/mips64-clang/contrib/netbsd-tests/bin/cat/d_se_output.in - copied unchanged from r305394, head/contrib/netbsd-tests/bin/cat/d_se_output.in projects/mips64-clang/contrib/netbsd-tests/bin/cat/d_se_output.out - copied unchanged from r305394, head/contrib/netbsd-tests/bin/cat/d_se_output.out projects/mips64-clang/contrib/netbsd-tests/bin/sh/t_arith.sh - copied unchanged from r305394, head/contrib/netbsd-tests/bin/sh/t_arith.sh projects/mips64-clang/contrib/netbsd-tests/bin/sh/t_cmdsub.sh - copied unchanged from r305394, head/contrib/netbsd-tests/bin/sh/t_cmdsub.sh projects/mips64-clang/contrib/netbsd-tests/bin/sh/t_option.sh - copied unchanged from r305394, head/contrib/netbsd-tests/bin/sh/t_option.sh projects/mips64-clang/contrib/netbsd-tests/bin/sh/t_redir.sh - copied unchanged from r305394, head/contrib/netbsd-tests/bin/sh/t_redir.sh projects/mips64-clang/contrib/netbsd-tests/bin/sh/t_redircloexec.sh - copied unchanged from r305394, head/contrib/netbsd-tests/bin/sh/t_redircloexec.sh projects/mips64-clang/contrib/netbsd-tests/bin/sh/t_shift.sh - copied unchanged from r305394, head/contrib/netbsd-tests/bin/sh/t_shift.sh projects/mips64-clang/contrib/netbsd-tests/bin/sh/t_varval.sh - copied unchanged from r305394, head/contrib/netbsd-tests/bin/sh/t_varval.sh projects/mips64-clang/contrib/netbsd-tests/dev/fss/ - copied from r305394, head/contrib/netbsd-tests/dev/fss/ projects/mips64-clang/contrib/netbsd-tests/dev/usb/ - copied from r305394, head/contrib/netbsd-tests/dev/usb/ projects/mips64-clang/contrib/netbsd-tests/include/sys/t_pslist.c - copied unchanged from r305394, head/contrib/netbsd-tests/include/sys/t_pslist.c projects/mips64-clang/contrib/netbsd-tests/kernel/kqueue/t_vnode.c - copied, changed from r305394, head/contrib/netbsd-tests/kernel/kqueue/t_vnode.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/db/h_lfsr.c - copied unchanged from r305394, head/contrib/netbsd-tests/lib/libc/db/h_lfsr.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/db/t_db_hash_seq.c - copied unchanged from r305394, head/contrib/netbsd-tests/lib/libc/db/t_db_hash_seq.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/inet/t_inet_addr.c - copied unchanged from r305394, head/contrib/netbsd-tests/lib/libc/inet/t_inet_addr.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/stdio/t_open_memstream.c - copied unchanged from r305394, head/contrib/netbsd-tests/lib/libc/stdio/t_open_memstream.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/stdlib/t_strtoi.c - copied unchanged from r305394, head/contrib/netbsd-tests/lib/libc/stdlib/t_strtoi.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/sync/cpp_atomic_ops_linkable.cc - copied unchanged from r305394, head/contrib/netbsd-tests/lib/libc/sync/cpp_atomic_ops_linkable.cc projects/mips64-clang/contrib/netbsd-tests/lib/libc/sys/t_bind.c - copied unchanged from r305394, head/contrib/netbsd-tests/lib/libc/sys/t_bind.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/sys/t_getsockname.c - copied unchanged from r305394, head/contrib/netbsd-tests/lib/libc/sys/t_getsockname.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/sys/t_posix_fallocate.c - copied unchanged from r305394, head/contrib/netbsd-tests/lib/libc/sys/t_posix_fallocate.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/sys/t_wait.c - copied unchanged from r305394, head/contrib/netbsd-tests/lib/libc/sys/t_wait.c projects/mips64-clang/contrib/netbsd-tests/lib/libm/t_fenv.c - copied unchanged from r305394, head/contrib/netbsd-tests/lib/libm/t_fenv.c projects/mips64-clang/contrib/netbsd-tests/lib/libm/t_hypot.c - copied unchanged from r305394, head/contrib/netbsd-tests/lib/libm/t_hypot.c projects/mips64-clang/contrib/netbsd-tests/lib/libusbhid/ - copied from r305394, head/contrib/netbsd-tests/lib/libusbhid/ projects/mips64-clang/contrib/netbsd-tests/net/arp/ - copied from r305394, head/contrib/netbsd-tests/net/arp/ projects/mips64-clang/contrib/netbsd-tests/net/icmp/t_icmp6_redirect.sh - copied unchanged from r305394, head/contrib/netbsd-tests/net/icmp/t_icmp6_redirect.sh projects/mips64-clang/contrib/netbsd-tests/net/icmp/t_icmp_redirect.sh - copied unchanged from r305394, head/contrib/netbsd-tests/net/icmp/t_icmp_redirect.sh projects/mips64-clang/contrib/netbsd-tests/net/if/ifconf.c - copied unchanged from r305394, head/contrib/netbsd-tests/net/if/ifconf.c projects/mips64-clang/contrib/netbsd-tests/net/if/t_ifconf.sh - copied unchanged from r305394, head/contrib/netbsd-tests/net/if/t_ifconf.sh projects/mips64-clang/contrib/netbsd-tests/net/if/t_ifconfig.sh - copied unchanged from r305394, head/contrib/netbsd-tests/net/if/t_ifconfig.sh projects/mips64-clang/contrib/netbsd-tests/net/if_gif/ - copied from r305394, head/contrib/netbsd-tests/net/if_gif/ projects/mips64-clang/contrib/netbsd-tests/net/if_pppoe/ - copied from r305394, head/contrib/netbsd-tests/net/if_pppoe/ projects/mips64-clang/contrib/netbsd-tests/net/if_tap/ - copied from r305394, head/contrib/netbsd-tests/net/if_tap/ projects/mips64-clang/contrib/netbsd-tests/net/in_cksum/ - copied from r305394, head/contrib/netbsd-tests/net/in_cksum/ projects/mips64-clang/contrib/netbsd-tests/net/mcast/ - copied from r305394, head/contrib/netbsd-tests/net/mcast/ projects/mips64-clang/contrib/netbsd-tests/net/mpls/t_mpls_fw6.sh - copied unchanged from r305394, head/contrib/netbsd-tests/net/mpls/t_mpls_fw6.sh projects/mips64-clang/contrib/netbsd-tests/net/mpls/t_mpls_fw64.sh - copied unchanged from r305394, head/contrib/netbsd-tests/net/mpls/t_mpls_fw64.sh projects/mips64-clang/contrib/netbsd-tests/net/ndp/ - copied from r305394, head/contrib/netbsd-tests/net/ndp/ projects/mips64-clang/contrib/netbsd-tests/net/net/t_forwarding.sh - copied unchanged from r305394, head/contrib/netbsd-tests/net/net/t_forwarding.sh projects/mips64-clang/contrib/netbsd-tests/net/net/t_ipaddress.sh - copied unchanged from r305394, head/contrib/netbsd-tests/net/net/t_ipaddress.sh projects/mips64-clang/contrib/netbsd-tests/net/net/t_ipv6_lifetime.sh - copied unchanged from r305394, head/contrib/netbsd-tests/net/net/t_ipv6_lifetime.sh projects/mips64-clang/contrib/netbsd-tests/net/net/t_ipv6address.sh - copied unchanged from r305394, head/contrib/netbsd-tests/net/net/t_ipv6address.sh projects/mips64-clang/contrib/netbsd-tests/net/route/t_flags.sh - copied unchanged from r305394, head/contrib/netbsd-tests/net/route/t_flags.sh projects/mips64-clang/contrib/netbsd-tests/net/route/t_flags6.sh - copied unchanged from r305394, head/contrib/netbsd-tests/net/route/t_flags6.sh projects/mips64-clang/contrib/netbsd-tests/net/route/t_route.sh - copied unchanged from r305394, head/contrib/netbsd-tests/net/route/t_route.sh projects/mips64-clang/contrib/netbsd-tests/sbin/gpt/ - copied from r305394, head/contrib/netbsd-tests/sbin/gpt/ projects/mips64-clang/contrib/netbsd-tests/sbin/resize_ffs/t_check.sh - copied unchanged from r305394, head/contrib/netbsd-tests/sbin/resize_ffs/t_check.sh projects/mips64-clang/contrib/netbsd-tests/sys/net/ - copied from r305394, head/contrib/netbsd-tests/sys/net/ projects/mips64-clang/contrib/netbsd-tests/sys/netatalk/ - copied from r305394, head/contrib/netbsd-tests/sys/netatalk/ projects/mips64-clang/contrib/netbsd-tests/sys/netinet/ - copied from r305394, head/contrib/netbsd-tests/sys/netinet/ projects/mips64-clang/contrib/netbsd-tests/sys/netinet6/ - copied from r305394, head/contrib/netbsd-tests/sys/netinet6/ projects/mips64-clang/contrib/netbsd-tests/usr.bin/config/d_min - copied unchanged from r305394, head/contrib/netbsd-tests/usr.bin/config/d_min projects/mips64-clang/contrib/netbsd-tests/usr.bin/gdb/ - copied from r305394, head/contrib/netbsd-tests/usr.bin/gdb/ projects/mips64-clang/contrib/netbsd-tests/usr.bin/ld/ - copied from r305394, head/contrib/netbsd-tests/usr.bin/ld/ projects/mips64-clang/contrib/netbsd-tests/usr.bin/netpgpverify/Testspec - copied unchanged from r305394, head/contrib/netbsd-tests/usr.bin/netpgpverify/Testspec projects/mips64-clang/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_anon_struct.c - copied unchanged from r305394, head/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_anon_struct.c projects/mips64-clang/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_compound_literal_comma.c - copied unchanged from r305394, head/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_compound_literal_comma.c projects/mips64-clang/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_flex_array_packed.c - copied unchanged from r305394, head/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_flex_array_packed.c projects/mips64-clang/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_nested_struct.c - copied unchanged from r305394, head/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_nested_struct.c projects/mips64-clang/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_union_init4.c - copied unchanged from r305394, head/contrib/netbsd-tests/usr.bin/xlint/lint1/d_c99_union_init4.c projects/mips64-clang/contrib/netbsd-tests/usr.bin/xlint/lint1/d_cast_fun_array_param.c - copied unchanged from r305394, head/contrib/netbsd-tests/usr.bin/xlint/lint1/d_cast_fun_array_param.c projects/mips64-clang/contrib/netbsd-tests/usr.bin/xlint/lint1/d_type_question_colon.c - copied unchanged from r305394, head/contrib/netbsd-tests/usr.bin/xlint/lint1/d_type_question_colon.c projects/mips64-clang/contrib/netbsd-tests/usr.bin/xlint/lint1/d_typefun.c - copied unchanged from r305394, head/contrib/netbsd-tests/usr.bin/xlint/lint1/d_typefun.c projects/mips64-clang/contrib/unbound/cachedb/ - copied from r305394, head/contrib/unbound/cachedb/ projects/mips64-clang/contrib/unbound/compat/strsep.c - copied unchanged from r305394, head/contrib/unbound/compat/strsep.c projects/mips64-clang/contrib/unbound/util/ub_event.c - copied unchanged from r305394, head/contrib/unbound/util/ub_event.c projects/mips64-clang/contrib/unbound/util/ub_event.h - copied unchanged from r305394, head/contrib/unbound/util/ub_event.h projects/mips64-clang/contrib/unbound/util/ub_event_pluggable.c - copied unchanged from r305394, head/contrib/unbound/util/ub_event_pluggable.c projects/mips64-clang/crypto/openssh/blacklist.c - copied unchanged from r305394, head/crypto/openssh/blacklist.c projects/mips64-clang/crypto/openssh/blacklist_client.h - copied unchanged from r305394, head/crypto/openssh/blacklist_client.h projects/mips64-clang/lib/libc/sys/ptrace.c - copied unchanged from r305394, head/lib/libc/sys/ptrace.c projects/mips64-clang/lib/libc/tests/stdio/open_memstream2_test.c - copied unchanged from r305394, head/lib/libc/tests/stdio/open_memstream2_test.c projects/mips64-clang/lib/libcasper/services/cap_dns/tests/ - copied from r305666, head/lib/libcasper/services/cap_dns/tests/ projects/mips64-clang/lib/libcasper/services/cap_grp/tests/ - copied from r305666, head/lib/libcasper/services/cap_grp/tests/ projects/mips64-clang/lib/libcasper/services/cap_pwd/tests/ - copied from r305666, head/lib/libcasper/services/cap_pwd/tests/ projects/mips64-clang/lib/libcasper/services/cap_sysctl/tests/ - copied from r305666, head/lib/libcasper/services/cap_sysctl/tests/ projects/mips64-clang/lib/libifconfig/ - copied from r305394, head/lib/libifconfig/ projects/mips64-clang/lib/libnv/tests/cnv_tests.cc - copied unchanged from r305394, head/lib/libnv/tests/cnv_tests.cc projects/mips64-clang/lib/msun/amd64/e_fmod.S - copied unchanged from r305394, head/lib/msun/amd64/e_fmod.S projects/mips64-clang/lib/msun/amd64/e_fmodf.S - copied unchanged from r305394, head/lib/msun/amd64/e_fmodf.S projects/mips64-clang/lib/msun/amd64/e_fmodl.S - copied unchanged from r305394, head/lib/msun/amd64/e_fmodl.S projects/mips64-clang/lib/msun/i387/e_fmodf.S - copied unchanged from r305394, head/lib/msun/i387/e_fmodf.S projects/mips64-clang/lib/msun/i387/e_fmodl.S - copied unchanged from r305394, head/lib/msun/i387/e_fmodl.S projects/mips64-clang/libexec/rtld-elf/tests/libpythagoras/Makefile.depend - copied unchanged from r305394, head/libexec/rtld-elf/tests/libpythagoras/Makefile.depend projects/mips64-clang/libexec/rtld-elf/tests/target/Makefile.depend - copied unchanged from r305394, head/libexec/rtld-elf/tests/target/Makefile.depend projects/mips64-clang/share/examples/libifconfig/ - copied from r305394, head/share/examples/libifconfig/ projects/mips64-clang/share/man/man4/cxgbev.4 - copied unchanged from r305666, head/share/man/man4/cxgbev.4 projects/mips64-clang/share/man/man9/cnv.9 - copied unchanged from r305394, head/share/man/man9/cnv.9 projects/mips64-clang/sys/arm/allwinner/clk/aw_thsclk.c - copied, changed from r305394, head/sys/arm/allwinner/clk/aw_thsclk.c projects/mips64-clang/sys/arm/annapurna/alpine/alpine_ccu.c - copied unchanged from r305666, head/sys/arm/annapurna/alpine/alpine_ccu.c projects/mips64-clang/sys/arm/annapurna/alpine/alpine_nb_service.c - copied unchanged from r305666, head/sys/arm/annapurna/alpine/alpine_nb_service.c projects/mips64-clang/sys/arm/ti/am335x/am335x_scm.c - copied unchanged from r305394, head/sys/arm/ti/am335x/am335x_scm.c projects/mips64-clang/sys/boot/fdt/dts/arm64/ - copied from r305394, head/sys/boot/fdt/dts/arm64/ projects/mips64-clang/sys/boot/i386/boot.ldscript - copied unchanged from r305394, head/sys/boot/i386/boot.ldscript projects/mips64-clang/sys/contrib/alpine-hal/al_hal_serdes_25g.c - copied unchanged from r305666, head/sys/contrib/alpine-hal/al_hal_serdes_25g.c projects/mips64-clang/sys/contrib/alpine-hal/al_hal_serdes_25g.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/al_hal_serdes_25g.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_serdes_25g_internal_regs.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/al_hal_serdes_25g_internal_regs.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_serdes_25g_regs.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/al_hal_serdes_25g_regs.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_serdes_hssp.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/al_hal_serdes_hssp.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_serdes_hssp_internal_regs.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/al_hal_serdes_hssp_internal_regs.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_serdes_hssp_regs.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/al_hal_serdes_hssp_regs.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_serdes_interface.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/al_hal_serdes_interface.h projects/mips64-clang/sys/contrib/alpine-hal/al_serdes.c - copied unchanged from r305666, head/sys/contrib/alpine-hal/al_serdes.c projects/mips64-clang/sys/contrib/alpine-hal/al_serdes.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/al_serdes.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_common.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_common.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_iofic.c - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_iofic.c projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_iofic.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_iofic.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_iofic_regs.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_iofic_regs.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_nb_regs.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_nb_regs.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_pbs_regs.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_pbs_regs.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_pcie.c - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_pcie.c projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_pcie.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_pcie.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_pcie_axi_reg.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_pcie_axi_reg.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_pcie_interrupts.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_pcie_interrupts.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_pcie_regs.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_pcie_regs.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_pcie_w_reg.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_pcie_w_reg.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_plat_services.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_plat_services.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_plat_types.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_plat_types.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_reg_utils.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_reg_utils.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_serdes.c - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_serdes.c projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_serdes.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_serdes.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_serdes_25g.c - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_serdes_25g.c projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_serdes_25g.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_serdes_25g.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_serdes_25g_internal_regs.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_serdes_25g_internal_regs.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_serdes_25g_regs.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_serdes_25g_regs.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_serdes_hssp.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_serdes_hssp.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_serdes_hssp_internal_regs.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_serdes_hssp_internal_regs.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_serdes_hssp_regs.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_serdes_hssp_regs.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_serdes_interface.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_serdes_interface.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_serdes_internal_regs.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_serdes_internal_regs.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_serdes_regs.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_serdes_regs.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_types.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_types.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_udma.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_udma.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_udma_config.c - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_udma_config.c projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_udma_config.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_udma_config.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_udma_debug.c - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_udma_debug.c projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_udma_debug.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_udma_debug.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_udma_iofic.c - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_udma_iofic.c projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_udma_iofic.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_udma_iofic.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_udma_iofic_regs.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_udma_iofic_regs.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_udma_main.c - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_udma_main.c projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_udma_regs.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_udma_regs.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_udma_regs_gen.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_udma_regs_gen.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_udma_regs_m2s.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_udma_regs_m2s.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_udma_regs_s2m.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_udma_regs_s2m.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_unit_adapter_regs.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_hal_unit_adapter_regs.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_serdes.c - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_serdes.c projects/mips64-clang/sys/contrib/alpine-hal/eth/al_serdes.h - copied unchanged from r305666, head/sys/contrib/alpine-hal/eth/al_serdes.h projects/mips64-clang/sys/contrib/alpine-hal/eth/eth/ - copied from r305666, head/sys/contrib/alpine-hal/eth/eth/ projects/mips64-clang/sys/contrib/libnv/cnvlist.c - copied unchanged from r305394, head/sys/contrib/libnv/cnvlist.c projects/mips64-clang/sys/dev/bhnd/bhnd_erom.c - copied unchanged from r305394, head/sys/dev/bhnd/bhnd_erom.c projects/mips64-clang/sys/dev/bhnd/bhnd_erom.h - copied unchanged from r305394, head/sys/dev/bhnd/bhnd_erom.h projects/mips64-clang/sys/dev/bhnd/bhnd_erom_if.m - copied unchanged from r305394, head/sys/dev/bhnd/bhnd_erom_if.m projects/mips64-clang/sys/dev/bhnd/bhnd_erom_types.h - copied unchanged from r305394, head/sys/dev/bhnd/bhnd_erom_types.h projects/mips64-clang/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c - copied unchanged from r305394, head/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c projects/mips64-clang/sys/dev/bhnd/cores/chipc/pwrctl/ - copied from r305394, head/sys/dev/bhnd/cores/chipc/pwrctl/ projects/mips64-clang/sys/dev/bhnd/cores/pmu/ - copied from r305394, head/sys/dev/bhnd/cores/pmu/ projects/mips64-clang/sys/dev/bhnd/cores/usb/ - copied from r305666, head/sys/dev/bhnd/cores/usb/ projects/mips64-clang/sys/dev/bhnd/siba/siba_erom.c - copied unchanged from r305394, head/sys/dev/bhnd/siba/siba_erom.c projects/mips64-clang/sys/dev/cpufreq/cpufreq_dt.c - copied unchanged from r305666, head/sys/dev/cpufreq/cpufreq_dt.c projects/mips64-clang/sys/dev/cxgbe/common/t4vf_hw.c - copied unchanged from r305666, head/sys/dev/cxgbe/common/t4vf_hw.c projects/mips64-clang/sys/dev/cxgbe/if_cxlv.c - copied unchanged from r305666, head/sys/dev/cxgbe/if_cxlv.c projects/mips64-clang/sys/dev/cxgbe/t4_vf.c - copied unchanged from r305666, head/sys/dev/cxgbe/t4_vf.c projects/mips64-clang/sys/dev/iicbus/sy8106a.c - copied unchanged from r305666, head/sys/dev/iicbus/sy8106a.c projects/mips64-clang/sys/mips/broadcom/bcm_machdep.h - copied unchanged from r305394, head/sys/mips/broadcom/bcm_machdep.h projects/mips64-clang/sys/mips/broadcom/bcm_mips_exts.h - copied unchanged from r305394, head/sys/mips/broadcom/bcm_mips_exts.h projects/mips64-clang/sys/mips/broadcom/bcm_pmu.c - copied unchanged from r305394, head/sys/mips/broadcom/bcm_pmu.c projects/mips64-clang/sys/mips/conf/std.AR91XX - copied unchanged from r305394, head/sys/mips/conf/std.AR91XX projects/mips64-clang/sys/mips/conf/std.QCA955X - copied unchanged from r305394, head/sys/mips/conf/std.QCA955X projects/mips64-clang/sys/mips/malta/asm_malta.S - copied unchanged from r305666, head/sys/mips/malta/asm_malta.S projects/mips64-clang/sys/mips/malta/malta_mp.c - copied unchanged from r305666, head/sys/mips/malta/malta_mp.c projects/mips64-clang/sys/modules/cxgbe/if_cxgbev/ - copied from r305666, head/sys/modules/cxgbe/if_cxgbev/ projects/mips64-clang/sys/modules/cxgbe/if_cxlv/ - copied from r305666, head/sys/modules/cxgbe/if_cxlv/ projects/mips64-clang/sys/sys/cnv.h - copied unchanged from r305394, head/sys/sys/cnv.h projects/mips64-clang/tests/sys/kqueue/libkqueue/ - copied from r305666, head/tests/sys/kqueue/libkqueue/ projects/mips64-clang/tests/sys/pjdfstest/pjdfstest/Makefile.depend - copied unchanged from r305394, head/tests/sys/pjdfstest/pjdfstest/Makefile.depend projects/mips64-clang/tests/sys/sys/Makefile.depend - copied unchanged from r305394, head/tests/sys/sys/Makefile.depend projects/mips64-clang/tools/tools/crypto/cryptorun.sh - copied unchanged from r305394, head/tools/tools/crypto/cryptorun.sh projects/mips64-clang/usr.bin/bsdcat/tests/Makefile.depend - copied unchanged from r305394, head/usr.bin/bsdcat/tests/Makefile.depend projects/mips64-clang/usr.bin/sdiff/tests/Makefile.depend - copied unchanged from r305394, head/usr.bin/sdiff/tests/Makefile.depend projects/mips64-clang/usr.bin/xinstall/tests/Makefile.depend - copied unchanged from r305394, head/usr.bin/xinstall/tests/Makefile.depend projects/mips64-clang/usr.sbin/extattr/tests/Makefile.depend - copied unchanged from r305394, head/usr.sbin/extattr/tests/Makefile.depend projects/mips64-clang/usr.sbin/pmcstudy/Makefile.depend - copied unchanged from r305394, head/usr.sbin/pmcstudy/Makefile.depend projects/mips64-clang/usr.sbin/ypldap/Makefile.depend - copied unchanged from r305394, head/usr.sbin/ypldap/Makefile.depend Replaced: projects/mips64-clang/tests/sys/kqueue/Makefile - copied unchanged from r305666, head/tests/sys/kqueue/Makefile Deleted: projects/mips64-clang/contrib/libarchive/README projects/mips64-clang/contrib/netbsd-tests/bin/sh/t_compexit.sh projects/mips64-clang/contrib/netbsd-tests/fs/nfs/nfsservice/mountd.c projects/mips64-clang/contrib/netbsd-tests/fs/nfs/nfsservice/nfsd.c projects/mips64-clang/lib/libc/amd64/sys/ptrace.S projects/mips64-clang/lib/libc/arm/sys/ptrace.S projects/mips64-clang/lib/libc/i386/sys/ptrace.S projects/mips64-clang/lib/libc/mips/sys/ptrace.S projects/mips64-clang/lib/libc/powerpc/sys/ptrace.S projects/mips64-clang/lib/libc/powerpc64/sys/ptrace.S projects/mips64-clang/lib/libc/sparc64/sys/ptrace.S projects/mips64-clang/lib/libc/tests/stdio/open_memstream_test.c projects/mips64-clang/lib/libifc/ projects/mips64-clang/share/examples/libifc/ projects/mips64-clang/share/man/man4/digi.4 projects/mips64-clang/sys/dev/bhnd/soc/ projects/mips64-clang/sys/dev/cxgbe/cxgbei/cxgbei_ulp2_ddp.c projects/mips64-clang/sys/dev/cxgbe/cxgbei/cxgbei_ulp2_ddp.h projects/mips64-clang/sys/dev/hyperv/netvsc/hv_rndis.h projects/mips64-clang/sys/mips/broadcom/bcm_socinfo.c projects/mips64-clang/sys/mips/broadcom/bcm_socinfo.h projects/mips64-clang/sys/mips/conf/AR91XX_BASE projects/mips64-clang/sys/mips/conf/QCA955X_BASE projects/mips64-clang/sys/mips/sentry5/ projects/mips64-clang/sys/modules/bhnd/cores/bhnd_chipc/ projects/mips64-clang/sys/modules/bhnd/nvram/ projects/mips64-clang/sys/modules/digi/ projects/mips64-clang/sys/vm/vm_zeroidle.c projects/mips64-clang/tests/sys/kqueue/Makefile.depend projects/mips64-clang/tests/sys/kqueue/common.h projects/mips64-clang/tests/sys/kqueue/config.h projects/mips64-clang/tests/sys/kqueue/kqueue_test.sh projects/mips64-clang/tests/sys/kqueue/main.c projects/mips64-clang/tests/sys/kqueue/proc.c projects/mips64-clang/tests/sys/kqueue/read.c projects/mips64-clang/tests/sys/kqueue/signal.c projects/mips64-clang/tests/sys/kqueue/timer.c projects/mips64-clang/tests/sys/kqueue/user.c projects/mips64-clang/tests/sys/kqueue/vnode.c projects/mips64-clang/tools/regression/capsicum/libcasper/ Modified: projects/mips64-clang/Makefile projects/mips64-clang/Makefile.inc1 projects/mips64-clang/ObsoleteFiles.inc projects/mips64-clang/UPDATING projects/mips64-clang/bin/cat/tests/Makefile projects/mips64-clang/bin/df/df.c projects/mips64-clang/bin/sh/tests/builtins/Makefile projects/mips64-clang/cddl/contrib/opensolaris/cmd/zdb/zdb.c projects/mips64-clang/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c projects/mips64-clang/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h projects/mips64-clang/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/mips64-clang/cddl/contrib/opensolaris/cmd/zhack/zhack.c projects/mips64-clang/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c projects/mips64-clang/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c projects/mips64-clang/cddl/contrib/opensolaris/cmd/ztest/ztest.c projects/mips64-clang/cddl/contrib/opensolaris/common/ctf/ctf_types.c projects/mips64-clang/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c projects/mips64-clang/cddl/usr.sbin/dtrace/Makefile.depend projects/mips64-clang/cddl/usr.sbin/lockstat/Makefile.depend projects/mips64-clang/cddl/usr.sbin/plockstat/Makefile.depend projects/mips64-clang/cddl/usr.sbin/zfsd/Makefile projects/mips64-clang/cddl/usr.sbin/zfsd/Makefile.common projects/mips64-clang/cddl/usr.sbin/zfsd/tests/Makefile projects/mips64-clang/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc projects/mips64-clang/cddl/usr.sbin/zfsd/vdev.h projects/mips64-clang/contrib/bmake/ChangeLog projects/mips64-clang/contrib/bmake/Makefile projects/mips64-clang/contrib/bmake/bmake.1 projects/mips64-clang/contrib/bmake/bmake.cat1 projects/mips64-clang/contrib/bmake/main.c projects/mips64-clang/contrib/bmake/make.1 projects/mips64-clang/contrib/bmake/meta.c projects/mips64-clang/contrib/bmake/mk/ChangeLog projects/mips64-clang/contrib/bmake/mk/dirdeps.mk projects/mips64-clang/contrib/bmake/mk/install-mk projects/mips64-clang/contrib/bmake/mk/lib.mk projects/mips64-clang/contrib/bmake/mk/meta.sys.mk projects/mips64-clang/contrib/bmake/mk/prog.mk projects/mips64-clang/contrib/bmake/os.sh projects/mips64-clang/contrib/bmake/suff.c projects/mips64-clang/contrib/elftoolchain/common/elfdefinitions.h projects/mips64-clang/contrib/elftoolchain/elfcopy/archive.c projects/mips64-clang/contrib/elftoolchain/elfcopy/ascii.c projects/mips64-clang/contrib/elftoolchain/elfcopy/pe.c projects/mips64-clang/contrib/elftoolchain/elfdump/elfdump.c projects/mips64-clang/contrib/elftoolchain/libelf/elf_flagdata.3 projects/mips64-clang/contrib/elftoolchain/libelftc/Makefile projects/mips64-clang/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3 projects/mips64-clang/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c projects/mips64-clang/contrib/elftoolchain/libelftc/libelftc.h projects/mips64-clang/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c projects/mips64-clang/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c projects/mips64-clang/contrib/elftoolchain/readelf/readelf.1 projects/mips64-clang/contrib/elftoolchain/readelf/readelf.c projects/mips64-clang/contrib/gcc/doc/cpp.texi projects/mips64-clang/contrib/gcclibs/libcpp/ChangeLog.gcc43 projects/mips64-clang/contrib/gcclibs/libcpp/internal.h projects/mips64-clang/contrib/gcclibs/libcpp/macro.c projects/mips64-clang/contrib/gcclibs/libcpp/pch.c projects/mips64-clang/contrib/gcclibs/libcpp/system.h projects/mips64-clang/contrib/ipfilter/opts.h projects/mips64-clang/contrib/libarchive/libarchive/archive_acl.c projects/mips64-clang/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c projects/mips64-clang/contrib/libarchive/libarchive/archive_read_disk_posix.c projects/mips64-clang/contrib/libarchive/libarchive/archive_read_support_format_tar.c projects/mips64-clang/contrib/libarchive/libarchive/archive_read_support_format_zip.c projects/mips64-clang/contrib/libarchive/libarchive/archive_write_disk_acl.c projects/mips64-clang/contrib/libarchive/libarchive/archive_write_disk_posix.c projects/mips64-clang/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c projects/mips64-clang/contrib/libarchive/tar/util.c projects/mips64-clang/contrib/libcxxrt/unwind-arm.h projects/mips64-clang/contrib/llvm/lib/Target/AArch64/AArch64InstrInfo.cpp projects/mips64-clang/contrib/ncurses/ncurses/tinfo/lib_baudrate.c projects/mips64-clang/contrib/netbsd-tests/bin/cat/d_align.in projects/mips64-clang/contrib/netbsd-tests/bin/cat/d_align.out projects/mips64-clang/contrib/netbsd-tests/bin/cat/t_cat.sh projects/mips64-clang/contrib/netbsd-tests/bin/sh/dotcmd/scoped_command projects/mips64-clang/contrib/netbsd-tests/bin/sh/dotcmd/t_dotcmd.sh projects/mips64-clang/contrib/netbsd-tests/bin/sh/t_evaltested.sh projects/mips64-clang/contrib/netbsd-tests/bin/sh/t_exit.sh projects/mips64-clang/contrib/netbsd-tests/bin/sh/t_expand.sh projects/mips64-clang/contrib/netbsd-tests/bin/sh/t_fsplit.sh projects/mips64-clang/contrib/netbsd-tests/bin/sh/t_here.sh projects/mips64-clang/contrib/netbsd-tests/bin/sh/t_set_e.sh projects/mips64-clang/contrib/netbsd-tests/bin/sh/t_ulimit.sh projects/mips64-clang/contrib/netbsd-tests/bin/sh/t_varquote.sh projects/mips64-clang/contrib/netbsd-tests/bin/sh/t_wait.sh projects/mips64-clang/contrib/netbsd-tests/crypto/opencrypto/t_opencrypto.sh projects/mips64-clang/contrib/netbsd-tests/dev/audio/t_pad_output.bz2.uue projects/mips64-clang/contrib/netbsd-tests/dev/dm/h_dm.c projects/mips64-clang/contrib/netbsd-tests/dev/sysmon/t_swsensor.sh projects/mips64-clang/contrib/netbsd-tests/dev/sysmon/t_swwdog.c projects/mips64-clang/contrib/netbsd-tests/fs/common/fstest_lfs.c projects/mips64-clang/contrib/netbsd-tests/fs/common/h_fsmacros.h projects/mips64-clang/contrib/netbsd-tests/fs/nfs/nfsservice/rumpnfsd.c projects/mips64-clang/contrib/netbsd-tests/fs/nfs/t_rquotad.sh projects/mips64-clang/contrib/netbsd-tests/fs/tmpfs/t_vnd.sh projects/mips64-clang/contrib/netbsd-tests/fs/vfs/t_io.c projects/mips64-clang/contrib/netbsd-tests/fs/vfs/t_renamerace.c projects/mips64-clang/contrib/netbsd-tests/fs/vfs/t_unpriv.c projects/mips64-clang/contrib/netbsd-tests/fs/vfs/t_vnops.c projects/mips64-clang/contrib/netbsd-tests/games/t_factor.sh projects/mips64-clang/contrib/netbsd-tests/h_macros.h projects/mips64-clang/contrib/netbsd-tests/include/sys/t_bitops.c projects/mips64-clang/contrib/netbsd-tests/include/sys/t_cdefs.c projects/mips64-clang/contrib/netbsd-tests/include/sys/t_socket.c projects/mips64-clang/contrib/netbsd-tests/include/t_paths.c projects/mips64-clang/contrib/netbsd-tests/ipf/expected/n14 projects/mips64-clang/contrib/netbsd-tests/ipf/expected/n14_6 projects/mips64-clang/contrib/netbsd-tests/ipf/t_filter_parse.sh projects/mips64-clang/contrib/netbsd-tests/ipf/t_nat_exec.sh projects/mips64-clang/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c projects/mips64-clang/contrib/netbsd-tests/kernel/kqueue/read/t_file.c projects/mips64-clang/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c projects/mips64-clang/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c projects/mips64-clang/contrib/netbsd-tests/kernel/kqueue/t_ioctl.c projects/mips64-clang/contrib/netbsd-tests/kernel/kqueue/t_proc1.c projects/mips64-clang/contrib/netbsd-tests/kernel/kqueue/t_proc2.c projects/mips64-clang/contrib/netbsd-tests/kernel/kqueue/t_proc3.c projects/mips64-clang/contrib/netbsd-tests/kernel/kqueue/t_sig.c projects/mips64-clang/contrib/netbsd-tests/kernel/t_rnd.c projects/mips64-clang/contrib/netbsd-tests/lib/libbpfjit/t_bpfjit.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/arch/ia64/return_one.S projects/mips64-clang/contrib/netbsd-tests/lib/libc/arch/powerpc/return_one.S projects/mips64-clang/contrib/netbsd-tests/lib/libc/arch/riscv/return_one.S projects/mips64-clang/contrib/netbsd-tests/lib/libc/db/t_db.sh projects/mips64-clang/contrib/netbsd-tests/lib/libc/gen/execve/t_execve.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/gen/isqemu.h projects/mips64-clang/contrib/netbsd-tests/lib/libc/gen/posix_spawn/t_spawn.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/gen/t_fnmatch.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/gen/t_fpsetmask.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/gen/t_randomid.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/gen/t_sleep.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/gen/t_time.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/gen/t_vis.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/inet/t_inet_network.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/net/t_servent.sh projects/mips64-clang/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/stdlib/t_getenv.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/stdlib/t_posix_memalign.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/stdlib/t_strtod.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/stdlib/t_strtol.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/string/t_memset.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/sys/t_connect.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/sys/t_getrusage.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/sys/t_kevent.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/sys/t_mlock.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/sys/t_mmap.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/sys/t_mprotect.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/sys/t_setrlimit.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/sys/t_sigqueue.c projects/mips64-clang/contrib/netbsd-tests/lib/libc/time/t_strptime.c projects/mips64-clang/contrib/netbsd-tests/lib/libcurses/director/testlang_parse.y projects/mips64-clang/contrib/netbsd-tests/lib/libm/t_exp.c projects/mips64-clang/contrib/netbsd-tests/lib/libm/t_fmod.c projects/mips64-clang/contrib/netbsd-tests/lib/libm/t_log.c projects/mips64-clang/contrib/netbsd-tests/lib/libm/t_pow.c projects/mips64-clang/contrib/netbsd-tests/lib/libpthread/t_cond.c projects/mips64-clang/contrib/netbsd-tests/lib/libpthread/t_mutex.c projects/mips64-clang/contrib/netbsd-tests/lib/libpthread/t_rwlock.c projects/mips64-clang/contrib/netbsd-tests/lib/librumpclient/t_exec.sh projects/mips64-clang/contrib/netbsd-tests/lib/librumpclient/t_fd.c projects/mips64-clang/contrib/netbsd-tests/lib/librumphijack/t_tcpip.sh projects/mips64-clang/contrib/netbsd-tests/lib/libutil/t_parsedate.c projects/mips64-clang/contrib/netbsd-tests/net/bpfilter/t_bpfilter.c projects/mips64-clang/contrib/netbsd-tests/net/bpfjit/t_bpfjit.c projects/mips64-clang/contrib/netbsd-tests/net/icmp/t_forward.c projects/mips64-clang/contrib/netbsd-tests/net/icmp/t_ping.c projects/mips64-clang/contrib/netbsd-tests/net/icmp/t_ping2.sh projects/mips64-clang/contrib/netbsd-tests/net/if_bridge/t_bridge.sh projects/mips64-clang/contrib/netbsd-tests/net/mpls/t_ldp_regen.sh projects/mips64-clang/contrib/netbsd-tests/net/mpls/t_mpls_fw.sh projects/mips64-clang/contrib/netbsd-tests/net/mpls/t_rfc4182.sh projects/mips64-clang/contrib/netbsd-tests/net/net/t_tcp.c projects/mips64-clang/contrib/netbsd-tests/net/route/t_change.sh projects/mips64-clang/contrib/netbsd-tests/rump/modautoload/t_modautoload.c projects/mips64-clang/contrib/netbsd-tests/rump/rumpkern/h_server/h_simpleserver.c projects/mips64-clang/contrib/netbsd-tests/rump/rumpkern/t_lwproc.c projects/mips64-clang/contrib/netbsd-tests/rump/rumpkern/t_sp.sh projects/mips64-clang/contrib/netbsd-tests/rump/rumpnet/t_shmif.sh projects/mips64-clang/contrib/netbsd-tests/rump/rumpvfs/t_p2kifs.c projects/mips64-clang/contrib/netbsd-tests/sbin/resize_ffs/common.sh projects/mips64-clang/contrib/netbsd-tests/sbin/resize_ffs/t_grow.sh projects/mips64-clang/contrib/netbsd-tests/sbin/resize_ffs/t_grow_swapped.sh projects/mips64-clang/contrib/netbsd-tests/sbin/resize_ffs/t_shrink.sh projects/mips64-clang/contrib/netbsd-tests/sbin/resize_ffs/t_shrink_swapped.sh projects/mips64-clang/contrib/netbsd-tests/sbin/sysctl/t_perm.sh projects/mips64-clang/contrib/netbsd-tests/share/mk/t_lib.sh projects/mips64-clang/contrib/netbsd-tests/share/mk/t_prog.sh projects/mips64-clang/contrib/netbsd-tests/share/mk/t_test.sh projects/mips64-clang/contrib/netbsd-tests/usr.bin/cc/t_hello.sh projects/mips64-clang/contrib/netbsd-tests/usr.bin/config/support/conf/files projects/mips64-clang/contrib/netbsd-tests/usr.bin/config/t_config.sh projects/mips64-clang/contrib/netbsd-tests/usr.bin/dirname/t_dirname.sh projects/mips64-clang/contrib/netbsd-tests/usr.bin/make/t_make.sh projects/mips64-clang/contrib/netbsd-tests/usr.bin/netpgpverify/t_netpgpverify.sh projects/mips64-clang/contrib/netbsd-tests/usr.bin/sed/t_sed.sh projects/mips64-clang/contrib/netbsd-tests/usr.bin/sort/d_any_char_dflag_out.txt (contents, props changed) projects/mips64-clang/contrib/netbsd-tests/usr.bin/sort/d_any_char_fflag_out.txt (contents, props changed) projects/mips64-clang/contrib/netbsd-tests/usr.bin/sort/d_any_char_iflag_out.txt (contents, props changed) projects/mips64-clang/contrib/netbsd-tests/usr.sbin/traceroute/t_traceroute.sh projects/mips64-clang/contrib/one-true-awk/b.c projects/mips64-clang/contrib/telnet/libtelnet/pk.c projects/mips64-clang/contrib/telnet/telnet/commands.c projects/mips64-clang/contrib/tnftp/src/ftp.c projects/mips64-clang/contrib/top/commands.c projects/mips64-clang/contrib/top/machine.h projects/mips64-clang/contrib/top/top.c projects/mips64-clang/contrib/top/top.xs projects/mips64-clang/contrib/unbound/Makefile.in projects/mips64-clang/contrib/unbound/acx_nlnetlabs.m4 projects/mips64-clang/contrib/unbound/compat/explicit_bzero.c projects/mips64-clang/contrib/unbound/compat/getentropy_linux.c projects/mips64-clang/contrib/unbound/config.h projects/mips64-clang/contrib/unbound/config.h.in projects/mips64-clang/contrib/unbound/configure projects/mips64-clang/contrib/unbound/configure.ac projects/mips64-clang/contrib/unbound/daemon/daemon.c projects/mips64-clang/contrib/unbound/daemon/daemon.h projects/mips64-clang/contrib/unbound/daemon/remote.c projects/mips64-clang/contrib/unbound/daemon/unbound.c projects/mips64-clang/contrib/unbound/daemon/worker.c projects/mips64-clang/contrib/unbound/dns64/dns64.c projects/mips64-clang/contrib/unbound/dnstap/dnstap.c projects/mips64-clang/contrib/unbound/doc/Changelog projects/mips64-clang/contrib/unbound/doc/README projects/mips64-clang/contrib/unbound/doc/example.conf projects/mips64-clang/contrib/unbound/doc/example.conf.in projects/mips64-clang/contrib/unbound/doc/libunbound.3 projects/mips64-clang/contrib/unbound/doc/libunbound.3.in projects/mips64-clang/contrib/unbound/doc/unbound-anchor.8 projects/mips64-clang/contrib/unbound/doc/unbound-anchor.8.in projects/mips64-clang/contrib/unbound/doc/unbound-checkconf.8 projects/mips64-clang/contrib/unbound/doc/unbound-checkconf.8.in projects/mips64-clang/contrib/unbound/doc/unbound-control.8 projects/mips64-clang/contrib/unbound/doc/unbound-control.8.in projects/mips64-clang/contrib/unbound/doc/unbound-host.1 projects/mips64-clang/contrib/unbound/doc/unbound-host.1.in projects/mips64-clang/contrib/unbound/doc/unbound.8 projects/mips64-clang/contrib/unbound/doc/unbound.8.in projects/mips64-clang/contrib/unbound/doc/unbound.conf.5 projects/mips64-clang/contrib/unbound/doc/unbound.conf.5.in projects/mips64-clang/contrib/unbound/iterator/iter_fwd.c projects/mips64-clang/contrib/unbound/iterator/iter_utils.c projects/mips64-clang/contrib/unbound/iterator/iter_utils.h projects/mips64-clang/contrib/unbound/iterator/iterator.c projects/mips64-clang/contrib/unbound/iterator/iterator.h projects/mips64-clang/contrib/unbound/libunbound/context.h projects/mips64-clang/contrib/unbound/libunbound/libunbound.c projects/mips64-clang/contrib/unbound/libunbound/libworker.c projects/mips64-clang/contrib/unbound/libunbound/libworker.h projects/mips64-clang/contrib/unbound/libunbound/python/libunbound.i projects/mips64-clang/contrib/unbound/libunbound/ubsyms.def projects/mips64-clang/contrib/unbound/libunbound/unbound-event.h projects/mips64-clang/contrib/unbound/libunbound/worker.h projects/mips64-clang/contrib/unbound/services/cache/dns.c projects/mips64-clang/contrib/unbound/services/listen_dnsport.c projects/mips64-clang/contrib/unbound/services/listen_dnsport.h projects/mips64-clang/contrib/unbound/services/localzone.c projects/mips64-clang/contrib/unbound/services/localzone.h projects/mips64-clang/contrib/unbound/services/mesh.c projects/mips64-clang/contrib/unbound/services/modstack.c projects/mips64-clang/contrib/unbound/services/outside_network.c projects/mips64-clang/contrib/unbound/services/outside_network.h projects/mips64-clang/contrib/unbound/sldns/keyraw.c projects/mips64-clang/contrib/unbound/sldns/parseutil.c projects/mips64-clang/contrib/unbound/sldns/rrdef.h projects/mips64-clang/contrib/unbound/sldns/str2wire.c projects/mips64-clang/contrib/unbound/sldns/wire2str.c projects/mips64-clang/contrib/unbound/smallapp/unbound-checkconf.c projects/mips64-clang/contrib/unbound/smallapp/unbound-control.c projects/mips64-clang/contrib/unbound/smallapp/worker_cb.c projects/mips64-clang/contrib/unbound/util/config_file.c projects/mips64-clang/contrib/unbound/util/config_file.h projects/mips64-clang/contrib/unbound/util/configlexer.lex projects/mips64-clang/contrib/unbound/util/configparser.y projects/mips64-clang/contrib/unbound/util/data/dname.c projects/mips64-clang/contrib/unbound/util/data/msgencode.c projects/mips64-clang/contrib/unbound/util/data/msgparse.c projects/mips64-clang/contrib/unbound/util/data/msgparse.h projects/mips64-clang/contrib/unbound/util/data/msgreply.c projects/mips64-clang/contrib/unbound/util/data/msgreply.h projects/mips64-clang/contrib/unbound/util/fptr_wlist.c projects/mips64-clang/contrib/unbound/util/fptr_wlist.h projects/mips64-clang/contrib/unbound/util/iana_ports.inc projects/mips64-clang/contrib/unbound/util/module.h projects/mips64-clang/contrib/unbound/util/net_help.c projects/mips64-clang/contrib/unbound/util/netevent.c projects/mips64-clang/contrib/unbound/util/netevent.h projects/mips64-clang/contrib/unbound/util/tube.c projects/mips64-clang/contrib/unbound/util/tube.h projects/mips64-clang/contrib/unbound/validator/autotrust.c projects/mips64-clang/contrib/unbound/validator/val_anchor.c projects/mips64-clang/contrib/unbound/validator/val_secalgo.c projects/mips64-clang/contrib/unbound/validator/val_secalgo.h projects/mips64-clang/crypto/openssh/auth-pam.c projects/mips64-clang/crypto/openssh/auth.c projects/mips64-clang/crypto/openssh/auth1.c projects/mips64-clang/crypto/openssh/auth2.c projects/mips64-clang/crypto/openssh/packet.c projects/mips64-clang/crypto/openssh/servconf.c projects/mips64-clang/crypto/openssh/servconf.h projects/mips64-clang/crypto/openssh/sshd.c projects/mips64-clang/crypto/openssh/sshd_config projects/mips64-clang/crypto/openssh/sshd_config.5 projects/mips64-clang/etc/mtree/BSD.tests.dist projects/mips64-clang/gnu/lib/libgcc/Makefile projects/mips64-clang/include/libgen.h projects/mips64-clang/lib/Makefile projects/mips64-clang/lib/atf/libatf-c++/Makefile projects/mips64-clang/lib/atf/libatf-c/Makefile projects/mips64-clang/lib/clang/libclangformat/Makefile.depend projects/mips64-clang/lib/clang/libclangtoolingcore/Makefile.depend projects/mips64-clang/lib/libarchive/config_freebsd.h projects/mips64-clang/lib/libarchive/tests/Makefile projects/mips64-clang/lib/libc/aarch64/sys/Makefile.inc projects/mips64-clang/lib/libc/amd64/sys/Makefile.inc projects/mips64-clang/lib/libc/arm/sys/Makefile.inc projects/mips64-clang/lib/libc/gen/directory.3 projects/mips64-clang/lib/libc/gen/dirname.c projects/mips64-clang/lib/libc/gen/getvfsbyname.3 projects/mips64-clang/lib/libc/gen/siglist.c projects/mips64-clang/lib/libc/i386/sys/Makefile.inc projects/mips64-clang/lib/libc/include/libc_private.h projects/mips64-clang/lib/libc/mips/sys/Makefile.inc projects/mips64-clang/lib/libc/net/getaddrinfo.c projects/mips64-clang/lib/libc/net/name6.c projects/mips64-clang/lib/libc/powerpc/sys/Makefile.inc projects/mips64-clang/lib/libc/powerpc64/sys/Makefile.inc projects/mips64-clang/lib/libc/riscv/sys/Makefile.inc projects/mips64-clang/lib/libc/sparc64/sys/Makefile.inc projects/mips64-clang/lib/libc/stdio/fgets.c projects/mips64-clang/lib/libc/stdio/fgetwc.c projects/mips64-clang/lib/libc/stdio/fgetwln.c projects/mips64-clang/lib/libc/stdio/fgetws.c projects/mips64-clang/lib/libc/sys/Makefile.inc projects/mips64-clang/lib/libc/sys/_exit.2 projects/mips64-clang/lib/libc/sys/intro.2 projects/mips64-clang/lib/libc/sys/ptrace.2 projects/mips64-clang/lib/libc/tests/db/Makefile projects/mips64-clang/lib/libc/tests/hash/Makefile projects/mips64-clang/lib/libc/tests/inet/Makefile projects/mips64-clang/lib/libc/tests/stdio/Makefile projects/mips64-clang/lib/libc/tests/stdlib/Makefile projects/mips64-clang/lib/libc/tests/stdlib/Makefile.depend projects/mips64-clang/lib/libc/tests/sys/Makefile projects/mips64-clang/lib/libcasper/services/cap_dns/Makefile projects/mips64-clang/lib/libcasper/services/cap_grp/Makefile projects/mips64-clang/lib/libcasper/services/cap_pwd/Makefile projects/mips64-clang/lib/libcasper/services/cap_sysctl/Makefile projects/mips64-clang/lib/libdevctl/devctl.3 projects/mips64-clang/lib/libdevctl/devctl.c projects/mips64-clang/lib/libdevctl/devctl.h projects/mips64-clang/lib/libelftc/Makefile projects/mips64-clang/lib/libelftc/elftc_version.c projects/mips64-clang/lib/libifconfig/libifconfig.c projects/mips64-clang/lib/libifconfig/libifconfig.h projects/mips64-clang/lib/libifconfig/libifconfig_internal.c projects/mips64-clang/lib/libifconfig/libifconfig_internal.h projects/mips64-clang/lib/libnv/Makefile projects/mips64-clang/lib/libnv/tests/Makefile projects/mips64-clang/lib/libproc/Makefile.depend projects/mips64-clang/lib/libproc/tests/Makefile.depend projects/mips64-clang/lib/librtld_db/Makefile.depend projects/mips64-clang/lib/libstand/bootp.c projects/mips64-clang/lib/libstand/bootp.h projects/mips64-clang/lib/libstand/globals.c projects/mips64-clang/lib/libstand/net.h projects/mips64-clang/lib/libstand/nfs.c projects/mips64-clang/lib/libstand/tftp.c projects/mips64-clang/lib/libstand/ufs.c projects/mips64-clang/lib/libunbound/Makefile projects/mips64-clang/lib/libusb/libusb20.c projects/mips64-clang/lib/msun/amd64/Makefile.inc projects/mips64-clang/lib/msun/i387/Makefile.inc projects/mips64-clang/lib/msun/src/e_fmod.c projects/mips64-clang/lib/msun/tests/Makefile projects/mips64-clang/lib/msun/tests/ctrig_test.c projects/mips64-clang/release/doc/en_US.ISO8859-1/hardware/article.xml projects/mips64-clang/release/doc/en_US.ISO8859-1/relnotes/article.xml projects/mips64-clang/rescue/rescue/Makefile.depend projects/mips64-clang/sbin/dhclient/clparse.c projects/mips64-clang/sbin/dhclient/dhclient.c projects/mips64-clang/sbin/dhclient/dhcpd.h projects/mips64-clang/sbin/dhclient/dispatch.c projects/mips64-clang/sbin/dhclient/privsep.c projects/mips64-clang/sbin/dhclient/privsep.h projects/mips64-clang/sbin/hastd/lzf.h projects/mips64-clang/sbin/newfs_msdos/mkfs_msdos.c projects/mips64-clang/secure/usr.bin/ssh/Makefile.depend projects/mips64-clang/secure/usr.sbin/sshd/Makefile projects/mips64-clang/secure/usr.sbin/sshd/Makefile.depend projects/mips64-clang/share/dtrace/mbuf.d projects/mips64-clang/share/examples/libifconfig/ifcreate.c projects/mips64-clang/share/examples/libifconfig/ifdestroy.c projects/mips64-clang/share/examples/libifconfig/setdescription.c projects/mips64-clang/share/examples/libifconfig/setmtu.c projects/mips64-clang/share/man/man3/Makefile projects/mips64-clang/share/man/man3/queue.3 projects/mips64-clang/share/man/man4/Makefile projects/mips64-clang/share/man/man4/amdsbwd.4 projects/mips64-clang/share/man/man4/cxgbe.4 projects/mips64-clang/share/man/man4/ddb.4 projects/mips64-clang/share/man/man4/intpm.4 projects/mips64-clang/share/man/man4/pci.4 projects/mips64-clang/share/man/man4/vt.4 projects/mips64-clang/share/man/man9/Makefile projects/mips64-clang/share/man/man9/mbuf.9 projects/mips64-clang/share/man/man9/pci.9 projects/mips64-clang/share/man/man9/pmap.9 projects/mips64-clang/share/man/man9/pmap_zero_page.9 projects/mips64-clang/share/misc/bsd-family-tree projects/mips64-clang/share/mk/bsd.crunchgen.mk projects/mips64-clang/share/mk/bsd.dep.mk projects/mips64-clang/share/mk/bsd.init.mk projects/mips64-clang/share/mk/bsd.libnames.mk projects/mips64-clang/share/mk/bsd.obj.mk projects/mips64-clang/share/mk/bsd.subdir.mk projects/mips64-clang/share/mk/bsd.sys.mk projects/mips64-clang/share/mk/dirdeps.mk projects/mips64-clang/share/mk/local.meta.sys.mk projects/mips64-clang/share/mk/meta.sys.mk projects/mips64-clang/share/mk/src.libnames.mk projects/mips64-clang/share/mk/sys.mk projects/mips64-clang/share/timedef/ko_KR.UTF-8.src projects/mips64-clang/share/timedef/ko_KR.eucKR.src projects/mips64-clang/share/timedef/zh_CN.GB2312.src projects/mips64-clang/share/timedef/zh_CN.GBK.src projects/mips64-clang/share/timedef/zh_CN.UTF-8.src projects/mips64-clang/share/timedef/zh_CN.eucCN.src projects/mips64-clang/share/timedef/zh_TW.Big5.src projects/mips64-clang/share/timedef/zh_TW.UTF-8.src projects/mips64-clang/sys/amd64/amd64/initcpu.c projects/mips64-clang/sys/amd64/amd64/machdep.c projects/mips64-clang/sys/amd64/amd64/pmap.c projects/mips64-clang/sys/amd64/amd64/prof_machdep.c projects/mips64-clang/sys/amd64/amd64/support.S projects/mips64-clang/sys/amd64/conf/NOTES projects/mips64-clang/sys/amd64/include/md_var.h projects/mips64-clang/sys/amd64/vmm/io/iommu.c projects/mips64-clang/sys/amd64/vmm/io/iommu.h projects/mips64-clang/sys/amd64/vmm/io/ppt.c projects/mips64-clang/sys/amd64/vmm/vmm.c projects/mips64-clang/sys/arm/allwinner/aw_sid.c projects/mips64-clang/sys/arm/allwinner/aw_thermal.c projects/mips64-clang/sys/arm/allwinner/aw_usbphy.c projects/mips64-clang/sys/arm/allwinner/aw_wdog.c projects/mips64-clang/sys/arm/allwinner/axp81x.c projects/mips64-clang/sys/arm/allwinner/clk/aw_cpuclk.c projects/mips64-clang/sys/arm/allwinner/clk/aw_pll.c projects/mips64-clang/sys/arm/allwinner/files.allwinner projects/mips64-clang/sys/arm/allwinner/if_awg.c projects/mips64-clang/sys/arm/annapurna/alpine/alpine_machdep.c projects/mips64-clang/sys/arm/annapurna/alpine/alpine_machdep_mp.c projects/mips64-clang/sys/arm/arm/cpufunc_asm_xscale_c3.S projects/mips64-clang/sys/arm/arm/locore-v4.S projects/mips64-clang/sys/arm/arm/minidump_machdep.c projects/mips64-clang/sys/arm/arm/pmap-v4.c projects/mips64-clang/sys/arm/arm/pmap-v6.c projects/mips64-clang/sys/arm/conf/ALLWINNER projects/mips64-clang/sys/arm/conf/ALPINE projects/mips64-clang/sys/arm/conf/NOTES projects/mips64-clang/sys/arm/ti/am335x/am335x_prcm.c projects/mips64-clang/sys/arm/ti/am335x/am335x_scm.h projects/mips64-clang/sys/arm/ti/am335x/files.am335x projects/mips64-clang/sys/arm/ti/cpsw/if_cpsw.c projects/mips64-clang/sys/arm/ti/ti_pruss.c projects/mips64-clang/sys/arm/ti/ti_scm.c projects/mips64-clang/sys/arm/xscale/i8134x/crb_machdep.c projects/mips64-clang/sys/arm/xscale/i8134x/obio.c projects/mips64-clang/sys/arm/xscale/i8134x/obiovar.h projects/mips64-clang/sys/arm/xscale/i8134x/uart_cpu_i81342.c projects/mips64-clang/sys/arm64/arm64/cpufunc_asm.S projects/mips64-clang/sys/arm64/arm64/machdep.c projects/mips64-clang/sys/arm64/arm64/pmap.c projects/mips64-clang/sys/arm64/arm64/trap.c projects/mips64-clang/sys/arm64/conf/GENERIC projects/mips64-clang/sys/arm64/include/pcpu.h projects/mips64-clang/sys/boot/common/dev_net.c projects/mips64-clang/sys/boot/efi/boot1/Makefile projects/mips64-clang/sys/boot/efi/libefi/Makefile projects/mips64-clang/sys/boot/efi/libefi/efi_console.c projects/mips64-clang/sys/boot/efi/loader/Makefile projects/mips64-clang/sys/boot/efi/loader/conf.c projects/mips64-clang/sys/boot/efi/loader/copy.c projects/mips64-clang/sys/boot/fdt/dts/Makefile projects/mips64-clang/sys/boot/fdt/dts/arm/a83t.dtsi projects/mips64-clang/sys/boot/fdt/dts/arm/annapurna-alpine.dts projects/mips64-clang/sys/boot/fdt/dts/arm/sinovoip-bpi-m3.dts projects/mips64-clang/sys/boot/fdt/dts/arm64/a64.dtsi projects/mips64-clang/sys/boot/fdt/dts/riscv/qemu.dts projects/mips64-clang/sys/boot/fdt/dts/riscv/rocket.dts projects/mips64-clang/sys/boot/fdt/dts/riscv/spike.dts projects/mips64-clang/sys/boot/forth/loader.4th projects/mips64-clang/sys/boot/i386/Makefile.inc projects/mips64-clang/sys/boot/i386/boot0/Makefile projects/mips64-clang/sys/boot/i386/boot2/Makefile projects/mips64-clang/sys/boot/i386/btx/btx/Makefile projects/mips64-clang/sys/boot/i386/btx/btxldr/Makefile projects/mips64-clang/sys/boot/i386/cdboot/Makefile projects/mips64-clang/sys/boot/i386/gptboot/Makefile projects/mips64-clang/sys/boot/i386/gptzfsboot/Makefile projects/mips64-clang/sys/boot/i386/libi386/biosdisk.c projects/mips64-clang/sys/boot/i386/libi386/pxe.c projects/mips64-clang/sys/boot/i386/loader/conf.c projects/mips64-clang/sys/boot/i386/mbr/Makefile projects/mips64-clang/sys/boot/i386/pmbr/Makefile projects/mips64-clang/sys/boot/i386/pxeldr/Makefile projects/mips64-clang/sys/boot/i386/pxeldr/pxeboot.8 projects/mips64-clang/sys/boot/i386/zfsboot/Makefile projects/mips64-clang/sys/boot/mips/uboot/ldscript.mips projects/mips64-clang/sys/boot/pc98/Makefile.inc projects/mips64-clang/sys/boot/pc98/boot0/Makefile projects/mips64-clang/sys/boot/pc98/boot2/Makefile projects/mips64-clang/sys/boot/pc98/btx/btx/Makefile projects/mips64-clang/sys/boot/pc98/btx/btxldr/Makefile projects/mips64-clang/sys/boot/pc98/cdboot/Makefile projects/mips64-clang/sys/boot/pc98/loader/conf.c projects/mips64-clang/sys/boot/powerpc/boot1.chrp/boot1.c projects/mips64-clang/sys/cam/ata/ata_all.c projects/mips64-clang/sys/cam/cam_periph.c projects/mips64-clang/sys/cam/scsi/scsi_all.c projects/mips64-clang/sys/cam/scsi/scsi_all.h projects/mips64-clang/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c projects/mips64-clang/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c projects/mips64-clang/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c projects/mips64-clang/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h projects/mips64-clang/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h projects/mips64-clang/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h projects/mips64-clang/sys/compat/freebsd32/freebsd32_ioctl.c projects/mips64-clang/sys/compat/freebsd32/freebsd32_ioctl.h projects/mips64-clang/sys/conf/NOTES projects/mips64-clang/sys/conf/files projects/mips64-clang/sys/conf/files.arm projects/mips64-clang/sys/conf/files.arm64 projects/mips64-clang/sys/conf/kern.mk projects/mips64-clang/sys/conf/ldscript.arm64 projects/mips64-clang/sys/conf/options.amd64 projects/mips64-clang/sys/conf/options.mips projects/mips64-clang/sys/contrib/alpine-hal/al_hal_iofic.c projects/mips64-clang/sys/contrib/alpine-hal/al_hal_iofic.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_iofic_regs.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_nb_regs.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_pbs_regs.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_pcie.c projects/mips64-clang/sys/contrib/alpine-hal/al_hal_pcie.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_pcie_axi_reg.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_pcie_interrupts.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_pcie_regs.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_pcie_w_reg.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_plat_services.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_plat_types.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_reg_utils.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_serdes.c projects/mips64-clang/sys/contrib/alpine-hal/al_hal_serdes.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_udma.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_udma_config.c projects/mips64-clang/sys/contrib/alpine-hal/al_hal_udma_config.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_udma_debug.c projects/mips64-clang/sys/contrib/alpine-hal/al_hal_udma_iofic.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_udma_main.c projects/mips64-clang/sys/contrib/alpine-hal/al_hal_udma_regs_gen.h projects/mips64-clang/sys/contrib/alpine-hal/al_hal_unit_adapter_regs.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_eth.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_eth_mac_regs.h projects/mips64-clang/sys/contrib/alpine-hal/eth/al_hal_eth_main.c projects/mips64-clang/sys/contrib/dev/ath/ath_hal/ar9300/ar9300phy.h projects/mips64-clang/sys/contrib/ipfilter/netinet/ip_compat.h projects/mips64-clang/sys/contrib/ipfilter/netinet/ip_fil.h projects/mips64-clang/sys/contrib/ipfilter/netinet/ip_log.c projects/mips64-clang/sys/contrib/ipfilter/netinet/ip_nat.h projects/mips64-clang/sys/contrib/ipfilter/netinet/ip_proxy.h projects/mips64-clang/sys/contrib/libnv/nvlist.c projects/mips64-clang/sys/contrib/libnv/nvlist_impl.h projects/mips64-clang/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c projects/mips64-clang/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.c projects/mips64-clang/sys/crypto/skein/amd64/skein_block_asm.s (contents, props changed) projects/mips64-clang/sys/ddb/db_command.c projects/mips64-clang/sys/ddb/db_expr.c projects/mips64-clang/sys/ddb/db_main.c projects/mips64-clang/sys/ddb/db_run.c projects/mips64-clang/sys/ddb/ddb.h projects/mips64-clang/sys/dev/ahci/ahci.c projects/mips64-clang/sys/dev/amdsbwd/amdsbwd.c projects/mips64-clang/sys/dev/ath/ath_hal/ah.c projects/mips64-clang/sys/dev/ath/ath_hal/ah.h projects/mips64-clang/sys/dev/ath/ath_hal/ah_internal.h projects/mips64-clang/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c projects/mips64-clang/sys/dev/bhnd/bcma/bcma.c projects/mips64-clang/sys/dev/bhnd/bcma/bcma.h projects/mips64-clang/sys/dev/bhnd/bcma/bcma_bhndb.c projects/mips64-clang/sys/dev/bhnd/bcma/bcma_dmp.h projects/mips64-clang/sys/dev/bhnd/bcma/bcma_erom.c projects/mips64-clang/sys/dev/bhnd/bcma/bcma_eromvar.h projects/mips64-clang/sys/dev/bhnd/bcma/bcma_nexus.c projects/mips64-clang/sys/dev/bhnd/bcma/bcma_subr.c projects/mips64-clang/sys/dev/bhnd/bcma/bcmavar.h projects/mips64-clang/sys/dev/bhnd/bhnd.c projects/mips64-clang/sys/dev/bhnd/bhnd.h projects/mips64-clang/sys/dev/bhnd/bhnd_bus_if.m projects/mips64-clang/sys/dev/bhnd/bhnd_core.h projects/mips64-clang/sys/dev/bhnd/bhnd_ids.h projects/mips64-clang/sys/dev/bhnd/bhnd_match.h projects/mips64-clang/sys/dev/bhnd/bhnd_nexus.c projects/mips64-clang/sys/dev/bhnd/bhnd_subr.c projects/mips64-clang/sys/dev/bhnd/bhnd_types.h projects/mips64-clang/sys/dev/bhnd/bhndb/bhnd_bhndb.c projects/mips64-clang/sys/dev/bhnd/bhndb/bhndb.c projects/mips64-clang/sys/dev/bhnd/bhndb/bhndb_bus_if.m projects/mips64-clang/sys/dev/bhnd/bhndb/bhndb_if.m projects/mips64-clang/sys/dev/bhnd/bhndb/bhndb_pci.c projects/mips64-clang/sys/dev/bhnd/bhndb/bhndb_pci_sprom.c projects/mips64-clang/sys/dev/bhnd/bhndb/bhndb_pcivar.h projects/mips64-clang/sys/dev/bhnd/bhndb/bhndb_private.h projects/mips64-clang/sys/dev/bhnd/bhndb/bhndb_subr.c projects/mips64-clang/sys/dev/bhnd/bhndb/bhndbvar.h projects/mips64-clang/sys/dev/bhnd/bhndvar.h projects/mips64-clang/sys/dev/bhnd/cores/chipc/bhnd_chipc_if.m projects/mips64-clang/sys/dev/bhnd/cores/chipc/bhnd_sprom_chipc.c projects/mips64-clang/sys/dev/bhnd/cores/chipc/chipc.c projects/mips64-clang/sys/dev/bhnd/cores/chipc/chipc.h projects/mips64-clang/sys/dev/bhnd/cores/chipc/chipc_subr.c projects/mips64-clang/sys/dev/bhnd/cores/chipc/chipcreg.h projects/mips64-clang/sys/dev/bhnd/cores/chipc/chipcvar.h projects/mips64-clang/sys/dev/bhnd/cores/pmu/bhnd_pmu_subr.c projects/mips64-clang/sys/dev/bhnd/nvram/nvram_map projects/mips64-clang/sys/dev/bhnd/siba/siba.c projects/mips64-clang/sys/dev/bhnd/siba/siba.h projects/mips64-clang/sys/dev/bhnd/siba/siba_bhndb.c projects/mips64-clang/sys/dev/bhnd/siba/siba_nexus.c projects/mips64-clang/sys/dev/bhnd/siba/siba_subr.c projects/mips64-clang/sys/dev/bhnd/siba/sibareg.h projects/mips64-clang/sys/dev/bhnd/siba/sibavar.h projects/mips64-clang/sys/dev/bwn/bwn_mac.c projects/mips64-clang/sys/dev/bwn/if_bwn_pci.c projects/mips64-clang/sys/dev/bwn/if_bwn_pcivar.h projects/mips64-clang/sys/dev/cxgb/cxgb_sge.c projects/mips64-clang/sys/dev/cxgbe/adapter.h projects/mips64-clang/sys/dev/cxgbe/common/common.h projects/mips64-clang/sys/dev/cxgbe/common/t4_hw.c projects/mips64-clang/sys/dev/cxgbe/cxgbei/cxgbei.c projects/mips64-clang/sys/dev/cxgbe/cxgbei/cxgbei.h projects/mips64-clang/sys/dev/cxgbe/cxgbei/icl_cxgbei.c projects/mips64-clang/sys/dev/cxgbe/firmware/t4fw_interface.h projects/mips64-clang/sys/dev/cxgbe/offload.h projects/mips64-clang/sys/dev/cxgbe/t4_iov.c projects/mips64-clang/sys/dev/cxgbe/t4_main.c projects/mips64-clang/sys/dev/cxgbe/t4_sge.c projects/mips64-clang/sys/dev/cxgbe/tom/t4_connect.c projects/mips64-clang/sys/dev/cxgbe/tom/t4_ddp.c projects/mips64-clang/sys/dev/cxgbe/tom/t4_tom.c projects/mips64-clang/sys/dev/cxgbe/tom/t4_tom.h projects/mips64-clang/sys/dev/drm2/drmP.h projects/mips64-clang/sys/dev/gpio/gpiobusvar.h projects/mips64-clang/sys/dev/hyperv/netvsc/hv_net_vsc.c projects/mips64-clang/sys/dev/hyperv/netvsc/hv_net_vsc.h projects/mips64-clang/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/mips64-clang/sys/dev/hyperv/netvsc/hv_rndis_filter.c projects/mips64-clang/sys/dev/hyperv/netvsc/hv_rndis_filter.h projects/mips64-clang/sys/dev/hyperv/netvsc/if_hnreg.h projects/mips64-clang/sys/dev/hyperv/netvsc/if_hnvar.h projects/mips64-clang/sys/dev/hyperv/netvsc/ndis.h projects/mips64-clang/sys/dev/hyperv/utilities/hv_heartbeat.c projects/mips64-clang/sys/dev/hyperv/utilities/hv_kvp.c projects/mips64-clang/sys/dev/hyperv/utilities/hv_shutdown.c projects/mips64-clang/sys/dev/hyperv/utilities/hv_timesync.c projects/mips64-clang/sys/dev/hyperv/utilities/vmbus_icreg.h projects/mips64-clang/sys/dev/hyperv/vmbus/vmbus_chan.c projects/mips64-clang/sys/dev/hyperv/vmbus/vmbus_reg.h projects/mips64-clang/sys/dev/intpm/intpm.c projects/mips64-clang/sys/dev/ioat/ioat.c projects/mips64-clang/sys/dev/iscsi/iscsi.c projects/mips64-clang/sys/dev/iscsi_initiator/iscsi.h projects/mips64-clang/sys/dev/iwm/if_iwm.c projects/mips64-clang/sys/dev/iwm/if_iwm_scan.c projects/mips64-clang/sys/dev/iwm/if_iwmreg.h projects/mips64-clang/sys/dev/ixl/if_ixlv.c projects/mips64-clang/sys/dev/ixl/ixl_txrx.c projects/mips64-clang/sys/dev/kbdmux/kbdmux.c projects/mips64-clang/sys/dev/mfi/mfi.c projects/mips64-clang/sys/dev/netmap/if_ixl_netmap.h projects/mips64-clang/sys/dev/ofw/ofw_bus_subr.c projects/mips64-clang/sys/dev/ofw/ofw_bus_subr.h projects/mips64-clang/sys/dev/pci/pci.c projects/mips64-clang/sys/dev/pci/pci_host_generic.c projects/mips64-clang/sys/dev/pci/pci_host_generic.h projects/mips64-clang/sys/dev/pci/pcireg.h projects/mips64-clang/sys/dev/pci/pcivar.h projects/mips64-clang/sys/dev/ppbus/ppb_1284.c projects/mips64-clang/sys/dev/ppbus/ppb_base.c projects/mips64-clang/sys/dev/ppbus/ppbconf.h projects/mips64-clang/sys/dev/rtwn/if_rtwn.c projects/mips64-clang/sys/dev/syscons/syscons.c projects/mips64-clang/sys/dev/syscons/syscons.h projects/mips64-clang/sys/dev/tsec/if_tsec.h projects/mips64-clang/sys/dev/tsec/if_tsec_fdt.c projects/mips64-clang/sys/dev/uart/uart_core.c projects/mips64-clang/sys/dev/uart/uart_cpu_powerpc.c projects/mips64-clang/sys/dev/usb/input/ums.c projects/mips64-clang/sys/dev/usb/net/if_urndis.c projects/mips64-clang/sys/dev/usb/serial/uplcom.c projects/mips64-clang/sys/dev/usb/template/usb_template.c projects/mips64-clang/sys/dev/usb/usb_device.c projects/mips64-clang/sys/dev/usb/usb_device.h projects/mips64-clang/sys/dev/usb/usb_generic.c projects/mips64-clang/sys/dev/usb/usb_request.c projects/mips64-clang/sys/dev/usb/usb_transfer.c projects/mips64-clang/sys/dev/usb/usb_util.c projects/mips64-clang/sys/dev/usb/wlan/if_rum.c projects/mips64-clang/sys/fs/nullfs/null_vnops.c projects/mips64-clang/sys/geom/mirror/g_mirror.c projects/mips64-clang/sys/i386/i386/machdep.c projects/mips64-clang/sys/i386/i386/pmap.c projects/mips64-clang/sys/i386/i386/support.s projects/mips64-clang/sys/i386/i386/trap.c projects/mips64-clang/sys/i386/i386/vm86.c projects/mips64-clang/sys/i386/include/pmap.h projects/mips64-clang/sys/kern/capabilities.conf projects/mips64-clang/sys/kern/init_sysent.c projects/mips64-clang/sys/kern/kern_condvar.c projects/mips64-clang/sys/kern/kern_descrip.c projects/mips64-clang/sys/kern/kern_sig.c projects/mips64-clang/sys/kern/subr_bus.c projects/mips64-clang/sys/kern/subr_gtaskqueue.c projects/mips64-clang/sys/kern/subr_sleepqueue.c projects/mips64-clang/sys/kern/subr_smp.c projects/mips64-clang/sys/kern/subr_taskqueue.c projects/mips64-clang/sys/kern/sys_capability.c projects/mips64-clang/sys/kern/uipc_mbuf.c projects/mips64-clang/sys/kern/uipc_usrreq.c projects/mips64-clang/sys/kern/vfs_cache.c projects/mips64-clang/sys/kern/vfs_lookup.c projects/mips64-clang/sys/kern/vnode_if.src projects/mips64-clang/sys/mips/broadcom/bcm_machdep.c projects/mips64-clang/sys/mips/broadcom/files.broadcom projects/mips64-clang/sys/mips/broadcom/uart_bus_chipc.c projects/mips64-clang/sys/mips/broadcom/uart_cpu_chipc.c projects/mips64-clang/sys/mips/cavium/octeon_mp.c projects/mips64-clang/sys/mips/conf/AP135 projects/mips64-clang/sys/mips/conf/BCM projects/mips64-clang/sys/mips/conf/CARAMBOLA2 projects/mips64-clang/sys/mips/conf/DIR-655A1 projects/mips64-clang/sys/mips/conf/TL-ARCHERC7V2 projects/mips64-clang/sys/mips/conf/TL-WDR4300 projects/mips64-clang/sys/mips/conf/TL-WR1043NDv2 projects/mips64-clang/sys/mips/conf/TP-WN1043ND projects/mips64-clang/sys/mips/conf/std.AR933X projects/mips64-clang/sys/mips/conf/std.AR934X projects/mips64-clang/sys/mips/gxemul/gxemul_machdep.c projects/mips64-clang/sys/mips/include/hwfunc.h projects/mips64-clang/sys/mips/include/intr.h projects/mips64-clang/sys/mips/malta/files.malta projects/mips64-clang/sys/mips/malta/std.malta projects/mips64-clang/sys/mips/mips/locore.S projects/mips64-clang/sys/mips/mips/mips_pic.c projects/mips64-clang/sys/mips/mips/mp_machdep.c projects/mips64-clang/sys/mips/mips/nexus.c projects/mips64-clang/sys/mips/mips/pmap.c projects/mips64-clang/sys/mips/nlm/xlp_machdep.c projects/mips64-clang/sys/mips/rmi/xlr_machdep.c projects/mips64-clang/sys/mips/sibyte/sb_machdep.c projects/mips64-clang/sys/mips/sibyte/sb_scd.c projects/mips64-clang/sys/modules/bhnd/Makefile projects/mips64-clang/sys/modules/bhnd/bcma/Makefile projects/mips64-clang/sys/modules/bhnd/bcma_bhndb/Makefile projects/mips64-clang/sys/modules/bhnd/bhndb/Makefile projects/mips64-clang/sys/modules/bhnd/cores/Makefile projects/mips64-clang/sys/modules/bhnd/siba/Makefile projects/mips64-clang/sys/modules/bhnd/siba_bhndb/Makefile projects/mips64-clang/sys/modules/bwn/Makefile projects/mips64-clang/sys/modules/cloudabi32/Makefile projects/mips64-clang/sys/modules/cloudabi64/Makefile projects/mips64-clang/sys/modules/cxgbe/Makefile projects/mips64-clang/sys/modules/cxgbe/cxgbei/Makefile projects/mips64-clang/sys/net/ethernet.h projects/mips64-clang/sys/net/rndis.h projects/mips64-clang/sys/net80211/ieee80211_freebsd.c projects/mips64-clang/sys/net80211/ieee80211_freebsd.h projects/mips64-clang/sys/netinet/igmp.c projects/mips64-clang/sys/netinet/tcp_stacks/fastpath.c projects/mips64-clang/sys/netipsec/ipsec_input.c projects/mips64-clang/sys/powerpc/aim/mmu_oea.c projects/mips64-clang/sys/powerpc/aim/mmu_oea64.c projects/mips64-clang/sys/powerpc/booke/pmap.c projects/mips64-clang/sys/powerpc/conf/NOTES projects/mips64-clang/sys/powerpc/mpc85xx/mpc85xx.c projects/mips64-clang/sys/powerpc/mpc85xx/platform_mpc85xx.c projects/mips64-clang/sys/powerpc/powerpc/cpu.c projects/mips64-clang/sys/powerpc/powerpc/mmu_if.m projects/mips64-clang/sys/powerpc/powerpc/pmap_dispatch.c projects/mips64-clang/sys/riscv/riscv/pmap.c projects/mips64-clang/sys/riscv/riscv/timer.c projects/mips64-clang/sys/security/audit/audit_syscalls.c projects/mips64-clang/sys/sparc64/conf/GENERIC projects/mips64-clang/sys/sparc64/sparc64/pmap.c projects/mips64-clang/sys/sys/bus.h projects/mips64-clang/sys/sys/filedesc.h projects/mips64-clang/sys/sys/mbuf.h projects/mips64-clang/sys/sys/param.h projects/mips64-clang/sys/sys/queue.h projects/mips64-clang/sys/ufs/ffs/ffs_balloc.c projects/mips64-clang/sys/ufs/ffs/ffs_extern.h projects/mips64-clang/sys/ufs/ffs/ffs_inode.c projects/mips64-clang/sys/ufs/ffs/ffs_softdep.c projects/mips64-clang/sys/ufs/ffs/ffs_suspend.c projects/mips64-clang/sys/ufs/ffs/ffs_vfsops.c projects/mips64-clang/sys/ufs/ffs/ffs_vnops.c projects/mips64-clang/sys/ufs/ffs/fs.h projects/mips64-clang/sys/ufs/ufs/dir.h projects/mips64-clang/sys/ufs/ufs/ufs_lookup.c projects/mips64-clang/sys/ufs/ufs/ufs_quota.c projects/mips64-clang/sys/ufs/ufs/ufs_vnops.c projects/mips64-clang/sys/vm/pmap.h projects/mips64-clang/sys/vm/swap_pager.c projects/mips64-clang/sys/vm/vm_meter.c projects/mips64-clang/sys/vm/vm_page.c projects/mips64-clang/sys/vm/vm_page.h projects/mips64-clang/sys/vm/vm_phys.c projects/mips64-clang/sys/vm/vm_phys.h projects/mips64-clang/sys/x86/x86/cpu_machdep.c projects/mips64-clang/targets/pseudo/bootstrap-tools/Makefile projects/mips64-clang/targets/pseudo/hosttools/Makefile.depend.host projects/mips64-clang/targets/pseudo/tests/Makefile.depend projects/mips64-clang/targets/pseudo/userland/Makefile.depend projects/mips64-clang/targets/pseudo/userland/cddl/Makefile.depend projects/mips64-clang/targets/pseudo/userland/libexec/Makefile.depend projects/mips64-clang/tests/sys/acl/04.sh projects/mips64-clang/tests/sys/mac/bsdextended/matches_test.sh projects/mips64-clang/tools/bsdbox/Makefile.depend projects/mips64-clang/tools/regression/capsicum/syscalls/cap_fcntls_limit.c projects/mips64-clang/tools/regression/capsicum/syscalls/cap_ioctls_limit.c projects/mips64-clang/tools/tools/crypto/cryptotest.c projects/mips64-clang/tools/tools/locale/Makefile projects/mips64-clang/tools/tools/locale/tools/cldr2def.pl projects/mips64-clang/tools/tools/net80211/wlanwds/wlanwds.c projects/mips64-clang/usr.bin/Makefile projects/mips64-clang/usr.bin/bmake/Makefile projects/mips64-clang/usr.bin/bsdiff/bspatch/bspatch.c projects/mips64-clang/usr.bin/gzip/gzip.c projects/mips64-clang/usr.bin/localedef/collate.c projects/mips64-clang/usr.bin/netstat/route.c projects/mips64-clang/usr.bin/newkey/generic.c projects/mips64-clang/usr.bin/nfsstat/Makefile.depend projects/mips64-clang/usr.bin/sort/sort.1.in projects/mips64-clang/usr.bin/tar/tests/Makefile.depend projects/mips64-clang/usr.bin/top/machine.c projects/mips64-clang/usr.bin/w/w.1 projects/mips64-clang/usr.bin/w/w.c projects/mips64-clang/usr.sbin/acpi/acpidump/acpi.c projects/mips64-clang/usr.sbin/bhyve/Makefile.depend projects/mips64-clang/usr.sbin/bhyve/pci_e82545.c projects/mips64-clang/usr.sbin/bluetooth/btpand/bnep.c projects/mips64-clang/usr.sbin/bluetooth/btpand/btpand.h projects/mips64-clang/usr.sbin/bsdinstall/partedit/gpart_ops.c projects/mips64-clang/usr.sbin/cron/cron/cron.h projects/mips64-clang/usr.sbin/cron/crontab/crontab.c projects/mips64-clang/usr.sbin/crunch/crunchgen/crunchgen.c projects/mips64-clang/usr.sbin/devctl/devctl.8 projects/mips64-clang/usr.sbin/devctl/devctl.c projects/mips64-clang/usr.sbin/etcupdate/etcupdate.sh projects/mips64-clang/usr.sbin/newsyslog/newsyslog.c projects/mips64-clang/usr.sbin/newsyslog/tests/legacy_test.sh projects/mips64-clang/usr.sbin/portsnap/portsnap/portsnap.sh projects/mips64-clang/usr.sbin/pw/tests/Makefile.depend projects/mips64-clang/usr.sbin/unbound/checkconf/Makefile projects/mips64-clang/usr.sbin/unbound/control/Makefile projects/mips64-clang/usr.sbin/unbound/daemon/Makefile Directory Properties: projects/mips64-clang/ (props changed) projects/mips64-clang/cddl/ (props changed) projects/mips64-clang/cddl/contrib/opensolaris/ (props changed) projects/mips64-clang/cddl/contrib/opensolaris/cmd/zdb/ (props changed) projects/mips64-clang/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/mips64-clang/contrib/bmake/ (props changed) projects/mips64-clang/contrib/elftoolchain/ (props changed) projects/mips64-clang/contrib/elftoolchain/elfdump/ (props changed) projects/mips64-clang/contrib/gcc/ (props changed) projects/mips64-clang/contrib/ipfilter/ (props changed) projects/mips64-clang/contrib/libarchive/ (props changed) projects/mips64-clang/contrib/libarchive/libarchive/ (props changed) projects/mips64-clang/contrib/libarchive/tar/ (props changed) projects/mips64-clang/contrib/libcxxrt/ (props changed) projects/mips64-clang/contrib/llvm/ (props changed) projects/mips64-clang/contrib/ncurses/ (props changed) projects/mips64-clang/contrib/netbsd-tests/ (props changed) projects/mips64-clang/contrib/one-true-awk/ (props changed) projects/mips64-clang/contrib/tnftp/ (props changed) projects/mips64-clang/contrib/top/ (props changed) projects/mips64-clang/contrib/unbound/ (props changed) projects/mips64-clang/crypto/openssh/ (props changed) projects/mips64-clang/gnu/lib/ (props changed) projects/mips64-clang/sys/cddl/contrib/opensolaris/ (props changed) projects/mips64-clang/sys/contrib/ipfilter/ (props changed) Modified: projects/mips64-clang/Makefile ============================================================================== --- projects/mips64-clang/Makefile Fri Sep 9 17:40:26 2016 (r305668) +++ projects/mips64-clang/Makefile Fri Sep 9 18:18:37 2016 (r305669) @@ -109,7 +109,8 @@ # Note: we use this awkward construct to be compatible with FreeBSD's # old make used in 10.0 and 9.2 and earlier. -.if defined(MK_DIRDEPS_BUILD) && ${MK_DIRDEPS_BUILD} == "yes" && !make(showconfig) +.if defined(MK_DIRDEPS_BUILD) && ${MK_DIRDEPS_BUILD} == "yes" && \ + !make(showconfig) && !make(print-dir) # targets/Makefile plays the role of top-level .include "targets/Makefile" .else @@ -132,7 +133,7 @@ TGTS= all all-man buildenv buildenvvars xdev-links native-xtools stageworld stagekernel stage-packages \ create-world-packages create-kernel-packages create-packages \ packages installconfig real-packages sign-packages package-pkg \ - test-system-compiler + print-dir test-system-compiler # XXX: r156740: This can't work since bsd.subdir.mk is not included ever. # It will only work for SUBDIR_TARGETS in make.conf. @@ -257,6 +258,10 @@ _TARGET_ARCH= ${XDEV_ARCH} _TARGET?= ${MACHINE} _TARGET_ARCH?= ${MACHINE_ARCH} +.if make(print-dir) +.SILENT: +.endif + # # Make sure we have an up-to-date make(1). Only world and buildworld # should do this as those are the initial targets used for upgrades. Modified: projects/mips64-clang/Makefile.inc1 ============================================================================== --- projects/mips64-clang/Makefile.inc1 Fri Sep 9 17:40:26 2016 (r305668) +++ projects/mips64-clang/Makefile.inc1 Fri Sep 9 18:18:37 2016 (r305669) @@ -1628,8 +1628,10 @@ _crunchide= usr.sbin/crunch/crunchide # r285986 crunchen: use STRIPBIN rather than STRIP # 1100113: Support MK_AUTO_OBJ +# 1200006: META_MODE fixes .if ${BOOTSTRAPPING} < 1100078 || \ - (${MK_AUTO_OBJ} == "yes" && ${BOOTSTRAPPING} < 1100114) + (${MK_AUTO_OBJ} == "yes" && ${BOOTSTRAPPING} < 1100114) || \ + (${MK_META_MODE} == "yes" && ${BOOTSTRAPPING} < 1200006) _crunchgen= usr.sbin/crunch/crunchgen .endif Modified: projects/mips64-clang/ObsoleteFiles.inc ============================================================================== --- projects/mips64-clang/ObsoleteFiles.inc Fri Sep 9 17:40:26 2016 (r305668) +++ projects/mips64-clang/ObsoleteFiles.inc Fri Sep 9 18:18:37 2016 (r305669) @@ -38,6 +38,11 @@ # xargs -n1 | sort | uniq -d; # done +# 20160906: libkqueue tests moved to /usr/tests/sys/kqueue/libkqueue +OLD_FILES+=usr/tests/sys/kqueue/kqtest +OLD_FILES+=usr/tests/sys/kqueue/kqueue_test +# 20160901: Remove digi(4) +OLD_FILES+=usr/share/man/man4/digi.4.gz # 20160819: Remove ie(4) OLD_FILES+=usr/share/man/man4/i386/ie.4.gz # 20160819: Remove spic(4) Modified: projects/mips64-clang/UPDATING ============================================================================== --- projects/mips64-clang/UPDATING Fri Sep 9 17:40:26 2016 (r305668) +++ projects/mips64-clang/UPDATING Fri Sep 9 18:18:37 2016 (r305669) @@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20160908: + The queue(3) debugging macro, QUEUE_MACRO_DEBUG, has been split into + two separate components, QUEUE_MACRO_DEBUG_TRACE and + QUEUE_MACRO_DEBUG_TRASH. Define both for the original + QUEUE_MACRO_DEBUG behavior. + 20160824: r304787 changed some ioctl interfaces between the iSCSI userspace programs and the kernel. ctladm, ctld, iscsictl, and iscsid must be Modified: projects/mips64-clang/bin/cat/tests/Makefile ============================================================================== --- projects/mips64-clang/bin/cat/tests/Makefile Fri Sep 9 17:40:26 2016 (r305668) +++ projects/mips64-clang/bin/cat/tests/Makefile Fri Sep 9 18:18:37 2016 (r305669) @@ -6,7 +6,15 @@ NETBSD_ATF_TESTS_SH= cat_test ${PACKAGE}FILES+= d_align.in ${PACKAGE}FILES+= d_align.out +${PACKAGE}FILES+= d_se_output.in +${PACKAGE}FILES+= d_se_output.out .include +d_align.out: ${TESTSRC}/d_align.out + sed -E -e 's,^[[:space:]]{7}\$$$$,\$$,' < ${.ALLSRC} > ${.TARGET}.tmp + mv ${.TARGET}.tmp ${.TARGET} + +CLEANFILES+= d_align.out d_align.out.tmp + .include Modified: projects/mips64-clang/bin/df/df.c ============================================================================== --- projects/mips64-clang/bin/df/df.c Fri Sep 9 17:40:26 2016 (r305668) +++ projects/mips64-clang/bin/df/df.c Fri Sep 9 18:18:37 2016 (r305669) @@ -166,6 +166,9 @@ main(int argc, char *argv[]) hflag = 0; break; case 'l': + /* Ignore duplicate -l */ + if (lflag) + break; if (vfslist != NULL) xo_errx(1, "-l and -t are mutually exclusive."); vfslist = makevfslist(makenetvfslist()); Modified: projects/mips64-clang/bin/sh/tests/builtins/Makefile ============================================================================== --- projects/mips64-clang/bin/sh/tests/builtins/Makefile Fri Sep 9 17:40:26 2016 (r305668) +++ projects/mips64-clang/bin/sh/tests/builtins/Makefile Fri Sep 9 18:18:37 2016 (r305669) @@ -68,6 +68,9 @@ ${PACKAGE}FILES+= dot1.0 ${PACKAGE}FILES+= dot2.0 ${PACKAGE}FILES+= dot3.0 ${PACKAGE}FILES+= dot4.0 +${PACKAGE}FILES+= echo1.0 +${PACKAGE}FILES+= echo2.0 +${PACKAGE}FILES+= echo3.0 ${PACKAGE}FILES+= eval1.0 ${PACKAGE}FILES+= eval2.0 ${PACKAGE}FILES+= eval3.0 Copied: projects/mips64-clang/bin/sh/tests/builtins/echo1.0 (from r305394, head/bin/sh/tests/builtins/echo1.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips64-clang/bin/sh/tests/builtins/echo1.0 Fri Sep 9 18:18:37 2016 (r305669, copy of r305394, head/bin/sh/tests/builtins/echo1.0) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +# Not specified by POSIX. + +[ "`echo -n a b; echo c d; echo e f`" = "a bc d +e f" ] Copied: projects/mips64-clang/bin/sh/tests/builtins/echo2.0 (from r305394, head/bin/sh/tests/builtins/echo2.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips64-clang/bin/sh/tests/builtins/echo2.0 Fri Sep 9 18:18:37 2016 (r305669, copy of r305394, head/bin/sh/tests/builtins/echo2.0) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +# Not specified by POSIX. + +a=`echo -e '\a\b\e\f\n\r\t\v\\\\\0041\c'; echo .` +b=`printf '\a\b\033\f\n\r\t\v\\\\!.'` +[ "$a" = "$b" ] Copied: projects/mips64-clang/bin/sh/tests/builtins/echo3.0 (from r305394, head/bin/sh/tests/builtins/echo3.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips64-clang/bin/sh/tests/builtins/echo3.0 Fri Sep 9 18:18:37 2016 (r305669, copy of r305394, head/bin/sh/tests/builtins/echo3.0) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +# Not specified by POSIX. + +[ "`echo -e 'a\cb' c; echo d`" = "ad" ] Modified: projects/mips64-clang/cddl/contrib/opensolaris/cmd/zdb/zdb.c ============================================================================== --- projects/mips64-clang/cddl/contrib/opensolaris/cmd/zdb/zdb.c Fri Sep 9 17:40:26 2016 (r305668) +++ projects/mips64-clang/cddl/contrib/opensolaris/cmd/zdb/zdb.c Fri Sep 9 18:18:37 2016 (r305669) @@ -21,7 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011, 2015 by Delphix. All rights reserved. + * Copyright (c) 2011, 2016 by Delphix. All rights reserved. * Copyright (c) 2014 Integros [integros.com] */ @@ -60,7 +60,6 @@ #include #include #include -#undef ZFS_MAXNAMELEN #undef verify #include @@ -118,7 +117,7 @@ static void usage(void) { (void) fprintf(stderr, - "Usage: %s [-CumMdibcsDvhLXFPA] [-t txg] [-e [-p path...]] " + "Usage: %s [-CumMdibcsDvhLXFPAG] [-t txg] [-e [-p path...]] " "[-U config] [-I inflight I/Os] [-x dumpdir] poolname [object...]\n" " %s [-divPA] [-e -p path...] [-U config] dataset " "[object...]\n" @@ -179,12 +178,23 @@ usage(void) (void) fprintf(stderr, " -I -- " "specify the maximum number of " "checksumming I/Os [default is 200]\n"); + (void) fprintf(stderr, " -G dump zfs_dbgmsg buffer before " + "exiting\n"); (void) fprintf(stderr, "Specify an option more than once (e.g. -bb) " "to make only that option verbose\n"); (void) fprintf(stderr, "Default is to dump everything non-verbosely\n"); exit(1); } +static void +dump_debug_buffer() +{ + if (dump_opt['G']) { + (void) printf("\n"); + zfs_dbgmsg_print("zdb"); + } +} + /* * Called for usage errors that are discovered after a call to spa_open(), * dmu_bonus_hold(), or pool_match(). abort() is called for other errors. @@ -201,6 +211,8 @@ fatal(const char *fmt, ...) va_end(ap); (void) fprintf(stderr, "\n"); + dump_debug_buffer(); + exit(1); } @@ -1290,7 +1302,7 @@ visit_indirect(spa_t *spa, const dnode_p } if (!err) ASSERT3U(fill, ==, BP_GET_FILL(bp)); - (void) arc_buf_remove_ref(buf, &buf); + arc_buf_destroy(buf, &buf); } return (err); @@ -1945,7 +1957,7 @@ dump_dir(objset_t *os) uint64_t refdbytes, usedobjs, scratch; char numbuf[32]; char blkbuf[BP_SPRINTF_LEN + 20]; - char osname[MAXNAMELEN]; + char osname[ZFS_MAX_DATASET_NAME_LEN]; char *type = "UNKNOWN"; int verbosity = dump_opt['d']; int print_header = 1; @@ -3104,8 +3116,10 @@ dump_zpool(spa_t *spa) if (dump_opt['h']) dump_history(spa); - if (rc != 0) + if (rc != 0) { + dump_debug_buffer(); exit(rc); + } } #define ZDB_FLAG_CHECKSUM 0x0001 @@ -3482,7 +3496,7 @@ find_zpool(char **target, nvlist_t **con nvlist_t *match = NULL; char *name = NULL; char *sepp = NULL; - char sep; + char sep = '\0'; int count = 0; importargs_t args = { 0 }; @@ -3576,7 +3590,7 @@ main(int argc, char **argv) spa_config_path = spa_config_path_env; while ((c = getopt(argc, argv, - "bcdhilmMI:suCDRSAFLXx:evp:t:U:P")) != -1) { + "bcdhilmMI:suCDRSAFLXx:evp:t:U:PG")) != -1) { switch (c) { case 'b': case 'c': @@ -3592,6 +3606,7 @@ main(int argc, char **argv) case 'M': case 'R': case 'S': + case 'G': dump_opt[c]++; dump_all = 0; break; @@ -3827,6 +3842,8 @@ main(int argc, char **argv) fuid_table_destroy(); sa_loaded = B_FALSE; + dump_debug_buffer(); + libzfs_fini(g_zfs); kernel_fini(); Modified: projects/mips64-clang/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c ============================================================================== --- projects/mips64-clang/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c Fri Sep 9 17:40:26 2016 (r305668) +++ projects/mips64-clang/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c Fri Sep 9 18:18:37 2016 (r305669) @@ -21,8 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012 Pawel Jakub Dawidek . - * All rights reserved. + * Copyright (c) 2012 Pawel Jakub Dawidek. All rights reserved. * Copyright 2013 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2013 by Delphix. All rights reserved. */ @@ -320,8 +319,8 @@ zfs_sort(const void *larg, const void *r } else if (psc->sc_prop == ZFS_PROP_NAME) { lvalid = rvalid = B_TRUE; - (void) strlcpy(lbuf, zfs_get_name(l), sizeof(lbuf)); - (void) strlcpy(rbuf, zfs_get_name(r), sizeof(rbuf)); + (void) strlcpy(lbuf, zfs_get_name(l), sizeof (lbuf)); + (void) strlcpy(rbuf, zfs_get_name(r), sizeof (rbuf)); lstr = lbuf; rstr = rbuf; Modified: projects/mips64-clang/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h ============================================================================== --- projects/mips64-clang/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h Fri Sep 9 17:40:26 2016 (r305668) +++ projects/mips64-clang/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h Fri Sep 9 18:18:37 2016 (r305669) @@ -22,6 +22,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2011-2012 Pawel Jakub Dawidek. All rights reserved. * Copyright 2013 Nexenta Systems, Inc. All rights reserved. */ Modified: projects/mips64-clang/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/mips64-clang/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Sep 9 17:40:26 2016 (r305668) +++ projects/mips64-clang/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Sep 9 18:18:37 2016 (r305669) @@ -24,13 +24,12 @@ * Copyright (c) 2011, 2015 by Delphix. All rights reserved. * Copyright 2012 Milan Jurik. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. - * Copyright (c) 2011-2012 Pawel Jakub Dawidek . - * All rights reserved. + * Copyright (c) 2011-2012 Pawel Jakub Dawidek. All rights reserved. * Copyright (c) 2012 Martin Matuska . All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. - * Copyright 2013 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2014 Integros [integros.com] * Copyright 2016 Igor Kozhukhov . + * Copyright 2016 Nexenta Systems, Inc. */ #include @@ -1511,7 +1510,7 @@ get_callback(zfs_handle_t *zhp, void *da char buf[ZFS_MAXPROPLEN]; char rbuf[ZFS_MAXPROPLEN]; zprop_source_t sourcetype; - char source[ZFS_MAXNAMELEN]; + char source[ZFS_MAX_DATASET_NAME_LEN]; zprop_get_cbdata_t *cbp = data; nvlist_t *user_props = zfs_get_user_props(zhp); zprop_list_t *pl = cbp->cb_proplist; @@ -1991,7 +1990,7 @@ typedef struct upgrade_cbdata { uint64_t cb_version; boolean_t cb_newer; boolean_t cb_foundone; - char cb_lastfs[ZFS_MAXNAMELEN]; + char cb_lastfs[ZFS_MAX_DATASET_NAME_LEN]; } upgrade_cbdata_t; static int @@ -2437,7 +2436,7 @@ userspace_cb(void *arg, const char *doma if (domain != NULL && domain[0] != '\0') { /* SMB */ - char sid[ZFS_MAXNAMELEN + 32]; + char sid[MAXNAMELEN + 32]; uid_t id; #ifdef illumos int err; @@ -2574,7 +2573,7 @@ print_us_node(boolean_t scripted, boolea size_t *width, us_node_t *node) { nvlist_t *nvl = node->usn_nvl; - char valstr[ZFS_MAXNAMELEN]; + char valstr[MAXNAMELEN]; boolean_t first = B_TRUE; int cfield = 0; int field; @@ -3009,7 +3008,7 @@ print_dataset(zfs_handle_t *zhp, list_cb if (pl->pl_prop == ZFS_PROP_NAME) { (void) strlcpy(property, zfs_get_name(zhp), - sizeof(property)); + sizeof (property)); propstr = property; right_justify = zfs_prop_align_right(pl->pl_prop); } else if (pl->pl_prop != ZPROP_INVAL) { @@ -3473,7 +3472,7 @@ zfs_do_rollback(int argc, char **argv) boolean_t force = B_FALSE; rollback_cbdata_t cb = { 0 }; zfs_handle_t *zhp, *snap; - char parentname[ZFS_MAXNAMELEN]; + char parentname[ZFS_MAX_DATASET_NAME_LEN]; char *delim; /* check options */ @@ -3873,7 +3872,7 @@ zfs_do_send(int argc, char **argv) */ if (strchr(argv[0], '@') == NULL || (fromname && strchr(fromname, '#') != NULL)) { - char frombuf[ZFS_MAXNAMELEN]; + char frombuf[ZFS_MAX_DATASET_NAME_LEN]; enum lzc_send_flags lzc_flags = 0; if (flags.replicate || flags.doall || flags.props || @@ -3925,7 +3924,7 @@ zfs_do_send(int argc, char **argv) * case if they specify the origin. */ if (fromname && (cp = strchr(fromname, '@')) != NULL) { - char origin[ZFS_MAXNAMELEN]; + char origin[ZFS_MAX_DATASET_NAME_LEN]; zprop_source_t src; (void) zfs_prop_get(zhp, ZFS_PROP_ORIGIN, @@ -4059,7 +4058,7 @@ zfs_do_receive(int argc, char **argv) usage(B_FALSE); } - char namebuf[ZFS_MAXNAMELEN]; + char namebuf[ZFS_MAX_DATASET_NAME_LEN]; (void) snprintf(namebuf, sizeof (namebuf), "%s/%%recv", argv[0]); @@ -4917,7 +4916,7 @@ store_allow_perm(zfs_deleg_who_type_t ty { int i; char ld[2] = { '\0', '\0' }; - char who_buf[ZFS_MAXNAMELEN+32]; + char who_buf[MAXNAMELEN + 32]; char base_type = '\0'; char set_type = '\0'; nvlist_t *base_nvl = NULL; @@ -5285,7 +5284,7 @@ static void print_fs_perms(fs_perm_set_t *fspset) { fs_perm_node_t *node = NULL; - char buf[ZFS_MAXNAMELEN+32]; + char buf[MAXNAMELEN + 32]; const char *dsname = buf; for (node = uu_list_first(fspset->fsps_list); node != NULL; @@ -5294,7 +5293,7 @@ print_fs_perms(fs_perm_set_t *fspset) uu_avl_t *uge_avl = node->fspn_fsperm.fsp_uge_avl; int left = 0; - (void) snprintf(buf, ZFS_MAXNAMELEN+32, + (void) snprintf(buf, sizeof (buf), gettext("---- Permissions on %s "), node->fspn_fsperm.fsp_name); (void) printf(dsname); @@ -5491,7 +5490,7 @@ zfs_do_hold_rele_impl(int argc, char **a for (i = 0; i < argc; ++i) { zfs_handle_t *zhp; - char parent[ZFS_MAXNAMELEN]; + char parent[ZFS_MAX_DATASET_NAME_LEN]; const char *delim; char *path = argv[i]; @@ -5624,7 +5623,7 @@ holds_callback(zfs_handle_t *zhp, void * nvlist_t *nvl = NULL; nvpair_t *nvp = NULL; const char *zname = zfs_get_name(zhp); - size_t znamelen = strnlen(zname, ZFS_MAXNAMELEN); + size_t znamelen = strlen(zname); if (cbp->cb_recursive && cbp->cb_snapname != NULL) { const char *snapname; @@ -5645,7 +5644,7 @@ holds_callback(zfs_handle_t *zhp, void * while ((nvp = nvlist_next_nvpair(nvl, nvp)) != NULL) { const char *tag = nvpair_name(nvp); - size_t taglen = strnlen(tag, MAXNAMELEN); + size_t taglen = strlen(tag); if (taglen > cbp->cb_max_taglen) cbp->cb_max_taglen = taglen; } @@ -6484,6 +6483,15 @@ unshare_unmount(int op, int argc, char * continue; } + /* + * Ignore datasets that are excluded/restricted by + * parent pool name. + */ + if (zpool_skip_pool(zfs_get_pool_name(zhp))) { + zfs_close(zhp); + continue; + } + switch (op) { case OP_SHARE: verify(zfs_prop_get(zhp, ZFS_PROP_SHARENFS, @@ -6973,7 +6981,7 @@ zfs_do_diff(int argc, char **argv) static int zfs_do_bookmark(int argc, char **argv) { - char snapname[ZFS_MAXNAMELEN]; + char snapname[ZFS_MAX_DATASET_NAME_LEN]; zfs_handle_t *zhp; nvlist_t *nvl; int ret = 0; Modified: projects/mips64-clang/cddl/contrib/opensolaris/cmd/zhack/zhack.c ============================================================================== --- projects/mips64-clang/cddl/contrib/opensolaris/cmd/zhack/zhack.c Fri Sep 9 17:40:26 2016 (r305668) +++ projects/mips64-clang/cddl/contrib/opensolaris/cmd/zhack/zhack.c Fri Sep 9 18:18:37 2016 (r305669) @@ -48,7 +48,6 @@ #include #include #include -#undef ZFS_MAXNAMELEN #undef verify #include Modified: projects/mips64-clang/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c ============================================================================== --- projects/mips64-clang/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Fri Sep 9 17:40:26 2016 (r305668) +++ projects/mips64-clang/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c Fri Sep 9 18:18:37 2016 (r305669) @@ -4540,7 +4540,7 @@ zpool_do_status(int argc, char **argv) typedef struct upgrade_cbdata { boolean_t cb_first; boolean_t cb_unavail; - char cb_poolname[ZPOOL_MAXNAMELEN]; + char cb_poolname[ZFS_MAX_DATASET_NAME_LEN]; int cb_argc; uint64_t cb_version; char **cb_argv; Modified: projects/mips64-clang/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c ============================================================================== --- projects/mips64-clang/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c Fri Sep 9 17:40:26 2016 (r305668) +++ projects/mips64-clang/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c Fri Sep 9 18:18:37 2016 (r305669) @@ -21,7 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2013, 2015 by Delphix. All rights reserved. * Copyright 2016 Igor Kozhukhov . */ @@ -597,7 +597,6 @@ get_replication(nvlist_t *nvroot, boolea verify(nvlist_lookup_nvlist_array(nvroot, ZPOOL_CONFIG_CHILDREN, &top, &toplevels) == 0); - lastrep.zprl_type = NULL; for (t = 0; t < toplevels; t++) { uint64_t is_log = B_FALSE; Modified: projects/mips64-clang/cddl/contrib/opensolaris/cmd/ztest/ztest.c ============================================================================== --- projects/mips64-clang/cddl/contrib/opensolaris/cmd/ztest/ztest.c Fri Sep 9 17:40:26 2016 (r305668) +++ projects/mips64-clang/cddl/contrib/opensolaris/cmd/ztest/ztest.c Fri Sep 9 18:18:37 2016 (r305669) @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011, 2015 by Delphix. All rights reserved. + * Copyright (c) 2011, 2016 by Delphix. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012 Martin Matuska . All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. @@ -141,8 +141,8 @@ typedef struct ztest_shared_hdr { static ztest_shared_hdr_t *ztest_shared_hdr; typedef struct ztest_shared_opts { - char zo_pool[MAXNAMELEN]; - char zo_dir[MAXNAMELEN]; + char zo_pool[ZFS_MAX_DATASET_NAME_LEN]; + char zo_dir[ZFS_MAX_DATASET_NAME_LEN]; char zo_alt_ztest[MAXNAMELEN]; char zo_alt_libpath[MAXNAMELEN]; uint64_t zo_vdevs; @@ -189,6 +189,7 @@ extern uint64_t metaslab_gang_bang; extern uint64_t metaslab_df_alloc_threshold; extern uint64_t zfs_deadman_synctime_ms; extern int metaslab_preload_limit; +extern boolean_t zfs_compressed_arc_enabled; static ztest_shared_opts_t *ztest_shared_opts; static ztest_shared_opts_t ztest_opts; @@ -268,7 +269,7 @@ typedef struct ztest_od { uint64_t od_crblocksize; uint64_t od_gen; uint64_t od_crgen; - char od_name[MAXNAMELEN]; + char od_name[ZFS_MAX_DATASET_NAME_LEN]; } ztest_od_t; /* @@ -280,7 +281,7 @@ typedef struct ztest_ds { rwlock_t zd_zilog_lock; zilog_t *zd_zilog; ztest_od_t *zd_od; /* debugging aid */ - char zd_name[MAXNAMELEN]; + char zd_name[ZFS_MAX_DATASET_NAME_LEN]; mutex_t zd_dirobj_lock; rll_t zd_object_lock[ZTEST_OBJECT_LOCKS]; rll_t zd_range_lock[ZTEST_RANGE_LOCKS]; @@ -3227,7 +3228,7 @@ ztest_objset_destroy_cb(const char *name static boolean_t ztest_snapshot_create(char *osname, uint64_t id) { - char snapname[MAXNAMELEN]; + char snapname[ZFS_MAX_DATASET_NAME_LEN]; int error; (void) snprintf(snapname, sizeof (snapname), "%llu", (u_longlong_t)id); @@ -3247,10 +3248,10 @@ ztest_snapshot_create(char *osname, uint static boolean_t ztest_snapshot_destroy(char *osname, uint64_t id) { - char snapname[MAXNAMELEN]; + char snapname[ZFS_MAX_DATASET_NAME_LEN]; int error; - (void) snprintf(snapname, MAXNAMELEN, "%s@%llu", osname, + (void) snprintf(snapname, sizeof (snapname), "%s@%llu", osname, (u_longlong_t)id); error = dsl_destroy_snapshot(snapname, B_FALSE); @@ -3267,12 +3268,12 @@ ztest_dmu_objset_create_destroy(ztest_ds int iters; int error; objset_t *os, *os2; - char name[MAXNAMELEN]; + char name[ZFS_MAX_DATASET_NAME_LEN]; zilog_t *zilog; (void) rw_rdlock(&ztest_name_lock); - (void) snprintf(name, MAXNAMELEN, "%s/temp_%llu", + (void) snprintf(name, sizeof (name), "%s/temp_%llu", ztest_opts.zo_pool, (u_longlong_t)id); /* @@ -3378,18 +3379,23 @@ ztest_dmu_snapshot_create_destroy(ztest_ void ztest_dsl_dataset_cleanup(char *osname, uint64_t id) { - char snap1name[MAXNAMELEN]; - char clone1name[MAXNAMELEN]; - char snap2name[MAXNAMELEN]; - char clone2name[MAXNAMELEN]; - char snap3name[MAXNAMELEN]; + char snap1name[ZFS_MAX_DATASET_NAME_LEN]; + char clone1name[ZFS_MAX_DATASET_NAME_LEN]; + char snap2name[ZFS_MAX_DATASET_NAME_LEN]; + char clone2name[ZFS_MAX_DATASET_NAME_LEN]; + char snap3name[ZFS_MAX_DATASET_NAME_LEN]; int error; - (void) snprintf(snap1name, MAXNAMELEN, "%s@s1_%llu", osname, id); - (void) snprintf(clone1name, MAXNAMELEN, "%s/c1_%llu", osname, id); - (void) snprintf(snap2name, MAXNAMELEN, "%s@s2_%llu", clone1name, id); - (void) snprintf(clone2name, MAXNAMELEN, "%s/c2_%llu", osname, id); - (void) snprintf(snap3name, MAXNAMELEN, "%s@s3_%llu", clone1name, id); + (void) snprintf(snap1name, sizeof (snap1name), + "%s@s1_%llu", osname, id); + (void) snprintf(clone1name, sizeof (clone1name), + "%s/c1_%llu", osname, id); + (void) snprintf(snap2name, sizeof (snap2name), + "%s@s2_%llu", clone1name, id); + (void) snprintf(clone2name, sizeof (clone2name), + "%s/c2_%llu", osname, id); + (void) snprintf(snap3name, sizeof (snap3name), + "%s@s3_%llu", clone1name, id); error = dsl_destroy_head(clone2name); if (error && error != ENOENT) @@ -3415,11 +3421,11 @@ void ztest_dsl_dataset_promote_busy(ztest_ds_t *zd, uint64_t id) { objset_t *os; - char snap1name[MAXNAMELEN]; - char clone1name[MAXNAMELEN]; - char snap2name[MAXNAMELEN]; - char clone2name[MAXNAMELEN]; - char snap3name[MAXNAMELEN]; + char snap1name[ZFS_MAX_DATASET_NAME_LEN]; + char clone1name[ZFS_MAX_DATASET_NAME_LEN]; + char snap2name[ZFS_MAX_DATASET_NAME_LEN]; + char clone2name[ZFS_MAX_DATASET_NAME_LEN]; + char snap3name[ZFS_MAX_DATASET_NAME_LEN]; char *osname = zd->zd_name; int error; @@ -3427,11 +3433,16 @@ ztest_dsl_dataset_promote_busy(ztest_ds_ ztest_dsl_dataset_cleanup(osname, id); - (void) snprintf(snap1name, MAXNAMELEN, "%s@s1_%llu", osname, id); - (void) snprintf(clone1name, MAXNAMELEN, "%s/c1_%llu", osname, id); - (void) snprintf(snap2name, MAXNAMELEN, "%s@s2_%llu", clone1name, id); - (void) snprintf(clone2name, MAXNAMELEN, "%s/c2_%llu", osname, id); - (void) snprintf(snap3name, MAXNAMELEN, "%s@s3_%llu", clone1name, id); + (void) snprintf(snap1name, sizeof (snap1name), + "%s@s1_%llu", osname, id); + (void) snprintf(clone1name, sizeof (clone1name), + "%s/c1_%llu", osname, id); + (void) snprintf(snap2name, sizeof (snap2name), + "%s@s2_%llu", clone1name, id); + (void) snprintf(clone2name, sizeof (clone2name), + "%s/c2_%llu", osname, id); + (void) snprintf(snap3name, sizeof (snap3name), + "%s@s3_%llu", clone1name, id); error = dmu_objset_snapshot_one(osname, strchr(snap1name, '@') + 1); if (error && error != EEXIST) { @@ -4249,7 +4260,7 @@ ztest_fzap(ztest_ds_t *zd, uint64_t id) * 2050 entries we should see ptrtbl growth and leaf-block split. */ for (int i = 0; i < 2050; i++) { - char name[MAXNAMELEN]; + char name[ZFS_MAX_DATASET_NAME_LEN]; uint64_t value = i; dmu_tx_t *tx; int error; @@ -4654,7 +4665,7 @@ ztest_dmu_snapshot_hold(ztest_ds_t *zd, char fullname[100]; char clonename[100]; char tag[100]; - char osname[MAXNAMELEN]; + char osname[ZFS_MAX_DATASET_NAME_LEN]; nvlist_t *holds; (void) rw_rdlock(&ztest_name_lock); @@ -4782,7 +4793,7 @@ ztest_fault_inject(ztest_ds_t *zd, uint6 char path0[MAXPATHLEN]; char pathrand[MAXPATHLEN]; size_t fsize; - int bshift = SPA_OLD_MAXBLOCKSHIFT + 2; /* don't scrog all labels */ + int bshift = SPA_MAXBLOCKSHIFT + 2; int iters = 1000; int maxfaults; int mirror_save; @@ -4943,11 +4954,58 @@ ztest_fault_inject(ztest_ds_t *zd, uint6 fsize = lseek(fd, 0, SEEK_END); while (--iters != 0) { + /* + * The offset must be chosen carefully to ensure that + * we do not inject a given logical block with errors + * on two different leaf devices, because ZFS can not + * tolerate that (if maxfaults==1). + * + * We divide each leaf into chunks of size + * (# leaves * SPA_MAXBLOCKSIZE * 4). Within each chunk + * there is a series of ranges to which we can inject errors. + * Each range can accept errors on only a single leaf vdev. + * The error injection ranges are separated by ranges + * which we will not inject errors on any device (DMZs). + * Each DMZ must be large enough such that a single block + * can not straddle it, so that a single block can not be + * a target in two different injection ranges (on different + * leaf vdevs). + * + * For example, with 3 leaves, each chunk looks like: + * 0 to 32M: injection range for leaf 0 + * 32M to 64M: DMZ - no injection allowed + * 64M to 96M: injection range for leaf 1 + * 96M to 128M: DMZ - no injection allowed + * 128M to 160M: injection range for leaf 2 + * 160M to 192M: DMZ - no injection allowed + */ offset = ztest_random(fsize / (leaves << bshift)) * (leaves << bshift) + (leaf << bshift) + (ztest_random(1ULL << (bshift - 1)) & -8ULL); - if (offset >= fsize) + /* + * Only allow damage to the labels at one end of the vdev. + * + * If all labels are damaged, the device will be totally + * inaccessible, which will result in loss of data, + * because we also damage (parts of) the other side of + * the mirror/raidz. + * + * Additionally, we will always have both an even and an + * odd label, so that we can handle crashes in the + * middle of vdev_config_sync(). + */ + if ((leaf & 1) == 0 && offset < VDEV_LABEL_START_SIZE) + continue; + + /* + * The two end labels are stored at the "end" of the disk, but + * the end of the disk (vdev_psize) is aligned to + * sizeof (vdev_label_t). + */ + uint64_t psize = P2ALIGN(fsize, sizeof (vdev_label_t)); + if ((leaf & 1) == 1 && + offset + sizeof (bad) > psize - VDEV_LABEL_END_SIZE) continue; VERIFY(mutex_lock(&ztest_vdev_lock) == 0); @@ -5011,9 +5069,14 @@ ztest_ddt_repair(ztest_ds_t *zd, uint64_ return; } + dmu_objset_stats_t dds; + dsl_pool_config_enter(dmu_objset_pool(os), FTAG); + dmu_objset_fast_stat(os, &dds); + dsl_pool_config_exit(dmu_objset_pool(os), FTAG); + object = od[0].od_object; blocksize = od[0].od_blocksize; - pattern = zs->zs_guid ^ dmu_objset_fsid_guid(os); + pattern = zs->zs_guid ^ dds.dds_guid; ASSERT(object != 0); @@ -5345,6 +5408,12 @@ ztest_resume_thread(void *arg) if (spa_suspended(spa)) ztest_resume(spa); (void) poll(NULL, 0, 100); + + /* + * Periodically change the zfs_compressed_arc_enabled setting. + */ + if (ztest_random(10) == 0) + zfs_compressed_arc_enabled = ztest_random(2); } return (NULL); } @@ -5450,13 +5519,13 @@ ztest_thread(void *arg) static void ztest_dataset_name(char *dsname, char *pool, int d) { - (void) snprintf(dsname, MAXNAMELEN, "%s/ds_%d", pool, d); + (void) snprintf(dsname, ZFS_MAX_DATASET_NAME_LEN, "%s/ds_%d", pool, d); } static void ztest_dataset_destroy(int d) { - char name[MAXNAMELEN]; + char name[ZFS_MAX_DATASET_NAME_LEN]; ztest_dataset_name(name, ztest_opts.zo_pool, d); @@ -5505,7 +5574,7 @@ ztest_dataset_open(int d) uint64_t committed_seq = ZTEST_GET_SHARED_DS(d)->zd_seq; objset_t *os; zilog_t *zilog; - char name[MAXNAMELEN]; + char name[ZFS_MAX_DATASET_NAME_LEN]; int error; ztest_dataset_name(name, ztest_opts.zo_pool, d); @@ -5610,9 +5679,13 @@ ztest_run(ztest_shared_t *zs) metaslab_preload_limit = ztest_random(20) + 1; ztest_spa = spa; + dmu_objset_stats_t dds; VERIFY0(dmu_objset_own(ztest_opts.zo_pool, DMU_OST_ANY, B_TRUE, FTAG, &os)); - zs->zs_guid = dmu_objset_fsid_guid(os); + dsl_pool_config_enter(dmu_objset_pool(os), FTAG); + dmu_objset_fast_stat(os, &dds); + dsl_pool_config_exit(dmu_objset_pool(os), FTAG); + zs->zs_guid = dds.dds_guid; dmu_objset_disown(os, FTAG); spa->spa_dedup_ditto = 2 * ZIO_DEDUPDITTO_MIN; @@ -5728,8 +5801,8 @@ ztest_run(ztest_shared_t *zs) * different name. */ if (ztest_random(2) == 0) { - char name[MAXNAMELEN]; - (void) snprintf(name, MAXNAMELEN, "%s_import", + char name[ZFS_MAX_DATASET_NAME_LEN]; + (void) snprintf(name, sizeof (name), "%s_import", ztest_opts.zo_pool); ztest_spa_import_export(ztest_opts.zo_pool, name); ztest_spa_import_export(name, ztest_opts.zo_pool); @@ -6297,7 +6370,7 @@ main(int argc, char **argv) if (spa_open(ztest_opts.zo_pool, &spa, FTAG) == 0) { spa_close(spa, FTAG); } else { - char tmpname[MAXNAMELEN]; + char tmpname[ZFS_MAX_DATASET_NAME_LEN]; kernel_fini(); kernel_init(FREAD | FWRITE); (void) snprintf(tmpname, sizeof (tmpname), "%s_tmp", Modified: projects/mips64-clang/cddl/contrib/opensolaris/common/ctf/ctf_types.c ============================================================================== --- projects/mips64-clang/cddl/contrib/opensolaris/common/ctf/ctf_types.c Fri Sep 9 17:40:26 2016 (r305668) +++ projects/mips64-clang/cddl/contrib/opensolaris/common/ctf/ctf_types.c Fri Sep 9 18:18:37 2016 (r305669) @@ -644,11 +644,8 @@ ctf_type_compat(ctf_file_t *lfp, ctf_id_ } } -/* - * Return the type and offset for a given member of a STRUCT or UNION. - */ -int -ctf_member_info(ctf_file_t *fp, ctf_id_t type, const char *name, +static int +_ctf_member_info(ctf_file_t *fp, ctf_id_t type, const char *name, ulong_t off, ctf_membinfo_t *mip) { ctf_file_t *ofp = fp; @@ -673,9 +670,13 @@ ctf_member_info(ctf_file_t *fp, ctf_id_t ((uintptr_t)tp + increment); for (n = LCTF_INFO_VLEN(fp, tp->ctt_info); n != 0; n--, mp++) { + if (mp->ctm_name == 0 && + _ctf_member_info(fp, mp->ctm_type, name, + mp->ctm_offset + off, mip) == 0) + return (0); if (strcmp(ctf_strptr(fp, mp->ctm_name), name) == 0) { mip->ctm_type = mp->ctm_type; - mip->ctm_offset = mp->ctm_offset; + mip->ctm_offset = mp->ctm_offset + off; return (0); } } @@ -684,9 +685,14 @@ ctf_member_info(ctf_file_t *fp, ctf_id_t ((uintptr_t)tp + increment); for (n = LCTF_INFO_VLEN(fp, tp->ctt_info); n != 0; n--, lmp++) { + if (lmp->ctlm_name == 0 && + _ctf_member_info(fp, lmp->ctlm_name, name, + (ulong_t)CTF_LMEM_OFFSET(lmp) + off, mip) == 0) + return (0); if (strcmp(ctf_strptr(fp, lmp->ctlm_name), name) == 0) { mip->ctm_type = lmp->ctlm_type; - mip->ctm_offset = (ulong_t)CTF_LMEM_OFFSET(lmp); + mip->ctm_offset = + (ulong_t)CTF_LMEM_OFFSET(lmp) + off; return (0); } } @@ -696,6 +702,17 @@ ctf_member_info(ctf_file_t *fp, ctf_id_t } /* + * Return the type and offset for a given member of a STRUCT or UNION. + */ +int +ctf_member_info(ctf_file_t *fp, ctf_id_t type, const char *name, + ctf_membinfo_t *mip) +{ + + return (_ctf_member_info(fp, type, name, 0, mip)); +} + +/* * Return the array type, index, and size information for the specified ARRAY. */ int Modified: projects/mips64-clang/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c ============================================================================== --- projects/mips64-clang/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c Fri Sep 9 17:40:26 2016 (r305668) +++ projects/mips64-clang/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c Fri Sep 9 18:18:37 2016 (r305669) @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include "libnvpair.h" @@ -1228,7 +1228,8 @@ nvpair_value_match_regex(nvpair_t *nvp, break; } case DATA_TYPE_BOOLEAN_VALUE: { - boolean_t val, val_arg; + int32_t val_arg; + boolean_t val; /* scanf boolean_t from value and check for match */ sr = sscanf(value, "%"SCNi32, &val_arg); @@ -1239,7 +1240,8 @@ nvpair_value_match_regex(nvpair_t *nvp, break; } case DATA_TYPE_BOOLEAN_ARRAY: { - boolean_t *val_array, val_arg; + boolean_t *val_array; + int32_t val_arg; /* check indexed value of array for match */ sr = sscanf(value, "%"SCNi32, &val_arg); Modified: projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h ============================================================================== --- projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Fri Sep 9 17:40:26 2016 (r305668) +++ projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Fri Sep 9 18:18:37 2016 (r305669) @@ -21,14 +21,13 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011 Pawel Jakub Dawidek . - * All rights reserved. + * Copyright (c) 2011 Pawel Jakub Dawidek. All rights reserved. * Copyright (c) 2011, 2015 by Delphix. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. * Copyright (c) 2012 Martin Matuska . All rights reserved. * Copyright (c) 2013 Steven Hartland. All rights reserved. - * Copyright 2013 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2014 Integros [integros.com] + * Copyright 2016 Nexenta Systems, Inc. */ #ifndef _LIBZFS_H @@ -52,8 +51,6 @@ extern "C" { /* * Miscellaneous ZFS constants */ -#define ZFS_MAXNAMELEN MAXNAMELEN -#define ZPOOL_MAXNAMELEN MAXNAMELEN #define ZFS_MAXPROPLEN MAXPATHLEN #define ZPOOL_MAXPROPLEN MAXPATHLEN @@ -222,6 +219,7 @@ extern void zpool_free_handles(libzfs_ha */ typedef int (*zpool_iter_f)(zpool_handle_t *, void *); extern int zpool_iter(libzfs_handle_t *, zpool_iter_f, void *); +extern boolean_t zpool_skip_pool(const char *); /* * Functions to create and destroy pools @@ -412,6 +410,7 @@ extern void zfs_close(zfs_handle_t *); extern zfs_type_t zfs_get_type(const zfs_handle_t *); extern const char *zfs_get_name(const zfs_handle_t *); extern zpool_handle_t *zfs_get_pool_handle(const zfs_handle_t *); +extern const char *zfs_get_pool_name(const zfs_handle_t *); /* * Property management functions. Some functions are shared with the kernel, Modified: projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c ============================================================================== --- projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c Fri Sep 9 17:40:26 2016 (r305668) +++ projects/mips64-clang/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c Fri Sep 9 18:18:37 2016 (r305669) @@ -24,9 +24,10 @@ * Use is subject to license terms. * *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Sat Sep 10 15:38:47 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3053BD58A8 for ; Sat, 10 Sep 2016 15:38:47 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 81A70EC2; Sat, 10 Sep 2016 15:38:47 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8AFck0E093653; Sat, 10 Sep 2016 15:38:46 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8AFcktD093648; Sat, 10 Sep 2016 15:38:46 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201609101538.u8AFcktD093648@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 10 Sep 2016 15:38:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305680 - in projects/clang390-import/contrib/llvm: lib/Target/PowerPC tools/clang/include/clang/Driver X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Sep 2016 15:38:47 -0000 Author: dim Date: Sat Sep 10 15:38:46 2016 New Revision: 305680 URL: https://svnweb.freebsd.org/changeset/base/305680 Log: Pull in r280040 from upstream llvm trunk (by Hal Finkel): [PowerPC] Add support for -mlongcall The "long call" option forces the use of the indirect calling sequence for all calls (even those that don't really need it). GCC provides this option; This is helpful, under certain circumstances, for building very-large binaries, and some other specialized use cases. Fixes PR19098. Pull in r280041 from upstream clang trunk (by Hal Finkel): [PowerPC] Add support for -mlongcall Add support for GCC's PowerPC -mlongcall option; the backend supports the corresponding target feature as of r280040. Fixes PR19098. Modified: projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPC.td projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.cpp projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.h projects/clang390-import/contrib/llvm/tools/clang/include/clang/Driver/Options.td Modified: projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPC.td ============================================================================== --- projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPC.td Sat Sep 10 09:37:41 2016 (r305679) +++ projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPC.td Sat Sep 10 15:38:46 2016 (r305680) @@ -136,6 +136,8 @@ def FeatureInvariantFunctionDescriptors SubtargetFeature<"invariant-function-descriptors", "HasInvariantFunctionDescriptors", "true", "Assume function descriptors are invariant">; +def FeatureLongCall : SubtargetFeature<"longcall", "UseLongCalls", "true", + "Always use indirect calls">; def FeatureHTM : SubtargetFeature<"htm", "HasHTM", "true", "Enable Hardware Transactional Memory instructions">; def FeatureMFTB : SubtargetFeature<"", "FeatureMFTB", "true", Modified: projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp ============================================================================== --- projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp Sat Sep 10 09:37:41 2016 (r305679) +++ projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp Sat Sep 10 15:38:46 2016 (r305680) @@ -4680,7 +4680,9 @@ PPCTargetLowering::LowerCall(TargetLower ImmutableCallSite *CS = CLI.CS; if (isTailCall) { - if (Subtarget.isSVR4ABI() && Subtarget.isPPC64()) + if (Subtarget.useLongCalls() && !(CS && CS->isMustTailCall())) + isTailCall = false; + else if (Subtarget.isSVR4ABI() && Subtarget.isPPC64()) isTailCall = IsEligibleForTailCallOptimization_64SVR4(Callee, CallConv, CS, isVarArg, Outs, Ins, DAG); @@ -4710,6 +4712,13 @@ PPCTargetLowering::LowerCall(TargetLower report_fatal_error("failed to perform tail call elimination on a call " "site marked musttail"); + // When long calls (i.e. indirect calls) are always used, calls are always + // made via function pointer. If we have a function name, first translate it + // into a pointer. + if (Subtarget.useLongCalls() && isa(Callee) && + !isTailCall) + Callee = LowerGlobalAddress(Callee, DAG); + if (Subtarget.isSVR4ABI()) { if (Subtarget.isPPC64()) return LowerCall_64SVR4(Chain, Callee, CallConv, isVarArg, Modified: projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.cpp ============================================================================== --- projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.cpp Sat Sep 10 09:37:41 2016 (r305679) +++ projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.cpp Sat Sep 10 15:38:46 2016 (r305680) @@ -105,6 +105,7 @@ void PPCSubtarget::initializeEnvironment HasFusion = false; HasFloat128 = false; IsISA3_0 = false; + UseLongCalls = false; HasPOPCNTD = POPCNTD_Unavailable; } Modified: projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.h ============================================================================== --- projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.h Sat Sep 10 09:37:41 2016 (r305679) +++ projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCSubtarget.h Sat Sep 10 15:38:46 2016 (r305680) @@ -132,6 +132,7 @@ protected: bool HasFusion; bool HasFloat128; bool IsISA3_0; + bool UseLongCalls; POPCNTDKind HasPOPCNTD; @@ -275,6 +276,7 @@ public: bool hasFusion() const { return HasFusion; } bool hasFloat128() const { return HasFloat128; } bool isISA3_0() const { return IsISA3_0; } + bool useLongCalls() const { return UseLongCalls; } POPCNTDKind hasPOPCNTD() const { return HasPOPCNTD; } Modified: projects/clang390-import/contrib/llvm/tools/clang/include/clang/Driver/Options.td ============================================================================== --- projects/clang390-import/contrib/llvm/tools/clang/include/clang/Driver/Options.td Sat Sep 10 09:37:41 2016 (r305679) +++ projects/clang390-import/contrib/llvm/tools/clang/include/clang/Driver/Options.td Sat Sep 10 15:38:46 2016 (r305680) @@ -1574,6 +1574,10 @@ def mfloat128: Flag<["-"], "mfloat128">, Group; def mno_float128 : Flag<["-"], "mno-float128">, Group; +def mlongcall: Flag<["-"], "mlongcall">, + Group; +def mno_longcall : Flag<["-"], "mno-longcall">, + Group; def faltivec : Flag<["-"], "faltivec">, Group, Flags<[CC1Option]>, HelpText<"Enable AltiVec vector initializer syntax">; From owner-svn-src-projects@freebsd.org Sat Sep 10 15:44:02 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31EE9BD5B0C for ; Sat, 10 Sep 2016 15:44:02 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DBDE83FE; Sat, 10 Sep 2016 15:44:01 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8AFi1kW097437; Sat, 10 Sep 2016 15:44:01 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8AFi16F097436; Sat, 10 Sep 2016 15:44:01 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201609101544.u8AFi16F097436@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 10 Sep 2016 15:44:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305681 - projects/clang390-import/contrib/llvm/lib/Target/PowerPC X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Sep 2016 15:44:02 -0000 Author: dim Date: Sat Sep 10 15:44:00 2016 New Revision: 305681 URL: https://svnweb.freebsd.org/changeset/base/305681 Log: Pull in r280188 from upstream llvm trunk (by Hal Finkel): [PowerPC] Don't spill the frame pointer twice When a function contains something, such as inline asm, which explicitly clobbers the register used as the frame pointer, don't spill it twice. If we need a frame pointer, it will be saved/restored in the prologue/epilogue code. Explicitly spilling it again will reuse the same spill slot used by the prologue/epilogue code, thus clobbering the saved value. The same applies to the base-pointer or PIC-base register. Partially fixes PR26856. Thanks to Ulrich for his analysis and the small inline-asm reproducer. Modified: projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp Modified: projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp ============================================================================== --- projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp Sat Sep 10 15:38:46 2016 (r305680) +++ projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp Sat Sep 10 15:44:00 2016 (r305681) @@ -1420,6 +1420,17 @@ void PPCFrameLowering::determineCalleeSa FI->setPICBasePointerSaveIndex(PBPSI); } + // Make sure we don't explicitly spill r31, because, for example, we have + // some inline asm which explicity clobbers it, when we otherwise have a + // frame pointer and are using r31's spill slot for the prologue/epilogue + // code. Same goes for the base pointer and the PIC base register. + if (needsFP(MF)) + SavedRegs.reset(isPPC64 ? PPC::X31 : PPC::R31); + if (RegInfo->hasBasePointer(MF)) + SavedRegs.reset(RegInfo->getBaseRegister(MF)); + if (FI->usesPICBase()) + SavedRegs.reset(PPC::R30); + // Reserve stack space to move the linkage area to in case of a tail call. int TCSPDelta = 0; if (MF.getTarget().Options.GuaranteedTailCallOpt && From owner-svn-src-projects@freebsd.org Sat Sep 10 16:08:51 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4D604BD415B for ; Sat, 10 Sep 2016 16:08:51 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1E9A5C6; Sat, 10 Sep 2016 16:08:51 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8AG8ot6005502; Sat, 10 Sep 2016 16:08:50 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8AG8oMQ005501; Sat, 10 Sep 2016 16:08:50 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201609101608.u8AG8oMQ005501@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 10 Sep 2016 16:08:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305682 - projects/clang390-import/usr.bin/clang/lld X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Sep 2016 16:08:51 -0000 Author: dim Date: Sat Sep 10 16:08:50 2016 New Revision: 305682 URL: https://svnweb.freebsd.org/changeset/base/305682 Log: Fix sneaky typo in lld's Makefile: s/OBJOP/OBJTOP/ Modified: projects/clang390-import/usr.bin/clang/lld/Makefile Modified: projects/clang390-import/usr.bin/clang/lld/Makefile ============================================================================== --- projects/clang390-import/usr.bin/clang/lld/Makefile Sat Sep 10 15:44:00 2016 (r305681) +++ projects/clang390-import/usr.bin/clang/lld/Makefile Sat Sep 10 16:08:50 2016 (r305682) @@ -47,7 +47,7 @@ SRCS+= tools/lld/lld.cpp LIBDEPS+= llvm .for lib in ${LIBDEPS} -DPADD+= ${OBJOP}/lib/clang/lib${lib}/lib${lib}.a +DPADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a LDADD+= ${OBJTOP}/lib/clang/lib${lib}/lib${lib}.a .endfor From owner-svn-src-projects@freebsd.org Sat Sep 10 16:11:44 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 20A8CBD41B3 for ; Sat, 10 Sep 2016 16:11:44 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E3A15320; Sat, 10 Sep 2016 16:11:43 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8AGBhfm008946; Sat, 10 Sep 2016 16:11:43 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8AGBgmt008938; Sat, 10 Sep 2016 16:11:42 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201609101611.u8AGBgmt008938@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 10 Sep 2016 16:11:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305683 - in projects/clang390-import/contrib/llvm: include/llvm/CodeGen lib/CodeGen/SelectionDAG lib/Target/Mips lib/Target/PowerPC X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Sep 2016 16:11:44 -0000 Author: dim Date: Sat Sep 10 16:11:42 2016 New Revision: 305683 URL: https://svnweb.freebsd.org/changeset/base/305683 Log: Pull in r280350 from upstream llvm trunk (by Hal Finkel): Add ISD::EH_DWARF_CFA, simplify @llvm.eh.dwarf.cfa on Mips, fix on PowerPC LLVM has an @llvm.eh.dwarf.cfa intrinsic, used to lower the GCC-compatible __builtin_dwarf_cfa() builtin. As pointed out in PR26761, this is currently broken on PowerPC (and likely on ARM as well). Currently, @llvm.eh.dwarf.cfa is lowered using: ADD(FRAMEADDR, FRAME_TO_ARGS_OFFSET) where FRAME_TO_ARGS_OFFSET defaults to the constant zero. On x86, FRAME_TO_ARGS_OFFSET is lowered to 2*SlotSize. This setup, however, does not work for PowerPC. Because of the way that the stack layout works, the canonical frame address is not exactly (FRAMEADDR + FRAME_TO_ARGS_OFFSET) on PowerPC (there is a lower save-area offset as well), so it is not just a matter of implementing FRAME_TO_ARGS_OFFSET for PowerPC (unless we redefine its semantics -- We can do that, since it is currently used only for @llvm.eh.dwarf.cfa lowering, but the better to directly lower the CFA construct itself (since it can be easily represented as a fixed-offset FrameIndex)). Mips currently does this, but by using a custom lowering for ADD that specifically recognizes the (FRAMEADDR, FRAME_TO_ARGS_OFFSET) pattern. This change introduces a ISD::EH_DWARF_CFA node, which by default expands using the existing logic, but can be directly lowered by the target. Mips is updated to use this method (which simplifies its implementation, and I suspect makes it more robust), and updates PowerPC to do the same. Fixes PR26761. Differential Revision: https://reviews.llvm.org/D24038 Modified: projects/clang390-import/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp projects/clang390-import/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp projects/clang390-import/contrib/llvm/lib/Target/Mips/MipsISelLowering.h projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h Modified: projects/clang390-import/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h ============================================================================== --- projects/clang390-import/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h Sat Sep 10 16:08:50 2016 (r305682) +++ projects/clang390-import/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h Sat Sep 10 16:11:42 2016 (r305683) @@ -90,6 +90,11 @@ namespace ISD { /// adjustment during unwind. FRAME_TO_ARGS_OFFSET, + /// EH_DWARF_CFA - This node represents the pointer to the DWARF Canonical + /// Frame Address (CFA), generally the value of the stack pointer at the + /// call site in the previous frame. + EH_DWARF_CFA, + /// OUTCHAIN = EH_RETURN(INCHAIN, OFFSET, HANDLER) - This node represents /// 'eh_return' gcc dwarf builtin, which is used to return from /// exception. The general meaning is: adjust stack by OFFSET and pass Modified: projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp ============================================================================== --- projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Sat Sep 10 16:08:50 2016 (r305682) +++ projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Sat Sep 10 16:11:42 2016 (r305683) @@ -999,6 +999,7 @@ void SelectionDAGLegalize::LegalizeOp(SD case ISD::MERGE_VALUES: case ISD::EH_RETURN: case ISD::FRAME_TO_ARGS_OFFSET: + case ISD::EH_DWARF_CFA: case ISD::EH_SJLJ_SETJMP: case ISD::EH_SJLJ_LONGJMP: case ISD::EH_SJLJ_SETUP_DISPATCH: @@ -2732,6 +2733,21 @@ bool SelectionDAGLegalize::ExpandNode(SD case ISD::FRAME_TO_ARGS_OFFSET: Results.push_back(DAG.getConstant(0, dl, Node->getValueType(0))); break; + case ISD::EH_DWARF_CFA: { + SDValue CfaArg = DAG.getSExtOrTrunc(Node->getOperand(0), dl, + TLI.getPointerTy(DAG.getDataLayout())); + SDValue Offset = DAG.getNode(ISD::ADD, dl, + CfaArg.getValueType(), + DAG.getNode(ISD::FRAME_TO_ARGS_OFFSET, dl, + CfaArg.getValueType()), + CfaArg); + SDValue FA = DAG.getNode( + ISD::FRAMEADDR, dl, TLI.getPointerTy(DAG.getDataLayout()), + DAG.getConstant(0, dl, TLI.getPointerTy(DAG.getDataLayout()))); + Results.push_back(DAG.getNode(ISD::ADD, dl, FA.getValueType(), + FA, Offset)); + break; + } case ISD::FLT_ROUNDS_: Results.push_back(DAG.getConstant(1, dl, Node->getValueType(0))); break; Modified: projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp ============================================================================== --- projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Sat Sep 10 16:08:50 2016 (r305682) +++ projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Sat Sep 10 16:11:42 2016 (r305683) @@ -4999,18 +4999,9 @@ SelectionDAGBuilder::visitIntrinsicCall( DAG.getMachineFunction().getMMI().setCallsUnwindInit(true); return nullptr; case Intrinsic::eh_dwarf_cfa: { - SDValue CfaArg = DAG.getSExtOrTrunc(getValue(I.getArgOperand(0)), sdl, - TLI.getPointerTy(DAG.getDataLayout())); - SDValue Offset = DAG.getNode(ISD::ADD, sdl, - CfaArg.getValueType(), - DAG.getNode(ISD::FRAME_TO_ARGS_OFFSET, sdl, - CfaArg.getValueType()), - CfaArg); - SDValue FA = DAG.getNode( - ISD::FRAMEADDR, sdl, TLI.getPointerTy(DAG.getDataLayout()), - DAG.getConstant(0, sdl, TLI.getPointerTy(DAG.getDataLayout()))); - setValue(&I, DAG.getNode(ISD::ADD, sdl, FA.getValueType(), - FA, Offset)); + setValue(&I, DAG.getNode(ISD::EH_DWARF_CFA, sdl, + TLI.getPointerTy(DAG.getDataLayout()), + getValue(I.getArgOperand(0)))); return nullptr; } case Intrinsic::eh_sjlj_callsite: { Modified: projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp ============================================================================== --- projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp Sat Sep 10 16:08:50 2016 (r305682) +++ projects/clang390-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGDumper.cpp Sat Sep 10 16:11:42 2016 (r305683) @@ -105,6 +105,7 @@ std::string SDNode::getOperationName(con case ISD::READ_REGISTER: return "READ_REGISTER"; case ISD::WRITE_REGISTER: return "WRITE_REGISTER"; case ISD::FRAME_TO_ARGS_OFFSET: return "FRAME_TO_ARGS_OFFSET"; + case ISD::EH_DWARF_CFA: return "EH_DWARF_CFA"; case ISD::EH_RETURN: return "EH_RETURN"; case ISD::EH_SJLJ_SETJMP: return "EH_SJLJ_SETJMP"; case ISD::EH_SJLJ_LONGJMP: return "EH_SJLJ_LONGJMP"; Modified: projects/clang390-import/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp ============================================================================== --- projects/clang390-import/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp Sat Sep 10 16:08:50 2016 (r305682) +++ projects/clang390-import/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp Sat Sep 10 16:11:42 2016 (r305683) @@ -305,9 +305,9 @@ MipsTargetLowering::MipsTargetLowering(c setOperationAction(ISD::SRL_PARTS, MVT::i32, Custom); } - setOperationAction(ISD::ADD, MVT::i32, Custom); + setOperationAction(ISD::EH_DWARF_CFA, MVT::i32, Custom); if (Subtarget.isGP64bit()) - setOperationAction(ISD::ADD, MVT::i64, Custom); + setOperationAction(ISD::EH_DWARF_CFA, MVT::i64, Custom); setOperationAction(ISD::SDIV, MVT::i32, Expand); setOperationAction(ISD::SREM, MVT::i32, Expand); @@ -914,7 +914,7 @@ LowerOperation(SDValue Op, SelectionDAG case ISD::SRL_PARTS: return lowerShiftRightParts(Op, DAG, false); case ISD::LOAD: return lowerLOAD(Op, DAG); case ISD::STORE: return lowerSTORE(Op, DAG); - case ISD::ADD: return lowerADD(Op, DAG); + case ISD::EH_DWARF_CFA: return lowerEH_DWARF_CFA(Op, DAG); case ISD::FP_TO_SINT: return lowerFP_TO_SINT(Op, DAG); } return SDValue(); @@ -2393,26 +2393,15 @@ SDValue MipsTargetLowering::lowerSTORE(S return lowerFP_TO_SINT_STORE(SD, DAG); } -SDValue MipsTargetLowering::lowerADD(SDValue Op, SelectionDAG &DAG) const { - if (Op->getOperand(0).getOpcode() != ISD::FRAMEADDR - || cast - (Op->getOperand(0).getOperand(0))->getZExtValue() != 0 - || Op->getOperand(1).getOpcode() != ISD::FRAME_TO_ARGS_OFFSET) - return SDValue(); +SDValue MipsTargetLowering::lowerEH_DWARF_CFA(SDValue Op, + SelectionDAG &DAG) const { - // The pattern - // (add (frameaddr 0), (frame_to_args_offset)) - // results from lowering llvm.eh.dwarf.cfa intrinsic. Transform it to - // (add FrameObject, 0) - // where FrameObject is a fixed StackObject with offset 0 which points to - // the old stack pointer. + // Return a fixed StackObject with offset 0 which points to the old stack + // pointer. MachineFrameInfo *MFI = DAG.getMachineFunction().getFrameInfo(); EVT ValTy = Op->getValueType(0); int FI = MFI->CreateFixedObject(Op.getValueSizeInBits() / 8, 0, false); - SDValue InArgsAddr = DAG.getFrameIndex(FI, ValTy); - SDLoc DL(Op); - return DAG.getNode(ISD::ADD, DL, ValTy, InArgsAddr, - DAG.getConstant(0, DL, ValTy)); + return DAG.getFrameIndex(FI, ValTy); } SDValue MipsTargetLowering::lowerFP_TO_SINT(SDValue Op, Modified: projects/clang390-import/contrib/llvm/lib/Target/Mips/MipsISelLowering.h ============================================================================== --- projects/clang390-import/contrib/llvm/lib/Target/Mips/MipsISelLowering.h Sat Sep 10 16:08:50 2016 (r305682) +++ projects/clang390-import/contrib/llvm/lib/Target/Mips/MipsISelLowering.h Sat Sep 10 16:11:42 2016 (r305683) @@ -446,7 +446,7 @@ namespace llvm { SDValue lowerShiftLeftParts(SDValue Op, SelectionDAG& DAG) const; SDValue lowerShiftRightParts(SDValue Op, SelectionDAG& DAG, bool IsSRA) const; - SDValue lowerADD(SDValue Op, SelectionDAG &DAG) const; + SDValue lowerEH_DWARF_CFA(SDValue Op, SelectionDAG &DAG) const; SDValue lowerFP_TO_SINT(SDValue Op, SelectionDAG &DAG) const; /// isEligibleForTailCallOptimization - Check whether the call is eligible Modified: projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp ============================================================================== --- projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp Sat Sep 10 16:08:50 2016 (r305682) +++ projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp Sat Sep 10 16:11:42 2016 (r305683) @@ -344,6 +344,8 @@ PPCTargetLowering::PPCTargetLowering(con setOperationAction(ISD::DYNAMIC_STACKALLOC, MVT::i64 , Custom); setOperationAction(ISD::GET_DYNAMIC_AREA_OFFSET, MVT::i32, Custom); setOperationAction(ISD::GET_DYNAMIC_AREA_OFFSET, MVT::i64, Custom); + setOperationAction(ISD::EH_DWARF_CFA, MVT::i32, Custom); + setOperationAction(ISD::EH_DWARF_CFA, MVT::i64, Custom); // We want to custom lower some of our intrinsics. setOperationAction(ISD::INTRINSIC_WO_CHAIN, MVT::Other, Custom); @@ -6173,6 +6175,17 @@ SDValue PPCTargetLowering::LowerDYNAMIC_ return DAG.getNode(PPCISD::DYNALLOC, dl, VTs, Ops); } +SDValue PPCTargetLowering::LowerEH_DWARF_CFA(SDValue Op, + SelectionDAG &DAG) const { + MachineFunction &MF = DAG.getMachineFunction(); + + bool isPPC64 = Subtarget.isPPC64(); + EVT PtrVT = getPointerTy(DAG.getDataLayout()); + + int FI = MF.getFrameInfo()->CreateFixedObject(isPPC64 ? 8 : 4, 0, false); + return DAG.getFrameIndex(FI, PtrVT); +} + SDValue PPCTargetLowering::lowerEH_SJLJ_SETJMP(SDValue Op, SelectionDAG &DAG) const { SDLoc DL(Op); @@ -8231,6 +8244,9 @@ SDValue PPCTargetLowering::LowerOperatio case ISD::GET_DYNAMIC_AREA_OFFSET: return LowerGET_DYNAMIC_AREA_OFFSET(Op, DAG); + case ISD::EH_DWARF_CFA: + return LowerEH_DWARF_CFA(Op, DAG); + case ISD::EH_SJLJ_SETJMP: return lowerEH_SJLJ_SETJMP(Op, DAG); case ISD::EH_SJLJ_LONGJMP: return lowerEH_SJLJ_LONGJMP(Op, DAG); Modified: projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h ============================================================================== --- projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h Sat Sep 10 16:08:50 2016 (r305682) +++ projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h Sat Sep 10 16:11:42 2016 (r305683) @@ -811,6 +811,7 @@ namespace llvm { SDValue LowerSTACKRESTORE(SDValue Op, SelectionDAG &DAG) const; SDValue LowerGET_DYNAMIC_AREA_OFFSET(SDValue Op, SelectionDAG &DAG) const; SDValue LowerDYNAMIC_STACKALLOC(SDValue Op, SelectionDAG &DAG) const; + SDValue LowerEH_DWARF_CFA(SDValue Op, SelectionDAG &DAG) const; SDValue LowerLOAD(SDValue Op, SelectionDAG &DAG) const; SDValue LowerSTORE(SDValue Op, SelectionDAG &DAG) const; SDValue LowerTRUNCATE(SDValue Op, SelectionDAG &DAG) const; From owner-svn-src-projects@freebsd.org Sat Sep 10 16:51:40 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 96063BD4CA9 for ; Sat, 10 Sep 2016 16:51:40 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 72570B15; Sat, 10 Sep 2016 16:51:40 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8AGpdie023287; Sat, 10 Sep 2016 16:51:39 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8AGpdb4023286; Sat, 10 Sep 2016 16:51:39 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201609101651.u8AGpdb4023286@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 10 Sep 2016 16:51:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305686 - projects/clang390-import/contrib/llvm/lib/Target/PowerPC X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Sep 2016 16:51:40 -0000 Author: dim Date: Sat Sep 10 16:51:39 2016 New Revision: 305686 URL: https://svnweb.freebsd.org/changeset/base/305686 Log: Pull in r280705 from upstream llvm trunk (by Krzysztof Parzyszek): [PPC] Claim stack frame before storing into it, if no red zone is present Unlike PPC64, PPC32/SVRV4 does not have red zone. In the absence of it there is no guarantee that this part of the stack will not be modified by any interrupt. To avoid this, make sure to claim the stack frame first before storing into it. This fixes https://llvm.org/bugs/show_bug.cgi?id=26519. Differential Revision: https://reviews.llvm.org/D24093 Modified: projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp Modified: projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp ============================================================================== --- projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp Sat Sep 10 16:49:25 2016 (r305685) +++ projects/clang390-import/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp Sat Sep 10 16:51:39 2016 (r305686) @@ -673,8 +673,9 @@ PPCFrameLowering::twoUniqueScratchRegsRe bool IsLargeFrame = !isInt<16>(NegFrameSize); MachineFrameInfo *MFI = MF.getFrameInfo(); unsigned MaxAlign = MFI->getMaxAlignment(); + bool HasRedZone = Subtarget.isPPC64() || !Subtarget.isSVR4ABI(); - return IsLargeFrame && HasBP && MaxAlign > 1; + return (IsLargeFrame || !HasRedZone) && HasBP && MaxAlign > 1; } bool PPCFrameLowering::canUseAsPrologue(const MachineBasicBlock &MBB) const { @@ -743,6 +744,7 @@ void PPCFrameLowering::emitPrologue(Mach // Do we have a frame pointer and/or base pointer for this function? bool HasFP = hasFP(MF); bool HasBP = RegInfo->hasBasePointer(MF); + bool HasRedZone = isPPC64 || !isSVR4ABI; unsigned SPReg = isPPC64 ? PPC::X1 : PPC::R1; unsigned BPReg = RegInfo->getBaseRegister(MF); @@ -877,54 +879,57 @@ void PPCFrameLowering::emitPrologue(Mach MIB.addReg(MustSaveCRs[i], CrState); } - if (HasFP) - // FIXME: On PPC32 SVR4, we must not spill before claiming the stackframe. - BuildMI(MBB, MBBI, dl, StoreInst) - .addReg(FPReg) - .addImm(FPOffset) - .addReg(SPReg); - - if (FI->usesPICBase()) - // FIXME: On PPC32 SVR4, we must not spill before claiming the stackframe. - BuildMI(MBB, MBBI, dl, StoreInst) - .addReg(PPC::R30) - .addImm(PBPOffset) - .addReg(SPReg); - - if (HasBP) - // FIXME: On PPC32 SVR4, we must not spill before claiming the stackframe. - BuildMI(MBB, MBBI, dl, StoreInst) - .addReg(BPReg) - .addImm(BPOffset) - .addReg(SPReg); + if (HasRedZone) { + if (HasFP) + BuildMI(MBB, MBBI, dl, StoreInst) + .addReg(FPReg) + .addImm(FPOffset) + .addReg(SPReg); + if (FI->usesPICBase()) + BuildMI(MBB, MBBI, dl, StoreInst) + .addReg(PPC::R30) + .addImm(PBPOffset) + .addReg(SPReg); + if (HasBP) + BuildMI(MBB, MBBI, dl, StoreInst) + .addReg(BPReg) + .addImm(BPOffset) + .addReg(SPReg); + } if (MustSaveLR) - // FIXME: On PPC32 SVR4, we must not spill before claiming the stackframe. BuildMI(MBB, MBBI, dl, StoreInst) .addReg(ScratchReg, getKillRegState(true)) .addImm(LROffset) .addReg(SPReg); if (MustSaveCR && - !(SingleScratchReg && MustSaveLR)) // will only occur for PPC64 + !(SingleScratchReg && MustSaveLR)) { // will only occur for PPC64 + assert(HasRedZone && "A red zone is always available on PPC64"); BuildMI(MBB, MBBI, dl, TII.get(PPC::STW8)) .addReg(TempReg, getKillRegState(true)) .addImm(8) .addReg(SPReg); + } // Skip the rest if this is a leaf function & all spills fit in the Red Zone. - if (!FrameSize) return; + if (!FrameSize) + return; // Adjust stack pointer: r1 += NegFrameSize. // If there is a preferred stack alignment, align R1 now - if (HasBP) { + if (HasBP && HasRedZone) { // Save a copy of r1 as the base pointer. BuildMI(MBB, MBBI, dl, OrInst, BPReg) .addReg(SPReg) .addReg(SPReg); } + // Have we generated a STUX instruction to claim stack frame? If so, + // the frame size will be placed in ScratchReg. + bool HasSTUX = false; + // This condition must be kept in sync with canUseAsPrologue. if (HasBP && MaxAlign > 1) { if (isPPC64) @@ -953,10 +958,12 @@ void PPCFrameLowering::emitPrologue(Mach .addReg(ScratchReg, RegState::Kill) .addReg(TempReg, RegState::Kill); } + BuildMI(MBB, MBBI, dl, StoreUpdtIdxInst, SPReg) .addReg(SPReg, RegState::Kill) .addReg(SPReg) .addReg(ScratchReg); + HasSTUX = true; } else if (!isLargeFrame) { BuildMI(MBB, MBBI, dl, StoreUpdtInst, SPReg) @@ -974,6 +981,65 @@ void PPCFrameLowering::emitPrologue(Mach .addReg(SPReg, RegState::Kill) .addReg(SPReg) .addReg(ScratchReg); + HasSTUX = true; + } + + if (!HasRedZone) { + assert(!isPPC64 && "A red zone is always available on PPC64"); + if (HasSTUX) { + // The frame size is in ScratchReg, and the SPReg has been advanced + // (downwards) by the frame size: SPReg = old SPReg + ScratchReg. + // Set ScratchReg to the original SPReg: ScratchReg = SPReg - ScratchReg. + BuildMI(MBB, MBBI, dl, TII.get(PPC::SUBF), ScratchReg) + .addReg(ScratchReg, RegState::Kill) + .addReg(SPReg); + + // Now that the stack frame has been allocated, save all the necessary + // registers using ScratchReg as the base address. + if (HasFP) + BuildMI(MBB, MBBI, dl, StoreInst) + .addReg(FPReg) + .addImm(FPOffset) + .addReg(ScratchReg); + if (FI->usesPICBase()) + BuildMI(MBB, MBBI, dl, StoreInst) + .addReg(PPC::R30) + .addImm(PBPOffset) + .addReg(ScratchReg); + if (HasBP) { + BuildMI(MBB, MBBI, dl, StoreInst) + .addReg(BPReg) + .addImm(BPOffset) + .addReg(ScratchReg); + BuildMI(MBB, MBBI, dl, OrInst, BPReg) + .addReg(ScratchReg, RegState::Kill) + .addReg(ScratchReg); + } + } else { + // The frame size is a known 16-bit constant (fitting in the immediate + // field of STWU). To be here we have to be compiling for PPC32. + // Since the SPReg has been decreased by FrameSize, add it back to each + // offset. + if (HasFP) + BuildMI(MBB, MBBI, dl, StoreInst) + .addReg(FPReg) + .addImm(FrameSize + FPOffset) + .addReg(SPReg); + if (FI->usesPICBase()) + BuildMI(MBB, MBBI, dl, StoreInst) + .addReg(PPC::R30) + .addImm(FrameSize + PBPOffset) + .addReg(SPReg); + if (HasBP) { + BuildMI(MBB, MBBI, dl, StoreInst) + .addReg(BPReg) + .addImm(FrameSize + BPOffset) + .addReg(SPReg); + BuildMI(MBB, MBBI, dl, TII.get(PPC::ADDI), BPReg) + .addReg(SPReg) + .addImm(FrameSize); + } + } } // Add Call Frame Information for the instructions we generated above. From owner-svn-src-projects@freebsd.org Sat Sep 10 17:00:11 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DF398BD4E5C for ; Sat, 10 Sep 2016 17:00:11 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 83535E5A; Sat, 10 Sep 2016 17:00:11 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8AH0AbN024363; Sat, 10 Sep 2016 17:00:10 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8AH08ag024342; Sat, 10 Sep 2016 17:00:08 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201609101700.u8AH08ag024342@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 10 Sep 2016 17:00:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305687 - in projects/clang390-import: . contrib/bmake contrib/bmake/mk etc/mtree lib/libc/aarch64/sys lib/libc/amd64/sys lib/libc/arm/sys lib/libc/i386/sys lib/libc/mips/sys lib/libc/p... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Sep 2016 17:00:12 -0000 Author: dim Date: Sat Sep 10 17:00:08 2016 New Revision: 305687 URL: https://svnweb.freebsd.org/changeset/base/305687 Log: Merge ^/head r305623 through r305686. Added: projects/clang390-import/lib/libcasper/services/cap_dns/tests/ - copied from r305686, head/lib/libcasper/services/cap_dns/tests/ projects/clang390-import/lib/libcasper/services/cap_grp/tests/ - copied from r305686, head/lib/libcasper/services/cap_grp/tests/ projects/clang390-import/lib/libcasper/services/cap_pwd/tests/ - copied from r305686, head/lib/libcasper/services/cap_pwd/tests/ projects/clang390-import/lib/libcasper/services/cap_sysctl/tests/ - copied from r305686, head/lib/libcasper/services/cap_sysctl/tests/ projects/clang390-import/sys/mips/malta/asm_malta.S - copied unchanged from r305686, head/sys/mips/malta/asm_malta.S projects/clang390-import/sys/mips/malta/malta_mp.c - copied unchanged from r305686, head/sys/mips/malta/malta_mp.c projects/clang390-import/tests/sys/kern/waitpid_nohang.c - copied unchanged from r305686, head/tests/sys/kern/waitpid_nohang.c Deleted: projects/clang390-import/tools/regression/capsicum/libcasper/ Modified: projects/clang390-import/UPDATING projects/clang390-import/contrib/bmake/ChangeLog projects/clang390-import/contrib/bmake/Makefile projects/clang390-import/contrib/bmake/bmake.1 projects/clang390-import/contrib/bmake/bmake.cat1 projects/clang390-import/contrib/bmake/main.c projects/clang390-import/contrib/bmake/make.1 projects/clang390-import/contrib/bmake/meta.c projects/clang390-import/contrib/bmake/mk/ChangeLog projects/clang390-import/contrib/bmake/mk/dirdeps.mk projects/clang390-import/contrib/bmake/mk/install-mk projects/clang390-import/contrib/bmake/mk/lib.mk projects/clang390-import/contrib/bmake/mk/meta.sys.mk projects/clang390-import/contrib/bmake/mk/prog.mk projects/clang390-import/contrib/bmake/os.sh projects/clang390-import/contrib/bmake/suff.c projects/clang390-import/etc/mtree/BSD.tests.dist projects/clang390-import/lib/libc/aarch64/sys/Makefile.inc projects/clang390-import/lib/libc/amd64/sys/Makefile.inc projects/clang390-import/lib/libc/arm/sys/Makefile.inc projects/clang390-import/lib/libc/i386/sys/Makefile.inc projects/clang390-import/lib/libc/mips/sys/Makefile.inc projects/clang390-import/lib/libc/powerpc/sys/Makefile.inc projects/clang390-import/lib/libc/powerpc64/sys/Makefile.inc projects/clang390-import/lib/libc/riscv/sys/Makefile.inc projects/clang390-import/lib/libc/sparc64/sys/Makefile.inc projects/clang390-import/lib/libc/sys/Makefile.inc projects/clang390-import/lib/libc/sys/_exit.2 projects/clang390-import/lib/libc/sys/intro.2 projects/clang390-import/lib/libcasper/services/cap_dns/Makefile projects/clang390-import/lib/libcasper/services/cap_grp/Makefile projects/clang390-import/lib/libcasper/services/cap_pwd/Makefile projects/clang390-import/lib/libcasper/services/cap_sysctl/Makefile projects/clang390-import/share/man/man3/Makefile projects/clang390-import/share/man/man3/queue.3 projects/clang390-import/share/man/man4/ddb.4 projects/clang390-import/share/man/man4/pci.4 projects/clang390-import/share/mk/bsd.subdir.mk projects/clang390-import/share/mk/dirdeps.mk projects/clang390-import/share/mk/meta.sys.mk projects/clang390-import/sys/amd64/amd64/pmap.c projects/clang390-import/sys/arm/arm/pmap-v6.c projects/clang390-import/sys/arm64/arm64/pmap.c projects/clang390-import/sys/cddl/compat/opensolaris/sys/random.h projects/clang390-import/sys/conf/options.mips projects/clang390-import/sys/ddb/db_command.c projects/clang390-import/sys/ddb/db_main.c projects/clang390-import/sys/ddb/db_run.c projects/clang390-import/sys/ddb/ddb.h projects/clang390-import/sys/dev/ath/ath_hal/ah.c projects/clang390-import/sys/dev/ath/ath_hal/ah.h projects/clang390-import/sys/dev/ath/ath_hal/ah_internal.h projects/clang390-import/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c projects/clang390-import/sys/dev/cxgbe/t4_main.c projects/clang390-import/sys/dev/cxgbe/t4_sge.c projects/clang390-import/sys/dev/gpio/gpiobusvar.h projects/clang390-import/sys/fs/nullfs/null_vnops.c projects/clang390-import/sys/i386/i386/pmap.c projects/clang390-import/sys/kern/kern_exit.c projects/clang390-import/sys/kern/kern_mutex.c projects/clang390-import/sys/kern/subr_witness.c projects/clang390-import/sys/kern/uipc_syscalls.c projects/clang390-import/sys/kern/vfs_cache.c projects/clang390-import/sys/mips/malta/files.malta projects/clang390-import/sys/mips/malta/std.malta projects/clang390-import/sys/mips/mips/locore.S projects/clang390-import/sys/net80211/ieee80211_freebsd.c projects/clang390-import/sys/net80211/ieee80211_freebsd.h projects/clang390-import/sys/powerpc/booke/pmap.c projects/clang390-import/sys/powerpc/conf/MPC85XX projects/clang390-import/sys/riscv/riscv/pmap.c projects/clang390-import/sys/security/audit/audit_syscalls.c projects/clang390-import/sys/sparc64/sparc64/pmap.c projects/clang390-import/sys/sys/queue.h projects/clang390-import/sys/vm/pmap.h projects/clang390-import/tests/sys/kern/Makefile projects/clang390-import/usr.bin/bmake/Makefile projects/clang390-import/usr.sbin/newsyslog/newsyslog.c Directory Properties: projects/clang390-import/ (props changed) projects/clang390-import/contrib/bmake/ (props changed) Modified: projects/clang390-import/UPDATING ============================================================================== --- projects/clang390-import/UPDATING Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/UPDATING Sat Sep 10 17:00:08 2016 (r305687) @@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20160908: + The queue(3) debugging macro, QUEUE_MACRO_DEBUG, has been split into + two separate components, QUEUE_MACRO_DEBUG_TRACE and + QUEUE_MACRO_DEBUG_TRASH. Define both for the original + QUEUE_MACRO_DEBUG behavior. + 20160824: r304787 changed some ioctl interfaces between the iSCSI userspace programs and the kernel. ctladm, ctld, iscsictl, and iscsid must be Modified: projects/clang390-import/contrib/bmake/ChangeLog ============================================================================== --- projects/clang390-import/contrib/bmake/ChangeLog Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/contrib/bmake/ChangeLog Sat Sep 10 17:00:08 2016 (r305687) @@ -1,3 +1,32 @@ +2016-08-18 Simon J. Gerraty + + * Makefile (_MAKE_VERSION): 20160818 + its a neater number; pick up whitespace fixes to man page. + +2016-08-17 Simon J. Gerraty + + * Makefile (_MAKE_VERSION): 20160817 + Merge with NetBSD make, pick up + o meta.c: move handling of .MAKE.META.IGNORE_* to meta_ignore() + so we can call it before adding entries to missingFiles. + Thus we do not track files we have been told to ignore. + +2016-08-15 Simon J. Gerraty + + * Makefile (_MAKE_VERSION): 20160815 + Merge with NetBSD make, pick up + o meta_oodate: apply .MAKE.META.IGNORE_FILTER (if defined) to + pathnames, and skip if the expansion is empty. + Useful for dirdeps.mk when checking DIRDEPS_CACHE. + +2016-08-12 Simon J. Gerraty + + * Makefile (_MAKE_VERSION): 20160812 + Merge with NetBSD make, pick up + o meta.c: remove all missingFiles entries that match a deleted + dir. + o main.c: set .ERROR_CMD if possible. + 2016-06-06 Simon J. Gerraty * Makefile (_MAKE_VERSION): 20160606 Modified: projects/clang390-import/contrib/bmake/Makefile ============================================================================== --- projects/clang390-import/contrib/bmake/Makefile Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/contrib/bmake/Makefile Sat Sep 10 17:00:08 2016 (r305687) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.67 2016/06/07 00:46:12 sjg Exp $ +# $Id: Makefile,v 1.72 2016/08/18 23:02:26 sjg Exp $ # Base version on src date -_MAKE_VERSION= 20160606 +_MAKE_VERSION= 20160818 PROG= bmake Modified: projects/clang390-import/contrib/bmake/bmake.1 ============================================================================== --- projects/clang390-import/contrib/bmake/bmake.1 Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/contrib/bmake/bmake.1 Sat Sep 10 17:00:08 2016 (r305687) @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.259 2016/06/03 07:07:37 wiz Exp $ +.\" $NetBSD: make.1,v 1.262 2016/08/18 19:23:20 wiz Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd June 2, 2016 +.Dd August 15, 2016 .Dt MAKE 1 .Os .Sh NAME @@ -927,6 +927,9 @@ The default list includes: .It Va .MAKE.META.IGNORE_PATTERNS Provides a list of patterns to match against pathnames. Ignore any that match. +.It Va .MAKE.META.IGNORE_FILTER +Provides a list of variable modifiers to apply to each pathname. +Ignore if the expansion is an empty string. .It Va .MAKE.META.PREFIX Defines the message printed for each meta file updated in "meta verbose" mode. The default value is: @@ -974,7 +977,19 @@ per normal evaluation rules. .It Va MAKE_PRINT_VAR_ON_ERROR When .Nm -stops due to an error, it prints its name and the value of +stops due to an error, it sets +.Ql Va .ERROR_TARGET +to the name of the target that failed, +.Ql Va .ERROR_CMD +to the commands of the failed target, +and in "meta" mode, it also sets +.Ql Va .ERROR_CWD +to the +.Xr getcwd 3 , +and +.Ql Va .ERROR_META_FILE +to the path of the meta file (if any) describing the failed target. +It then prints its name and the value of .Ql Va .CURDIR as well as the value of any variables named in .Ql Va MAKE_PRINT_VAR_ON_ERROR . Modified: projects/clang390-import/contrib/bmake/bmake.cat1 ============================================================================== --- projects/clang390-import/contrib/bmake/bmake.cat1 Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/contrib/bmake/bmake.cat1 Sat Sep 10 17:00:08 2016 (r305687) @@ -604,6 +604,10 @@ VVAARRIIAABBLLEE AASSSSIIGG Provides a list of patterns to match against pathnames. Ignore any that match. + _._M_A_K_E_._M_E_T_A_._I_G_N_O_R_E___F_I_L_T_E_R + Provides a list of variable modifiers to apply to each + pathname. Ignore if the expansion is an empty string. + _._M_A_K_E_._M_E_T_A_._P_R_E_F_I_X Defines the message printed for each meta file updated in "meta verbose" mode. The default value is: @@ -635,9 +639,14 @@ VVAARRIIAABBLLEE AASSSSIIGG becomes `$' per normal evaluation rules. _M_A_K_E___P_R_I_N_T___V_A_R___O_N___E_R_R_O_R - When bbmmaakkee stops due to an error, it prints its name and - the value of `_._C_U_R_D_I_R' as well as the value of any vari- - ables named in `_M_A_K_E___P_R_I_N_T___V_A_R___O_N___E_R_R_O_R'. + When bbmmaakkee stops due to an error, it sets `_._E_R_R_O_R___T_A_R_G_E_T' + to the name of the target that failed, `_._E_R_R_O_R___C_M_D' to + the commands of the failed target, and in "meta" mode, it + also sets `_._E_R_R_O_R___C_W_D' to the getcwd(3), and + `_._E_R_R_O_R___M_E_T_A___F_I_L_E' to the path of the meta file (if any) + describing the failed target. It then prints its name + and the value of `_._C_U_R_D_I_R' as well as the value of any + variables named in `_M_A_K_E___P_R_I_N_T___V_A_R___O_N___E_R_R_O_R'. _._n_e_w_l_i_n_e This variable is simply assigned a newline character as its value. This allows expansions using the ::@@ modifier @@ -1489,4 +1498,4 @@ BBUUGGSS There is no way of escaping a space character in a filename. -NetBSD 5.1 June 2, 2016 NetBSD 5.1 +NetBSD 5.1 August 15, 2016 NetBSD 5.1 Modified: projects/clang390-import/contrib/bmake/main.c ============================================================================== --- projects/clang390-import/contrib/bmake/main.c Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/contrib/bmake/main.c Sat Sep 10 17:00:08 2016 (r305687) @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.247 2016/06/05 01:39:17 christos Exp $ */ +/* $NetBSD: main.c,v 1.250 2016/08/11 19:53:17 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: main.c,v 1.247 2016/06/05 01:39:17 christos Exp $"; +static char rcsid[] = "$NetBSD: main.c,v 1.250 2016/08/11 19:53:17 sjg Exp $"; #else #include #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.247 2016/06/05 01:39:17 christos Exp $"); +__RCSID("$NetBSD: main.c,v 1.250 2016/08/11 19:53:17 sjg Exp $"); #endif #endif /* not lint */ #endif @@ -1903,11 +1903,10 @@ cached_realpath(const char *pathname, ch #endif } - rp = Var_Value(pathname, cache, &cp); - if (rp) { + if ((rp = Var_Value(pathname, cache, &cp)) != NULL) { /* a hit */ strlcpy(resolved, rp, MAXPATHLEN); - } else if ((rp = realpath(pathname, resolved))) { + } else if ((rp = realpath(pathname, resolved)) != NULL) { Var_Set(pathname, rp, cache, 0); } free(cp); @@ -1922,6 +1921,14 @@ PrintAddr(void *a, void *b) } +static int +addErrorCMD(void *cmdp, void *gnp) +{ + if (cmdp == NULL) + return 1; /* stop */ + Var_Append(".ERROR_CMD", cmdp, VAR_GLOBAL); + return 0; +} void PrintOnError(GNode *gn, const char *s) @@ -1942,6 +1949,8 @@ PrintOnError(GNode *gn, const char *s) * We can print this even if there is no .ERROR target. */ Var_Set(".ERROR_TARGET", gn->name, VAR_GLOBAL, 0); + Var_Delete(".ERROR_CMD", VAR_GLOBAL); + Lst_ForEach(gn->commands, addErrorCMD, gn); } strncpy(tmp, "${MAKE_PRINT_VAR_ON_ERROR:@v@$v='${$v}'\n@}", sizeof(tmp) - 1); Modified: projects/clang390-import/contrib/bmake/make.1 ============================================================================== --- projects/clang390-import/contrib/bmake/make.1 Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/contrib/bmake/make.1 Sat Sep 10 17:00:08 2016 (r305687) @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.259 2016/06/03 07:07:37 wiz Exp $ +.\" $NetBSD: make.1,v 1.262 2016/08/18 19:23:20 wiz Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd June 2, 2016 +.Dd August 15, 2016 .Dt MAKE 1 .Os .Sh NAME @@ -938,6 +938,9 @@ The default list includes: .It Va .MAKE.META.IGNORE_PATTERNS Provides a list of patterns to match against pathnames. Ignore any that match. +.It Va .MAKE.META.IGNORE_FILTER +Provides a list of variable modifiers to apply to each pathname. +Ignore if the expansion is an empty string. .It Va .MAKE.META.PREFIX Defines the message printed for each meta file updated in "meta verbose" mode. The default value is: @@ -985,7 +988,19 @@ per normal evaluation rules. .It Va MAKE_PRINT_VAR_ON_ERROR When .Nm -stops due to an error, it prints its name and the value of +stops due to an error, it sets +.Ql Va .ERROR_TARGET +to the name of the target that failed, +.Ql Va .ERROR_CMD +to the commands of the failed target, +and in "meta" mode, it also sets +.Ql Va .ERROR_CWD +to the +.Xr getcwd 3 , +and +.Ql Va .ERROR_META_FILE +to the path of the meta file (if any) describing the failed target. +It then prints its name and the value of .Ql Va .CURDIR as well as the value of any variables named in .Ql Va MAKE_PRINT_VAR_ON_ERROR . Modified: projects/clang390-import/contrib/bmake/meta.c ============================================================================== --- projects/clang390-import/contrib/bmake/meta.c Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/contrib/bmake/meta.c Sat Sep 10 17:00:08 2016 (r305687) @@ -1,4 +1,4 @@ -/* $NetBSD: meta.c,v 1.61 2016/06/07 00:40:00 sjg Exp $ */ +/* $NetBSD: meta.c,v 1.67 2016/08/17 15:52:42 sjg Exp $ */ /* * Implement 'meta' mode. @@ -69,6 +69,9 @@ static char *metaIgnorePathsStr; /* stri #ifndef MAKE_META_IGNORE_PATTERNS #define MAKE_META_IGNORE_PATTERNS ".MAKE.META.IGNORE_PATTERNS" #endif +#ifndef MAKE_META_IGNORE_FILTER +#define MAKE_META_IGNORE_FILTER ".MAKE.META.IGNORE_FILTER" +#endif Boolean useMeta = FALSE; static Boolean useFilemon = FALSE; @@ -79,6 +82,7 @@ static Boolean metaEnv = FALSE; /* don' static Boolean metaVerbose = FALSE; static Boolean metaIgnoreCMDs = FALSE; /* ignore CMDs in .meta files */ static Boolean metaIgnorePatterns = FALSE; /* do we need to do pattern matches */ +static Boolean metaIgnoreFilter = FALSE; /* do we have more complex filtering? */ static Boolean metaCurdirOk = FALSE; /* write .meta in .CURDIR Ok? */ static Boolean metaSilent = FALSE; /* if we have a .meta be SILENT */ @@ -645,6 +649,11 @@ meta_mode_init(const char *make_mode) metaIgnorePatterns = TRUE; free(cp); } + cp = NULL; + if (Var_Value(MAKE_META_IGNORE_FILTER, VAR_GLOBAL, &cp)) { + metaIgnoreFilter = TRUE; + free(cp); + } } /* @@ -869,6 +878,7 @@ fgetLine(char **bufp, size_t *szp, int o return 0; } +/* Lst_ForEach wants 1 to stop search */ static int prefix_match(void *p, void *q) { @@ -879,6 +889,32 @@ prefix_match(void *p, void *q) return (0 == strncmp(path, prefix, n)); } +/* + * looking for exact or prefix/ match to + * Lst_Find wants 0 to stop search + */ +static int +path_match(const void *p, const void *q) +{ + const char *prefix = q; + const char *path = p; + size_t n = strlen(prefix); + int rc; + + if ((rc = strncmp(path, prefix, n)) == 0) { + switch (path[n]) { + case '\0': + case '/': + break; + default: + rc = 1; + break; + } + } + return rc; +} + +/* Lst_Find wants 0 to stop search */ static int string_match(const void *p, const void *q) { @@ -889,6 +925,67 @@ string_match(const void *p, const void * } +static int +meta_ignore(GNode *gn, const char *p) +{ + char fname[MAXPATHLEN]; + + if (p == NULL) + return TRUE; + + if (*p == '/') { + cached_realpath(p, fname); /* clean it up */ + if (Lst_ForEach(metaIgnorePaths, prefix_match, fname)) { +#ifdef DEBUG_META_MODE + if (DEBUG(META)) + fprintf(debug_file, "meta_oodate: ignoring path: %s\n", + p); +#endif + return TRUE; + } + } + + if (metaIgnorePatterns) { + char *pm; + + snprintf(fname, sizeof(fname), + "${%s:@m@${%s:L:M$m}@}", + MAKE_META_IGNORE_PATTERNS, p); + pm = Var_Subst(NULL, fname, gn, VARF_WANTRES); + if (*pm) { +#ifdef DEBUG_META_MODE + if (DEBUG(META)) + fprintf(debug_file, "meta_oodate: ignoring pattern: %s\n", + p); +#endif + free(pm); + return TRUE; + } + free(pm); + } + + if (metaIgnoreFilter) { + char *fm; + + /* skip if filter result is empty */ + snprintf(fname, sizeof(fname), + "${%s:L:${%s:ts:}}", + p, MAKE_META_IGNORE_FILTER); + fm = Var_Subst(NULL, fname, gn, VARF_WANTRES); + if (*fm == '\0') { +#ifdef DEBUG_META_MODE + if (DEBUG(META)) + fprintf(debug_file, "meta_oodate: ignoring filtered: %s\n", + p); +#endif + free(fm); + return TRUE; + } + free(fm); + } + return FALSE; +} + /* * When running with 'meta' functionality, a target can be out-of-date * if any of the references in its meta data file is more recent. @@ -1170,12 +1267,19 @@ meta_oodate(GNode *gn, Boolean oodate) /* FALLTHROUGH */ case 'D': /* unlink */ if (*p == '/' && !Lst_IsEmpty(missingFiles)) { - /* remove p from the missingFiles list if present */ - if ((ln = Lst_Find(missingFiles, p, string_match)) != NULL) { - char *tp = Lst_Datum(ln); - Lst_Remove(missingFiles, ln); - free(tp); - ln = NULL; /* we're done with it */ + /* remove any missingFiles entries that match p */ + if ((ln = Lst_Find(missingFiles, p, + path_match)) != NULL) { + LstNode nln; + char *tp; + + do { + nln = Lst_FindFrom(missingFiles, Lst_Succ(ln), + p, path_match); + tp = Lst_Datum(ln); + Lst_Remove(missingFiles, ln); + free(tp); + } while ((ln = nln) != NULL); } } if (buf[0] == 'M') { @@ -1240,8 +1344,10 @@ meta_oodate(GNode *gn, Boolean oodate) if ((link_src != NULL && cached_lstat(p, &fs) < 0) || (link_src == NULL && cached_stat(p, &fs) < 0)) { - if (Lst_Find(missingFiles, p, string_match) == NULL) + if (!meta_ignore(gn, p)) { + if (Lst_Find(missingFiles, p, string_match) == NULL) Lst_AtEnd(missingFiles, bmake_strdup(p)); + } } break; check_link_src: @@ -1259,37 +1365,9 @@ meta_oodate(GNode *gn, Boolean oodate) * be part of the dependencies because * they are _expected_ to change. */ - if (*p == '/') { - cached_realpath(p, fname1); /* clean it up */ - if (Lst_ForEach(metaIgnorePaths, prefix_match, fname1)) { -#ifdef DEBUG_META_MODE - if (DEBUG(META)) - fprintf(debug_file, "meta_oodate: ignoring path: %s\n", - p); -#endif - break; - } - } - - if (metaIgnorePatterns) { - char *pm; - - snprintf(fname1, sizeof(fname1), - "${%s:@m@${%s:L:M$m}@}", - MAKE_META_IGNORE_PATTERNS, p); - pm = Var_Subst(NULL, fname1, gn, VARF_WANTRES); - if (*pm) { -#ifdef DEBUG_META_MODE - if (DEBUG(META)) - fprintf(debug_file, "meta_oodate: ignoring pattern: %s\n", - p); -#endif - free(pm); - break; - } - free(pm); - } - + if (meta_ignore(gn, p)) + break; + /* * The rest of the record is the file name. * Check if it's not an absolute path. @@ -1547,7 +1625,7 @@ meta_compat_parent(void) while (fgets(buf, sizeof(buf), fp)) { meta_job_output(NULL, buf, ""); printf("%s", buf); - (void)fflush(stdout); + fflush(stdout); } fclose(fp); } Modified: projects/clang390-import/contrib/bmake/mk/ChangeLog ============================================================================== --- projects/clang390-import/contrib/bmake/mk/ChangeLog Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/contrib/bmake/mk/ChangeLog Sat Sep 10 17:00:08 2016 (r305687) @@ -1,3 +1,34 @@ +2016-08-15 Simon J. Gerraty + + * install-mk (MK_VERSION): 20160815 + + * dirdeps.mk (.MAKE.META.IGNORE_FILTER): set filter to only + consider Makefile.depend* when checking if DIRDEPS_CACHE is up-to-date. + +2016-08-13 Simon J. Gerraty + + * meta.sys.mk (.MAKE.META.IGNORE_PATHS): + in meta mode we can ignore the mtime of makefiles + +2016-08-02 Simon J. Gerraty + + * install-mk (MK_VERSION): 20160802 + + * lib.mk (libinstall): depends on beforinstall + + * prog.mk (proginstall): depends on beforinstall + patch from Lauri Tirkkonen + + * dirdeps.mk (bootstrap): When bootstrapping; creat + .MAKE.DEPENDFILE_DEFAULT and allow additional filtering via + .MAKE.DEPENDFILE_BOOTSTRAP_SED + + * dirdeps.mk: move some comments to where they make sense. + +2016-07-27 Simon J. Gerraty + + * dirdeps.mk (DIRDEPS_CACHE): no dirname. + 2016-06-02 Simon J. Gerraty * install-mk (MK_VERSION): 20160602 Modified: projects/clang390-import/contrib/bmake/mk/dirdeps.mk ============================================================================== --- projects/clang390-import/contrib/bmake/mk/dirdeps.mk Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/contrib/bmake/mk/dirdeps.mk Sat Sep 10 17:00:08 2016 (r305687) @@ -1,4 +1,4 @@ -# $Id: dirdeps.mk,v 1.67 2016/04/18 21:50:47 sjg Exp $ +# $Id: dirdeps.mk,v 1.73 2016/08/15 19:28:13 sjg Exp $ # Copyright (c) 2010-2013, Juniper Networks, Inc. # All rights reserved. @@ -116,12 +116,17 @@ _DIRDEP_USE_LEVEL?= 0 .if ${.MAKE.LEVEL} == ${_DIRDEP_USE_LEVEL} # only the first instance is interested in all this -# First off, we want to know what ${MACHINE} to build for. -# This can be complicated if we are using a mixture of ${MACHINE} specific -# and non-specific Makefile.depend* - .if !target(_DIRDEP_USE) +# do some setup we only need once +_CURDIR ?= ${.CURDIR} +_OBJDIR ?= ${.OBJDIR} + +now_utc = ${%s:L:gmtime} +.if !defined(start_utc) +start_utc := ${now_utc} +.endif + .if ${MAKEFILE:T} == ${.PARSEFILE} && empty(DIRDEPS) && ${.TARGETS:Uall:M*/*} != "" # This little trick let's us do # @@ -144,15 +149,6 @@ MK_DIRDEPS_CACHE = no # make sure we get the behavior we expect .MAKE.SAVE_DOLLARS = no -# do some setup we only need once -_CURDIR ?= ${.CURDIR} -_OBJDIR ?= ${.OBJDIR} - -now_utc = ${%s:L:gmtime} -.if !defined(start_utc) -start_utc := ${now_utc} -.endif - # make sure these are empty to start with _DEP_TARGET_SPEC = @@ -223,6 +219,10 @@ N_notmachine := ${.MAKE.DEPENDFILE_PREFE .endif # !target(_DIRDEP_USE) +# First off, we want to know what ${MACHINE} to build for. +# This can be complicated if we are using a mixture of ${MACHINE} specific +# and non-specific Makefile.depend* + # if we were included recursively _DEP_TARGET_SPEC should be valid. .if empty(_DEP_TARGET_SPEC) # we may or may not have included a dependfile yet @@ -385,7 +385,7 @@ BUILD_DIRDEPS ?= yes .if !defined(NO_DIRDEPS) && !defined(NO_DIRDEPS_BELOW) .if ${MK_DIRDEPS_CACHE} == "yes" # this is where we will cache all our work -DIRDEPS_CACHE?= ${_OBJDIR}/dirdeps.cache${.TARGETS:Nall:O:u:ts-:S,/,_,g:S,^,.,:N.} +DIRDEPS_CACHE?= ${_OBJDIR:tA}/dirdeps.cache${.TARGETS:Nall:O:u:ts-:S,/,_,g:S,^,.,:N.} # just ensure this exists build-dirdeps: @@ -397,6 +397,9 @@ M_oneperline = @x@\\${.newline} $$x@ # we do this via sub-make BUILD_DIRDEPS = no +# ignore anything but these +.MAKE.META.IGNORE_FILTER = M*/${.MAKE.DEPENDFILE_PREFIX}* + dirdeps: dirdeps-cached dirdeps-cached: ${DIRDEPS_CACHE} .MAKE @echo "${TRACER}Using ${DIRDEPS_CACHE}" @@ -669,7 +672,10 @@ _DEP_RELDIR := ${RELDIR} make(bootstrap-recurse) || \ make(bootstrap-empty)) -.if exists(${.CURDIR}/${.MAKE.DEPENDFILE:T}) +# if we are bootstrapping create the default +_want = ${.CURDIR}/${.MAKE.DEPENDFILE_DEFAULT:T} + +.if exists(${_want}) # stop here ${.TARGETS:Mboot*}: .elif !make(bootstrap-empty) @@ -679,12 +685,19 @@ _src != cd ${.CURDIR} && for m in ${.MAK .error cannot find any of ${.MAKE.DEPENDFILE_PREFERENCE:T}${.newline}Use: bootstrap-empty .endif -_src?= ${.MAKE.DEPENDFILE:T} +_src?= ${.MAKE.DEPENDFILE} + +.MAKE.DEPENDFILE_BOOTSTRAP_SED+= -e 's,${_src:E},${MACHINE},g' # just create Makefile.depend* for this dir bootstrap-this: .NOTMAIN - @echo Bootstrapping ${RELDIR}/${.MAKE.DEPENDFILE:T} from ${_src:T} - (cd ${.CURDIR} && sed 's,${_src:E},${MACHINE},g' ${_src} > ${.MAKE.DEPENDFILE:T}) + @echo Bootstrapping ${RELDIR}/${_want:T} from ${_src:T}; \ + echo You need to build ${RELDIR} to correctly populate it. +.if ${_src:T} != ${.MAKE.DEPENDFILE_PREFIX:T} + (cd ${.CURDIR} && sed ${.MAKE.DEPENDFILE_BOOTSTRAP_SED} ${_src} > ${_want}) +.else + cp ${.CURDIR}/${_src} ${_want} +.endif # create Makefile.depend* for this dir and its dependencies bootstrap: bootstrap-recurse @@ -704,8 +717,8 @@ bootstrap-recurse: .NOTMAIN .MAKE # create an empty Makefile.depend* to get the ball rolling. bootstrap-empty: .NOTMAIN .NOMETA - @echo Creating empty ${RELDIR}/${.MAKE.DEPENDFILE:T}; \ + @echo Creating empty ${RELDIR}/${_want:T}; \ echo You need to build ${RELDIR} to correctly populate it. - @{ echo DIRDEPS=; echo ".include "; } > ${.CURDIR}/${.MAKE.DEPENDFILE:T} + @{ echo DIRDEPS=; echo ".include "; } > ${_want} .endif Modified: projects/clang390-import/contrib/bmake/mk/install-mk ============================================================================== --- projects/clang390-import/contrib/bmake/mk/install-mk Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/contrib/bmake/mk/install-mk Sat Sep 10 17:00:08 2016 (r305687) @@ -55,7 +55,7 @@ # Simon J. Gerraty # RCSid: -# $Id: install-mk,v 1.128 2016/06/03 17:22:32 sjg Exp $ +# $Id: install-mk,v 1.130 2016/08/15 19:28:13 sjg Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # @@ -70,7 +70,7 @@ # sjg@crufty.net # -MK_VERSION=20160602 +MK_VERSION=20160815 OWNER= GROUP= MODE=444 Modified: projects/clang390-import/contrib/bmake/mk/lib.mk ============================================================================== --- projects/clang390-import/contrib/bmake/mk/lib.mk Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/contrib/bmake/mk/lib.mk Sat Sep 10 17:00:08 2016 (r305687) @@ -1,4 +1,4 @@ -# $Id: lib.mk,v 1.53 2016/03/22 20:45:14 sjg Exp $ +# $Id: lib.mk,v 1.54 2016/08/02 20:52:17 sjg Exp $ .if !target(__${.PARSEFILE}__) __${.PARSEFILE}__: @@ -564,6 +564,7 @@ libinstall: install: maninstall _SUBDIRUSE maninstall: afterinstall afterinstall: realinstall +libinstall: beforeinstall realinstall: beforeinstall .endif Modified: projects/clang390-import/contrib/bmake/mk/meta.sys.mk ============================================================================== --- projects/clang390-import/contrib/bmake/mk/meta.sys.mk Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/contrib/bmake/mk/meta.sys.mk Sat Sep 10 17:00:08 2016 (r305687) @@ -1,4 +1,4 @@ -# $Id: meta.sys.mk,v 1.28 2016/04/05 15:58:37 sjg Exp $ +# $Id: meta.sys.mk,v 1.29 2016/08/13 17:51:45 sjg Exp $ # # @(#) Copyright (c) 2010, Simon J. Gerraty @@ -25,6 +25,10 @@ # absoulte path to what we are reading. _PARSEDIR = ${.PARSEDIR:tA} +.if !defined(SYS_MK_DIR) +SYS_MK_DIR := ${_PARSEDIR} +.endif + META_MODE += meta verbose .MAKE.MODE ?= ${META_MODE} @@ -119,6 +123,15 @@ MKDEP_MK = meta.autodep.mk # re-running needlessly META_COOKIE_TOUCH= touch ${COOKIE.${.TARGET}:U${.OBJDIR}/${.TARGET}} META_NOPHONY= + +# some targets involve old pre-built targets +# ignore mtime of shell +# and mtime of makefiles does not matter in meta mode +.MAKE.META.IGNORE_PATHS += \ + ${MAKEFILE} \ + ${SHELL} \ + ${SYS_MK_DIR} + .if ${UPDATE_DEPENDFILE:Uyes:tl} != "no" .if ${.MAKEFLAGS:Uno:M-k} != "" # make this more obvious Modified: projects/clang390-import/contrib/bmake/mk/prog.mk ============================================================================== --- projects/clang390-import/contrib/bmake/mk/prog.mk Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/contrib/bmake/mk/prog.mk Sat Sep 10 17:00:08 2016 (r305687) @@ -1,4 +1,4 @@ -# $Id: prog.mk,v 1.26 2016/03/22 20:45:14 sjg Exp $ +# $Id: prog.mk,v 1.27 2016/08/02 20:52:17 sjg Exp $ .if !target(__${.PARSEFILE}__) __${.PARSEFILE}__: @@ -191,6 +191,7 @@ install_links: maninstall: afterinstall afterinstall: realinstall +proginstall: beforeinstall realinstall: beforeinstall .endif Modified: projects/clang390-import/contrib/bmake/os.sh ============================================================================== --- projects/clang390-import/contrib/bmake/os.sh Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/contrib/bmake/os.sh Sat Sep 10 17:00:08 2016 (r305687) @@ -17,7 +17,7 @@ # Simon J. Gerraty # RCSid: -# $Id: os.sh,v 1.50 2015/12/17 17:06:29 sjg Exp $ +# $Id: os.sh,v 1.52 2016/06/17 05:15:14 sjg Exp $ # # @(#) Copyright (c) 1994 Simon J. Gerraty # @@ -139,7 +139,7 @@ SunOS) case $OS in NetBSD) HOST_ARCH=$MACHINE - SHARE_ARCH=$OS/$HOST + SHARE_ARCH=$OS/$HOST_ARCH ;; OpenBSD) arch=`Which arch /usr/bin:/usr/ucb:$PATH` @@ -208,7 +208,8 @@ TMP_DIRS=${TMP_DIRS:-"/tmp /var/tmp"} MACHINE_ARCH=${MACHINE_ARCH:-$MACHINE} HOST_ARCH=${HOST_ARCH:-$MACHINE_ARCH} # we mount server:/share/arch/$SHARE_ARCH as /usr/local -SHARE_ARCH=${SHARE_ARCH:-$OS/$OSMAJOR.X/$HOST_ARCH} +SHARE_ARCH_DEFAULT=$OS/$OSMAJOR.X/$HOST_ARCH +SHARE_ARCH=${SHARE_ARCH:-$SHARE_ARCH_DEFAULT} LN=${LN:-ln} TR=${TR:-tr} Modified: projects/clang390-import/contrib/bmake/suff.c ============================================================================== --- projects/clang390-import/contrib/bmake/suff.c Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/contrib/bmake/suff.c Sat Sep 10 17:00:08 2016 (r305687) @@ -1,4 +1,4 @@ -/* $NetBSD: suff.c,v 1.81 2016/03/15 18:30:14 matthias Exp $ */ +/* $NetBSD: suff.c,v 1.84 2016/06/30 05:34:04 dholland Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: suff.c,v 1.81 2016/03/15 18:30:14 matthias Exp $"; +static char rcsid[] = "$NetBSD: suff.c,v 1.84 2016/06/30 05:34:04 dholland Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94"; #else -__RCSID("$NetBSD: suff.c,v 1.81 2016/03/15 18:30:14 matthias Exp $"); +__RCSID("$NetBSD: suff.c,v 1.84 2016/06/30 05:34:04 dholland Exp $"); #endif #endif /* not lint */ #endif @@ -766,6 +766,8 @@ Suff_EndTransform(void *gnp, void *dummy { GNode *gn = (GNode *)gnp; + (void)dummy; + if ((gn->type & OP_DOUBLEDEP) && !Lst_IsEmpty (gn->cohorts)) gn = (GNode *)Lst_Datum(Lst_Last(gn->cohorts)); if ((gn->type & OP_TRANSFORM) && Lst_IsEmpty(gn->commands) && @@ -809,7 +811,7 @@ Suff_EndTransform(void *gnp, void *dummy fprintf(debug_file, "transformation %s complete\n", gn->name); } - return(dummy ? 0 : 0); + return 0; } /*- @@ -1215,7 +1217,7 @@ SuffAddSrc(void *sp, void *lsp) #ifdef DEBUG_SRC s2->cp = Lst_Init(FALSE); Lst_AtEnd(targ->cp, s2); - fprintf(debug_file, "1 add %x %x to %x:", targ, s2, ls->l); + fprintf(debug_file, "1 add %p %p to %p:", targ, s2, ls->l); Lst_ForEach(ls->l, PrintAddr, NULL); fprintf(debug_file, "\n"); #endif @@ -1233,7 +1235,7 @@ SuffAddSrc(void *sp, void *lsp) #ifdef DEBUG_SRC s2->cp = Lst_Init(FALSE); Lst_AtEnd(targ->cp, s2); - fprintf(debug_file, "2 add %x %x to %x:", targ, s2, ls->l); + fprintf(debug_file, "2 add %p %p to %p:", targ, s2, ls->l); Lst_ForEach(ls->l, PrintAddr, NULL); fprintf(debug_file, "\n"); #endif @@ -1305,14 +1307,14 @@ SuffRemoveSrc(Lst l) free(s->pref); else { #ifdef DEBUG_SRC - LstNode ln = Lst_Member(s->parent->cp, s); - if (ln != NULL) - Lst_Remove(s->parent->cp, ln); + LstNode ln2 = Lst_Member(s->parent->cp, s); + if (ln2 != NULL) + Lst_Remove(s->parent->cp, ln2); #endif --s->parent->children; } #ifdef DEBUG_SRC - fprintf(debug_file, "free: [l=%x] p=%x %d\n", l, s, s->children); + fprintf(debug_file, "free: [l=%p] p=%p %d\n", l, s, s->children); Lst_Destroy(s->cp, NULL); #endif Lst_Remove(l, ln); @@ -1323,7 +1325,7 @@ SuffRemoveSrc(Lst l) } #ifdef DEBUG_SRC else { - fprintf(debug_file, "keep: [l=%x] p=%x %d: ", l, s, s->children); + fprintf(debug_file, "keep: [l=%p] p=%p %d: ", l, s, s->children); Lst_ForEach(s->cp, PrintAddr, NULL); fprintf(debug_file, "\n"); } @@ -1372,7 +1374,7 @@ SuffFindThem(Lst srcs, Lst slst) */ if (Targ_FindNode(s->file, TARG_NOCREATE) != NULL) { #ifdef DEBUG_SRC - fprintf(debug_file, "remove %x from %x\n", s, srcs); + fprintf(debug_file, "remove %p from %p\n", s, srcs); #endif rs = s; break; @@ -1381,7 +1383,7 @@ SuffFindThem(Lst srcs, Lst slst) if ((ptr = Dir_FindFile(s->file, s->suff->searchPath)) != NULL) { rs = s; #ifdef DEBUG_SRC - fprintf(debug_file, "remove %x from %x\n", s, srcs); + fprintf(debug_file, "remove %p from %p\n", s, srcs); #endif free(ptr); break; @@ -1497,7 +1499,7 @@ SuffFindCmds(Src *targ, Lst slst) targ->children += 1; #ifdef DEBUG_SRC ret->cp = Lst_Init(FALSE); - fprintf(debug_file, "3 add %x %x\n", targ, ret); + fprintf(debug_file, "3 add %p %p\n", targ, ret); Lst_AtEnd(targ->cp, ret); #endif Lst_AtEnd(slst, ret); @@ -1616,7 +1618,7 @@ SuffExpandChildren(LstNode cln, GNode *p } free(freeIt); - } else if (*cp == '\\' && *cp != '\0') { + } else if (*cp == '\\' && cp[1] != '\0') { /* * Escaped something -- skip over it */ @@ -2597,8 +2599,10 @@ Suff_End(void) static int SuffPrintName(void *s, void *dummy) { + (void)dummy; + fprintf(debug_file, "%s ", ((Suff *)s)->name); - return (dummy ? 0 : 0); + return 0; } static int @@ -2608,6 +2612,8 @@ SuffPrintSuff(void *sp, void *dummy) int flags; int flag; + (void)dummy; + fprintf(debug_file, "# `%s' [%d] ", s->name, s->refCount); flags = s->flags; @@ -2640,7 +2646,7 @@ SuffPrintSuff(void *sp, void *dummy) fprintf(debug_file, "#\tSearch Path: "); Dir_PrintPath(s->searchPath); fputc('\n', debug_file); - return (dummy ? 0 : 0); + return 0; } static int @@ -2648,12 +2654,14 @@ SuffPrintTrans(void *tp, void *dummy) { GNode *t = (GNode *)tp; + (void)dummy; + fprintf(debug_file, "%-16s: ", t->name); Targ_PrintType(t->type); fputc('\n', debug_file); Lst_ForEach(t->commands, Targ_PrintCmd, NULL); fputc('\n', debug_file); - return(dummy ? 0 : 0); + return 0; } void Modified: projects/clang390-import/etc/mtree/BSD.tests.dist ============================================================================== --- projects/clang390-import/etc/mtree/BSD.tests.dist Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/etc/mtree/BSD.tests.dist Sat Sep 10 17:00:08 2016 (r305687) @@ -308,6 +308,18 @@ ttyio .. .. + libcasper + services + cap_dns + .. + cap_grp + .. + cap_pwd + .. + cap_sysctl + .. + .. + .. libcrypt .. libdevdctl Modified: projects/clang390-import/lib/libc/aarch64/sys/Makefile.inc ============================================================================== --- projects/clang390-import/lib/libc/aarch64/sys/Makefile.inc Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/lib/libc/aarch64/sys/Makefile.inc Sat Sep 10 17:00:08 2016 (r305687) @@ -11,13 +11,5 @@ MDASM= cerror.S \ vfork.S # Don't generate default code for these syscalls: -NOASM= break.o \ - exit.o \ - getlogin.o \ - sbrk.o \ - sstk.o \ - vfork.o \ - yield.o - -PSEUDO= _exit.o \ - _getlogin.o +NOASM+= sbrk.o \ + vfork.o Modified: projects/clang390-import/lib/libc/amd64/sys/Makefile.inc ============================================================================== --- projects/clang390-import/lib/libc/amd64/sys/Makefile.inc Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/lib/libc/amd64/sys/Makefile.inc Sat Sep 10 17:00:08 2016 (r305687) @@ -8,6 +8,4 @@ MDASM= vfork.S brk.S cerror.S exect.S ge sbrk.S setlogin.S sigreturn.S # Don't generate default code for these syscalls: -NOASM= break.o exit.o getlogin.o sstk.o vfork.o yield.o - -PSEUDO= _getlogin.o _exit.o +NOASM+= vfork.o Modified: projects/clang390-import/lib/libc/arm/sys/Makefile.inc ============================================================================== --- projects/clang390-import/lib/libc/arm/sys/Makefile.inc Sat Sep 10 16:51:39 2016 (r305686) +++ projects/clang390-import/lib/libc/arm/sys/Makefile.inc Sat Sep 10 17:00:08 2016 (r305687) @@ -5,6 +5,4 @@ SRCS+= __vdso_gettc.c MDASM= Ovfork.S brk.S cerror.S sbrk.S shmat.S sigreturn.S syscall.S # Don't generate default code for these syscalls: -NOASM= break.o exit.o getlogin.o sstk.o vfork.o yield.o - -PSEUDO= _exit.o _getlogin.o +NOASM+= vfork.o *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***