diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-12-31 14:39:45 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-12-31 14:39:45 +0000 |
| commit | 34cdd77646db8a3e57441b3f7d028973dc880c54 (patch) | |
| tree | 7200f82c9be15d3c4522d61d33faff5900454d33 | |
| parent | 802df53c824b0d8020c32cb6227313f3604186e6 (diff) | |
First part of updating llvm/clang build glue: getting llvm-tblgen,
clang-tblgen and clang itself built.
Notes
Notes:
svn path=/projects/clang380-import/; revision=292988
76 files changed, 217 insertions, 143 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index a26df46ecafd..afd473940dc3 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1459,11 +1459,11 @@ _gensnmptree= usr.sbin/bsnmpd/gensnmptree _clang_tblgen= \ lib/clang/libllvmsupport \ lib/clang/libllvmtablegen \ - usr.bin/clang/tblgen \ + usr.bin/clang/llvm-tblgen \ usr.bin/clang/clang-tblgen ${_bt}-usr.bin/clang/clang-tblgen: ${_bt}-lib/clang/libllvmtablegen ${_bt}-lib/clang/libllvmsupport -${_bt}-usr.bin/clang/tblgen: ${_bt}-lib/clang/libllvmtablegen ${_bt}-lib/clang/libllvmsupport +${_bt}-usr.bin/clang/llvm-tblgen: ${_bt}-lib/clang/libllvmtablegen ${_bt}-lib/clang/libllvmsupport .endif # Default to building the GPL DTC, but build the BSDL one if users explicitly @@ -1668,7 +1668,7 @@ NXBENV= MAKEOBJDIRPREFIX=${OBJTREE}/nxb \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${PATH}:${OBJTREE}/gperf_for_gcc/usr/bin NXBMAKE= ${NXBENV} ${MAKE} \ - TBLGEN=${NXBDESTDIR}/usr/bin/tblgen \ + LLVM_TBLGEN=${NXBDESTDIR}/usr/bin/llvm-tblgen \ CLANG_TBLGEN=${NXBDESTDIR}/usr/bin/clang-tblgen \ MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \ MK_GDB=no MK_TESTS=no \ diff --git a/lib/clang/Makefile b/lib/clang/Makefile index 905346a4567e..eacda631abc6 100644 --- a/lib/clang/Makefile +++ b/lib/clang/Makefile @@ -38,7 +38,6 @@ SUBDIR= libclanganalysis \ libllvmcore \ libllvminstcombine \ libllvminstrumentation \ - libllvmipa \ libllvmipo \ libllvmirreader \ libllvmlinker \ @@ -58,38 +57,38 @@ SUBDIR= libclanganalysis \ libllvmvectorize \ \ libllvmaarch64asmparser \ + libllvmaarch64asmprinter \ libllvmaarch64codegen \ libllvmaarch64desc \ libllvmaarch64info \ - libllvmaarch64instprinter \ libllvmaarch64utils \ libllvmarmasmparser \ + libllvmarmasmprinter \ libllvmarmcodegen \ libllvmarmdesc \ libllvmarmdisassembler \ libllvmarminfo \ - libllvmarminstprinter \ libllvmmipsasmparser \ + libllvmmipsasmprinter \ libllvmmipscodegen \ libllvmmipsdesc \ libllvmmipsinfo \ - libllvmmipsinstprinter \ libllvmpowerpcasmparser \ + libllvmpowerpcasmprinter \ libllvmpowerpccodegen \ libllvmpowerpcdesc \ libllvmpowerpcdisassembler \ libllvmpowerpcinfo \ - libllvmpowerpcinstprinter \ libllvmsparcasmparser \ + libllvmsparcasmprinter \ libllvmsparccodegen \ libllvmsparcdesc \ libllvmsparcinfo \ - libllvmsparcinstprinter \ libllvmx86asmparser \ + libllvmx86asmprinter \ libllvmx86codegen \ libllvmx86desc \ libllvmx86info \ - libllvmx86instprinter \ libllvmx86utils .if ${MK_CLANG_EXTRAS} != "no" @@ -99,11 +98,13 @@ SUBDIR+=libllvmdebuginfodwarf \ libllvmlto \ libllvmmirparser \ libllvmorcjit \ - libllvmpasses + libllvmpasses \ + libllvmsymbolize .endif # MK_CLANG_EXTRAS + .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" -SUBDIR+=libllvmaarch64disassembler \ - libllvmexecutionengine \ +SUBDIR+=libllvmexecutionengine \ + libllvmaarch64disassembler \ libllvminterpreter \ libllvmmcjit \ libllvmmipsdisassembler \ diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk index e90bd3f80648..eb6ef16ed1f4 100644 --- a/lib/clang/clang.build.mk +++ b/lib/clang/clang.build.mk @@ -39,13 +39,24 @@ CXXFLAGS.clang+= -stdlib=libc++ .PATH: ${LLVM_SRCS}/${SRCDIR} -TBLGEN?= tblgen +LLVM_TBLGEN?= llvm-tblgen CLANG_TBLGEN?= clang-tblgen +Attributes.inc.h: ${LLVM_SRCS}/include/llvm/IR/Attributes.td + ${LLVM_TBLGEN} -gen-attrs \ + -I ${LLVM_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ + ${LLVM_SRCS}/include/llvm/IR/Attributes.td + +AttributesCompatFunc.inc.h: ${LLVM_SRCS}/lib/IR/AttributesCompatFunc.td + ${LLVM_TBLGEN} -gen-attrs \ + -I ${LLVM_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ + ${LLVM_SRCS}/lib/IR/AttributesCompatFunc.td + Intrinsics.inc.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td - ${TBLGEN} -gen-intrinsic \ + ${LLVM_TBLGEN} -gen-intrinsic \ -I ${LLVM_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td + .for arch in \ AArch64/AArch64 ARM/ARM Mips/Mips PowerPC/PPC Sparc/Sparc X86/X86 . for hdr in \ @@ -63,7 +74,7 @@ Intrinsics.inc.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td RegisterInfo/-gen-register-info \ SubtargetInfo/-gen-subtarget ${arch:T}Gen${hdr:H:C/$/.inc.h/}: ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td - ${TBLGEN} ${hdr:T:C/,/ /g} \ + ${LLVM_TBLGEN} ${hdr:T:C/,/ /g} \ -I ${LLVM_SRCS}/include -I ${LLVM_SRCS}/lib/Target/${arch:H} \ -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ ${LLVM_SRCS}/lib/Target/${arch:H}/${arch:T}.td @@ -212,13 +223,13 @@ Diagnostic${hdr}Kinds.inc.h: ${CLANG_SRCS}/include/clang/Basic/Diagnostic.td # XXX: Atrocious hack, need to clean this up later .if defined(LIB) && ${LIB} == "llvmlibdriver" Options.inc.h: ${LLVM_SRCS}/lib/LibDriver/Options.td - ${TBLGEN} -gen-opt-parser-defs \ + ${LLVM_TBLGEN} -gen-opt-parser-defs \ -I ${LLVM_SRCS}/include \ -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ ${LLVM_SRCS}/lib/LibDriver/Options.td .else Options.inc.h: ${CLANG_SRCS}/include/clang/Driver/Options.td - ${TBLGEN} -gen-opt-parser-defs \ + ${LLVM_TBLGEN} -gen-opt-parser-defs \ -I ${LLVM_SRCS}/include -I ${CLANG_SRCS}/include/clang/Driver \ -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \ ${CLANG_SRCS}/include/clang/Driver/Options.td diff --git a/lib/clang/include/AttributesCompatFunc.inc b/lib/clang/include/AttributesCompatFunc.inc new file mode 100644 index 000000000000..7f4e777481c7 --- /dev/null +++ b/lib/clang/include/AttributesCompatFunc.inc @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "AttributesCompatFunc.inc.h" diff --git a/lib/clang/include/llvm/IR/Attributes.inc b/lib/clang/include/llvm/IR/Attributes.inc new file mode 100644 index 000000000000..dfe888ecf595 --- /dev/null +++ b/lib/clang/include/llvm/IR/Attributes.inc @@ -0,0 +1,2 @@ +/* $FreeBSD$ */ +#include "Attributes.inc.h" diff --git a/lib/clang/libclangast/Makefile b/lib/clang/libclangast/Makefile index a3f00aa00bd3..d77857bc7e64 100644 --- a/lib/clang/libclangast/Makefile +++ b/lib/clang/libclangast/Makefile @@ -34,6 +34,7 @@ SRCS= APValue.cpp \ ExprCXX.cpp \ ExprClassification.cpp \ ExprConstant.cpp \ + ExprObjC.cpp \ ExternalASTSource.cpp \ InheritViz.cpp \ ItaniumCXXABI.cpp \ @@ -43,13 +44,17 @@ SRCS= APValue.cpp \ MicrosoftMangle.cpp \ NSAPI.cpp \ NestedNameSpecifier.cpp \ + OpenMPClause.cpp \ ParentMap.cpp \ RawCommentList.cpp \ RecordLayout.cpp \ RecordLayoutBuilder.cpp \ SelectorLocationsKind.cpp \ Stmt.cpp \ + StmtCXX.cpp \ StmtIterator.cpp \ + StmtObjC.cpp \ + StmtOpenMP.cpp \ StmtPrinter.cpp \ StmtProfile.cpp \ StmtViz.cpp \ diff --git a/lib/clang/libclangcodegen/Makefile b/lib/clang/libclangcodegen/Makefile index 623daba9be93..6b907a6c801c 100644 --- a/lib/clang/libclangcodegen/Makefile +++ b/lib/clang/libclangcodegen/Makefile @@ -56,6 +56,7 @@ SRCS= BackendUtil.cpp \ TGHDRS= AttrList \ AttrParsedAttrList \ AttrVisitor \ + Attributes \ Attrs \ CommentCommandList \ CommentNodes \ diff --git a/lib/clang/libclangfrontend/Makefile b/lib/clang/libclangfrontend/Makefile index 8e63fb042ccf..0a71441d4ce5 100644 --- a/lib/clang/libclangfrontend/Makefile +++ b/lib/clang/libclangfrontend/Makefile @@ -33,6 +33,7 @@ SRCS= ASTConsumers.cpp \ PrintPreprocessedOutput.cpp \ SerializedDiagnosticPrinter.cpp \ SerializedDiagnosticReader.cpp \ + TestModuleFileExtension.cpp \ TextDiagnostic.cpp \ TextDiagnosticBuffer.cpp \ TextDiagnosticPrinter.cpp \ @@ -41,6 +42,7 @@ SRCS= ASTConsumers.cpp \ TGHDRS= AttrList \ AttrParsedAttrList \ AttrVisitor \ + Attributes \ Attrs \ CommentCommandList \ CommentNodes \ diff --git a/lib/clang/libclangrewritefrontend/Makefile b/lib/clang/libclangrewritefrontend/Makefile index 2f614fb366ab..bf8685885f29 100644 --- a/lib/clang/libclangrewritefrontend/Makefile +++ b/lib/clang/libclangrewritefrontend/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIB= clangrewritefrontend @@ -12,6 +12,11 @@ SRCS= FixItRewriter.cpp \ RewriteMacros.cpp \ RewriteTest.cpp +.if ${MK_CLANG_EXTRAS} != "no" +SRCS+= RewriteModernObjC.cpp \ + RewriteObjC.cpp +.endif + TGHDRS= AttrList \ AttrParsedAttrList \ Attrs \ diff --git a/lib/clang/libclangsema/Makefile b/lib/clang/libclangsema/Makefile index 08c120a380df..0ab91e447a25 100644 --- a/lib/clang/libclangsema/Makefile +++ b/lib/clang/libclangsema/Makefile @@ -24,6 +24,7 @@ SRCS= AnalysisBasedWarnings.cpp \ SemaChecking.cpp \ SemaCodeComplete.cpp \ SemaConsumer.cpp \ + SemaCoroutine.cpp \ SemaDecl.cpp \ SemaDeclAttr.cpp \ SemaDeclCXX.cpp \ diff --git a/lib/clang/libclangserialization/Makefile b/lib/clang/libclangserialization/Makefile index 3a6a65eeea31..bd9b2d830f72 100644 --- a/lib/clang/libclangserialization/Makefile +++ b/lib/clang/libclangserialization/Makefile @@ -15,6 +15,7 @@ SRCS= ASTCommon.cpp \ GeneratePCH.cpp \ GlobalModuleIndex.cpp \ Module.cpp \ + ModuleFileExtension.cpp \ ModuleManager.cpp TGHDRS= AttrList \ diff --git a/lib/clang/libclangstaticanalyzercheckers/Makefile b/lib/clang/libclangstaticanalyzercheckers/Makefile index ec4a76ff72c6..c40203998e15 100644 --- a/lib/clang/libclangstaticanalyzercheckers/Makefile +++ b/lib/clang/libclangstaticanalyzercheckers/Makefile @@ -28,6 +28,7 @@ SRCS= AllocationDiagnostics.cpp \ DereferenceChecker.cpp \ DirectIvarAssignment.cpp \ DivZeroChecker.cpp \ + DynamicTypeChecker.cpp \ DynamicTypePropagation.cpp \ ExprInspectionChecker.cpp \ FixedAddressChecker.cpp \ @@ -35,6 +36,7 @@ SRCS= AllocationDiagnostics.cpp \ IdenticalExprChecker.cpp \ IvarInvalidationChecker.cpp \ LLVMConventionsChecker.cpp \ + LocalizationChecker.cpp \ MacOSKeychainAPIChecker.cpp \ MacOSXAPIChecker.cpp \ MallocChecker.cpp \ @@ -44,12 +46,14 @@ SRCS= AllocationDiagnostics.cpp \ NSErrorChecker.cpp \ NoReturnFunctionChecker.cpp \ NonNullParamChecker.cpp \ + NullabilityChecker.cpp \ ObjCAtSyncChecker.cpp \ ObjCContainersASTChecker.cpp \ ObjCContainersChecker.cpp \ ObjCMissingSuperCallChecker.cpp \ ObjCSelfInitChecker.cpp \ ObjCUnusedIVarsChecker.cpp \ + PaddingChecker.cpp \ PointerArithChecker.cpp \ PointerSubChecker.cpp \ PthreadLockChecker.cpp \ @@ -70,6 +74,7 @@ SRCS= AllocationDiagnostics.cpp \ UnixAPIChecker.cpp \ UnreachableCodeChecker.cpp \ VLASizeChecker.cpp \ + VforkChecker.cpp \ VirtualCallChecker.cpp .if ${MK_CLANG_EXTRAS} != "no" diff --git a/lib/clang/libclangstaticanalyzercore/Makefile b/lib/clang/libclangstaticanalyzercore/Makefile index e171517479f8..bfee77aef2bf 100644 --- a/lib/clang/libclangstaticanalyzercore/Makefile +++ b/lib/clang/libclangstaticanalyzercore/Makefile @@ -21,6 +21,7 @@ SRCS= APSIntType.cpp \ CommonBugCategories.cpp \ ConstraintManager.cpp \ CoreEngine.cpp \ + DynamicTypeMap.cpp \ Environment.cpp \ ExplodedGraph.cpp \ ExprEngine.cpp \ @@ -30,6 +31,8 @@ SRCS= APSIntType.cpp \ ExprEngineObjC.cpp \ FunctionSummary.cpp \ HTMLDiagnostics.cpp \ + IssueHash.cpp \ + LoopWidening.cpp \ MemRegion.cpp \ PathDiagnostic.cpp \ PlistDiagnostics.cpp \ diff --git a/lib/clang/libclangstaticanalyzerfrontend/Makefile b/lib/clang/libclangstaticanalyzerfrontend/Makefile index 397550901ede..5e074d920368 100644 --- a/lib/clang/libclangstaticanalyzerfrontend/Makefile +++ b/lib/clang/libclangstaticanalyzerfrontend/Makefile @@ -7,8 +7,8 @@ LIB= clangstaticanalyzerfrontend SRCDIR= tools/clang/lib/StaticAnalyzer/Frontend SRCS= AnalysisConsumer.cpp \ CheckerRegistration.cpp \ - ModelConsumer.cpp \ FrontendActions.cpp \ + ModelConsumer.cpp \ ModelInjector.cpp TGHDRS= AttrList \ diff --git a/lib/clang/libllvmaarch64instprinter/Makefile b/lib/clang/libllvmaarch64asmprinter/Makefile index c037dc8854f6..222dd74b7e79 100644 --- a/lib/clang/libllvmaarch64instprinter/Makefile +++ b/lib/clang/libllvmaarch64asmprinter/Makefile @@ -2,7 +2,7 @@ .include <bsd.own.mk> -LIB= llvmaarch64instprinter +LIB= llvmaarch64asmprinter SRCDIR= lib/Target/AArch64/InstPrinter INCDIR= lib/Target/AArch64 diff --git a/lib/clang/libllvmaarch64instprinter/Makefile.depend b/lib/clang/libllvmaarch64asmprinter/Makefile.depend index 56c8d3928ee0..56c8d3928ee0 100644 --- a/lib/clang/libllvmaarch64instprinter/Makefile.depend +++ b/lib/clang/libllvmaarch64asmprinter/Makefile.depend diff --git a/lib/clang/libllvmaarch64codegen/Makefile b/lib/clang/libllvmaarch64codegen/Makefile index db0023f991c2..50fec61bb966 100644 --- a/lib/clang/libllvmaarch64codegen/Makefile +++ b/lib/clang/libllvmaarch64codegen/Makefile @@ -41,6 +41,7 @@ TGHDRS= AArch64GenCallingConv \ AArch64GenMCPseudoLowering \ AArch64GenRegisterInfo \ AArch64GenSubtargetInfo \ + Attributes \ Intrinsics .include "../clang.lib.mk" diff --git a/lib/clang/libllvmaarch64desc/Makefile b/lib/clang/libllvmaarch64desc/Makefile index 041fbf21db61..e757f45227ba 100644 --- a/lib/clang/libllvmaarch64desc/Makefile +++ b/lib/clang/libllvmaarch64desc/Makefile @@ -19,6 +19,7 @@ CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/.. TGHDRS= AArch64GenInstrInfo \ AArch64GenMCCodeEmitter \ AArch64GenRegisterInfo \ - AArch64GenSubtargetInfo + AArch64GenSubtargetInfo \ + Attributes .include "../clang.lib.mk" diff --git a/lib/clang/libllvmaarch64disassembler/Makefile b/lib/clang/libllvmaarch64disassembler/Makefile index 0cf9658b6a27..12b5025b44e9 100644 --- a/lib/clang/libllvmaarch64disassembler/Makefile +++ b/lib/clang/libllvmaarch64disassembler/Makefile @@ -12,7 +12,9 @@ SRCS= AArch64Disassembler.cpp SRCS+= AArch64ExternalSymbolizer.cpp .endif -TGHDRS= AArch64GenDisassemblerTables \ +TGHDRS= Attributes \ + Intrinsics \ + AArch64GenDisassemblerTables \ AArch64GenInstrInfo \ AArch64GenRegisterInfo \ AArch64GenSubtargetInfo diff --git a/lib/clang/libllvmanalysis/Makefile b/lib/clang/libllvmanalysis/Makefile index 23d1f876c22d..a05083b6f3a8 100644 --- a/lib/clang/libllvmanalysis/Makefile +++ b/lib/clang/libllvmanalysis/Makefile @@ -6,9 +6,7 @@ LIB= llvmanalysis SRCDIR= lib/Analysis SRCS= AliasAnalysis.cpp \ - AliasAnalysisCounter.cpp \ AliasAnalysisEvaluator.cpp \ - AliasDebugger.cpp \ AliasSetTracker.cpp \ AssumptionCache.cpp \ BasicAliasAnalysis.cpp \ @@ -18,16 +16,23 @@ SRCS= AliasAnalysis.cpp \ CFG.cpp \ CFGPrinter.cpp \ CFLAliasAnalysis.cpp \ + CallGraph.cpp \ + CallGraphSCCPass.cpp \ + CallPrinter.cpp \ CaptureTracking.cpp \ CodeMetrics.cpp \ ConstantFolding.cpp \ CostModel.cpp \ Delinearization.cpp \ + DemandedBits.cpp \ DependenceAnalysis.cpp \ DivergenceAnalysis.cpp \ DomPrinter.cpp \ DominanceFrontier.cpp \ + EHPersonalities.cpp \ + GlobalsModRef.cpp \ IVUsers.cpp \ + InlineCost.cpp \ InstCount.cpp \ InstructionSimplify.cpp \ Interval.cpp \ @@ -35,8 +40,6 @@ SRCS= AliasAnalysis.cpp \ IteratedDominanceFrontier.cpp \ LazyCallGraph.cpp \ LazyValueInfo.cpp \ - LibCallAliasAnalysis.cpp \ - LibCallSemantics.cpp \ Lint.cpp \ Loads.cpp \ LoopAccessAnalysis.cpp \ @@ -48,7 +51,10 @@ SRCS= AliasAnalysis.cpp \ MemoryDependenceAnalysis.cpp \ MemoryLocation.cpp \ ModuleDebugInfoPrinter.cpp \ - NoAliasAnalysis.cpp \ + ObjCARCAliasAnalysis.cpp \ + ObjCARCAnalysisUtils.cpp \ + ObjCARCInstKind.cpp \ + OrderedBasicBlock.cpp \ PHITransAddr.cpp \ PostDominators.cpp \ PtrUseVisitor.cpp \ @@ -73,6 +79,7 @@ SRCS+= Analysis.cpp \ Trace.cpp .endif -TGHDRS= Intrinsics +TGHDRS= Attributes \ + Intrinsics .include "../clang.lib.mk" diff --git a/lib/clang/libllvmarminstprinter/Makefile b/lib/clang/libllvmarmasmprinter/Makefile index 67b8fee26965..b9e9f95b2db5 100644 --- a/lib/clang/libllvmarminstprinter/Makefile +++ b/lib/clang/libllvmarmasmprinter/Makefile @@ -2,7 +2,7 @@ .include <bsd.own.mk> -LIB= llvmarminstprinter +LIB= llvmarmasmprinter SRCDIR= lib/Target/ARM/InstPrinter INCDIR= lib/Target/ARM diff --git a/lib/clang/libllvmarminstprinter/Makefile.depend b/lib/clang/libllvmarmasmprinter/Makefile.depend index ba60d0695ac5..ba60d0695ac5 100644 --- a/lib/clang/libllvmarminstprinter/Makefile.depend +++ b/lib/clang/libllvmarmasmprinter/Makefile.depend diff --git a/lib/clang/libllvmarmcodegen/Makefile b/lib/clang/libllvmarmcodegen/Makefile index 6da61b9f12ec..a77dfdce68f1 100644 --- a/lib/clang/libllvmarmcodegen/Makefile +++ b/lib/clang/libllvmarmcodegen/Makefile @@ -46,6 +46,7 @@ TGHDRS= ARMGenAsmWriter \ ARMGenMCPseudoLowering \ ARMGenRegisterInfo \ ARMGenSubtargetInfo \ + Attributes \ Intrinsics .include "../clang.lib.mk" diff --git a/lib/clang/libllvmarmdesc/Makefile b/lib/clang/libllvmarmdesc/Makefile index 42c3f5c7cad7..423f80758aaf 100644 --- a/lib/clang/libllvmarmdesc/Makefile +++ b/lib/clang/libllvmarmdesc/Makefile @@ -7,7 +7,6 @@ LIB= llvmarmdesc SRCDIR= lib/Target/ARM/MCTargetDesc SRCS= ARMAsmBackend.cpp \ ARMELFObjectWriter.cpp \ - ARMELFObjectWriter.cpp \ ARMELFStreamer.cpp \ ARMMCAsmInfo.cpp \ ARMMCCodeEmitter.cpp \ @@ -24,6 +23,7 @@ CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/.. TGHDRS= ARMGenInstrInfo \ ARMGenMCCodeEmitter \ ARMGenRegisterInfo \ - ARMGenSubtargetInfo + ARMGenSubtargetInfo \ + Attributes .include "../clang.lib.mk" diff --git a/lib/clang/libllvmarminfo/Makefile b/lib/clang/libllvmarminfo/Makefile index 1da434c71a0d..fcf03549b6e9 100644 --- a/lib/clang/libllvmarminfo/Makefile +++ b/lib/clang/libllvmarminfo/Makefile @@ -10,6 +10,7 @@ SRCS= ARMTargetInfo.cpp TGHDRS= ARMGenInstrInfo \ ARMGenRegisterInfo \ - ARMGenSubtargetInfo + ARMGenSubtargetInfo \ + Attributes .include "../clang.lib.mk" diff --git a/lib/clang/libllvmasmparser/Makefile b/lib/clang/libllvmasmparser/Makefile index bb8f0dfda238..7ee59866ab1a 100644 --- a/lib/clang/libllvmasmparser/Makefile +++ b/lib/clang/libllvmasmparser/Makefile @@ -9,4 +9,6 @@ SRCS= LLLexer.cpp \ LLParser.cpp \ Parser.cpp +TGHDRS= Attributes + .include "../clang.lib.mk" diff --git a/lib/clang/libllvmasmprinter/Makefile b/lib/clang/libllvmasmprinter/Makefile index 1cddd556f53d..eca8cd3a37d1 100644 --- a/lib/clang/libllvmasmprinter/Makefile +++ b/lib/clang/libllvmasmprinter/Makefile @@ -12,8 +12,8 @@ SRCS= ARMException.cpp \ AsmPrinterInlineAsm.cpp \ DIE.cpp \ DIEHash.cpp \ - DebugLocStream.cpp \ DbgValueHistoryCalculator.cpp \ + DebugLocStream.cpp \ DwarfAccelTable.cpp \ DwarfCFIException.cpp \ DwarfCompileUnit.cpp \ @@ -28,6 +28,7 @@ SRCS= ARMException.cpp \ WinCodeViewLineTables.cpp \ WinException.cpp -TGHDRS= Intrinsics +TGHDRS= Attributes \ + Intrinsics .include "../clang.lib.mk" diff --git a/lib/clang/libllvmbitreader/Makefile b/lib/clang/libllvmbitreader/Makefile index 6add8a39ab08..252c9a9979cd 100644 --- a/lib/clang/libllvmbitreader/Makefile +++ b/lib/clang/libllvmbitreader/Makefile @@ -1,14 +1,18 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIB= llvmbitreader SRCDIR= lib/Bitcode/Reader -SRCS= BitReader.cpp \ - BitcodeReader.cpp \ +SRCS= BitcodeReader.cpp \ BitstreamReader.cpp -TGHDRS= Intrinsics +.if ${MK_CLANG_EXTRAS} != "no" +SRCS+= BitReader.cpp +.endif + +TGHDRS= Attributes \ + Intrinsics .include "../clang.lib.mk" diff --git a/lib/clang/libllvmbitwriter/Makefile b/lib/clang/libllvmbitwriter/Makefile index 2e5fa2ac7ffd..4ce8bde6791b 100644 --- a/lib/clang/libllvmbitwriter/Makefile +++ b/lib/clang/libllvmbitwriter/Makefile @@ -13,4 +13,7 @@ SRCS= BitcodeWriter.cpp \ SRCS+= BitWriter.cpp .endif +TGHDRS= Attributes \ + Intrinsics + .include "../clang.lib.mk" diff --git a/lib/clang/libllvmcodegen/Makefile b/lib/clang/libllvmcodegen/Makefile index 3205f6a1d4e9..f5c7f4e8c09a 100644 --- a/lib/clang/libllvmcodegen/Makefile +++ b/lib/clang/libllvmcodegen/Makefile @@ -27,6 +27,7 @@ SRCS= AggressiveAntiDepBreaker.cpp \ ExpandISelPseudos.cpp \ ExpandPostRAPseudos.cpp \ FaultMaps.cpp \ + FuncletLayout.cpp \ GCMetadata.cpp \ GCRootLowering.cpp \ GlobalMerge.cpp \ @@ -39,6 +40,7 @@ SRCS= AggressiveAntiDepBreaker.cpp \ LLVMTargetMachine.cpp \ LatencyPriorityQueue.cpp \ LexicalScopes.cpp \ + LiveDebugValues.cpp \ LiveDebugVariables.cpp \ LiveInterval.cpp \ LiveIntervalAnalysis.cpp \ @@ -84,6 +86,7 @@ SRCS= AggressiveAntiDepBreaker.cpp \ OptimizePHIs.cpp \ PHIElimination.cpp \ PHIEliminationUtils.cpp \ + ParallelCG.cpp \ Passes.cpp \ PeepholeOptimizer.cpp \ PostRASchedulerList.cpp \ @@ -134,6 +137,7 @@ SRCS+= GCMetadataPrinter.cpp \ GCStrategy.cpp .endif -TGHDRS= Intrinsics +TGHDRS= Attributes \ + Intrinsics .include "../clang.lib.mk" diff --git a/lib/clang/libllvmcore/Makefile b/lib/clang/libllvmcore/Makefile index 1d57eccd7f82..dc9ce47974dc 100644 --- a/lib/clang/libllvmcore/Makefile +++ b/lib/clang/libllvmcore/Makefile @@ -23,6 +23,7 @@ SRCS= AsmWriter.cpp \ DiagnosticPrinter.cpp \ Dominators.cpp \ Function.cpp \ + FunctionInfo.cpp \ GCOV.cpp \ GVMaterializer.cpp \ Globals.cpp \ @@ -38,7 +39,6 @@ SRCS= AsmWriter.cpp \ MDBuilder.cpp \ Mangler.cpp \ Metadata.cpp \ - MetadataTracking.cpp \ Module.cpp \ Operator.cpp \ Pass.cpp \ @@ -57,6 +57,8 @@ SRCS= AsmWriter.cpp \ SRCS+= PassManager.cpp .endif -TGHDRS= Intrinsics +TGHDRS= Attributes \ + AttributesCompatFunc \ + Intrinsics .include "../clang.lib.mk" diff --git a/lib/clang/libllvmdebuginfodwarf/Makefile b/lib/clang/libllvmdebuginfodwarf/Makefile index 5f52f33d03e4..6af9703980a0 100644 --- a/lib/clang/libllvmdebuginfodwarf/Makefile +++ b/lib/clang/libllvmdebuginfodwarf/Makefile @@ -16,10 +16,12 @@ SRCS= DWARFAbbreviationDeclaration.cpp \ DWARFDebugInfoEntry.cpp \ DWARFDebugLine.cpp \ DWARFDebugLoc.cpp \ + DWARFDebugMacro.cpp \ DWARFDebugRangeList.cpp \ DWARFFormValue.cpp \ DWARFTypeUnit.cpp \ DWARFUnit.cpp \ + DWARFUnitIndex.cpp \ SyntaxHighlighting.cpp .include "../clang.lib.mk" diff --git a/lib/clang/libllvminstcombine/Makefile b/lib/clang/libllvminstcombine/Makefile index 3752aef1987f..a23b60baf64f 100644 --- a/lib/clang/libllvminstcombine/Makefile +++ b/lib/clang/libllvminstcombine/Makefile @@ -19,6 +19,7 @@ SRCS= InstCombineAddSub.cpp \ InstCombineVectorOps.cpp \ InstructionCombining.cpp -TGHDRS= Intrinsics +TGHDRS= Attributes \ + Intrinsics .include "../clang.lib.mk" diff --git a/lib/clang/libllvminstrumentation/Makefile b/lib/clang/libllvminstrumentation/Makefile index 82730b00319a..c38e9e2a0493 100644 --- a/lib/clang/libllvminstrumentation/Makefile +++ b/lib/clang/libllvminstrumentation/Makefile @@ -9,16 +9,15 @@ SRCS= AddressSanitizer.cpp \ BoundsChecking.cpp \ DataFlowSanitizer.cpp \ GCOVProfiling.cpp \ - MemorySanitizer.cpp \ InstrProfiling.cpp \ + Instrumentation.cpp \ + MemorySanitizer.cpp \ + PGOInstrumentation.cpp \ SafeStack.cpp \ SanitizerCoverage.cpp \ ThreadSanitizer.cpp -.if ${MK_CLANG_EXTRAS} != "no" -SRCS+= Instrumentation.cpp -.endif - -TGHDRS= Intrinsics +TGHDRS= Attributes \ + Intrinsics .include "../clang.lib.mk" diff --git a/lib/clang/libllvmipa/Makefile b/lib/clang/libllvmipa/Makefile deleted file mode 100644 index 3380cf358415..000000000000 --- a/lib/clang/libllvmipa/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# $FreeBSD$ - -.include <src.opts.mk> - -LIB= llvmipa - -SRCDIR= lib/Analysis/IPA -SRCS= CallGraph.cpp \ - CallGraphSCCPass.cpp \ - CallPrinter.cpp \ - GlobalsModRef.cpp \ - InlineCost.cpp - -.if ${MK_CLANG_EXTRAS} != "no" -SRCS+= IPA.cpp -.endif - -TGHDRS= Intrinsics - -.include "../clang.lib.mk" diff --git a/lib/clang/libllvmipa/Makefile.depend b/lib/clang/libllvmipa/Makefile.depend deleted file mode 100644 index b534e62100b6..000000000000 --- a/lib/clang/libllvmipa/Makefile.depend +++ /dev/null @@ -1,26 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - include \ - include/xlocale \ - lib/libc++ \ - lib/msun \ - usr.bin/clang/tblgen.host \ - - -.include <dirdeps.mk> - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -CallGraph.o: Intrinsics.inc.h -CallGraph.po: Intrinsics.inc.h -CallGraphSCCPass.o: Intrinsics.inc.h -CallGraphSCCPass.po: Intrinsics.inc.h -CallPrinter.o: Intrinsics.inc.h -CallPrinter.po: Intrinsics.inc.h -GlobalsModRef.o: Intrinsics.inc.h -GlobalsModRef.po: Intrinsics.inc.h -InlineCost.o: Intrinsics.inc.h -InlineCost.po: Intrinsics.inc.h -.endif diff --git a/lib/clang/libllvmipo/Makefile b/lib/clang/libllvmipo/Makefile index 16e1c3adbabf..09134029a860 100644 --- a/lib/clang/libllvmipo/Makefile +++ b/lib/clang/libllvmipo/Makefile @@ -8,13 +8,17 @@ SRCDIR= lib/Transforms/IPO SRCS= ArgumentPromotion.cpp \ BarrierNoopPass.cpp \ ConstantMerge.cpp \ + CrossDSOCFI.cpp \ DeadArgumentElimination.cpp \ ElimAvailExtern.cpp \ ExtractGV.cpp \ + ForceFunctionAttrs.cpp \ FunctionAttrs.cpp \ + FunctionImport.cpp \ GlobalDCE.cpp \ GlobalOpt.cpp \ IPConstantPropagation.cpp \ + InferFunctionAttrs.cpp \ InlineAlways.cpp \ InlineSimple.cpp \ Inliner.cpp \ @@ -25,6 +29,7 @@ SRCS= ArgumentPromotion.cpp \ PartialInlining.cpp \ PassManagerBuilder.cpp \ PruneEH.cpp \ + SampleProfile.cpp \ StripDeadPrototypes.cpp \ StripSymbols.cpp @@ -32,6 +37,7 @@ SRCS= ArgumentPromotion.cpp \ SRCS+= IPO.cpp .endif -TGHDRS= Intrinsics +TGHDRS= Attributes \ + Intrinsics .include "../clang.lib.mk" diff --git a/lib/clang/libllvmirreader/Makefile b/lib/clang/libllvmirreader/Makefile index d9f7e693fd43..8f89947d7a46 100644 --- a/lib/clang/libllvmirreader/Makefile +++ b/lib/clang/libllvmirreader/Makefile @@ -7,4 +7,6 @@ LIB= llvmirreader SRCDIR= lib/IRReader SRCS= IRReader.cpp +TGHDRS= Attributes + .include "../clang.lib.mk" diff --git a/lib/clang/libllvmlinker/Makefile b/lib/clang/libllvmlinker/Makefile index 711b36986c16..eed5a3c2c6b6 100644 --- a/lib/clang/libllvmlinker/Makefile +++ b/lib/clang/libllvmlinker/Makefile @@ -5,6 +5,9 @@ LIB= llvmlinker SRCDIR= lib/Linker -SRCS= LinkModules.cpp +SRCS= IRMover.cpp \ + LinkModules.cpp + +TGHDRS= Attributes .include "../clang.lib.mk" diff --git a/lib/clang/libllvmmc/Makefile b/lib/clang/libllvmmc/Makefile index 5acd2cce5dc4..7b70a066cbaa 100644 --- a/lib/clang/libllvmmc/Makefile +++ b/lib/clang/libllvmmc/Makefile @@ -21,6 +21,7 @@ SRCS= ConstantPools.cpp \ MCELFObjectTargetWriter.cpp \ MCELFStreamer.cpp \ MCExpr.cpp \ + MCFragment.cpp \ MCInst.cpp \ MCInstPrinter.cpp \ MCInstrAnalysis.cpp \ diff --git a/lib/clang/libllvmmipsasmparser/Makefile b/lib/clang/libllvmmipsasmparser/Makefile index 0572f8d225b7..b6b87bf28a4e 100644 --- a/lib/clang/libllvmmipsasmparser/Makefile +++ b/lib/clang/libllvmmipsasmparser/Makefile @@ -8,7 +8,8 @@ SRCDIR= lib/Target/Mips/AsmParser INCDIR= lib/Target/Mips SRCS= MipsAsmParser.cpp -TGHDRS= MipsGenAsmMatcher \ +TGHDRS= Attributes \ + MipsGenAsmMatcher \ MipsGenInstrInfo \ MipsGenRegisterInfo \ MipsGenSubtargetInfo diff --git a/lib/clang/libllvmmipsinstprinter/Makefile b/lib/clang/libllvmmipsasmprinter/Makefile index 39df7cc59ef3..94cd25f63f2d 100644 --- a/lib/clang/libllvmmipsinstprinter/Makefile +++ b/lib/clang/libllvmmipsasmprinter/Makefile @@ -2,13 +2,14 @@ .include <bsd.own.mk> -LIB= llvmmipsinstprinter +LIB= llvmmipsasmprinter SRCDIR= lib/Target/Mips/InstPrinter INCDIR= lib/Target/Mips SRCS= MipsInstPrinter.cpp -TGHDRS= MipsGenAsmWriter \ +TGHDRS= Attributes \ + MipsGenAsmWriter \ MipsGenInstrInfo \ MipsGenRegisterInfo \ MipsGenSubtargetInfo diff --git a/lib/clang/libllvmmipsinstprinter/Makefile.depend b/lib/clang/libllvmmipsasmprinter/Makefile.depend index 2426018a3582..2426018a3582 100644 --- a/lib/clang/libllvmmipsinstprinter/Makefile.depend +++ b/lib/clang/libllvmmipsasmprinter/Makefile.depend diff --git a/lib/clang/libllvmmipscodegen/Makefile b/lib/clang/libllvmmipscodegen/Makefile index b40b65c25aac..95e8b3571e84 100644 --- a/lib/clang/libllvmmipscodegen/Makefile +++ b/lib/clang/libllvmmipscodegen/Makefile @@ -38,7 +38,8 @@ SRCS= Mips16FrameLowering.cpp \ MipsTargetMachine.cpp \ MipsTargetObjectFile.cpp -TGHDRS= Intrinsics \ +TGHDRS= Attributes \ + Intrinsics \ MipsGenAsmWriter \ MipsGenCallingConv \ MipsGenCodeEmitter \ diff --git a/lib/clang/libllvmmipsdesc/Makefile b/lib/clang/libllvmmipsdesc/Makefile index f22ff8074f41..19c585fe42ac 100644 --- a/lib/clang/libllvmmipsdesc/Makefile +++ b/lib/clang/libllvmmipsdesc/Makefile @@ -19,7 +19,8 @@ SRCS= MipsABIFlagsSection.cpp \ MipsTargetStreamer.cpp CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}/.. -TGHDRS= MipsGenInstrInfo \ +TGHDRS= Attributes \ + MipsGenInstrInfo \ MipsGenMCCodeEmitter \ MipsGenRegisterInfo \ MipsGenSubtargetInfo diff --git a/lib/clang/libllvmmipsdisassembler/Makefile b/lib/clang/libllvmmipsdisassembler/Makefile index 41d20628416b..8a6006dbcc4b 100644 --- a/lib/clang/libllvmmipsdisassembler/Makefile +++ b/lib/clang/libllvmmipsdisassembler/Makefile @@ -8,7 +8,9 @@ SRCDIR= lib/Target/Mips/Disassembler INCDIR= lib/Target/Mips SRCS= MipsDisassembler.cpp -TGHDRS= MipsGenDisassemblerTables \ +TGHDRS= Attributes \ + Intrinsics \ + MipsGenDisassemblerTables \ MipsGenInstrInfo \ MipsGenRegisterInfo \ MipsGenSubtargetInfo diff --git a/lib/clang/libllvmmipsinfo/Makefile b/lib/clang/libllvmmipsinfo/Makefile index c65c8c86f743..be8d5883680e 100644 --- a/lib/clang/libllvmmipsinfo/Makefile +++ b/lib/clang/libllvmmipsinfo/Makefile @@ -8,7 +8,8 @@ SRCDIR= lib/Target/Mips/TargetInfo INCDIR= lib/Target/Mips SRCS= MipsTargetInfo.cpp -TGHDRS= MipsGenInstrInfo \ +TGHDRS= Attributes \ + MipsGenInstrInfo \ MipsGenRegisterInfo \ MipsGenSubtargetInfo diff --git a/lib/clang/libllvmobjcarcopts/Makefile b/lib/clang/libllvmobjcarcopts/Makefile index 308e11a7d70f..b88c5b5f3ec6 100644 --- a/lib/clang/libllvmobjcarcopts/Makefile +++ b/lib/clang/libllvmobjcarcopts/Makefile @@ -1,15 +1,12 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> LIB= llvmobjcarcopts SRCDIR= lib/Transforms/ObjCARC -SRCS= ARCInstKind.cpp \ - DependencyAnalysis.cpp \ - ObjCARC.cpp \ +SRCS= DependencyAnalysis.cpp \ ObjCARCAPElim.cpp \ - ObjCARCAliasAnalysis.cpp \ ObjCARCContract.cpp \ ObjCARCExpand.cpp \ ObjCARCOpts.cpp \ @@ -17,6 +14,11 @@ SRCS= ARCInstKind.cpp \ ProvenanceAnalysisEvaluator.cpp \ PtrState.cpp -TGHDRS= Intrinsics +.if ${MK_CLANG_EXTRAS} != "no" +SRCS+= ObjCARC.cpp +.endif + +TGHDRS= Attributes \ + Intrinsics .include "../clang.lib.mk" diff --git a/lib/clang/libllvmobject/Makefile b/lib/clang/libllvmobject/Makefile index c575ecd574d2..f7864d254dc5 100644 --- a/lib/clang/libllvmobject/Makefile +++ b/lib/clang/libllvmobject/Makefile @@ -14,6 +14,7 @@ SRCS= Archive.cpp \ ELFObjectFile.cpp \ ELFYAML.cpp \ Error.cpp \ + FunctionIndexObjectFile.cpp \ IRObjectFile.cpp \ MachOObjectFile.cpp \ MachOUniversal.cpp \ @@ -25,5 +26,7 @@ SRCS= Archive.cpp \ SRCS+= Object.cpp \ SymbolSize.cpp .endif + +TGHDRS= Attributes .include "../clang.lib.mk" diff --git a/lib/clang/libllvmorcjit/Makefile b/lib/clang/libllvmorcjit/Makefile index 84621de80782..27259b2914ff 100644 --- a/lib/clang/libllvmorcjit/Makefile +++ b/lib/clang/libllvmorcjit/Makefile @@ -7,6 +7,9 @@ LIB= llvmorcjit SRCDIR= lib/ExecutionEngine/Orc SRCS= ExecutionUtils.cpp \ IndirectionUtils.cpp \ + NullResolver.cpp \ + OrcCBindings.cpp \ + OrcCBindingsStack.cpp \ OrcMCJITReplacement.cpp \ OrcTargetSupport.cpp diff --git a/lib/clang/libllvmpowerpcinstprinter/Makefile b/lib/clang/libllvmpowerpcasmprinter/Makefile index ac98321db91c..0fa17e0625ce 100644 --- a/lib/clang/libllvmpowerpcinstprinter/Makefile +++ b/lib/clang/libllvmpowerpcasmprinter/Makefile @@ -2,7 +2,7 @@ .include <bsd.own.mk> -LIB= llvmpowerpcinstprinter +LIB= llvmpowerpcasmprinter SRCDIR= lib/Target/PowerPC/InstPrinter INCDIR= lib/Target/PowerPC diff --git a/lib/clang/libllvmpowerpcinstprinter/Makefile.depend b/lib/clang/libllvmpowerpcasmprinter/Makefile.depend index 9ddadfa29259..9ddadfa29259 100644 --- a/lib/clang/libllvmpowerpcinstprinter/Makefile.depend +++ b/lib/clang/libllvmpowerpcasmprinter/Makefile.depend diff --git a/lib/clang/libllvmpowerpccodegen/Makefile b/lib/clang/libllvmpowerpccodegen/Makefile index ea83b75702c4..d0ec3cd8bb11 100644 --- a/lib/clang/libllvmpowerpccodegen/Makefile +++ b/lib/clang/libllvmpowerpccodegen/Makefile @@ -6,6 +6,7 @@ LIB= llvmpowerpccodegen SRCDIR= lib/Target/PowerPC SRCS= PPCAsmPrinter.cpp \ + PPCBoolRetToInt.cpp \ PPCBranchSelector.cpp \ PPCCTRLoops.cpp \ PPCEarlyReturn.cpp \ @@ -18,6 +19,7 @@ SRCS= PPCAsmPrinter.cpp \ PPCLoopDataPrefetch.cpp \ PPCLoopPreIncPrep.cpp \ PPCMCInstLower.cpp \ + PPCMIPeephole.cpp \ PPCMachineFunctionInfo.cpp \ PPCRegisterInfo.cpp \ PPCSubtarget.cpp \ @@ -30,7 +32,8 @@ SRCS= PPCAsmPrinter.cpp \ PPCVSXFMAMutate.cpp \ PPCVSXSwapRemoval.cpp -TGHDRS= Intrinsics \ +TGHDRS= Attributes \ + Intrinsics \ PPCGenCallingConv \ PPCGenCodeEmitter \ PPCGenDAGISel \ diff --git a/lib/clang/libllvmpowerpcinfo/Makefile b/lib/clang/libllvmpowerpcinfo/Makefile index 03bba0e72931..db1577642102 100644 --- a/lib/clang/libllvmpowerpcinfo/Makefile +++ b/lib/clang/libllvmpowerpcinfo/Makefile @@ -8,7 +8,8 @@ SRCDIR= lib/Target/PowerPC/TargetInfo INCDIR= lib/Target/PowerPC SRCS= PowerPCTargetInfo.cpp -TGHDRS= PPCGenInstrInfo \ +TGHDRS= Attributes \ + PPCGenInstrInfo \ PPCGenRegisterInfo \ PPCGenSubtargetInfo diff --git a/lib/clang/libllvmprofiledata/Makefile b/lib/clang/libllvmprofiledata/Makefile index a38a1903fae2..f7b3b19a4786 100644 --- a/lib/clang/libllvmprofiledata/Makefile +++ b/lib/clang/libllvmprofiledata/Makefile @@ -18,4 +18,6 @@ SRCS= CoverageMapping.cpp \ SRCS+= SampleProfWriter.cpp .endif +TGHDRS= Attributes + .include "../clang.lib.mk" diff --git a/lib/clang/libllvmscalaropts/Makefile b/lib/clang/libllvmscalaropts/Makefile index 8579df910d26..a05916ebc24d 100644 --- a/lib/clang/libllvmscalaropts/Makefile +++ b/lib/clang/libllvmscalaropts/Makefile @@ -26,6 +26,7 @@ SRCS= ADCE.cpp \ LoopDistribute.cpp \ LoopIdiomRecognize.cpp \ LoopInterchange.cpp \ + LoopLoadElimination.cpp \ LoopRerollPass.cpp \ LoopRotation.cpp \ LoopStrengthReduce.cpp \ @@ -43,7 +44,6 @@ SRCS= ADCE.cpp \ RewriteStatepointsForGC.cpp \ SCCP.cpp \ SROA.cpp \ - SampleProfile.cpp \ ScalarReplAggregates.cpp \ Scalarizer.cpp \ SeparateConstOffsetFromGEP.cpp \ @@ -59,6 +59,7 @@ SRCS+= LoopInstSimplify.cpp \ Scalar.cpp .endif -TGHDRS= Intrinsics +TGHDRS= Attributes \ + Intrinsics .include "../clang.lib.mk" diff --git a/lib/clang/libllvmselectiondag/Makefile b/lib/clang/libllvmselectiondag/Makefile index b73a1c53f8cd..ed3425197a98 100644 --- a/lib/clang/libllvmselectiondag/Makefile +++ b/lib/clang/libllvmselectiondag/Makefile @@ -30,6 +30,7 @@ SRCS= DAGCombiner.cpp \ TargetLowering.cpp \ TargetSelectionDAGInfo.cpp -TGHDRS= Intrinsics +TGHDRS= Attributes \ + Intrinsics .include "../clang.lib.mk" diff --git a/lib/clang/libllvmsparcinstprinter/Makefile b/lib/clang/libllvmsparcasmprinter/Makefile index e15c55e4d06f..6144fd4b8226 100644 --- a/lib/clang/libllvmsparcinstprinter/Makefile +++ b/lib/clang/libllvmsparcasmprinter/Makefile @@ -2,7 +2,7 @@ .include <bsd.own.mk> -LIB= llvmsparcinstprinter +LIB= llvmsparcasmprinter SRCDIR= lib/Target/Sparc/InstPrinter INCDIR= lib/Target/Sparc diff --git a/lib/clang/libllvmsparcinstprinter/Makefile.depend b/lib/clang/libllvmsparcasmprinter/Makefile.depend index 6571fb427ac3..6571fb427ac3 100644 --- a/lib/clang/libllvmsparcinstprinter/Makefile.depend +++ b/lib/clang/libllvmsparcasmprinter/Makefile.depend diff --git a/lib/clang/libllvmsparccodegen/Makefile b/lib/clang/libllvmsparccodegen/Makefile index 35b131066705..4c42a706b3a7 100644 --- a/lib/clang/libllvmsparccodegen/Makefile +++ b/lib/clang/libllvmsparccodegen/Makefile @@ -18,7 +18,8 @@ SRCS= DelaySlotFiller.cpp \ SparcTargetMachine.cpp \ SparcTargetObjectFile.cpp -TGHDRS= Intrinsics \ +TGHDRS= Attributes \ + Intrinsics \ SparcGenAsmWriter \ SparcGenCallingConv \ SparcGenCodeEmitter \ diff --git a/lib/clang/libllvmsparcdisassembler/Makefile b/lib/clang/libllvmsparcdisassembler/Makefile index a388ff225d11..1913ee6f64c5 100644 --- a/lib/clang/libllvmsparcdisassembler/Makefile +++ b/lib/clang/libllvmsparcdisassembler/Makefile @@ -8,7 +8,9 @@ SRCDIR= lib/Target/Sparc/Disassembler INCDIR= lib/Target/Sparc SRCS= SparcDisassembler.cpp -TGHDRS= SparcGenDisassemblerTables \ +TGHDRS= Attributes \ + Intrinsics \ + SparcGenDisassemblerTables \ SparcGenInstrInfo \ SparcGenRegisterInfo \ SparcGenSubtargetInfo diff --git a/lib/clang/libllvmsparcinfo/Makefile b/lib/clang/libllvmsparcinfo/Makefile index 6c8052e33256..46791f95c0ec 100644 --- a/lib/clang/libllvmsparcinfo/Makefile +++ b/lib/clang/libllvmsparcinfo/Makefile @@ -8,7 +8,8 @@ SRCDIR= lib/Target/Sparc/TargetInfo INCDIR= lib/Target/Sparc SRCS= SparcTargetInfo.cpp -TGHDRS= SparcGenInstrInfo \ +TGHDRS= Attributes \ + SparcGenInstrInfo \ SparcGenRegisterInfo \ SparcGenSubtargetInfo diff --git a/lib/clang/libllvmsupport/Makefile b/lib/clang/libllvmsupport/Makefile index 860285b47263..fdd9dcadcb13 100644 --- a/lib/clang/libllvmsupport/Makefile +++ b/lib/clang/libllvmsupport/Makefile @@ -34,6 +34,7 @@ SRCS= APFloat.cpp \ IntEqClasses.cpp \ IntervalMap.cpp \ IntrusiveRefCntPtr.cpp \ + JamCRC.cpp \ LEB128.cpp \ LineIterator.cpp \ Locale.cpp \ @@ -77,7 +78,6 @@ SRCS= APFloat.cpp \ Triple.cpp \ Twine.cpp \ Unicode.cpp \ - Valgrind.cpp \ YAMLParser.cpp \ YAMLTraits.cpp \ circular_raw_ostream.cpp \ @@ -96,6 +96,8 @@ SRCS+= ARMWinEH.cpp \ FileOutputBuffer.cpp \ FileUtilities.cpp \ SystemUtils.cpp \ + ThreadPool.cpp \ + Valgrind.cpp \ Watchdog.cpp .endif diff --git a/lib/clang/libllvmtarget/Makefile b/lib/clang/libllvmtarget/Makefile index 82410e0f59af..25f977baa20d 100644 --- a/lib/clang/libllvmtarget/Makefile +++ b/lib/clang/libllvmtarget/Makefile @@ -16,6 +16,7 @@ SRCS= Target.cpp \ SRCS+= TargetIntrinsicInfo.cpp .endif -TGHDRS= Intrinsics +TGHDRS= Attributes \ + Intrinsics .include "../clang.lib.mk" diff --git a/lib/clang/libllvmtransformutils/Makefile b/lib/clang/libllvmtransformutils/Makefile index f5043e60aa85..ecb8d1c5ea2f 100644 --- a/lib/clang/libllvmtransformutils/Makefile +++ b/lib/clang/libllvmtransformutils/Makefile @@ -40,6 +40,7 @@ SRCS= ASanStackFrameLayout.cpp \ SimplifyIndVar.cpp \ SimplifyInstructions.cpp \ SimplifyLibCalls.cpp \ + SplitModule.cpp \ SymbolRewriter.cpp \ UnifyFunctionExitNodes.cpp \ ValueMapper.cpp @@ -48,6 +49,7 @@ SRCS= ASanStackFrameLayout.cpp \ SRCS+= Utils.cpp .endif -TGHDRS= Intrinsics +TGHDRS= Attributes \ + Intrinsics .include "../clang.lib.mk" diff --git a/lib/clang/libllvmvectorize/Makefile b/lib/clang/libllvmvectorize/Makefile index bfe1a1013916..0bca448a27fe 100644 --- a/lib/clang/libllvmvectorize/Makefile +++ b/lib/clang/libllvmvectorize/Makefile @@ -13,6 +13,7 @@ SRCS= BBVectorize.cpp \ SRCS+= Vectorize.cpp .endif -TGHDRS= Intrinsics +TGHDRS= Attributes \ + Intrinsics .include "../clang.lib.mk" diff --git a/lib/clang/libllvmx86instprinter/Makefile b/lib/clang/libllvmx86asmprinter/Makefile index 308f91c8020e..aa4d31b59a65 100644 --- a/lib/clang/libllvmx86instprinter/Makefile +++ b/lib/clang/libllvmx86asmprinter/Makefile @@ -2,7 +2,7 @@ .include <bsd.own.mk> -LIB= llvmx86instprinter +LIB= llvmx86asmprinter SRCDIR= lib/Target/X86/InstPrinter INCDIR= lib/Target/X86 diff --git a/lib/clang/libllvmx86instprinter/Makefile.depend b/lib/clang/libllvmx86asmprinter/Makefile.depend index dfc7c0f6b050..dfc7c0f6b050 100644 --- a/lib/clang/libllvmx86instprinter/Makefile.depend +++ b/lib/clang/libllvmx86asmprinter/Makefile.depend diff --git a/lib/clang/libllvmx86codegen/Makefile b/lib/clang/libllvmx86codegen/Makefile index 0f6776a9e099..78ccc640e547 100644 --- a/lib/clang/libllvmx86codegen/Makefile +++ b/lib/clang/libllvmx86codegen/Makefile @@ -17,6 +17,7 @@ SRCS= X86AsmPrinter.cpp \ X86InstrInfo.cpp \ X86MCInstLower.cpp \ X86MachineFunctionInfo.cpp \ + X86OptimizeLEAs.cpp \ X86PadShortFunction.cpp \ X86RegisterInfo.cpp \ X86SelectionDAGInfo.cpp \ @@ -27,7 +28,8 @@ SRCS= X86AsmPrinter.cpp \ X86VZeroUpper.cpp \ X86WinEHState.cpp -TGHDRS= Intrinsics \ +TGHDRS= Attributes \ + Intrinsics \ X86GenCallingConv \ X86GenDAGISel \ X86GenFastISel \ diff --git a/share/mk/local.meta.sys.mk b/share/mk/local.meta.sys.mk index 1aa749abd231..8aa79f11e0e2 100644 --- a/share/mk/local.meta.sys.mk +++ b/share/mk/local.meta.sys.mk @@ -210,8 +210,9 @@ TRACER= ${TIME_STAMP} ${:U} MK_SHARED_TOOLCHAIN= no .endif TOOLCHAIN_VARS= AS AR CC CLANG_TBLGEN CXX CPP LD NM OBJDUMP OBJCOPY RANLIB \ - STRINGS SIZE TBLGEN + STRINGS SIZE LLVM_TBLGEN _toolchain_bin_CLANG_TBLGEN= /usr/bin/clang-tblgen +_toolchain_bin_LLVM_TBLGEN= /usr/bin/llvm-tblgen _toolchain_bin_CXX= /usr/bin/c++ .ifdef WITH_TOOLSDIR TOOLSDIR?= ${HOST_OBJTOP}/tools diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index d55050644bd6..7c638eedacd1 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1052,7 +1052,7 @@ OLD_FILES+=usr/bin/clang OLD_FILES+=usr/bin/clang++ OLD_FILES+=usr/bin/clang-cpp OLD_FILES+=usr/bin/clang-tblgen -OLD_FILES+=usr/bin/tblgen +OLD_FILES+=usr/bin/llvm-tblgen OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/allocator_interface.h OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/asan_interface.h OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/common_interface_defs.h @@ -1143,7 +1143,7 @@ OLD_DIRS+=usr/share/doc/llvm OLD_FILES+=usr/share/man/man1/clang.1.gz OLD_FILES+=usr/share/man/man1/clang++.1.gz OLD_FILES+=usr/share/man/man1/clang-cpp.1.gz -OLD_FILES+=usr/share/man/man1/tblgen.1.gz +OLD_FILES+=usr/share/man/man1/llvm-tblgen.1.gz .endif .if ${MK_CLANG_EXTRAS} == no diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile index c19f7b6efd32..8e42cdad3548 100644 --- a/usr.bin/clang/Makefile +++ b/usr.bin/clang/Makefile @@ -2,7 +2,7 @@ .include <src.opts.mk> -SUBDIR= clang clang-tblgen tblgen +SUBDIR= clang clang-tblgen llvm-tblgen .if !defined(TOOLS_PREFIX) .if ${MK_CLANG_EXTRAS} != "no" diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile index 1489a5e2d327..b6deacb335cc 100644 --- a/usr.bin/clang/clang/Makefile +++ b/usr.bin/clang/clang/Makefile @@ -30,7 +30,9 @@ MLINKS+= clang.1 cc.1 \ clang.1 cpp.1 .endif -TGHDRS= DiagnosticCommonKinds \ +TGHDRS= Attributes \ + Intrinsics \ + DiagnosticCommonKinds \ DiagnosticDriverKinds \ DiagnosticFrontendKinds \ DiagnosticLexKinds \ @@ -64,40 +66,39 @@ LIBDEPS=clangfrontendtool \ clangbasic \ llvmoption \ llvmobjcarcopts \ - llvmlinker \ - llvmirreader \ llvmipo \ llvmvectorize \ - llvmbitwriter \ + llvmlinker \ + llvmirreader \ llvmasmparser \ llvmaarch64codegen \ llvmaarch64asmparser \ llvmaarch64desc \ llvmaarch64info \ - llvmaarch64instprinter \ + llvmaarch64asmprinter \ llvmaarch64utils \ llvmarmdisassembler \ llvmarmcodegen \ llvmarmasmparser \ llvmarmdesc \ llvmarminfo \ - llvmarminstprinter \ + llvmarmasmprinter \ llvmmipscodegen \ llvmmipsasmparser \ llvmmipsdesc \ llvmmipsinfo \ - llvmmipsinstprinter \ + llvmmipsasmprinter \ llvmpowerpcdisassembler \ llvmpowerpccodegen \ llvmpowerpcasmparser \ llvmpowerpcdesc \ llvmpowerpcinfo \ - llvmpowerpcinstprinter \ + llvmpowerpcasmprinter \ llvmsparccodegen \ llvmsparcasmparser \ llvmsparcdesc \ llvmsparcinfo \ - llvmsparcinstprinter \ + llvmsparcasmprinter \ llvmx86asmparser \ llvmx86codegen \ llvmselectiondag \ @@ -105,11 +106,11 @@ LIBDEPS=clangfrontendtool \ llvmcodegen \ llvmtarget \ llvmscalaropts \ - llvmprofiledata \ llvminstcombine \ llvminstrumentation \ + llvmprofiledata \ llvmtransformutils \ - llvmipa \ + llvmbitwriter \ llvmanalysis \ llvmx86desc \ llvmobject \ @@ -117,7 +118,7 @@ LIBDEPS=clangfrontendtool \ llvmbitreader \ llvmmcdisassembler \ llvmx86info \ - llvmx86instprinter \ + llvmx86asmprinter \ llvmmc \ llvmx86utils \ llvmcore \ diff --git a/usr.bin/clang/tblgen/Makefile b/usr.bin/clang/llvm-tblgen/Makefile index 75a45de8e53c..14b46db89ca9 100644 --- a/usr.bin/clang/tblgen/Makefile +++ b/usr.bin/clang/llvm-tblgen/Makefile @@ -2,12 +2,13 @@ .include <bsd.own.mk> -PROG_CXX=tblgen +PROG_CXX=llvm-tblgen SRCDIR= utils/TableGen SRCS= AsmMatcherEmitter.cpp \ AsmWriterEmitter.cpp \ AsmWriterInst.cpp \ + Attributes.cpp \ CTagsEmitter.cpp \ CallingConvEmitter.cpp \ CodeEmitterGen.cpp \ diff --git a/usr.bin/clang/tblgen/Makefile.depend b/usr.bin/clang/llvm-tblgen/Makefile.depend index 58ed9a748cc7..58ed9a748cc7 100644 --- a/usr.bin/clang/tblgen/Makefile.depend +++ b/usr.bin/clang/llvm-tblgen/Makefile.depend diff --git a/usr.bin/clang/tblgen/tblgen.1 b/usr.bin/clang/llvm-tblgen/llvm-tblgen.1 index 9ee3841dc841..9ee3841dc841 100644 --- a/usr.bin/clang/tblgen/tblgen.1 +++ b/usr.bin/clang/llvm-tblgen/llvm-tblgen.1 |