Date: Thu, 25 Sep 2014 19:10:19 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369283 - in head: devel/llvm-devel devel/llvm-devel/files lang/clang-devel lang/clang-devel/files Message-ID: <201409251910.s8PJAJcd040128@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Thu Sep 25 19:10:19 2014 New Revision: 369283 URL: http://svnweb.freebsd.org/changeset/ports/369283 QAT: https://qat.redports.org/buildarchive/r369283/ Log: Upgrade to r218451. USES=python Give llvm a chance to build on arm* and powerpc64 systems. [0] PR: 191996 [0] Submitted by: direct727@gmail.com [0] Sponsored by: DARPA, AFRL Modified: head/devel/llvm-devel/Makefile head/devel/llvm-devel/Makefile.svn_rev head/devel/llvm-devel/distinfo head/devel/llvm-devel/files/patch-utils_llvm-build_llvmbuild_main.py head/devel/llvm-devel/pkg-plist head/lang/clang-devel/Makefile head/lang/clang-devel/distinfo head/lang/clang-devel/files/patch-tools_clang_include_clang_Analysis_Analyses_FormatString.h head/lang/clang-devel/files/patch-tools_clang_lib_Analysis_FormatString.cpp head/lang/clang-devel/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp head/lang/clang-devel/pkg-plist Modified: head/devel/llvm-devel/Makefile ============================================================================== --- head/devel/llvm-devel/Makefile Thu Sep 25 18:35:58 2014 (r369282) +++ head/devel/llvm-devel/Makefile Thu Sep 25 19:10:19 2014 (r369283) @@ -3,7 +3,6 @@ PORTNAME= llvm DISTVERSION= 3.6.r${SVN_REV} -PORTREVISION= 1 CATEGORIES= devel lang MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= brooks @@ -105,10 +104,10 @@ PORTDATA+= cmake .if ${PORT_OPTIONS:MLIT} MAN1SRCS+= lit.1 -USE_PYTHON= yes +USES+= python LIT_COMMANDS= lit llvm-lit FileCheck .else -USE_PYTHON_BUILD= yes +USES+= python:build .endif .if ${PORT_OPTIONS:MMANPAGES} Modified: head/devel/llvm-devel/Makefile.svn_rev ============================================================================== --- head/devel/llvm-devel/Makefile.svn_rev Thu Sep 25 18:35:58 2014 (r369282) +++ head/devel/llvm-devel/Makefile.svn_rev Thu Sep 25 19:10:19 2014 (r369283) @@ -1 +1 @@ -SVN_REV= 216160 +SVN_REV= 218451 Modified: head/devel/llvm-devel/distinfo ============================================================================== --- head/devel/llvm-devel/distinfo Thu Sep 25 18:35:58 2014 (r369282) +++ head/devel/llvm-devel/distinfo Thu Sep 25 19:10:19 2014 (r369283) @@ -1,2 +1,2 @@ -SHA256 (llvm-3.6.r216160.tar.bz2) = ee6707ff2a62edb0cbf70421330054c6323fdb257320eb7e9e3b420f4cad0534 -SIZE (llvm-3.6.r216160.tar.bz2) = 13714057 +SHA256 (llvm-3.6.r218451.tar.bz2) = 6a59280d79529333e8ae86eeb48f389a9bbb630e590bde62f7e6491e5d30eda1 +SIZE (llvm-3.6.r218451.tar.bz2) = 13830528 Modified: head/devel/llvm-devel/files/patch-utils_llvm-build_llvmbuild_main.py ============================================================================== --- head/devel/llvm-devel/files/patch-utils_llvm-build_llvmbuild_main.py Thu Sep 25 18:35:58 2014 (r369282) +++ head/devel/llvm-devel/files/patch-utils_llvm-build_llvmbuild_main.py Thu Sep 25 19:10:19 2014 (r369283) @@ -3,16 +3,20 @@ $FreeBSD$ --- utils/llvm-build/llvmbuild/main.py.orig +++ utils/llvm-build/llvmbuild/main.py -@@ -633,7 +633,13 @@ +@@ -660,7 +660,17 @@ # We handle a few special cases of target names here for historical # reasons, as these are the names configure currently comes up with. - native_target_name = { 'x86' : 'X86', + native_target_name = { 'amd64' : 'X86', + 'arm' : 'ARM', ++ 'armeb' : 'ARM', ++ 'armv6' : 'ARM', ++ 'armv6hf' : 'ARM', + 'i386' : 'X86', + 'mips' : 'Mips', + 'powerpc' : 'PowerPC', ++ 'powerpc64' : 'PowerPC', + 'sparc64' : 'Sparc', + 'x86' : 'X86', 'x86_64' : 'X86', Modified: head/devel/llvm-devel/pkg-plist ============================================================================== --- head/devel/llvm-devel/pkg-plist Thu Sep 25 18:35:58 2014 (r369282) +++ head/devel/llvm-devel/pkg-plist Thu Sep 25 19:10:19 2014 (r369283) @@ -145,6 +145,7 @@ llvm-devel/include/llvm/ADT/iterator.h llvm-devel/include/llvm/ADT/iterator_range.h llvm-devel/include/llvm/Analysis/AliasAnalysis.h llvm-devel/include/llvm/Analysis/AliasSetTracker.h +llvm-devel/include/llvm/Analysis/AssumptionTracker.h llvm-devel/include/llvm/Analysis/BlockFrequencyInfo.h llvm-devel/include/llvm/Analysis/BlockFrequencyInfoImpl.h llvm-devel/include/llvm/Analysis/BranchProbabilityInfo.h @@ -164,6 +165,7 @@ llvm-devel/include/llvm/Analysis/DomPrin llvm-devel/include/llvm/Analysis/DominanceFrontier.h llvm-devel/include/llvm/Analysis/DominanceFrontierImpl.h llvm-devel/include/llvm/Analysis/FindUsedTypes.h +llvm-devel/include/llvm/Analysis/FunctionTargetTransformInfo.h llvm-devel/include/llvm/Analysis/IVUsers.h llvm-devel/include/llvm/Analysis/InlineCost.h llvm-devel/include/llvm/Analysis/InstructionSimplify.h @@ -224,7 +226,6 @@ llvm-devel/include/llvm/CodeGen/GCStrate llvm-devel/include/llvm/CodeGen/GCs.h llvm-devel/include/llvm/CodeGen/ISDOpcodes.h llvm-devel/include/llvm/CodeGen/IntrinsicLowering.h -llvm-devel/include/llvm/CodeGen/JITCodeEmitter.h llvm-devel/include/llvm/CodeGen/JumpInstrTables.h llvm-devel/include/llvm/CodeGen/LatencyPriorityQueue.h llvm-devel/include/llvm/CodeGen/LexicalScopes.h @@ -242,8 +243,6 @@ llvm-devel/include/llvm/CodeGen/MachORel llvm-devel/include/llvm/CodeGen/MachineBasicBlock.h llvm-devel/include/llvm/CodeGen/MachineBlockFrequencyInfo.h llvm-devel/include/llvm/CodeGen/MachineBranchProbabilityInfo.h -llvm-devel/include/llvm/CodeGen/MachineCodeEmitter.h -llvm-devel/include/llvm/CodeGen/MachineCodeInfo.h llvm-devel/include/llvm/CodeGen/MachineCombinerPattern.h llvm-devel/include/llvm/CodeGen/MachineConstantPool.h llvm-devel/include/llvm/CodeGen/MachineDominanceFrontier.h @@ -265,7 +264,6 @@ llvm-devel/include/llvm/CodeGen/MachineP llvm-devel/include/llvm/CodeGen/MachinePostDominators.h llvm-devel/include/llvm/CodeGen/MachineRegionInfo.h llvm-devel/include/llvm/CodeGen/MachineRegisterInfo.h -llvm-devel/include/llvm/CodeGen/MachineRelocation.h llvm-devel/include/llvm/CodeGen/MachineSSAUpdater.h llvm-devel/include/llvm/CodeGen/MachineScheduler.h llvm-devel/include/llvm/CodeGen/MachineTraceMetrics.h @@ -314,9 +312,7 @@ llvm-devel/include/llvm/DebugInfo/DWARFF llvm-devel/include/llvm/ExecutionEngine/ExecutionEngine.h llvm-devel/include/llvm/ExecutionEngine/GenericValue.h llvm-devel/include/llvm/ExecutionEngine/Interpreter.h -llvm-devel/include/llvm/ExecutionEngine/JIT.h llvm-devel/include/llvm/ExecutionEngine/JITEventListener.h -llvm-devel/include/llvm/ExecutionEngine/JITMemoryManager.h llvm-devel/include/llvm/ExecutionEngine/MCJIT.h llvm-devel/include/llvm/ExecutionEngine/OProfileWrapper.h llvm-devel/include/llvm/ExecutionEngine/ObjectBuffer.h @@ -412,11 +408,6 @@ llvm-devel/include/llvm/LinkAllIR.h llvm-devel/include/llvm/LinkAllPasses.h llvm-devel/include/llvm/Linker/Linker.h llvm-devel/include/llvm/MC/ConstantPools.h -llvm-devel/include/llvm/MC/MCAnalysis/MCAtom.h -llvm-devel/include/llvm/MC/MCAnalysis/MCFunction.h -llvm-devel/include/llvm/MC/MCAnalysis/MCModule.h -llvm-devel/include/llvm/MC/MCAnalysis/MCModuleYAML.h -llvm-devel/include/llvm/MC/MCAnalysis/MCObjectSymbolizer.h llvm-devel/include/llvm/MC/MCAsmBackend.h llvm-devel/include/llvm/MC/MCAsmInfo.h llvm-devel/include/llvm/MC/MCAsmInfoCOFF.h @@ -450,7 +441,6 @@ llvm-devel/include/llvm/MC/MCLabel.h llvm-devel/include/llvm/MC/MCLinkerOptimizationHint.h llvm-devel/include/llvm/MC/MCMachOSymbolFlags.h llvm-devel/include/llvm/MC/MCMachObjectWriter.h -llvm-devel/include/llvm/MC/MCObjectDisassembler.h llvm-devel/include/llvm/MC/MCObjectFileInfo.h llvm-devel/include/llvm/MC/MCObjectStreamer.h llvm-devel/include/llvm/MC/MCObjectWriter.h @@ -517,6 +507,7 @@ llvm-devel/include/llvm/ProfileData/Cove llvm-devel/include/llvm/ProfileData/InstrProf.h llvm-devel/include/llvm/ProfileData/InstrProfReader.h llvm-devel/include/llvm/ProfileData/InstrProfWriter.h +llvm-devel/include/llvm/ProfileData/SampleProfReader.h llvm-devel/include/llvm/Support/AIXDataTypesFix.h llvm-devel/include/llvm/Support/ARMBuildAttributes.h llvm-devel/include/llvm/Support/ARMEHABI.h @@ -611,6 +602,7 @@ llvm-devel/include/llvm/Support/Timer.h llvm-devel/include/llvm/Support/ToolOutputFile.h llvm-devel/include/llvm/Support/Unicode.h llvm-devel/include/llvm/Support/UnicodeCharRanges.h +llvm-devel/include/llvm/Support/UniqueLock.h llvm-devel/include/llvm/Support/Valgrind.h llvm-devel/include/llvm/Support/Watchdog.h llvm-devel/include/llvm/Support/Win64EH.h @@ -636,7 +628,6 @@ llvm-devel/include/llvm/Target/TargetFra llvm-devel/include/llvm/Target/TargetInstrInfo.h llvm-devel/include/llvm/Target/TargetIntrinsicInfo.h llvm-devel/include/llvm/Target/TargetItinerary.td -llvm-devel/include/llvm/Target/TargetJITInfo.h llvm-devel/include/llvm/Target/TargetLibraryInfo.h llvm-devel/include/llvm/Target/TargetLowering.h llvm-devel/include/llvm/Target/TargetLoweringObjectFile.h @@ -714,12 +705,10 @@ llvm-devel/lib/libLLVMIRReader.a llvm-devel/lib/libLLVMInstCombine.a llvm-devel/lib/libLLVMInstrumentation.a llvm-devel/lib/libLLVMInterpreter.a -llvm-devel/lib/libLLVMJIT.a llvm-devel/lib/libLLVMLTO.a llvm-devel/lib/libLLVMLineEditor.a llvm-devel/lib/libLLVMLinker.a llvm-devel/lib/libLLVMMC.a -llvm-devel/lib/libLLVMMCAnalysis.a llvm-devel/lib/libLLVMMCDisassembler.a llvm-devel/lib/libLLVMMCJIT.a llvm-devel/lib/libLLVMMCParser.a @@ -791,6 +780,7 @@ llvm-devel/share/llvm/cmake/AddLLVM.cmak llvm-devel/share/llvm/cmake/AddLLVMDefinitions.cmake llvm-devel/share/llvm/cmake/AddSphinxTarget.cmake llvm-devel/share/llvm/cmake/ChooseMSVCCRT.cmake +llvm-devel/share/llvm/cmake/CrossCompile.cmake llvm-devel/share/llvm/cmake/FindSphinx.cmake llvm-devel/share/llvm/cmake/GetSVN.cmake llvm-devel/share/llvm/cmake/HandleLLVMOptions.cmake @@ -1082,7 +1072,6 @@ llvm-devel/share/llvm/cmake/TableGen.cma @dirrm llvm-devel/include/llvm/Option @dirrm llvm-devel/include/llvm/Object @dirrm llvm-devel/include/llvm/MC/MCParser -@dirrm llvm-devel/include/llvm/MC/MCAnalysis @dirrm llvm-devel/include/llvm/MC @dirrm llvm-devel/include/llvm/Linker @dirrm llvm-devel/include/llvm/LineEditor Modified: head/lang/clang-devel/Makefile ============================================================================== --- head/lang/clang-devel/Makefile Thu Sep 25 18:35:58 2014 (r369282) +++ head/lang/clang-devel/Makefile Thu Sep 25 19:10:19 2014 (r369283) @@ -3,7 +3,6 @@ PORTNAME= clang PORTVERSION= 3.6.r${SVN_REV} -PORTREVISION= 1 CATEGORIES= lang devel MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= brooks @@ -34,8 +33,7 @@ DOCSDIR= ${PREFIX}/share/doc/${PORTNAME} GNU_CONFIGURE= yes GNU_CONFIGURE_PREFIX= ${LLVM_PREFIX} -USES= compiler:c++11-lib gmake perl5 tar:bzip2 -USE_PYTHON= yes +USES= compiler:c++11-lib gmake perl5 python tar:bzip2 MAKE_ARGS= CLANG_TBLGEN=${WRKSRC}/${RELTYPE}/bin/clang-tblgen \ LLVMIncDir=${LLVM_PREFIX}/include \ Modified: head/lang/clang-devel/distinfo ============================================================================== --- head/lang/clang-devel/distinfo Thu Sep 25 18:35:58 2014 (r369282) +++ head/lang/clang-devel/distinfo Thu Sep 25 19:10:19 2014 (r369283) @@ -1,4 +1,4 @@ -SHA256 (clang-3.6.r216160.tar.bz2) = 1d383becbde1aea79528f63ce13587c4c7f9d021f0a531574f0eaaa816db76d1 -SIZE (clang-3.6.r216160.tar.bz2) = 9165471 -SHA256 (llvm-3.6.r216160.tar.bz2) = ee6707ff2a62edb0cbf70421330054c6323fdb257320eb7e9e3b420f4cad0534 -SIZE (llvm-3.6.r216160.tar.bz2) = 13714057 +SHA256 (clang-3.6.r218451.tar.bz2) = 9bed7bb78ded4cd5724471ed7c267343c477d99482d73c1f2cc250209edbb39b +SIZE (clang-3.6.r218451.tar.bz2) = 9253945 +SHA256 (llvm-3.6.r218451.tar.bz2) = 6a59280d79529333e8ae86eeb48f389a9bbb630e590bde62f7e6491e5d30eda1 +SIZE (llvm-3.6.r218451.tar.bz2) = 13830528 Modified: head/lang/clang-devel/files/patch-tools_clang_include_clang_Analysis_Analyses_FormatString.h ============================================================================== --- head/lang/clang-devel/files/patch-tools_clang_include_clang_Analysis_Analyses_FormatString.h Thu Sep 25 18:35:58 2014 (r369282) +++ head/lang/clang-devel/files/patch-tools_clang_include_clang_Analysis_Analyses_FormatString.h Thu Sep 25 19:10:19 2014 (r369283) @@ -3,7 +3,7 @@ $FreeBSD$ --- tools/clang/include/clang/Analysis/Analyses/FormatString.h.orig +++ tools/clang/include/clang/Analysis/Analyses/FormatString.h -@@ -115,9 +115,10 @@ +@@ -122,9 +122,10 @@ enum Kind { InvalidSpecifier = 0, // C99 conversion specifiers. @@ -15,12 +15,3 @@ $FreeBSD$ iArg, IntArgBeg = dArg, IntArgEnd = iArg, -@@ -147,7 +148,7 @@ - SArg, - - // ** Printf-specific ** -- -+ - // Objective-C specific specifiers. - ObjCObjArg, // '@' - ObjCBeg = ObjCObjArg, ObjCEnd = ObjCObjArg, Modified: head/lang/clang-devel/files/patch-tools_clang_lib_Analysis_FormatString.cpp ============================================================================== --- head/lang/clang-devel/files/patch-tools_clang_lib_Analysis_FormatString.cpp Thu Sep 25 18:35:58 2014 (r369282) +++ head/lang/clang-devel/files/patch-tools_clang_lib_Analysis_FormatString.cpp Thu Sep 25 19:10:19 2014 (r369283) @@ -3,20 +3,20 @@ $FreeBSD$ --- tools/clang/lib/Analysis/FormatString.cpp.orig +++ tools/clang/lib/Analysis/FormatString.cpp -@@ -550,6 +550,9 @@ +@@ -557,6 +557,9 @@ - // GlibC specific specifiers. - case PrintErrno: return "m"; + // MS specific specifiers. + case ZArg: return "Z"; + + // FreeBSD specfic specifiers. + case bArg: return "b"; } return nullptr; } -@@ -778,6 +781,7 @@ - case ConversionSpecifier::DArg: +@@ -812,6 +815,7 @@ case ConversionSpecifier::OArg: case ConversionSpecifier::UArg: + case ConversionSpecifier::ZArg: + case ConversionSpecifier::bArg: return false; } Modified: head/lang/clang-devel/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp ============================================================================== --- head/lang/clang-devel/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp Thu Sep 25 18:35:58 2014 (r369282) +++ head/lang/clang-devel/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp Thu Sep 25 19:10:19 2014 (r369283) @@ -3,24 +3,19 @@ $FreeBSD$ --- tools/clang/lib/Analysis/PrintfFormatString.cpp.orig +++ tools/clang/lib/Analysis/PrintfFormatString.cpp -@@ -198,9 +198,10 @@ - case '@': k = ConversionSpecifier::ObjCObjArg; break; - // Glibc specific. +@@ -208,7 +208,7 @@ case 'm': k = ConversionSpecifier::PrintErrno; break; -- // Apple-specific -+ -+ // Apple-specific (and one FreeBSD) + // Apple-specific. case 'D': - if (Target.getTriple().isOSDarwin()) + if (Target.getTriple().isOSDarwin() || Target.getTriple().isOSFreeBSD()) k = ConversionSpecifier::DArg; break; case 'O': -@@ -211,11 +212,29 @@ +@@ -219,6 +219,19 @@ if (Target.getTriple().isOSDarwin()) k = ConversionSpecifier::UArg; break; -+ + // FreeBSD-specific + case 'b': + if (Target.getTriple().isOSFreeBSD()) @@ -34,8 +29,10 @@ $FreeBSD$ + if (Target.getTriple().isOSFreeBSD()) + k = ConversionSpecifier::iArg; + break; - } - PrintfConversionSpecifier CS(conversionPosition, k); + // MS specific. + case 'Z': + if (Target.getTriple().isOSMSVCRT()) +@@ -228,6 +241,10 @@ FS.setConversionSpecifier(CS); if (CS.consumesDataArgument() && !FS.usesPositionalArg()) FS.setArgIndex(argIndex++); Modified: head/lang/clang-devel/pkg-plist ============================================================================== --- head/lang/clang-devel/pkg-plist Thu Sep 25 18:35:58 2014 (r369282) +++ head/lang/clang-devel/pkg-plist Thu Sep 25 19:10:19 2014 (r369283) @@ -134,7 +134,6 @@ llvm-devel/include/clang/ASTMatchers/Dyn llvm-devel/include/clang/ASTMatchers/Dynamic/VariantValue.h llvm-devel/include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h llvm-devel/include/clang/Analysis/Analyses/Consumed.h -llvm-devel/include/clang/Analysis/Analyses/DataflowWorklist.h llvm-devel/include/clang/Analysis/Analyses/Dominators.h llvm-devel/include/clang/Analysis/Analyses/FormatString.h llvm-devel/include/clang/Analysis/Analyses/LiveVariables.h @@ -154,6 +153,7 @@ llvm-devel/include/clang/Analysis/Analys llvm-devel/include/clang/Analysis/CFG.h llvm-devel/include/clang/Analysis/CFGStmtMap.h llvm-devel/include/clang/Analysis/CallGraph.h +llvm-devel/include/clang/Analysis/CodeInjector.h llvm-devel/include/clang/Analysis/DomainSpecific/CocoaConventions.h llvm-devel/include/clang/Analysis/DomainSpecific/ObjCNoReturn.h llvm-devel/include/clang/Analysis/FlowSensitive/DataflowValues.h @@ -171,6 +171,7 @@ llvm-devel/include/clang/Basic/Builtins. llvm-devel/include/clang/Basic/BuiltinsAArch64.def llvm-devel/include/clang/Basic/BuiltinsARM.def llvm-devel/include/clang/Basic/BuiltinsHexagon.def +llvm-devel/include/clang/Basic/BuiltinsLe64.def llvm-devel/include/clang/Basic/BuiltinsMips.def llvm-devel/include/clang/Basic/BuiltinsNEON.def llvm-devel/include/clang/Basic/BuiltinsNVPTX.def @@ -432,6 +433,7 @@ llvm-devel/include/clang/StaticAnalyzer/ llvm-devel/include/clang/StaticAnalyzer/Frontend/AnalysisConsumer.h llvm-devel/include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h llvm-devel/include/clang/StaticAnalyzer/Frontend/FrontendActions.h +llvm-devel/include/clang/StaticAnalyzer/Frontend/ModelConsumer.h llvm-devel/include/clang/Tooling/ArgumentsAdjusters.h llvm-devel/include/clang/Tooling/CommonOptionsParser.h llvm-devel/include/clang/Tooling/CompilationDatabase.h @@ -444,6 +446,7 @@ llvm-devel/include/clang/Tooling/Replace llvm-devel/include/clang/Tooling/Tooling.h llvm-devel/lib/clang/3.6.0/include/__wmmintrin_aes.h llvm-devel/lib/clang/3.6.0/include/__wmmintrin_pclmul.h +llvm-devel/lib/clang/3.6.0/include/adxintrin.h llvm-devel/lib/clang/3.6.0/include/altivec.h llvm-devel/lib/clang/3.6.0/include/ammintrin.h llvm-devel/lib/clang/3.6.0/include/arm_neon.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409251910.s8PJAJcd040128>