Index: projects/clang370-import/lib/clang/Makefile =================================================================== --- projects/clang370-import/lib/clang/Makefile (revision 287525) +++ projects/clang370-import/lib/clang/Makefile (revision 287526) @@ -1,175 +1,175 @@ # $FreeBSD$ .include .if !make(install) .if ${MK_CLANG_FULL} != "no" _libclangstaticanalyzer= \ libclangstaticanalyzercheckers \ libclangstaticanalyzercore \ libclangstaticanalyzerfrontend _libclangarcmigrate= \ libclangarcmigrate .endif # MK_CLANG_FULL SUBDIR= libclanganalysis \ ${_libclangarcmigrate} \ libclangast \ libclangbasic \ libclangcodegen \ libclangdriver \ libclangedit \ libclangfrontend \ libclangfrontendtool \ libclanglex \ libclangparse \ libclangrewritefrontend \ libclangrewrite \ libclangsema \ libclangserialization \ ${_libclangstaticanalyzer} \ \ libllvmanalysis \ libllvmasmparser \ libllvmasmprinter \ libllvmbitreader \ libllvmbitwriter \ libllvmcodegen \ libllvmcore \ libllvminstcombine \ libllvminstrumentation \ libllvmipa \ libllvmipo \ libllvmirreader \ libllvmlibdriver \ libllvmlinker \ libllvmmc \ libllvmmcdisassembler \ libllvmmcparser \ libllvmmirparser \ libllvmobjcarcopts \ libllvmobject \ libllvmoption \ libllvmprofiledata \ libllvmscalaropts \ libllvmselectiondag \ libllvmsupport \ libllvmtablegen \ libllvmtarget \ libllvmtransformutils \ libllvmvectorize \ \ libllvmaarch64asmparser \ libllvmaarch64codegen \ libllvmaarch64desc \ - libllvmaarch64disassembler \ libllvmaarch64info \ libllvmaarch64instprinter \ libllvmaarch64utils \ libllvmarmasmparser \ libllvmarmcodegen \ libllvmarmdesc \ libllvmarmdisassembler \ libllvmarminfo \ libllvmarminstprinter \ libllvmmipsasmparser \ libllvmmipscodegen \ libllvmmipsdesc \ - libllvmmipsdisassembler \ libllvmmipsinfo \ libllvmmipsinstprinter \ libllvmpowerpcasmparser \ libllvmpowerpccodegen \ libllvmpowerpcdesc \ libllvmpowerpcdisassembler \ libllvmpowerpcinfo \ libllvmpowerpcinstprinter \ libllvmsparcasmparser \ libllvmsparccodegen \ libllvmsparcdesc \ - libllvmsparcdisassembler \ libllvmsparcinfo \ libllvmsparcinstprinter \ libllvmx86asmparser \ libllvmx86codegen \ libllvmx86desc \ - libllvmx86disassembler \ libllvmx86info \ libllvmx86instprinter \ libllvmx86utils .if ${MK_CLANG_EXTRAS} != "no" SUBDIR+=libllvmdebuginfodwarf \ libllvmdebuginfopdb \ libllvmlto \ libllvmorcjit \ libllvmpasses .endif # MK_CLANG_EXTRAS .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" -SUBDIR+=libllvmexecutionengine \ +SUBDIR+=libllvmaarch64disassembler \ + libllvmexecutionengine \ libllvminterpreter \ libllvmmcjit \ - libllvmruntimedyld + libllvmmipsdisassembler \ + libllvmruntimedyld \ + libllvmsparcdisassembler \ + libllvmx86disassembler .endif # MK_CLANG_EXTRAS | LLDB .if ${MK_LLDB} != "no" SUBDIR+=liblldb \ \ liblldbAPI \ liblldbBreakpoint \ liblldbCommands \ liblldbCore \ liblldbDataFormatters \ liblldbExpression \ liblldbHostCommon \ liblldbHostFreeBSD \ liblldbHostPOSIX \ liblldbInitialization \ liblldbInterpreter \ liblldbSymbol \ liblldbTarget \ liblldbUtility \ \ liblldbPluginABISysV_arm \ liblldbPluginABISysV_arm64 \ liblldbPluginABISysV_i386 \ liblldbPluginABISysV_mips \ liblldbPluginABISysV_mips64 \ liblldbPluginABISysV_ppc \ liblldbPluginABISysV_ppc64 \ liblldbPluginABISysV_x86_64 \ liblldbPluginCXXItaniumABI \ liblldbPluginDisassemblerLLVM \ liblldbPluginDynamicLoaderStatic \ liblldbPluginDynamicLoaderPosixDYLD \ liblldbPluginInstructionARM \ liblldbPluginInstructionARM64 \ liblldbPluginInstructionMIPS \ liblldbPluginInstructionMIPS64 \ liblldbPluginInstrumentationRuntimeAddressSanitizer \ liblldbPluginJITLoaderGDB \ liblldbPluginMemoryHistoryASan \ liblldbPluginObjectContainerBSDArchive \ liblldbPluginObjectFileELF \ liblldbPluginObjectFileJIT \ liblldbPluginPlatformFreeBSD \ liblldbPluginPlatformGDB \ liblldbPluginProcessElfCore \ liblldbPluginProcessFreeBSD \ liblldbPluginProcessGDBRemote \ liblldbPluginProcessPOSIX \ liblldbPluginProcessUtility \ liblldbPluginSymbolFileDWARF \ liblldbPluginSymbolFileSymtab \ liblldbPluginSymbolVendorELF \ liblldbPluginUnwindAssemblyInstEmulation \ liblldbPluginUnwindAssemblyX86 .endif # MK_LLDB .endif # !make(install) SUBDIR+= include SUBDIR_PARALLEL= .include Index: projects/clang370-import/lib/clang/libclanganalysis/Makefile =================================================================== --- projects/clang370-import/lib/clang/libclanganalysis/Makefile (revision 287525) +++ projects/clang370-import/lib/clang/libclanganalysis/Makefile (revision 287526) @@ -1,43 +1,46 @@ # $FreeBSD$ -.include +.include LIB= clanganalysis SRCDIR= tools/clang/lib/Analysis SRCS= AnalysisDeclContext.cpp \ BodyFarm.cpp \ CFG.cpp \ CFGReachabilityAnalysis.cpp \ CFGStmtMap.cpp \ CallGraph.cpp \ CocoaConventions.cpp \ CodeInjector.cpp \ Consumed.cpp \ Dominators.cpp \ FormatString.cpp \ LiveVariables.cpp \ ObjCNoReturn.cpp \ PostOrderCFGView.cpp \ PrintfFormatString.cpp \ ProgramPoint.cpp \ PseudoConstantAnalysis.cpp \ ReachableCode.cpp \ ScanfFormatString.cpp \ ThreadSafety.cpp \ ThreadSafetyCommon.cpp \ - ThreadSafetyLogical.cpp \ ThreadSafetyTIL.cpp \ UninitializedValues.cpp + +.if ${MK_CLANG_EXTRAS} != "no" +SRCS+= ThreadSafetyLogical.cpp +.endif TGHDRS= AttrList \ AttrVisitor \ Attrs \ CommentCommandList \ CommentNodes \ DeclNodes \ DiagnosticAnalysisKinds \ DiagnosticCommonKinds \ StmtNodes .include "../clang.lib.mk" Index: projects/clang370-import/lib/clang/libclangstaticanalyzercheckers/Makefile =================================================================== --- projects/clang370-import/lib/clang/libclangstaticanalyzercheckers/Makefile (revision 287525) +++ projects/clang370-import/lib/clang/libclangstaticanalyzercheckers/Makefile (revision 287526) @@ -1,86 +1,89 @@ # $FreeBSD$ -.include +.include LIB= clangstaticanalyzercheckers SRCDIR= tools/clang/lib/StaticAnalyzer/Checkers SRCS= AllocationDiagnostics.cpp \ AnalyzerStatsChecker.cpp \ ArrayBoundChecker.cpp \ ArrayBoundCheckerV2.cpp \ BasicObjCFoundationChecks.cpp \ BoolAssignmentChecker.cpp \ BuiltinFunctionChecker.cpp \ CStringChecker.cpp \ CStringSyntaxChecker.cpp \ CallAndMessageChecker.cpp \ CastSizeChecker.cpp \ CastToStructChecker.cpp \ CheckObjCDealloc.cpp \ CheckObjCInstMethSignature.cpp \ CheckSecuritySyntaxOnly.cpp \ CheckSizeofPointer.cpp \ - CheckerDocumentation.cpp \ ChrootChecker.cpp \ ClangCheckers.cpp \ DeadStoresChecker.cpp \ DebugCheckers.cpp \ DereferenceChecker.cpp \ DirectIvarAssignment.cpp \ DivZeroChecker.cpp \ DynamicTypePropagation.cpp \ ExprInspectionChecker.cpp \ FixedAddressChecker.cpp \ GenericTaintChecker.cpp \ IdenticalExprChecker.cpp \ IvarInvalidationChecker.cpp \ LLVMConventionsChecker.cpp \ MacOSKeychainAPIChecker.cpp \ MacOSXAPIChecker.cpp \ MallocChecker.cpp \ MallocOverflowSecurityChecker.cpp \ MallocSizeofChecker.cpp \ NSAutoreleasePoolChecker.cpp \ NSErrorChecker.cpp \ NoReturnFunctionChecker.cpp \ NonNullParamChecker.cpp \ ObjCAtSyncChecker.cpp \ ObjCContainersASTChecker.cpp \ ObjCContainersChecker.cpp \ ObjCMissingSuperCallChecker.cpp \ ObjCSelfInitChecker.cpp \ ObjCUnusedIVarsChecker.cpp \ PointerArithChecker.cpp \ PointerSubChecker.cpp \ PthreadLockChecker.cpp \ RetainCountChecker.cpp \ ReturnPointerRangeChecker.cpp \ ReturnUndefChecker.cpp \ SimpleStreamChecker.cpp \ StackAddrEscapeChecker.cpp \ StreamChecker.cpp \ TaintTesterChecker.cpp \ TestAfterDivZeroChecker.cpp \ TraversalChecker.cpp \ UndefBranchChecker.cpp \ UndefCapturedBlockVarChecker.cpp \ UndefResultChecker.cpp \ UndefinedArraySubscriptChecker.cpp \ UndefinedAssignmentChecker.cpp \ UnixAPIChecker.cpp \ UnreachableCodeChecker.cpp \ VLASizeChecker.cpp \ VirtualCallChecker.cpp + +.if ${MK_CLANG_EXTRAS} != "no" +SRCS+= CheckerDocumentation.cpp +.endif TGHDRS= AttrList \ AttrVisitor \ Attrs \ Checkers \ CommentCommandList \ CommentNodes \ DeclNodes \ DiagnosticCommonKinds \ StmtNodes .include "../clang.lib.mk" Index: projects/clang370-import/lib/clang/libllvmanalysis/Makefile =================================================================== --- projects/clang370-import/lib/clang/libllvmanalysis/Makefile (revision 287525) +++ projects/clang370-import/lib/clang/libllvmanalysis/Makefile (revision 287526) @@ -1,75 +1,78 @@ # $FreeBSD$ .include LIB= llvmanalysis SRCDIR= lib/Analysis SRCS= AliasAnalysis.cpp \ AliasAnalysisCounter.cpp \ AliasAnalysisEvaluator.cpp \ AliasDebugger.cpp \ AliasSetTracker.cpp \ - Analysis.cpp \ AssumptionCache.cpp \ BasicAliasAnalysis.cpp \ BlockFrequencyInfo.cpp \ BlockFrequencyInfoImpl.cpp \ BranchProbabilityInfo.cpp \ CFG.cpp \ CFGPrinter.cpp \ CFLAliasAnalysis.cpp \ - CGSCCPassManager.cpp \ CaptureTracking.cpp \ CodeMetrics.cpp \ ConstantFolding.cpp \ CostModel.cpp \ Delinearization.cpp \ DependenceAnalysis.cpp \ DivergenceAnalysis.cpp \ DomPrinter.cpp \ DominanceFrontier.cpp \ IVUsers.cpp \ InstCount.cpp \ InstructionSimplify.cpp \ Interval.cpp \ IntervalPartition.cpp \ IteratedDominanceFrontier.cpp \ LazyCallGraph.cpp \ LazyValueInfo.cpp \ LibCallAliasAnalysis.cpp \ LibCallSemantics.cpp \ Lint.cpp \ Loads.cpp \ LoopAccessAnalysis.cpp \ LoopInfo.cpp \ LoopPass.cpp \ MemDepPrinter.cpp \ MemDerefPrinter.cpp \ MemoryBuiltins.cpp \ MemoryDependenceAnalysis.cpp \ MemoryLocation.cpp \ ModuleDebugInfoPrinter.cpp \ NoAliasAnalysis.cpp \ PHITransAddr.cpp \ PostDominators.cpp \ PtrUseVisitor.cpp \ RegionInfo.cpp \ RegionPass.cpp \ RegionPrinter.cpp \ ScalarEvolution.cpp \ ScalarEvolutionAliasAnalysis.cpp \ ScalarEvolutionExpander.cpp \ ScalarEvolutionNormalization.cpp \ ScopedNoAliasAA.cpp \ SparsePropagation.cpp \ TargetLibraryInfo.cpp \ TargetTransformInfo.cpp \ - Trace.cpp \ TypeBasedAliasAnalysis.cpp \ ValueTracking.cpp \ VectorUtils.cpp +.if ${MK_CLANG_EXTRAS} != "no" +SRCS+= Analysis.cpp \ + CGSCCPassManager.cpp \ + Trace.cpp +.endif + TGHDRS= Intrinsics .include "../clang.lib.mk" Index: projects/clang370-import/lib/clang/libllvmbitwriter/Makefile =================================================================== --- projects/clang370-import/lib/clang/libllvmbitwriter/Makefile (revision 287525) +++ projects/clang370-import/lib/clang/libllvmbitwriter/Makefile (revision 287526) @@ -1,13 +1,16 @@ # $FreeBSD$ -.include +.include LIB= llvmbitwriter SRCDIR= lib/Bitcode/Writer -SRCS= BitWriter.cpp \ - BitcodeWriter.cpp \ +SRCS= BitcodeWriter.cpp \ BitcodeWriterPass.cpp \ ValueEnumerator.cpp + +.if ${MK_CLANG_EXTRAS} != "no" +SRCS+= BitWriter.cpp +.endif .include "../clang.lib.mk" Index: projects/clang370-import/lib/clang/libllvmcodegen/Makefile =================================================================== --- projects/clang370-import/lib/clang/libllvmcodegen/Makefile (revision 287525) +++ projects/clang370-import/lib/clang/libllvmcodegen/Makefile (revision 287526) @@ -1,136 +1,139 @@ # $FreeBSD$ -.include +.include LIB= llvmcodegen SRCDIR= lib/CodeGen SRCS= AggressiveAntiDepBreaker.cpp \ AllocationOrder.cpp \ Analysis.cpp \ AtomicExpandPass.cpp \ BasicTargetTransformInfo.cpp \ BranchFolding.cpp \ CalcSpillWeights.cpp \ CallingConvLower.cpp \ CodeGen.cpp \ CodeGenPrepare.cpp \ CoreCLRGC.cpp \ CriticalAntiDepBreaker.cpp \ DFAPacketizer.cpp \ DeadMachineInstructionElim.cpp \ DwarfEHPrepare.cpp \ EarlyIfConversion.cpp \ EdgeBundles.cpp \ ErlangGC.cpp \ ExecutionDepsFix.cpp \ ExpandISelPseudos.cpp \ ExpandPostRAPseudos.cpp \ FaultMaps.cpp \ GCMetadata.cpp \ - GCMetadataPrinter.cpp \ GCRootLowering.cpp \ - GCStrategy.cpp \ GlobalMerge.cpp \ IfConversion.cpp \ ImplicitNullChecks.cpp \ InlineSpiller.cpp \ InterferenceCache.cpp \ InterleavedAccessPass.cpp \ IntrinsicLowering.cpp \ LLVMTargetMachine.cpp \ LatencyPriorityQueue.cpp \ LexicalScopes.cpp \ LiveDebugVariables.cpp \ LiveInterval.cpp \ LiveIntervalAnalysis.cpp \ LiveIntervalUnion.cpp \ LivePhysRegs.cpp \ LiveRangeCalc.cpp \ LiveRangeEdit.cpp \ LiveRegMatrix.cpp \ LiveStackAnalysis.cpp \ LiveVariables.cpp \ LocalStackSlotAllocation.cpp \ MIRPrinter.cpp \ MIRPrintingPass.cpp \ MachineBasicBlock.cpp \ MachineBlockFrequencyInfo.cpp \ MachineBlockPlacement.cpp \ MachineBranchProbabilityInfo.cpp \ MachineCSE.cpp \ MachineCombiner.cpp \ MachineCopyPropagation.cpp \ MachineDominanceFrontier.cpp \ MachineDominators.cpp \ MachineFunction.cpp \ MachineFunctionAnalysis.cpp \ MachineFunctionPass.cpp \ MachineFunctionPrinterPass.cpp \ MachineInstr.cpp \ MachineInstrBundle.cpp \ MachineLICM.cpp \ MachineLoopInfo.cpp \ MachineModuleInfo.cpp \ MachineModuleInfoImpls.cpp \ MachinePassRegistry.cpp \ MachinePostDominators.cpp \ MachineRegionInfo.cpp \ MachineRegisterInfo.cpp \ MachineSSAUpdater.cpp \ MachineScheduler.cpp \ MachineSink.cpp \ MachineTraceMetrics.cpp \ MachineVerifier.cpp \ OcamlGC.cpp \ OptimizePHIs.cpp \ PHIElimination.cpp \ PHIEliminationUtils.cpp \ Passes.cpp \ PeepholeOptimizer.cpp \ PostRASchedulerList.cpp \ ProcessImplicitDefs.cpp \ PrologEpilogInserter.cpp \ PseudoSourceValue.cpp \ RegAllocBase.cpp \ RegAllocBasic.cpp \ RegAllocFast.cpp \ RegAllocGreedy.cpp \ RegAllocPBQP.cpp \ RegisterClassInfo.cpp \ RegisterCoalescer.cpp \ RegisterPressure.cpp \ RegisterScavenging.cpp \ ScheduleDAG.cpp \ ScheduleDAGInstrs.cpp \ ScheduleDAGPrinter.cpp \ ScoreboardHazardRecognizer.cpp \ ShadowStackGC.cpp \ ShadowStackGCLowering.cpp \ ShrinkWrap.cpp \ SjLjEHPrepare.cpp \ SlotIndexes.cpp \ SpillPlacement.cpp \ SplitKit.cpp \ StackColoring.cpp \ StackMapLivenessAnalysis.cpp \ StackMaps.cpp \ StackProtector.cpp \ StackSlotColoring.cpp \ StatepointExampleGC.cpp \ TailDuplication.cpp \ TargetFrameLoweringImpl.cpp \ TargetInstrInfo.cpp \ TargetLoweringBase.cpp \ TargetLoweringObjectFileImpl.cpp \ TargetOptionsImpl.cpp \ TargetRegisterInfo.cpp \ TargetSchedule.cpp \ TwoAddressInstructionPass.cpp \ UnreachableBlockElim.cpp \ VirtRegMap.cpp \ WinEHPrepare.cpp + +.if ${MK_CLANG_EXTRAS} != "no" +SRCS+= GCMetadataPrinter.cpp \ + GCStrategy.cpp +.endif TGHDRS= Intrinsics .include "../clang.lib.mk" Index: projects/clang370-import/lib/clang/libllvmcore/Makefile =================================================================== --- projects/clang370-import/lib/clang/libllvmcore/Makefile (revision 287525) +++ projects/clang370-import/lib/clang/libllvmcore/Makefile (revision 287526) @@ -1,59 +1,62 @@ # $FreeBSD$ -.include +.include LIB= llvmcore SRCDIR= lib/IR SRCS= AsmWriter.cpp \ Attributes.cpp \ AutoUpgrade.cpp \ BasicBlock.cpp \ Comdat.cpp \ ConstantFold.cpp \ ConstantRange.cpp \ Constants.cpp \ Core.cpp \ DIBuilder.cpp \ DataLayout.cpp \ DebugInfo.cpp \ DebugInfoMetadata.cpp \ DebugLoc.cpp \ DiagnosticInfo.cpp \ DiagnosticPrinter.cpp \ Dominators.cpp \ Function.cpp \ GCOV.cpp \ GVMaterializer.cpp \ Globals.cpp \ IRBuilder.cpp \ IRPrintingPasses.cpp \ InlineAsm.cpp \ Instruction.cpp \ Instructions.cpp \ IntrinsicInst.cpp \ LLVMContext.cpp \ LLVMContextImpl.cpp \ LegacyPassManager.cpp \ MDBuilder.cpp \ Mangler.cpp \ Metadata.cpp \ MetadataTracking.cpp \ Module.cpp \ Operator.cpp \ Pass.cpp \ - PassManager.cpp \ PassRegistry.cpp \ Statepoint.cpp \ Type.cpp \ TypeFinder.cpp \ Use.cpp \ User.cpp \ Value.cpp \ ValueSymbolTable.cpp \ ValueTypes.cpp \ Verifier.cpp + +.if ${MK_CLANG_EXTRAS} != "no" +SRCS+= PassManager.cpp +.endif TGHDRS= Intrinsics .include "../clang.lib.mk" Index: projects/clang370-import/lib/clang/libllvminstrumentation/Makefile =================================================================== --- projects/clang370-import/lib/clang/libllvminstrumentation/Makefile (revision 287525) +++ projects/clang370-import/lib/clang/libllvminstrumentation/Makefile (revision 287526) @@ -1,21 +1,24 @@ # $FreeBSD$ -.include +.include LIB= llvminstrumentation SRCDIR= lib/Transforms/Instrumentation SRCS= AddressSanitizer.cpp \ BoundsChecking.cpp \ DataFlowSanitizer.cpp \ GCOVProfiling.cpp \ MemorySanitizer.cpp \ - Instrumentation.cpp \ InstrProfiling.cpp \ SafeStack.cpp \ SanitizerCoverage.cpp \ ThreadSanitizer.cpp + +.if ${MK_CLANG_EXTRAS} != "no" +SRCS+= Instrumentation.cpp +.endif TGHDRS= Intrinsics .include "../clang.lib.mk" Index: projects/clang370-import/lib/clang/libllvmmc/Makefile =================================================================== --- projects/clang370-import/lib/clang/libllvmmc/Makefile (revision 287525) +++ projects/clang370-import/lib/clang/libllvmmc/Makefile (revision 287526) @@ -1,58 +1,64 @@ # $FreeBSD$ .include LIB= llvmmc SRCDIR= lib/MC SRCS= ConstantPools.cpp \ ELFObjectWriter.cpp \ MCAsmBackend.cpp \ MCAsmInfo.cpp \ MCAsmInfoCOFF.cpp \ MCAsmInfoDarwin.cpp \ MCAsmInfoELF.cpp \ MCAsmStreamer.cpp \ MCAssembler.cpp \ MCCodeEmitter.cpp \ MCCodeGenInfo.cpp \ MCContext.cpp \ MCDwarf.cpp \ MCELFObjectTargetWriter.cpp \ MCELFStreamer.cpp \ MCExpr.cpp \ MCInst.cpp \ MCInstPrinter.cpp \ MCInstrAnalysis.cpp \ MCInstrDesc.cpp \ - MCLabel.cpp \ MCLinkerOptimizationHint.cpp \ MCMachOStreamer.cpp \ MCMachObjectTargetWriter.cpp \ MCNullStreamer.cpp \ MCObjectFileInfo.cpp \ MCObjectStreamer.cpp \ MCObjectWriter.cpp \ MCRegisterInfo.cpp \ MCSchedule.cpp \ MCSection.cpp \ MCSectionCOFF.cpp \ MCSectionELF.cpp \ MCSectionMachO.cpp \ MCStreamer.cpp \ MCSubtargetInfo.cpp \ MCSymbol.cpp \ MCSymbolELF.cpp \ - MCSymbolizer.cpp \ MCTargetOptions.cpp \ MCValue.cpp \ MCWin64EH.cpp \ MCWinEH.cpp \ MachObjectWriter.cpp \ StringTableBuilder.cpp \ SubtargetFeature.cpp \ WinCOFFObjectWriter.cpp \ - WinCOFFStreamer.cpp \ + WinCOFFStreamer.cpp + +.if ${MK_CLANG_EXTRAS} != "no" +SRCS+= MCLabel.cpp \ YAML.cpp +.endif + +.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" +SRCS+= MCSymbolizer.cpp +.endif .include "../clang.lib.mk" Index: projects/clang370-import/lib/clang/libllvmmcdisassembler/Makefile =================================================================== --- projects/clang370-import/lib/clang/libllvmmcdisassembler/Makefile (revision 287525) +++ projects/clang370-import/lib/clang/libllvmmcdisassembler/Makefile (revision 287526) @@ -1,13 +1,16 @@ # $FreeBSD$ -.include +.include LIB= llvmmcdisassembler SRCDIR= lib/MC/MCDisassembler SRCS= Disassembler.cpp \ - MCDisassembler.cpp \ - MCExternalSymbolizer.cpp \ MCRelocationInfo.cpp + +.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" +SRCS+= MCDisassembler.cpp \ + MCExternalSymbolizer.cpp +.endif .include "../clang.lib.mk" Index: projects/clang370-import/lib/clang/libllvmmirparser/Makefile =================================================================== --- projects/clang370-import/lib/clang/libllvmmirparser/Makefile (revision 287525) +++ projects/clang370-import/lib/clang/libllvmmirparser/Makefile (revision 287526) @@ -1,12 +1,15 @@ # $FreeBSD$ -.include +.include LIB= llvmmirparser SRCDIR= lib/CodeGen/MIRParser -SRCS= MILexer.cpp \ - MIParser.cpp \ +SRCS= MIParser.cpp \ MIRParser.cpp +.if ${MK_CLANG_EXTRAS} != "no" +SRCS+= MILexer.cpp +.endif + .include "../clang.lib.mk" Index: projects/clang370-import/lib/clang/libllvmobject/Makefile =================================================================== --- projects/clang370-import/lib/clang/libllvmobject/Makefile (revision 287525) +++ projects/clang370-import/lib/clang/libllvmobject/Makefile (revision 287526) @@ -1,26 +1,29 @@ # $FreeBSD$ -.include +.include LIB= llvmobject SRCDIR= lib/Object SRCS= Archive.cpp \ ArchiveWriter.cpp \ Binary.cpp \ COFFObjectFile.cpp \ COFFYAML.cpp \ ELF.cpp \ ELFObjectFile.cpp \ ELFYAML.cpp \ Error.cpp \ IRObjectFile.cpp \ MachOObjectFile.cpp \ MachOUniversal.cpp \ - Object.cpp \ ObjectFile.cpp \ RecordStreamer.cpp \ - SymbolSize.cpp \ SymbolicFile.cpp +.if ${MK_CLANG_EXTRAS} != "no" +SRCS+= Object.cpp \ + SymbolSize.cpp +.endif + .include "../clang.lib.mk" Index: projects/clang370-import/lib/clang/libllvmprofiledata/Makefile =================================================================== --- projects/clang370-import/lib/clang/libllvmprofiledata/Makefile (revision 287525) +++ projects/clang370-import/lib/clang/libllvmprofiledata/Makefile (revision 287526) @@ -1,18 +1,21 @@ # $FreeBSD$ -.include +.include LIB= llvmprofiledata SRCDIR= lib/ProfileData SRCS= CoverageMapping.cpp \ CoverageMappingReader.cpp \ CoverageMappingWriter.cpp \ InstrProf.cpp \ InstrProfReader.cpp \ InstrProfWriter.cpp \ SampleProf.cpp \ - SampleProfReader.cpp \ - SampleProfWriter.cpp + SampleProfReader.cpp + +.if ${MK_CLANG_EXTRAS} != "no" +SRCS+= SampleProfWriter.cpp +.endif .include "../clang.lib.mk" Index: projects/clang370-import/lib/clang/libllvmsupport/Makefile =================================================================== --- projects/clang370-import/lib/clang/libllvmsupport/Makefile (revision 287525) +++ projects/clang370-import/lib/clang/libllvmsupport/Makefile (revision 287526) @@ -1,108 +1,111 @@ # $FreeBSD$ .include LIB= llvmsupport SRCDIR= lib/Support SRCS= APFloat.cpp \ APInt.cpp \ APSInt.cpp \ ARMBuildAttrs.cpp \ - ARMWinEH.cpp \ Allocator.cpp \ Atomic.cpp \ BlockFrequency.cpp \ BranchProbability.cpp \ - COM.cpp \ CommandLine.cpp \ Compression.cpp \ ConvertUTF.c \ ConvertUTFWrapper.cpp \ CrashRecoveryContext.cpp \ DAGDeltaAlgorithm.cpp \ DataExtractor.cpp \ Debug.cpp \ DeltaAlgorithm.cpp \ Dwarf.cpp \ DynamicLibrary.cpp \ Errno.cpp \ ErrorHandling.cpp \ - FileOutputBuffer.cpp \ FoldingSet.cpp \ FormattedStream.cpp \ GraphWriter.cpp \ Hashing.cpp \ Host.cpp \ IntEqClasses.cpp \ IntervalMap.cpp \ IntrusiveRefCntPtr.cpp \ LEB128.cpp \ LineIterator.cpp \ Locale.cpp \ LockFileManager.cpp \ MD5.cpp \ ManagedStatic.cpp \ MathExtras.cpp \ - Memory.cpp \ MemoryBuffer.cpp \ MemoryObject.cpp \ Mutex.cpp \ Options.cpp \ Path.cpp \ PluginLoader.cpp \ PrettyStackTrace.cpp \ Process.cpp \ Program.cpp \ RWMutex.cpp \ RandomNumberGenerator.cpp \ Regex.cpp \ ScaledNumber.cpp \ SearchForAddressOfSpecialSymbol.cpp \ Signals.cpp \ SmallPtrSet.cpp \ SmallVector.cpp \ SourceMgr.cpp \ SpecialCaseList.cpp \ Statistic.cpp \ StreamingMemoryObject.cpp \ StringExtras.cpp \ StringMap.cpp \ StringPool.cpp \ StringRef.cpp \ StringSaver.cpp \ TargetParser.cpp \ TargetRegistry.cpp \ ThreadLocal.cpp \ Threading.cpp \ TimeValue.cpp \ Timer.cpp \ ToolOutputFile.cpp \ Triple.cpp \ Twine.cpp \ Unicode.cpp \ Valgrind.cpp \ - Watchdog.cpp \ YAMLParser.cpp \ YAMLTraits.cpp \ circular_raw_ostream.cpp \ raw_os_ostream.cpp \ raw_ostream.cpp \ regcomp.c \ regerror.c \ regexec.c \ regfree.c \ regstrlcpy.c .if ${MK_CLANG_EXTRAS} != "no" -SRCS+= DataStream.cpp \ +SRCS+= ARMWinEH.cpp \ + COM.cpp \ + DataStream.cpp \ + FileOutputBuffer.cpp \ FileUtilities.cpp \ - SystemUtils.cpp + SystemUtils.cpp \ + Watchdog.cpp +.endif + +.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" +SRCS+= Memory.cpp .endif .include "../clang.lib.mk" # Ugly hack to work around CLOCK_PROCESS_CPUTIME_ID not being properly defined # between r239347 and r245428. CXXFLAGS.Process.cpp= -DCLOCK_PROCESS_CPUTIME_ID=15 CXXFLAGS+= ${CXXFLAGS.${.IMPSRC:T}} Index: projects/clang370-import/lib/clang/libllvmtarget/Makefile =================================================================== --- projects/clang370-import/lib/clang/libllvmtarget/Makefile (revision 287525) +++ projects/clang370-import/lib/clang/libllvmtarget/Makefile (revision 287526) @@ -1,18 +1,21 @@ # $FreeBSD$ -.include +.include LIB= llvmtarget SRCDIR= lib/Target SRCS= Target.cpp \ - TargetIntrinsicInfo.cpp \ TargetLoweringObjectFile.cpp \ TargetMachine.cpp \ TargetMachineC.cpp \ TargetRecip.cpp \ TargetSubtargetInfo.cpp +.if ${MK_CLANG_EXTRAS} != "no" +SRCS+= TargetIntrinsicInfo.cpp +.endif + TGHDRS= Intrinsics .include "../clang.lib.mk" Index: projects/clang370-import/lib/clang/libllvmvectorize/Makefile =================================================================== --- projects/clang370-import/lib/clang/libllvmvectorize/Makefile (revision 287525) +++ projects/clang370-import/lib/clang/libllvmvectorize/Makefile (revision 287526) @@ -1,15 +1,18 @@ # $FreeBSD$ -.include +.include LIB= llvmvectorize SRCDIR= lib/Transforms/Vectorize SRCS= BBVectorize.cpp \ LoopVectorize.cpp \ - SLPVectorizer.cpp \ - Vectorize.cpp + SLPVectorizer.cpp + +.if ${MK_CLANG_EXTRAS} != "no" +SRCS+= Vectorize.cpp +.endif TGHDRS= Intrinsics .include "../clang.lib.mk" Index: projects/clang370-import/usr.bin/clang/clang/Makefile =================================================================== --- projects/clang370-import/usr.bin/clang/clang/Makefile (revision 287525) +++ projects/clang370-import/usr.bin/clang/clang/Makefile (revision 287526) @@ -1,131 +1,127 @@ # $FreeBSD$ .include PROG_CXX=clang SRCDIR= tools/clang/tools/driver SRCS= cc1_main.cpp \ cc1as_main.cpp \ driver.cpp .if ${MK_SHARED_TOOLCHAIN} == "no" NO_SHARED?= yes .endif LINKS= ${BINDIR}/clang ${BINDIR}/clang++ \ ${BINDIR}/clang ${BINDIR}/clang-cpp MLINKS= clang.1 clang++.1 \ clang.1 clang-cpp.1 .if ${MK_CLANG_IS_CC} != "no" LINKS+= ${BINDIR}/clang ${BINDIR}/cc \ ${BINDIR}/clang ${BINDIR}/c++ \ ${BINDIR}/clang ${BINDIR}/CC \ ${BINDIR}/clang ${BINDIR}/cpp MLINKS+= clang.1 cc.1 \ clang.1 c++.1 \ clang.1 CC.1 \ clang.1 cpp.1 .endif TGHDRS= DiagnosticCommonKinds \ DiagnosticDriverKinds \ DiagnosticFrontendKinds \ DiagnosticLexKinds \ DiagnosticSemaKinds \ Options .if ${MK_CLANG_FULL} != "no" _clangstaticanalyzer= \ clangstaticanalyzerfrontend \ clangstaticanalyzercheckers \ clangstaticanalyzercore _clangarcmigrate= \ clangarcmigrate .endif # MK_CLANG_FULL LIBDEPS=clangfrontendtool \ clangfrontend \ clangdriver \ clangserialization \ clangcodegen \ clangparse \ clangsema \ clangrewritefrontend \ clangrewrite \ ${_clangstaticanalyzer} \ ${_clangarcmigrate} \ clanganalysis \ clangedit \ clangast \ clanglex \ clangbasic \ llvmoption \ llvmobjcarcopts \ llvmlinker \ llvmirreader \ llvmipo \ llvmvectorize \ llvmbitwriter \ llvmasmparser \ - llvmaarch64disassembler \ llvmaarch64codegen \ llvmaarch64asmparser \ llvmaarch64desc \ llvmaarch64info \ llvmaarch64instprinter \ llvmaarch64utils \ llvmarmdisassembler \ llvmarmcodegen \ llvmarmasmparser \ llvmarmdesc \ llvmarminfo \ llvmarminstprinter \ - llvmmipsdisassembler \ llvmmipscodegen \ llvmmipsasmparser \ llvmmipsdesc \ llvmmipsinfo \ llvmmipsinstprinter \ llvmpowerpcdisassembler \ llvmpowerpccodegen \ llvmpowerpcasmparser \ llvmpowerpcdesc \ llvmpowerpcinfo \ llvmpowerpcinstprinter \ - llvmsparcdisassembler \ llvmsparccodegen \ llvmsparcasmparser \ llvmsparcdesc \ llvmsparcinfo \ llvmsparcinstprinter \ - llvmx86disassembler \ llvmx86asmparser \ llvmx86codegen \ llvmselectiondag \ llvmasmprinter \ llvmcodegen \ llvmtarget \ llvmscalaropts \ llvmprofiledata \ llvminstcombine \ llvminstrumentation \ llvmtransformutils \ llvmipa \ llvmanalysis \ llvmx86desc \ llvmobject \ llvmmcparser \ llvmbitreader \ llvmmcdisassembler \ llvmx86info \ llvmx86instprinter \ llvmmc \ llvmx86utils \ llvmcore \ llvmsupport .include "../clang.prog.mk" DPADD+= ${LIBZ} LDADD+= -lz