d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update llvm and clang build glue to make MK_CLANG_EXTRAS=yes and

Browse Source 
MK_CLANG_FULL=yes work.
This commit is contained in:
dim 2019-01-21 19:39:35 +00:00
parent d7a02056ea
commit d25b4345c8
6 changed files with 79 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/clang/libclang/Makefile
View File

@ -353,8 +353,6 @@ SRCS_MIN+= Frontend/Rewrite/FrontendActions.cpp
SRCS_MIN+= Frontend/Rewrite/HTMLPrint.cpp
SRCS_MIN+= Frontend/Rewrite/InclusionRewriter.cpp
SRCS_MIN+= Frontend/Rewrite/RewriteMacros.cpp
SRCS_MIN+= Frontend/Rewrite/RewriteModernObjC.cpp
SRCS_MIN+= Frontend/Rewrite/RewriteObjC.cpp
SRCS_MIN+= Frontend/Rewrite/RewriteTest.cpp
SRCS_MIN+= Frontend/SerializedDiagnosticPrinter.cpp
SRCS_MIN+= Frontend/SerializedDiagnosticReader.cpp
@ -504,6 +502,7 @@ SRCS_FUL+= StaticAnalyzer/Checkers/DirectIvarAssignment.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/DivZeroChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/DynamicTypeChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/DynamicTypePropagation.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/EnumCastOutOfRangeChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/ExprInspectionChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/FixedAddressChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/GTestChecker.cpp
@ -523,6 +522,7 @@ SRCS_FUL+= StaticAnalyzer/Checkers/MallocChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/MallocOverflowSecurityChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/MallocSizeofChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/MmapWriteExecChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/MoveChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/NSAutoreleasePoolChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/NSErrorChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/NoReturnFunctionChecker.cpp
@ -543,6 +543,8 @@ SRCS_FUL+= StaticAnalyzer/Checkers/PaddingChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/PointerArithChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/PointerSubChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/PthreadLockChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/RetainCountChecker/RetainCountChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/RetainCountChecker/RetainCountDiagnostics.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/ReturnPointerRangeChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/ReturnUndefChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/RunLoopAutoreleaseLeakChecker.cpp
@ -559,6 +561,8 @@ SRCS_FUL+= StaticAnalyzer/Checkers/UndefCapturedBlockVarChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/UndefResultChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/UndefinedArraySubscriptChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/UndefinedAssignmentChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/UninitializedObject/UninitializedObjectChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/UninitializedObject/UninitializedPointee.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/UnixAPIChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/UnreachableCodeChecker.cpp
SRCS_FUL+= StaticAnalyzer/Checkers/VLASizeChecker.cpp
@ -600,17 +604,21 @@ SRCS_FUL+= StaticAnalyzer/Core/ProgramState.cpp
SRCS_FUL+= StaticAnalyzer/Core/RangeConstraintManager.cpp
SRCS_FUL+= StaticAnalyzer/Core/RangedConstraintManager.cpp
SRCS_FUL+= StaticAnalyzer/Core/RegionStore.cpp
SRCS_FUL+= StaticAnalyzer/Core/RetainSummaryManager.cpp
SRCS_FUL+= StaticAnalyzer/Core/SValBuilder.cpp
SRCS_FUL+= StaticAnalyzer/Core/SVals.cpp
SRCS_FUL+= StaticAnalyzer/Core/SarifDiagnostics.cpp
SRCS_FUL+= StaticAnalyzer/Core/SimpleConstraintManager.cpp
SRCS_FUL+= StaticAnalyzer/Core/SimpleSValBuilder.cpp
SRCS_FUL+= StaticAnalyzer/Core/Store.cpp
SRCS_FUL+= StaticAnalyzer/Core/SubEngine.cpp
SRCS_FUL+= StaticAnalyzer/Core/SymbolManager.cpp
SRCS_FUL+= StaticAnalyzer/Core/TaintManager.cpp
SRCS_FUL+= StaticAnalyzer/Core/WorkList.cpp
SRCS_FUL+= StaticAnalyzer/Core/Z3ConstraintManager.cpp
SRCS_FUL+= StaticAnalyzer/Frontend/AnalysisConsumer.cpp
SRCS_FUL+= StaticAnalyzer/Frontend/CheckerRegistration.cpp
SRCS_FUL+= StaticAnalyzer/Frontend/CheckerRegistry.cpp
SRCS_FUL+= StaticAnalyzer/Frontend/FrontendActions.cpp
SRCS_FUL+= StaticAnalyzer/Frontend/ModelConsumer.cpp
SRCS_FUL+= StaticAnalyzer/Frontend/ModelInjector.cpp

