From 1ae6788e516b0849e16085dbc4f035ec6e86b09a Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Mon, 26 Jan 2015 18:48:27 +0000 Subject: [PATCH] Update llvm and clang library and binary Makefiles for 3.6.0 rc1. --- lib/clang/Makefile | 6 ++---- lib/clang/clang.build.mk | 2 +- lib/clang/include/Makefile | 2 +- lib/clang/include/clang/Basic/Version.inc | 10 +++++----- lib/clang/include/clang/Config/config.h | 11 +++++++---- lib/clang/include/llvm/Config/config.h | 9 ++++++--- lib/clang/include/llvm/Config/llvm-config.h | 5 ++++- lib/clang/libclanganalysis/Makefile | 1 + lib/clang/libclangast/Makefile | 2 +- lib/clang/libclangbasic/Makefile | 2 ++ lib/clang/libclangcodegen/Makefile | 3 ++- lib/clang/libclangdriver/Makefile | 5 +++-- lib/clang/libclangfrontend/Makefile | 2 ++ lib/clang/libclangfrontendtool/Makefile | 7 +++++-- lib/clang/libclangsema/Makefile | 1 + lib/clang/libclangstaticanalyzerfrontend/Makefile | 5 ++++- lib/clang/libllvmaarch64codegen/Makefile | 6 +++++- lib/clang/libllvmanalysis/Makefile | 8 ++++---- lib/clang/libllvmarmcodegen/Makefile | 2 -- lib/clang/libllvmasmprinter/Makefile | 2 ++ lib/clang/libllvmcodegen/Makefile | 8 ++++---- lib/clang/libllvmcore/Makefile | 4 +++- lib/clang/libllvmdebuginfo/Makefile | 7 ++++++- lib/clang/libllvmexecutionengine/Makefile | 1 + lib/clang/libllvminstrumentation/Makefile | 3 ++- lib/clang/libllvmipa/Makefile | 1 - lib/clang/libllvmjit/Makefile | 12 ------------ lib/clang/libllvmmc/Makefile | 7 +------ lib/clang/libllvmmcanalysis/Makefile | 15 --------------- lib/clang/libllvmmcdisassembler/Makefile | 5 ++++- lib/clang/libllvmmipscodegen/Makefile | 3 --- lib/clang/libllvmmipsdesc/Makefile | 1 + lib/clang/libllvmobjcarcopts/Makefile | 3 ++- lib/clang/libllvmpowerpccodegen/Makefile | 4 +--- lib/clang/libllvmprofiledata/Makefile | 10 ++++++++-- lib/clang/libllvmruntimedyld/Makefile | 3 +-- lib/clang/libllvmscalaropts/Makefile | 1 + lib/clang/libllvmselectiondag/Makefile | 1 + lib/clang/libllvmsparccodegen/Makefile | 2 -- lib/clang/libllvmsupport/Makefile | 6 +++--- lib/clang/libllvmtarget/Makefile | 1 - lib/clang/libllvmtransformutils/Makefile | 1 + lib/clang/libllvmx86codegen/Makefile | 3 --- lib/libclang_rt/Makefile.inc | 2 +- usr.bin/clang/bugpoint/Makefile | 5 ++++- usr.bin/clang/clang/Makefile | 5 +++-- usr.bin/clang/llc/Makefile | 4 +++- usr.bin/clang/lli/Makefile | 7 ++++--- usr.bin/clang/llvm-ar/Makefile | 4 +++- usr.bin/clang/llvm-extract/Makefile | 5 ++++- usr.bin/clang/llvm-mc/Makefile | 7 ++++--- usr.bin/clang/llvm-nm/Makefile | 4 +++- usr.bin/clang/llvm-objdump/Makefile | 8 ++++---- usr.bin/clang/llvm-rtdyld/Makefile | 6 ++++-- usr.bin/clang/opt/Makefile | 6 ++++-- 55 files changed, 139 insertions(+), 117 deletions(-) delete mode 100644 lib/clang/libllvmjit/Makefile delete mode 100644 lib/clang/libllvmmcanalysis/Makefile diff --git a/lib/clang/Makefile b/lib/clang/Makefile index dbf6c4d235d7..6da7ad7e4713 100644 --- a/lib/clang/Makefile +++ b/lib/clang/Makefile @@ -43,6 +43,7 @@ SUBDIR= libclanganalysis \ libllvmirreader \ libllvmlinker \ libllvmmc \ + libllvmmcdisassembler \ libllvmmcparser \ libllvmobjcarcopts \ libllvmobject \ @@ -96,14 +97,11 @@ SUBDIR= libclanganalysis \ libllvmx86utils .if ${MK_CLANG_EXTRAS} != "no" -SUBDIR+=libllvmdebuginfo \ - libllvmmcanalysis +SUBDIR+=libllvmdebuginfo .endif # MK_CLANG_EXTRAS .if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" SUBDIR+=libllvmexecutionengine \ libllvminterpreter \ - libllvmjit \ - libllvmmcdisassembler \ libllvmmcjit \ libllvmruntimedyld .endif # MK_CLANG_EXTRAS | LLDB diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk index 926c81f35305..5437bf766716 100644 --- a/lib/clang/clang.build.mk +++ b/lib/clang/clang.build.mk @@ -57,7 +57,7 @@ Intrinsics.inc.h: ${LLVM_SRCS}/include/llvm/IR/Intrinsics.td DisassemblerTables/-gen-disassembler \ FastISel/-gen-fast-isel \ InstrInfo/-gen-instr-info \ - MCCodeEmitter/-gen-emitter,-mc-emitter \ + MCCodeEmitter/-gen-emitter \ MCPseudoLowering/-gen-pseudo-lowering \ RegisterInfo/-gen-register-info \ SubtargetInfo/-gen-subtarget diff --git a/lib/clang/include/Makefile b/lib/clang/include/Makefile index d8f1864945d6..7a75c2af9ec6 100644 --- a/lib/clang/include/Makefile +++ b/lib/clang/include/Makefile @@ -8,7 +8,7 @@ LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm .PATH: ${LLVM_SRCS}/tools/clang/lib/Headers -INCSDIR=${INCLUDEDIR}/clang/3.5.1 +INCSDIR=${INCLUDEDIR}/clang/3.6.0 INCS= __wmmintrin_aes.h \ __wmmintrin_pclmul.h \ diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index 2f66e0364543..363d098b3de2 100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@ -1,11 +1,11 @@ /* $FreeBSD$ */ -#define CLANG_VERSION 3.5.1 +#define CLANG_VERSION 3.6.0 #define CLANG_VERSION_MAJOR 3 -#define CLANG_VERSION_MINOR 5 -#define CLANG_VERSION_PATCHLEVEL 1 +#define CLANG_VERSION_MINOR 6 +#define CLANG_VERSION_PATCHLEVEL 0 #define CLANG_VENDOR "FreeBSD " -#define CLANG_VENDOR_SUFFIX " 20150115" +#define CLANG_VENDOR_SUFFIX " 20150126" -#define SVN_REVISION "225668" +#define SVN_REVISION "226102" diff --git a/lib/clang/include/clang/Config/config.h b/lib/clang/include/clang/Config/config.h index b37098b71ec4..9c4512d83ecc 100644 --- a/lib/clang/include/clang/Config/config.h +++ b/lib/clang/include/clang/Config/config.h @@ -10,15 +10,15 @@ /* Bug report URL. */ #define BUG_REPORT_URL "https://bugs.freebsd.org/submit/" +/* Multilib suffix for libdir. */ +#define CLANG_LIBDIR_SUFFIX "" + /* Relative directory for resource files */ #define CLANG_RESOURCE_DIR "" /* Directories clang will search for headers */ #define C_INCLUDE_DIRS "" -/* Linker version detected at compile time. */ -/* #undef HOST_LINK_VERSION */ - /* Default to all compiler invocations for --sysroot=. */ /* #undef DEFAULT_SYSROOT */ @@ -28,9 +28,12 @@ /* Define if we have libxml2 */ /* #undef CLANG_HAVE_LIBXML */ -#define PACKAGE_STRING "LLVM 3.5.1" +#define PACKAGE_STRING "LLVM 3.6.0" /* The LLVM product name and version */ #define BACKEND_PACKAGE_STRING PACKAGE_STRING +/* Linker version detected at compile time. */ +/* #undef HOST_LINK_VERSION */ + #endif diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index 79c28251729b..8ff9ed86dd13 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -545,11 +545,14 @@ #define LLVM_VERSION_MAJOR 3 /* Minor version of the LLVM API */ -#define LLVM_VERSION_MINOR 5 +#define LLVM_VERSION_MINOR 6 /* Patch version of the LLVM API */ #define LLVM_VERSION_PATCH 0 +/* LLVM version string */ +#define LLVM_VERSION_STRING "3.6.0" + /* The shared library extension */ #define LTDL_SHLIB_EXT ".so" @@ -564,13 +567,13 @@ #define PACKAGE_NAME "LLVM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "LLVM 3.5.1" +#define PACKAGE_STRING "LLVM 3.6.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "llvm" /* Define to the version of this package. */ -#define PACKAGE_VERSION "3.5.1" +#define PACKAGE_VERSION "3.6.0" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h index 08da010188d1..1fb23e2c4bc4 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -92,6 +92,9 @@ #define LLVM_VERSION_MAJOR 3 /* Minor version of the LLVM API */ -#define LLVM_VERSION_MINOR 5 +#define LLVM_VERSION_MINOR 6 + +/* LLVM version string */ +#define LLVM_VERSION_STRING "3.6.0" #endif diff --git a/lib/clang/libclanganalysis/Makefile b/lib/clang/libclanganalysis/Makefile index 572ae86841dc..6a34dcabf2ec 100644 --- a/lib/clang/libclanganalysis/Makefile +++ b/lib/clang/libclanganalysis/Makefile @@ -12,6 +12,7 @@ SRCS= AnalysisDeclContext.cpp \ CFGStmtMap.cpp \ CallGraph.cpp \ CocoaConventions.cpp \ + CodeInjector.cpp \ Consumed.cpp \ Dominators.cpp \ FormatString.cpp \ diff --git a/lib/clang/libclangast/Makefile b/lib/clang/libclangast/Makefile index 080d00234d82..a3f00aa00bd3 100644 --- a/lib/clang/libclangast/Makefile +++ b/lib/clang/libclangast/Makefile @@ -39,7 +39,6 @@ SRCS= APValue.cpp \ ItaniumCXXABI.cpp \ ItaniumMangle.cpp \ Mangle.cpp \ - MangleNumberingContext.cpp \ MicrosoftCXXABI.cpp \ MicrosoftMangle.cpp \ NSAPI.cpp \ @@ -77,6 +76,7 @@ TGHDRS= AttrDump \ DiagnosticASTKinds \ DiagnosticCommentKinds \ DiagnosticCommonKinds \ + DiagnosticFrontendKinds \ DiagnosticSemaKinds \ StmtNodes diff --git a/lib/clang/libclangbasic/Makefile b/lib/clang/libclangbasic/Makefile index 285ac5d3c1b8..6a5791c1bc0c 100644 --- a/lib/clang/libclangbasic/Makefile +++ b/lib/clang/libclangbasic/Makefile @@ -18,6 +18,8 @@ SRCS= Attributes.cpp \ ObjCRuntime.cpp \ OpenMPKinds.cpp \ OperatorPrecedence.cpp \ + SanitizerBlacklist.cpp \ + Sanitizers.cpp \ SourceLocation.cpp \ SourceManager.cpp \ TargetInfo.cpp \ diff --git a/lib/clang/libclangcodegen/Makefile b/lib/clang/libclangcodegen/Makefile index 97a3dd4e065c..521a430de22e 100644 --- a/lib/clang/libclangcodegen/Makefile +++ b/lib/clang/libclangcodegen/Makefile @@ -45,10 +45,11 @@ SRCS= BackendUtil.cpp \ CodeGenPGO.cpp \ CodeGenTBAA.cpp \ CodeGenTypes.cpp \ + CoverageMappingGen.cpp \ ItaniumCXXABI.cpp \ MicrosoftCXXABI.cpp \ ModuleBuilder.cpp \ - SanitizerBlacklist.cpp \ + SanitizerMetadata.cpp \ TargetInfo.cpp TGHDRS= AttrList \ diff --git a/lib/clang/libclangdriver/Makefile b/lib/clang/libclangdriver/Makefile index f923cc4d0eee..aa51384a0764 100644 --- a/lib/clang/libclangdriver/Makefile +++ b/lib/clang/libclangdriver/Makefile @@ -7,9 +7,11 @@ LIB= clangdriver SRCDIR= tools/clang/lib/Driver SRCS= Action.cpp \ Compilation.cpp \ + CrossWindowsToolChain.cpp \ Driver.cpp \ DriverOptions.cpp \ Job.cpp \ + MSVCToolChain.cpp \ Multilib.cpp \ Phases.cpp \ SanitizerArgs.cpp \ @@ -17,8 +19,7 @@ SRCS= Action.cpp \ ToolChain.cpp \ ToolChains.cpp \ Tools.cpp \ - Types.cpp \ - WindowsToolChain.cpp + Types.cpp TGHDRS= DiagnosticCommonKinds \ DiagnosticDriverKinds \ diff --git a/lib/clang/libclangfrontend/Makefile b/lib/clang/libclangfrontend/Makefile index 4b158bc6228f..95b8fc873219 100644 --- a/lib/clang/libclangfrontend/Makefile +++ b/lib/clang/libclangfrontend/Makefile @@ -11,6 +11,7 @@ SRCS= ASTConsumers.cpp \ CacheTokens.cpp \ ChainedDiagnosticConsumer.cpp \ ChainedIncludesSource.cpp \ + CodeGenOptions.cpp \ CompilerInstance.cpp \ CompilerInvocation.cpp \ CreateInvocationFromCommandLine.cpp \ @@ -30,6 +31,7 @@ SRCS= ASTConsumers.cpp \ MultiplexConsumer.cpp \ PrintPreprocessedOutput.cpp \ SerializedDiagnosticPrinter.cpp \ + SerializedDiagnosticReader.cpp \ TextDiagnostic.cpp \ TextDiagnosticBuffer.cpp \ TextDiagnosticPrinter.cpp \ diff --git a/lib/clang/libclangfrontendtool/Makefile b/lib/clang/libclangfrontendtool/Makefile index f20aa35a11a8..0d71d55e3d74 100644 --- a/lib/clang/libclangfrontendtool/Makefile +++ b/lib/clang/libclangfrontendtool/Makefile @@ -7,8 +7,11 @@ LIB= clangfrontendtool SRCDIR= tools/clang/lib/FrontendTool SRCS= ExecuteCompilerInvocation.cpp -TGHDRS= DiagnosticCommonKinds \ +TGHDRS= CommentCommandList \ + DeclNodes \ + DiagnosticCommonKinds \ DiagnosticFrontendKinds \ - Options + Options \ + StmtNodes .include "../clang.lib.mk" diff --git a/lib/clang/libclangsema/Makefile b/lib/clang/libclangsema/Makefile index d868880b219f..08c120a380df 100644 --- a/lib/clang/libclangsema/Makefile +++ b/lib/clang/libclangsema/Makefile @@ -18,6 +18,7 @@ SRCS= AnalysisBasedWarnings.cpp \ Sema.cpp \ SemaAccess.cpp \ SemaAttr.cpp \ + SemaCUDA.cpp \ SemaCXXScopeSpec.cpp \ SemaCast.cpp \ SemaChecking.cpp \ diff --git a/lib/clang/libclangstaticanalyzerfrontend/Makefile b/lib/clang/libclangstaticanalyzerfrontend/Makefile index 61b782d5e86f..397550901ede 100644 --- a/lib/clang/libclangstaticanalyzerfrontend/Makefile +++ b/lib/clang/libclangstaticanalyzerfrontend/Makefile @@ -7,9 +7,12 @@ LIB= clangstaticanalyzerfrontend SRCDIR= tools/clang/lib/StaticAnalyzer/Frontend SRCS= AnalysisConsumer.cpp \ CheckerRegistration.cpp \ - FrontendActions.cpp + ModelConsumer.cpp \ + FrontendActions.cpp \ + ModelInjector.cpp TGHDRS= AttrList \ + AttrParsedAttrList \ AttrVisitor \ Attrs \ Checkers \ diff --git a/lib/clang/libllvmaarch64codegen/Makefile b/lib/clang/libllvmaarch64codegen/Makefile index 8a2563019501..db0023f991c2 100644 --- a/lib/clang/libllvmaarch64codegen/Makefile +++ b/lib/clang/libllvmaarch64codegen/Makefile @@ -5,12 +5,15 @@ LIB= llvmaarch64codegen SRCDIR= lib/Target/AArch64 -SRCS= AArch64AddressTypePromotion.cpp \ +SRCS= AArch64A53Fix835769.cpp \ + AArch64A57FPLoadBalancing.cpp \ + AArch64AddressTypePromotion.cpp \ AArch64AdvSIMDScalarPass.cpp \ AArch64AsmPrinter.cpp \ AArch64BranchRelaxation.cpp \ AArch64CleanupLocalDynamicTLSPass.cpp \ AArch64CollectLOH.cpp \ + AArch64ConditionOptimizer.cpp \ AArch64ConditionalCompares.cpp \ AArch64DeadRegisterDefinitionsPass.cpp \ AArch64ExpandPseudoInsts.cpp \ @@ -21,6 +24,7 @@ SRCS= AArch64AddressTypePromotion.cpp \ AArch64InstrInfo.cpp \ AArch64LoadStoreOptimizer.cpp \ AArch64MCInstLower.cpp \ + AArch64PBQPRegAlloc.cpp \ AArch64PromoteConstant.cpp \ AArch64RegisterInfo.cpp \ AArch64SelectionDAGInfo.cpp \ diff --git a/lib/clang/libllvmanalysis/Makefile b/lib/clang/libllvmanalysis/Makefile index afbb611b09c4..7c81c5bbe9bc 100644 --- a/lib/clang/libllvmanalysis/Makefile +++ b/lib/clang/libllvmanalysis/Makefile @@ -11,12 +11,14 @@ SRCS= AliasAnalysis.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 \ @@ -26,6 +28,7 @@ SRCS= AliasAnalysis.cpp \ DependenceAnalysis.cpp \ DomPrinter.cpp \ DominanceFrontier.cpp \ + FunctionTargetTransformInfo.cpp \ IVUsers.cpp \ InstCount.cpp \ InstructionSimplify.cpp \ @@ -55,16 +58,13 @@ SRCS= AliasAnalysis.cpp \ ScalarEvolutionAliasAnalysis.cpp \ ScalarEvolutionExpander.cpp \ ScalarEvolutionNormalization.cpp \ + ScopedNoAliasAA.cpp \ SparsePropagation.cpp \ TargetTransformInfo.cpp \ Trace.cpp \ TypeBasedAliasAnalysis.cpp \ ValueTracking.cpp -#.if ${MK_CLANG_EXTRAS} != "no" -#SRCS+= BlockFrequencyInfo.cpp -#.endif - TGHDRS= Intrinsics .include "../clang.lib.mk" diff --git a/lib/clang/libllvmarmcodegen/Makefile b/lib/clang/libllvmarmcodegen/Makefile index 22f75dd404d2..dc951e375dcb 100644 --- a/lib/clang/libllvmarmcodegen/Makefile +++ b/lib/clang/libllvmarmcodegen/Makefile @@ -9,7 +9,6 @@ SRCS= A15SDOptimizer.cpp \ ARMAsmPrinter.cpp \ ARMBaseInstrInfo.cpp \ ARMBaseRegisterInfo.cpp \ - ARMCodeEmitter.cpp \ ARMConstantIslandPass.cpp \ ARMConstantPoolValue.cpp \ ARMExpandPseudoInsts.cpp \ @@ -19,7 +18,6 @@ SRCS= A15SDOptimizer.cpp \ ARMISelDAGToDAG.cpp \ ARMISelLowering.cpp \ ARMInstrInfo.cpp \ - ARMJITInfo.cpp \ ARMLoadStoreOptimizer.cpp \ ARMMCInstLower.cpp \ ARMMachineFunctionInfo.cpp \ diff --git a/lib/clang/libllvmasmprinter/Makefile b/lib/clang/libllvmasmprinter/Makefile index 0a4caa5a83b3..4ff6f225ec10 100644 --- a/lib/clang/libllvmasmprinter/Makefile +++ b/lib/clang/libllvmasmprinter/Makefile @@ -15,7 +15,9 @@ SRCS= ARMException.cpp \ DbgValueHistoryCalculator.cpp \ DwarfAccelTable.cpp \ DwarfCFIException.cpp \ + DwarfCompileUnit.cpp \ DwarfDebug.cpp \ + DwarfExpression.cpp \ DwarfFile.cpp \ DwarfStringPool.cpp \ DwarfUnit.cpp \ diff --git a/lib/clang/libllvmcodegen/Makefile b/lib/clang/libllvmcodegen/Makefile index a23b17389645..d5d8e43f2906 100644 --- a/lib/clang/libllvmcodegen/Makefile +++ b/lib/clang/libllvmcodegen/Makefile @@ -8,7 +8,7 @@ SRCDIR= lib/CodeGen SRCS= AggressiveAntiDepBreaker.cpp \ AllocationOrder.cpp \ Analysis.cpp \ - AtomicExpandLoadLinkedPass.cpp \ + AtomicExpandPass.cpp \ BasicTargetTransformInfo.cpp \ BranchFolding.cpp \ CalcSpillWeights.cpp \ @@ -25,6 +25,7 @@ SRCS= AggressiveAntiDepBreaker.cpp \ ExecutionDepsFix.cpp \ ExpandISelPseudos.cpp \ ExpandPostRAPseudos.cpp \ + ForwardControlFlowIntegrity.cpp \ GCMetadata.cpp \ GCMetadataPrinter.cpp \ GCStrategy.cpp \ @@ -33,7 +34,6 @@ SRCS= AggressiveAntiDepBreaker.cpp \ InlineSpiller.cpp \ InterferenceCache.cpp \ IntrinsicLowering.cpp \ - JITCodeEmitter.cpp \ JumpInstrTables.cpp \ LLVMTargetMachine.cpp \ LatencyPriorityQueue.cpp \ @@ -54,7 +54,7 @@ SRCS= AggressiveAntiDepBreaker.cpp \ MachineBlockPlacement.cpp \ MachineBranchProbabilityInfo.cpp \ MachineCSE.cpp \ - MachineCodeEmitter.cpp \ + MachineCombiner.cpp \ MachineCopyPropagation.cpp \ MachineDominanceFrontier.cpp \ MachineDominators.cpp \ @@ -104,13 +104,13 @@ SRCS= AggressiveAntiDepBreaker.cpp \ SjLjEHPrepare.cpp \ SlotIndexes.cpp \ SpillPlacement.cpp \ - Spiller.cpp \ SplitKit.cpp \ StackColoring.cpp \ StackMapLivenessAnalysis.cpp \ StackMaps.cpp \ StackProtector.cpp \ StackSlotColoring.cpp \ + StatepointExampleGC.cpp \ TailDuplication.cpp \ TargetFrameLoweringImpl.cpp \ TargetInstrInfo.cpp \ diff --git a/lib/clang/libllvmcore/Makefile b/lib/clang/libllvmcore/Makefile index 920b70bfc8da..921d0bef2a6a 100644 --- a/lib/clang/libllvmcore/Makefile +++ b/lib/clang/libllvmcore/Makefile @@ -33,18 +33,20 @@ SRCS= AsmWriter.cpp \ IntrinsicInst.cpp \ LLVMContext.cpp \ LLVMContextImpl.cpp \ - LeakDetector.cpp \ LegacyPassManager.cpp \ MDBuilder.cpp \ Mangler.cpp \ Metadata.cpp \ + MetadataTracking.cpp \ Module.cpp \ Pass.cpp \ PassManager.cpp \ PassRegistry.cpp \ + Statepoint.cpp \ Type.cpp \ TypeFinder.cpp \ Use.cpp \ + UseListOrder.cpp \ User.cpp \ Value.cpp \ ValueSymbolTable.cpp \ diff --git a/lib/clang/libllvmdebuginfo/Makefile b/lib/clang/libllvmdebuginfo/Makefile index c8039dcad564..3cee40e40104 100644 --- a/lib/clang/libllvmdebuginfo/Makefile +++ b/lib/clang/libllvmdebuginfo/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include LIB= llvmdebuginfo @@ -21,4 +21,9 @@ SRCS= DIContext.cpp \ DWARFTypeUnit.cpp \ DWARFUnit.cpp +.if ${MK_CLANG_EXTRAS} != "no" +SRCS+= DWARFAcceleratorTable.cpp \ + SyntaxHighlighting.cpp +.endif + .include "../clang.lib.mk" diff --git a/lib/clang/libllvmexecutionengine/Makefile b/lib/clang/libllvmexecutionengine/Makefile index 382dd88f7969..f8b5901ff5a7 100644 --- a/lib/clang/libllvmexecutionengine/Makefile +++ b/lib/clang/libllvmexecutionengine/Makefile @@ -7,6 +7,7 @@ LIB= llvmexecutionengine SRCDIR= lib/ExecutionEngine SRCS= ExecutionEngine.cpp \ ExecutionEngineBindings.cpp \ + GDBRegistrationListener.cpp \ RTDyldMemoryManager.cpp \ TargetSelect.cpp diff --git a/lib/clang/libllvminstrumentation/Makefile b/lib/clang/libllvminstrumentation/Makefile index faba349ae494..963b6389c6bd 100644 --- a/lib/clang/libllvminstrumentation/Makefile +++ b/lib/clang/libllvminstrumentation/Makefile @@ -8,10 +8,11 @@ SRCDIR= lib/Transforms/Instrumentation SRCS= AddressSanitizer.cpp \ BoundsChecking.cpp \ DataFlowSanitizer.cpp \ - DebugIR.cpp \ GCOVProfiling.cpp \ MemorySanitizer.cpp \ Instrumentation.cpp \ + InstrProfiling.cpp \ + SanitizerCoverage.cpp \ ThreadSanitizer.cpp TGHDRS= Intrinsics diff --git a/lib/clang/libllvmipa/Makefile b/lib/clang/libllvmipa/Makefile index c866ca0ddfe0..3380cf358415 100644 --- a/lib/clang/libllvmipa/Makefile +++ b/lib/clang/libllvmipa/Makefile @@ -8,7 +8,6 @@ SRCDIR= lib/Analysis/IPA SRCS= CallGraph.cpp \ CallGraphSCCPass.cpp \ CallPrinter.cpp \ - FindUsedTypes.cpp \ GlobalsModRef.cpp \ InlineCost.cpp diff --git a/lib/clang/libllvmjit/Makefile b/lib/clang/libllvmjit/Makefile deleted file mode 100644 index a04eeb614041..000000000000 --- a/lib/clang/libllvmjit/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ - -.include - -LIB= llvmjit - -SRCDIR= lib/ExecutionEngine/JIT -SRCS= JIT.cpp \ - JITEmitter.cpp \ - JITMemoryManager.cpp - -.include "../clang.lib.mk" diff --git a/lib/clang/libllvmmc/Makefile b/lib/clang/libllvmmc/Makefile index 58435849bf03..f4582c21f20e 100644 --- a/lib/clang/libllvmmc/Makefile +++ b/lib/clang/libllvmmc/Makefile @@ -22,7 +22,6 @@ SRCS= ConstantPools.cpp \ MCELFObjectTargetWriter.cpp \ MCELFStreamer.cpp \ MCExpr.cpp \ - MCExternalSymbolizer.cpp \ MCInst.cpp \ MCInstPrinter.cpp \ MCInstrAnalysis.cpp \ @@ -35,7 +34,6 @@ SRCS= ConstantPools.cpp \ MCObjectStreamer.cpp \ MCObjectWriter.cpp \ MCRegisterInfo.cpp \ - MCRelocationInfo.cpp \ MCSection.cpp \ MCSectionCOFF.cpp \ MCSectionELF.cpp \ @@ -47,6 +45,7 @@ SRCS= ConstantPools.cpp \ MCTargetOptions.cpp \ MCValue.cpp \ MCWin64EH.cpp \ + MCWinEH.cpp \ MachObjectWriter.cpp \ StringTableBuilder.cpp \ SubtargetFeature.cpp \ @@ -54,8 +53,4 @@ SRCS= ConstantPools.cpp \ WinCOFFStreamer.cpp \ YAML.cpp -.if ${MK_CLANG_EXTRAS} != "no" || ${MK_LLDB} != "no" -SRCS+= MCDisassembler.cpp -.endif - .include "../clang.lib.mk" diff --git a/lib/clang/libllvmmcanalysis/Makefile b/lib/clang/libllvmmcanalysis/Makefile deleted file mode 100644 index aa40bbe9f130..000000000000 --- a/lib/clang/libllvmmcanalysis/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# $FreeBSD$ - -.include - -LIB= llvmmcanalysis - -SRCDIR= lib/MC/MCAnalysis -SRCS= MCAtom.cpp \ - MCFunction.cpp \ - MCModule.cpp \ - MCModuleYAML.cpp \ - MCObjectDisassembler.cpp \ - MCObjectSymbolizer.cpp - -.include "../clang.lib.mk" diff --git a/lib/clang/libllvmmcdisassembler/Makefile b/lib/clang/libllvmmcdisassembler/Makefile index cfcf9193776a..2f8a940adc2e 100644 --- a/lib/clang/libllvmmcdisassembler/Makefile +++ b/lib/clang/libllvmmcdisassembler/Makefile @@ -5,6 +5,9 @@ LIB= llvmmcdisassembler SRCDIR= lib/MC/MCDisassembler -SRCS= Disassembler.cpp +SRCS= Disassembler.cpp \ + MCDisassembler.cpp \ + MCExternalSymbolizer.cpp \ + MCRelocationInfo.cpp .include "../clang.lib.mk" diff --git a/lib/clang/libllvmmipscodegen/Makefile b/lib/clang/libllvmmipscodegen/Makefile index 1c919202538b..4495f502c026 100644 --- a/lib/clang/libllvmmipscodegen/Makefile +++ b/lib/clang/libllvmmipscodegen/Makefile @@ -12,11 +12,9 @@ SRCS= Mips16FrameLowering.cpp \ Mips16ISelLowering.cpp \ Mips16InstrInfo.cpp \ Mips16RegisterInfo.cpp \ - MipsABIInfo.cpp \ MipsAnalyzeImmediate.cpp \ MipsAsmPrinter.cpp \ MipsCCState.cpp \ - MipsCodeEmitter.cpp \ MipsConstantIslandPass.cpp \ MipsDelaySlotFiller.cpp \ MipsFastISel.cpp \ @@ -24,7 +22,6 @@ SRCS= Mips16FrameLowering.cpp \ MipsISelDAGToDAG.cpp \ MipsISelLowering.cpp \ MipsInstrInfo.cpp \ - MipsJITInfo.cpp \ MipsLongBranch.cpp \ MipsMCInstLower.cpp \ MipsMachineFunction.cpp \ diff --git a/lib/clang/libllvmmipsdesc/Makefile b/lib/clang/libllvmmipsdesc/Makefile index e2c04a9401c3..f22ff8074f41 100644 --- a/lib/clang/libllvmmipsdesc/Makefile +++ b/lib/clang/libllvmmipsdesc/Makefile @@ -6,6 +6,7 @@ LIB= llvmmipsdesc SRCDIR= lib/Target/Mips/MCTargetDesc SRCS= MipsABIFlagsSection.cpp \ + MipsABIInfo.cpp \ MipsAsmBackend.cpp \ MipsELFObjectWriter.cpp \ MipsELFStreamer.cpp \ diff --git a/lib/clang/libllvmobjcarcopts/Makefile b/lib/clang/libllvmobjcarcopts/Makefile index 5c47aa8f98e7..ee3ca83ad11f 100644 --- a/lib/clang/libllvmobjcarcopts/Makefile +++ b/lib/clang/libllvmobjcarcopts/Makefile @@ -13,7 +13,8 @@ SRCS= ObjCARC.cpp \ ObjCARCUtil.cpp \ ObjCARCContract.cpp \ DependencyAnalysis.cpp \ - ProvenanceAnalysis.cpp + ProvenanceAnalysis.cpp \ + ProvenanceAnalysisEvaluator.cpp TGHDRS= Intrinsics diff --git a/lib/clang/libllvmpowerpccodegen/Makefile b/lib/clang/libllvmpowerpccodegen/Makefile index 9fd268bf23bb..211bc22cafa6 100644 --- a/lib/clang/libllvmpowerpccodegen/Makefile +++ b/lib/clang/libllvmpowerpccodegen/Makefile @@ -8,14 +8,12 @@ SRCDIR= lib/Target/PowerPC SRCS= PPCAsmPrinter.cpp \ PPCBranchSelector.cpp \ PPCCTRLoops.cpp \ - PPCCodeEmitter.cpp \ - PPCFastISel.cpp \ + PPCFastISel.cpp \ PPCFrameLowering.cpp \ PPCHazardRecognizers.cpp \ PPCISelDAGToDAG.cpp \ PPCISelLowering.cpp \ PPCInstrInfo.cpp \ - PPCJITInfo.cpp \ PPCMCInstLower.cpp \ PPCMachineFunctionInfo.cpp \ PPCRegisterInfo.cpp \ diff --git a/lib/clang/libllvmprofiledata/Makefile b/lib/clang/libllvmprofiledata/Makefile index 371f269dcfd7..332bf1c73d5c 100644 --- a/lib/clang/libllvmprofiledata/Makefile +++ b/lib/clang/libllvmprofiledata/Makefile @@ -5,8 +5,14 @@ LIB= llvmprofiledata SRCDIR= lib/ProfileData -SRCS= InstrProf.cpp \ +SRCS= CoverageMapping.cpp \ + CoverageMappingReader.cpp \ + CoverageMappingWriter.cpp \ + InstrProf.cpp \ InstrProfReader.cpp \ - InstrProfWriter.cpp + InstrProfWriter.cpp \ + SampleProf.cpp \ + SampleProfReader.cpp \ + SampleProfWriter.cpp .include "../clang.lib.mk" diff --git a/lib/clang/libllvmruntimedyld/Makefile b/lib/clang/libllvmruntimedyld/Makefile index c7ccc33d10d1..0f92c5ad7609 100644 --- a/lib/clang/libllvmruntimedyld/Makefile +++ b/lib/clang/libllvmruntimedyld/Makefile @@ -5,8 +5,7 @@ LIB= llvmruntimedyld SRCDIR= lib/ExecutionEngine/RuntimeDyld -SRCS= GDBRegistrar.cpp \ - RuntimeDyld.cpp \ +SRCS= RuntimeDyld.cpp \ RuntimeDyldChecker.cpp \ RuntimeDyldELF.cpp \ RuntimeDyldMachO.cpp diff --git a/lib/clang/libllvmscalaropts/Makefile b/lib/clang/libllvmscalaropts/Makefile index 58a7340da7e6..bb8dc96bbccf 100644 --- a/lib/clang/libllvmscalaropts/Makefile +++ b/lib/clang/libllvmscalaropts/Makefile @@ -6,6 +6,7 @@ LIB= llvmscalaropts SRCDIR= lib/Transforms/Scalar SRCS= ADCE.cpp \ + AlignmentFromAssumptions.cpp \ ConstantHoisting.cpp \ ConstantProp.cpp \ CorrelatedValuePropagation.cpp \ diff --git a/lib/clang/libllvmselectiondag/Makefile b/lib/clang/libllvmselectiondag/Makefile index 754310286dc8..b73a1c53f8cd 100644 --- a/lib/clang/libllvmselectiondag/Makefile +++ b/lib/clang/libllvmselectiondag/Makefile @@ -26,6 +26,7 @@ SRCS= DAGCombiner.cpp \ SelectionDAGDumper.cpp \ SelectionDAGISel.cpp \ SelectionDAGPrinter.cpp \ + StatepointLowering.cpp \ TargetLowering.cpp \ TargetSelectionDAGInfo.cpp diff --git a/lib/clang/libllvmsparccodegen/Makefile b/lib/clang/libllvmsparccodegen/Makefile index 36cf0a6952ad..29bbae15b82c 100644 --- a/lib/clang/libllvmsparccodegen/Makefile +++ b/lib/clang/libllvmsparccodegen/Makefile @@ -7,12 +7,10 @@ LIB= llvmsparccodegen SRCDIR= lib/Target/Sparc SRCS= DelaySlotFiller.cpp \ SparcAsmPrinter.cpp \ - SparcCodeEmitter.cpp \ SparcFrameLowering.cpp \ SparcISelDAGToDAG.cpp \ SparcISelLowering.cpp \ SparcInstrInfo.cpp \ - SparcJITInfo.cpp \ SparcMCInstLower.cpp \ SparcMachineFunctionInfo.cpp \ SparcRegisterInfo.cpp \ diff --git a/lib/clang/libllvmsupport/Makefile b/lib/clang/libllvmsupport/Makefile index 4560f2acf325..f325b15e3ec7 100644 --- a/lib/clang/libllvmsupport/Makefile +++ b/lib/clang/libllvmsupport/Makefile @@ -33,7 +33,6 @@ SRCS= APFloat.cpp \ GraphWriter.cpp \ Hashing.cpp \ Host.cpp \ - IncludeFile.cpp \ IntEqClasses.cpp \ IntervalMap.cpp \ IntrusiveRefCntPtr.cpp \ @@ -45,10 +44,12 @@ SRCS= APFloat.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 \ @@ -65,12 +66,11 @@ SRCS= APFloat.cpp \ SourceMgr.cpp \ SpecialCaseList.cpp \ Statistic.cpp \ - StreamableMemoryObject.cpp \ + StreamingMemoryObject.cpp \ StringExtras.cpp \ StringMap.cpp \ StringPool.cpp \ StringRef.cpp \ - StringRefMemoryObject.cpp \ TargetRegistry.cpp \ ThreadLocal.cpp \ Threading.cpp \ diff --git a/lib/clang/libllvmtarget/Makefile b/lib/clang/libllvmtarget/Makefile index 4722e689828c..3f9619bd4677 100644 --- a/lib/clang/libllvmtarget/Makefile +++ b/lib/clang/libllvmtarget/Makefile @@ -7,7 +7,6 @@ LIB= llvmtarget SRCDIR= lib/Target SRCS= Target.cpp \ TargetIntrinsicInfo.cpp \ - TargetJITInfo.cpp \ TargetLibraryInfo.cpp \ TargetLoweringObjectFile.cpp \ TargetMachine.cpp \ diff --git a/lib/clang/libllvmtransformutils/Makefile b/lib/clang/libllvmtransformutils/Makefile index ba1fb2a86183..a3cf212af667 100644 --- a/lib/clang/libllvmtransformutils/Makefile +++ b/lib/clang/libllvmtransformutils/Makefile @@ -39,6 +39,7 @@ SRCS= ASanStackFrameLayout.cpp \ SimplifyIndVar.cpp \ SimplifyInstructions.cpp \ SimplifyLibCalls.cpp \ + SymbolRewriter.cpp \ UnifyFunctionExitNodes.cpp \ ValueMapper.cpp diff --git a/lib/clang/libllvmx86codegen/Makefile b/lib/clang/libllvmx86codegen/Makefile index 039a07d59e2f..58278521a7a2 100644 --- a/lib/clang/libllvmx86codegen/Makefile +++ b/lib/clang/libllvmx86codegen/Makefile @@ -6,8 +6,6 @@ LIB= llvmx86codegen SRCDIR= lib/Target/X86 SRCS= X86AsmPrinter.cpp \ - X86AtomicExpandPass.cpp \ - X86CodeEmitter.cpp \ X86FastISel.cpp \ X86FixupLEAs.cpp \ X86FloatingPoint.cpp \ @@ -15,7 +13,6 @@ SRCS= X86AsmPrinter.cpp \ X86ISelDAGToDAG.cpp \ X86ISelLowering.cpp \ X86InstrInfo.cpp \ - X86JITInfo.cpp \ X86MCInstLower.cpp \ X86MachineFunctionInfo.cpp \ X86PadShortFunction.cpp \ diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc index ec35e9e04c31..a577e2d90b19 100644 --- a/lib/libclang_rt/Makefile.inc +++ b/lib/libclang_rt/Makefile.inc @@ -5,7 +5,7 @@ CRTARCH=${MACHINE_CPUARCH:C/amd64/x86_64/} CRTSRC=${.CURDIR}/../../../contrib/compiler-rt -LIBDIR=/usr/lib/clang/3.5.1/lib/freebsd +LIBDIR=/usr/lib/clang/3.6.0/lib/freebsd NO_PIC= MK_PROFILE=no diff --git a/usr.bin/clang/bugpoint/Makefile b/usr.bin/clang/bugpoint/Makefile index 0e1ed0e67a37..a8b34c36340c 100644 --- a/usr.bin/clang/bugpoint/Makefile +++ b/usr.bin/clang/bugpoint/Makefile @@ -20,11 +20,14 @@ LIBDEPS=llvmcodegen \ llvmobjcarcopts \ llvmirreader \ llvmbitwriter \ - llvmbitreader \ llvmlinker \ llvmipo \ llvmvectorize \ llvmscalaropts \ + llvmprofiledata \ + llvmobject \ + llvmmcparser \ + llvmbitreader \ llvminstcombine \ llvminstrumentation \ llvmtransformutils \ diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile index dc17d82c3650..201e494f3bbb 100644 --- a/usr.bin/clang/clang/Makefile +++ b/usr.bin/clang/clang/Makefile @@ -60,7 +60,6 @@ LIBDEPS=clangfrontendtool \ clangast \ clanglex \ clangbasic \ - llvmprofiledata \ llvmoption \ llvmobjcarcopts \ llvmlinker \ @@ -108,6 +107,7 @@ LIBDEPS=clangfrontendtool \ llvmasmprinter \ llvmcodegen \ llvmscalaropts \ + llvmprofiledata \ llvminstcombine \ llvmtransformutils \ llvmipa \ @@ -117,11 +117,12 @@ LIBDEPS=clangfrontendtool \ llvmobject \ llvmmcparser \ llvmbitreader \ - llvmcore \ + llvmmcdisassembler \ llvmx86info \ llvmx86instprinter \ llvmmc \ llvmx86utils \ + llvmcore \ llvmsupport .include "../clang.prog.mk" diff --git a/usr.bin/clang/llc/Makefile b/usr.bin/clang/llc/Makefile index 250769ca7a1d..eef537e80e47 100644 --- a/usr.bin/clang/llc/Makefile +++ b/usr.bin/clang/llc/Makefile @@ -47,6 +47,7 @@ LIBDEPS=llvmirreader \ llvmasmprinter \ llvmcodegen \ llvmscalaropts \ + llvmprofiledata \ llvminstcombine \ llvmtransformutils \ llvmipa \ @@ -56,11 +57,12 @@ LIBDEPS=llvmirreader \ llvmobject \ llvmmcparser \ llvmbitreader \ - llvmcore \ + llvmmcdisassembler \ llvmx86info \ llvmx86instprinter \ llvmmc \ llvmx86utils \ + llvmcore \ llvmsupport .include "../clang.prog.mk" diff --git a/usr.bin/clang/lli/Makefile b/usr.bin/clang/lli/Makefile index 762c578e440f..b672acfb4d98 100644 --- a/usr.bin/clang/lli/Makefile +++ b/usr.bin/clang/lli/Makefile @@ -17,26 +17,27 @@ LIBDEPS=llvmx86disassembler \ llvmx86codegen \ llvmx86desc \ llvmx86info \ + llvmmcdisassembler \ llvmx86instprinter \ llvmx86utils \ llvmselectiondag \ llvmasmprinter \ llvminterpreter \ - llvminstrumentation \ - llvmjit \ llvmcodegen \ llvmscalaropts \ + llvmprofiledata \ llvminstcombine \ + llvminstrumentation \ llvmtransformutils \ llvmipa \ llvmanalysis \ llvmmcjit \ llvmtarget \ llvmruntimedyld \ + llvmexecutionengine \ llvmobject \ llvmmcparser \ llvmbitreader \ - llvmexecutionengine \ llvmmc \ llvmcore \ llvmsupport diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile index a04ab1048b1e..44586dc76da9 100644 --- a/usr.bin/clang/llvm-ar/Makefile +++ b/usr.bin/clang/llvm-ar/Makefile @@ -45,6 +45,7 @@ LIBDEPS=llvmaarch64disassembler \ llvmasmprinter \ llvmcodegen \ llvmscalaropts \ + llvmprofiledata \ llvminstcombine \ llvmtransformutils \ llvmipa \ @@ -54,11 +55,12 @@ LIBDEPS=llvmaarch64disassembler \ llvmobject \ llvmmcparser \ llvmbitreader \ - llvmcore \ + llvmmcdisassembler \ llvmx86info \ llvmx86instprinter \ llvmmc \ llvmx86utils \ + llvmcore \ llvmsupport .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-extract/Makefile b/usr.bin/clang/llvm-extract/Makefile index ee686c40be31..8456a0ff256c 100644 --- a/usr.bin/clang/llvm-extract/Makefile +++ b/usr.bin/clang/llvm-extract/Makefile @@ -10,10 +10,13 @@ SRCS= llvm-extract.cpp LIBDEPS=llvmirreader \ llvmasmparser \ llvmbitwriter \ - llvmbitreader \ llvmipo \ llvmvectorize \ llvmscalaropts \ + llvmprofiledata \ + llvmobject \ + llvmmcparser \ + llvmbitreader \ llvminstcombine \ llvmtransformutils \ llvmipa \ diff --git a/usr.bin/clang/llvm-mc/Makefile b/usr.bin/clang/llvm-mc/Makefile index c9c667cdf001..6e8599326544 100644 --- a/usr.bin/clang/llvm-mc/Makefile +++ b/usr.bin/clang/llvm-mc/Makefile @@ -9,8 +9,7 @@ SRCDIR= tools/llvm-mc SRCS= llvm-mc.cpp \ Disassembler.cpp -LIBDEPS=llvmmcdisassembler \ - llvmaarch64disassembler \ +LIBDEPS=llvmaarch64disassembler \ llvmaarch64codegen \ llvmaarch64asmparser \ llvmaarch64desc \ @@ -48,6 +47,7 @@ LIBDEPS=llvmmcdisassembler \ llvmasmprinter \ llvmcodegen \ llvmscalaropts \ + llvmprofiledata \ llvminstcombine \ llvmtransformutils \ llvmipa \ @@ -57,11 +57,12 @@ LIBDEPS=llvmmcdisassembler \ llvmobject \ llvmmcparser \ llvmbitreader \ - llvmcore \ + llvmmcdisassembler \ llvmx86info \ llvmx86instprinter \ llvmmc \ llvmx86utils \ + llvmcore \ llvmsupport .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile index 753cfdc6306a..79afa5af2541 100644 --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -45,6 +45,7 @@ LIBDEPS=llvmaarch64disassembler \ llvmasmprinter \ llvmcodegen \ llvmscalaropts \ + llvmprofiledata \ llvminstcombine \ llvmtransformutils \ llvmipa \ @@ -54,11 +55,12 @@ LIBDEPS=llvmaarch64disassembler \ llvmobject \ llvmmcparser \ llvmbitreader \ - llvmcore \ + llvmmcdisassembler \ llvmx86info \ llvmx86instprinter \ llvmmc \ llvmx86utils \ + llvmcore \ llvmsupport .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index bfd195b026a5..ccb7ed9c7938 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -11,9 +11,7 @@ SRCS= llvm-objdump.cpp \ ELFDump.cpp \ MachODump.cpp -LIBDEPS=llvmmcdisassembler \ - llvmmcanalysis \ - llvmdebuginfo \ +LIBDEPS=llvmdebuginfo \ llvmaarch64disassembler \ llvmaarch64codegen \ llvmaarch64asmparser \ @@ -52,6 +50,7 @@ LIBDEPS=llvmmcdisassembler \ llvmasmprinter \ llvmcodegen \ llvmscalaropts \ + llvmprofiledata \ llvminstcombine \ llvmtransformutils \ llvmipa \ @@ -61,11 +60,12 @@ LIBDEPS=llvmmcdisassembler \ llvmobject \ llvmmcparser \ llvmbitreader \ - llvmcore \ + llvmmcdisassembler \ llvmx86info \ llvmx86instprinter \ llvmmc \ llvmx86utils \ + llvmcore \ llvmsupport .include "../clang.prog.mk" diff --git a/usr.bin/clang/llvm-rtdyld/Makefile b/usr.bin/clang/llvm-rtdyld/Makefile index 26c8d54deebc..df74a5b1668c 100644 --- a/usr.bin/clang/llvm-rtdyld/Makefile +++ b/usr.bin/clang/llvm-rtdyld/Makefile @@ -9,7 +9,7 @@ SRCDIR= tools/llvm-rtdyld SRCS= llvm-rtdyld.cpp LIBDEPS=llvmdebuginfo \ - llvmjit \ + llvmmcjit \ llvmexecutionengine \ llvmruntimedyld \ llvmaarch64disassembler \ @@ -50,6 +50,7 @@ LIBDEPS=llvmdebuginfo \ llvmasmprinter \ llvmcodegen \ llvmscalaropts \ + llvmprofiledata \ llvminstcombine \ llvmtransformutils \ llvmipa \ @@ -59,11 +60,12 @@ LIBDEPS=llvmdebuginfo \ llvmobject \ llvmmcparser \ llvmbitreader \ - llvmcore \ + llvmmcdisassembler \ llvmx86info \ llvmx86instprinter \ llvmmc \ llvmx86utils \ + llvmcore \ llvmsupport .include "../clang.prog.mk" diff --git a/usr.bin/clang/opt/Makefile b/usr.bin/clang/opt/Makefile index 52cdfda47319..075a7bd8b140 100644 --- a/usr.bin/clang/opt/Makefile +++ b/usr.bin/clang/opt/Makefile @@ -53,8 +53,7 @@ LIBDEPS=llvmaarch64disassembler \ llvmasmprinter \ llvmcodegen \ llvmx86desc \ - llvmobject \ - llvmmcparser \ + llvmmcdisassembler \ llvmx86info \ llvmx86instprinter \ llvmx86utils \ @@ -62,6 +61,9 @@ LIBDEPS=llvmaarch64disassembler \ llvmvectorize \ llvmobjcarcopts \ llvmscalaropts \ + llvmprofiledata \ + llvmobject \ + llvmmcparser \ llvminstcombine \ llvminstrumentation \ llvmtransformutils \