From owner-svn-src-head@freebsd.org Fri Jun 22 17:58:57 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 40A1210229A5; Fri, 22 Jun 2018 17:58:57 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E78AA799BB; Fri, 22 Jun 2018 17:58:56 +0000 (UTC) (envelope-from bdrewery@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C4B5424033; Fri, 22 Jun 2018 17:58:56 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5MHwuxJ095326; Fri, 22 Jun 2018 17:58:56 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5MHwu78095325; Fri, 22 Jun 2018 17:58:56 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201806221758.w5MHwu78095325@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 22 Jun 2018 17:58:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r335560 - head/lib/clang/libllvm X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/lib/clang/libllvm X-SVN-Commit-Revision: 335560 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jun 2018 17:58:57 -0000 Author: bdrewery Date: Fri Jun 22 17:58:56 2018 New Revision: 335560 URL: https://svnweb.freebsd.org/changeset/base/335560 Log: Revert r335449 and add needed MK_LLD_BOOTSTRAP check for SRCS_MIW. This effectively reverts r335449 and changes the previous MK_LLD_IS_LD to a MK_LLD_BOOTSTRAP check. If !TOOLS_PREFIX then these sources are always built for llvm-objdump, lld, and llvm-cov. When TOOLS_PREFIX is set then they are only needed if lld is being bootstrapped. Reported by: dim Pointyhat to: bdrewery Sponsored by: Dell EMC Modified: head/lib/clang/libllvm/Makefile Modified: head/lib/clang/libllvm/Makefile ============================================================================== --- head/lib/clang/libllvm/Makefile Fri Jun 22 16:18:19 2018 (r335559) +++ head/lib/clang/libllvm/Makefile Fri Jun 22 17:58:56 2018 (r335560) @@ -382,30 +382,30 @@ SRCS_MIN+= DebugInfo/CodeView/TypeIndexDiscovery.cpp SRCS_MIN+= DebugInfo/CodeView/TypeRecordMapping.cpp SRCS_MIN+= DebugInfo/CodeView/TypeStreamMerger.cpp SRCS_MIN+= DebugInfo/CodeView/TypeTableCollection.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFAcceleratorTable.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFCompileUnit.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFContext.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFDataExtractor.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFDebugAbbrev.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFDebugArangeSet.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFDebugAranges.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFDebugFrame.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFDebugInfoEntry.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFDebugLine.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFDebugLoc.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFDebugMacro.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFDebugPubTable.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFDebugRangeList.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFDie.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFExpression.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFFormValue.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFGdbIndex.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFTypeUnit.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFUnit.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFUnitIndex.cpp -SRCS_XDL+= DebugInfo/DWARF/DWARFVerifier.cpp -SRCS_XDL+= DebugInfo/DWARF/SyntaxHighlighting.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFAcceleratorTable.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFCompileUnit.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFContext.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDataExtractor.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugAbbrev.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugArangeSet.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugAranges.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugFrame.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugInfoEntry.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugLine.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugLoc.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugMacro.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugPubTable.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDebugRangeList.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFDie.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFExpression.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFFormValue.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFGdbIndex.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFTypeUnit.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFUnit.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFUnitIndex.cpp +SRCS_MIW+= DebugInfo/DWARF/DWARFVerifier.cpp +SRCS_MIW+= DebugInfo/DWARF/SyntaxHighlighting.cpp SRCS_MIN+= DebugInfo/MSF/MSFBuilder.cpp SRCS_MIN+= DebugInfo/MSF/MSFCommon.cpp SRCS_MIN+= DebugInfo/MSF/MSFError.cpp @@ -1298,7 +1298,7 @@ SRCS_EXT+= Transforms/Vectorize/Vectorize.cpp SRCS_EXT+= XRay/InstrumentationMap.cpp SRCS_ALL+= ${SRCS_MIN} -.if !defined(TOOLS_PREFIX) +.if !defined(TOOLS_PREFIX) || ${MK_LLD_BOOTSTRAP} != "no" SRCS_ALL+= ${SRCS_MIW} .endif .if ${MK_CLANG_EXTRAS} != "no"