49
lib/clang/libllvm/Makefile
View File

@ -406,6 +406,7 @@ SRCS_MIN+= DebugInfo/CodeView/TypeDumpVisitor.cpp
SRCS_MIN+= DebugInfo/CodeView/TypeHashing.cpp
SRCS_MIN+= DebugInfo/CodeView/TypeIndex.cpp
SRCS_MIN+= DebugInfo/CodeView/TypeIndexDiscovery.cpp
SRCS_EXT+= DebugInfo/CodeView/TypeRecordHelpers.cpp
SRCS_MIN+= DebugInfo/CodeView/TypeRecordMapping.cpp
SRCS_MIN+= DebugInfo/CodeView/TypeStreamMerger.cpp
SRCS_MIN+= DebugInfo/CodeView/TypeTableCollection.cpp
@ -456,20 +457,29 @@ SRCS_EXT+= DebugInfo/PDB/Native/InfoStream.cpp
SRCS_EXT+= DebugInfo/PDB/Native/InfoStreamBuilder.cpp
SRCS_EXT+= DebugInfo/PDB/Native/ModuleDebugStream.cpp
SRCS_EXT+= DebugInfo/PDB/Native/NamedStreamMap.cpp
SRCS_EXT+= DebugInfo/PDB/Native/NativeBuiltinSymbol.cpp
SRCS_EXT+= DebugInfo/PDB/Native/NativeCompilandSymbol.cpp
SRCS_EXT+= DebugInfo/PDB/Native/NativeEnumGlobals.cpp
SRCS_EXT+= DebugInfo/PDB/Native/NativeEnumModules.cpp
SRCS_EXT+= DebugInfo/PDB/Native/NativeEnumSymbol.cpp
SRCS_EXT+= DebugInfo/PDB/Native/NativeEnumTypes.cpp
SRCS_EXT+= DebugInfo/PDB/Native/NativeExeSymbol.cpp
SRCS_EXT+= DebugInfo/PDB/Native/NativeRawSymbol.cpp
SRCS_EXT+= DebugInfo/PDB/Native/NativeSession.cpp
SRCS_EXT+= DebugInfo/PDB/Native/NativeSymbolEnumerator.cpp
SRCS_EXT+= DebugInfo/PDB/Native/NativeTypeArray.cpp
SRCS_EXT+= DebugInfo/PDB/Native/NativeTypeBuiltin.cpp
SRCS_EXT+= DebugInfo/PDB/Native/NativeTypeEnum.cpp
SRCS_EXT+= DebugInfo/PDB/Native/NativeTypeFunctionSig.cpp
SRCS_EXT+= DebugInfo/PDB/Native/NativeTypePointer.cpp
SRCS_EXT+= DebugInfo/PDB/Native/NativeTypeTypedef.cpp
SRCS_EXT+= DebugInfo/PDB/Native/NativeTypeUDT.cpp
SRCS_EXT+= DebugInfo/PDB/Native/NativeTypeVTShape.cpp
SRCS_EXT+= DebugInfo/PDB/Native/PDBFile.cpp
SRCS_EXT+= DebugInfo/PDB/Native/PDBFileBuilder.cpp
SRCS_EXT+= DebugInfo/PDB/Native/PDBStringTable.cpp
SRCS_EXT+= DebugInfo/PDB/Native/PDBStringTableBuilder.cpp
SRCS_EXT+= DebugInfo/PDB/Native/PublicsStream.cpp
SRCS_EXT+= DebugInfo/PDB/Native/RawError.cpp
SRCS_EXT+= DebugInfo/PDB/Native/SymbolCache.cpp
SRCS_EXT+= DebugInfo/PDB/Native/SymbolStream.cpp
SRCS_EXT+= DebugInfo/PDB/Native/TpiHashing.cpp
SRCS_EXT+= DebugInfo/PDB/Native/TpiStream.cpp
@ -516,6 +526,8 @@ SRCS_EXT+= DebugInfo/Symbolize/DIPrinter.cpp
SRCS_MIW+= DebugInfo/Symbolize/SymbolizableObjectFile.cpp
SRCS_MIW+= DebugInfo/Symbolize/Symbolize.cpp
SRCS_MIN+= Demangle/ItaniumDemangle.cpp
SRCS_MIW+= Demangle/MicrosoftDemangle.cpp
SRCS_MIW+= Demangle/MicrosoftDemangleNodes.cpp
SRCS_XDB+= ExecutionEngine/ExecutionEngine.cpp
SRCS_XDB+= ExecutionEngine/ExecutionEngineBindings.cpp
SRCS_XDB+= ExecutionEngine/GDBRegistrationListener.cpp
@ -529,8 +541,10 @@ SRCS_EXT+= ExecutionEngine/Orc/ExecutionUtils.cpp
SRCS_EXT+= ExecutionEngine/Orc/IRCompileLayer.cpp
SRCS_EXT+= ExecutionEngine/Orc/IRTransformLayer.cpp
SRCS_EXT+= ExecutionEngine/Orc/IndirectionUtils.cpp
SRCS_EXT+= ExecutionEngine/Orc/JITTargetMachineBuilder.cpp
SRCS_EXT+= ExecutionEngine/Orc/LLJIT.cpp
SRCS_EXT+= ExecutionEngine/Orc/Layer.cpp
SRCS_EXT+= ExecutionEngine/Orc/LazyReexports.cpp
SRCS_EXT+= ExecutionEngine/Orc/Legacy.cpp
SRCS_EXT+= ExecutionEngine/Orc/NullResolver.cpp
SRCS_EXT+= ExecutionEngine/Orc/OrcABISupport.cpp
@ -539,6 +553,7 @@ SRCS_EXT+= ExecutionEngine/Orc/OrcError.cpp
SRCS_EXT+= ExecutionEngine/Orc/OrcMCJITReplacement.cpp
SRCS_EXT+= ExecutionEngine/Orc/RPCUtils.cpp
SRCS_EXT+= ExecutionEngine/Orc/RTDyldObjectLinkingLayer.cpp
SRCS_EXT+= ExecutionEngine/Orc/ThreadSafeModule.cpp
SRCS_XDB+= ExecutionEngine/RuntimeDyld/JITSymbol.cpp
SRCS_XDB+= ExecutionEngine/RuntimeDyld/RTDyldMemoryManager.cpp
SRCS_XDB+= ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
@ -608,6 +623,7 @@ SRCS_MIN+= LTO/LTO.cpp
SRCS_MIN+= LTO/LTOBackend.cpp
SRCS_EXL+= LTO/LTOCodeGenerator.cpp
SRCS_EXL+= LTO/LTOModule.cpp
SRCS_EXL+= LTO/SummaryBasedOptimizations.cpp
SRCS_EXL+= LTO/ThinLTOCodeGenerator.cpp
SRCS_MIN+= LTO/UpdateCompilerUsed.cpp
SRCS_MIN+= LineEditor/LineEditor.cpp
@ -680,6 +696,24 @@ SRCS_MIN+= MC/StringTableBuilder.cpp
SRCS_MIN+= MC/SubtargetFeature.cpp
SRCS_MIN+= MC/WasmObjectWriter.cpp
SRCS_MIN+= MC/WinCOFFObjectWriter.cpp
SRCS_EXT+= MCA/Context.cpp
SRCS_EXT+= MCA/HWEventListener.cpp
SRCS_EXT+= MCA/HardwareUnits/HardwareUnit.cpp
SRCS_EXT+= MCA/HardwareUnits/LSUnit.cpp
SRCS_EXT+= MCA/HardwareUnits/RegisterFile.cpp
SRCS_EXT+= MCA/HardwareUnits/ResourceManager.cpp
SRCS_EXT+= MCA/HardwareUnits/RetireControlUnit.cpp
SRCS_EXT+= MCA/HardwareUnits/Scheduler.cpp
SRCS_EXT+= MCA/InstrBuilder.cpp
SRCS_EXT+= MCA/Instruction.cpp
SRCS_EXT+= MCA/Pipeline.cpp
SRCS_EXT+= MCA/Stages/DispatchStage.cpp
SRCS_EXT+= MCA/Stages/EntryStage.cpp
SRCS_EXT+= MCA/Stages/ExecuteStage.cpp
SRCS_EXT+= MCA/Stages/InstructionTables.cpp
SRCS_EXT+= MCA/Stages/RetireStage.cpp
SRCS_EXT+= MCA/Stages/Stage.cpp
SRCS_EXT+= MCA/Support.cpp
SRCS_MIN+= Object/Archive.cpp
SRCS_MIN+= Object/ArchiveWriter.cpp
SRCS_MIN+= Object/Binary.cpp
@ -716,6 +750,7 @@ SRCS_MIN+= Option/OptTable.cpp
SRCS_MIN+= Option/Option.cpp
SRCS_MIN+= Passes/PassBuilder.cpp
SRCS_EXT+= Passes/PassPlugin.cpp
SRCS_EXT+= Passes/StandardInstrumentations.cpp
SRCS_MIN+= ProfileData/Coverage/CoverageMapping.cpp
SRCS_MIN+= ProfileData/Coverage/CoverageMappingReader.cpp
SRCS_MIN+= ProfileData/Coverage/CoverageMappingWriter.cpp
@ -842,7 +877,7 @@ SRCS_MIN+= Support/regerror.c
SRCS_MIN+= Support/regexec.c
SRCS_MIN+= Support/regfree.c
SRCS_MIN+= Support/regstrlcpy.c
SRCS_LLD+= Support/xxhash.cpp
SRCS_MIW+= Support/xxhash.cpp
SRCS_MIN+= TableGen/Error.cpp
SRCS_MIN+= TableGen/JSONBackend.cpp
SRCS_MIN+= TableGen/Main.cpp
@ -1411,7 +1446,15 @@ SRCS_MIN+= Transforms/Vectorize/VPlanHCFGBuilder.cpp
SRCS_MIN+= Transforms/Vectorize/VPlanHCFGTransforms.cpp
SRCS_MIN+= Transforms/Vectorize/VPlanVerifier.cpp
SRCS_EXT+= Transforms/Vectorize/Vectorize.cpp
SRCS_EXT+= XRay/BlockIndexer.cpp
SRCS_EXT+= XRay/BlockVerifier.cpp
SRCS_EXT+= XRay/FDRRecordProducer.cpp
SRCS_EXT+= XRay/FDRRecords.cpp
SRCS_EXT+= XRay/FDRTraceExpander.cpp
SRCS_EXT+= XRay/FileHeaderReader.cpp
SRCS_EXT+= XRay/InstrumentationMap.cpp
SRCS_EXT+= XRay/LogBuilderConsumer.cpp
SRCS_EXT+= XRay/RecordInitializer.cpp
SRCS_EXT+= XRay/Trace.cpp
SRCS_ALL+= ${SRCS_MIN}

1
usr.bin/clang/llvm-cov/Makefile
View File

@ -11,6 +11,7 @@ MLINKS= llvm-cov.1 gcov.1
SRCDIR= tools/llvm-cov
SRCS+= CodeCoverage.cpp
SRCS+= CoverageExporterJson.cpp
SRCS+= CoverageExporterLcov.cpp
SRCS+= CoverageFilters.cpp
SRCS+= CoverageReport.cpp
SRCS+= CoverageSummaryInfo.cpp

38
usr.bin/clang/llvm-mca/Makefile
View File

@ -4,35 +4,21 @@ PROG_CXX= llvm-mca
SRCDIR= tools/llvm-mca
SRCS+= CodeRegion.cpp
SRCS+= Context.cpp
SRCS+= DispatchStage.cpp
SRCS+= DispatchStatistics.cpp
SRCS+= ExecuteStage.cpp
SRCS+= FetchStage.cpp
SRCS+= HWEventListener.cpp
SRCS+= HardwareUnit.cpp
SRCS+= InstrBuilder.cpp
SRCS+= Instruction.cpp
SRCS+= InstructionInfoView.cpp
SRCS+= InstructionTables.cpp
SRCS+= LSUnit.cpp
SRCS+= Pipeline.cpp
SRCS+= CodeRegionGenerator.cpp
SRCS+= PipelinePrinter.cpp
SRCS+= RegisterFile.cpp
SRCS+= RegisterFileStatistics.cpp
SRCS+= ResourcePressureView.cpp
SRCS+= RetireControlUnit.cpp
SRCS+= RetireControlUnitStatistics.cpp
SRCS+= RetireStage.cpp
SRCS+= Scheduler.cpp
SRCS+= SchedulerStatistics.cpp
SRCS+= Stage.cpp
SRCS+= SummaryView.cpp
SRCS+= Support.cpp
SRCS+= TimelineView.cpp
SRCS+= View.cpp
SRCS+= Views/DispatchStatistics.cpp
SRCS+= Views/InstructionInfoView.cpp
SRCS+= Views/RegisterFileStatistics.cpp
SRCS+= Views/ResourcePressureView.cpp
SRCS+= Views/RetireControlUnitStatistics.cpp
SRCS+= Views/SchedulerStatistics.cpp
SRCS+= Views/SummaryView.cpp
SRCS+= Views/TimelineView.cpp
SRCS+= Views/View.cpp
SRCS+= llvm-mca.cpp
CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}
LIBADD+= z
.include "../llvm.prog.mk"

11
usr.bin/clang/llvm-objcopy/Makefile
View File

@ -4,12 +4,20 @@ PROG_CXX= llvm-objcopy
MAN=
SRCDIR= tools/llvm-objcopy
SRCS+= Object.cpp
SRCS+= Buffer.cpp
SRCS+= COFF/COFFObjcopy.cpp
SRCS+= COFF/Object.cpp
SRCS+= COFF/Reader.cpp
SRCS+= COFF/Writer.cpp
SRCS+= CopyConfig.cpp
SRCS+= ELF/ELFObjcopy.cpp
SRCS+= ELF/Object.cpp
SRCS+= llvm-objcopy.cpp
.include "${SRCTOP}/lib/clang/llvm.pre.mk"
CFLAGS+= -I${.OBJDIR}
CFLAGS+= -I${LLVM_SRCS}/${SRCDIR}
.include "${SRCTOP}/lib/clang/llvm.build.mk"
@ -36,5 +44,6 @@ PACKAGE= clang
LIBADD+= ncursesw
LIBADD+= pthread
LIBADD+= z
.include <bsd.prog.mk>

1
usr.bin/clang/llvm-pdbutil/Makefile
View File

@ -3,7 +3,6 @@
PROG_CXX= llvm-pdbutil
SRCDIR= tools/llvm-pdbutil
SRCS+= Analyze.cpp
SRCS+= BytesOutputStyle.cpp
SRCS+= DumpOutputStyle.cpp
SRCS+= ExplainOutputStyle.cpp