Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Jan 2015 23:47:29 +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: r377636 - in head: devel devel/llvm36 lang lang/clang36 lang/clang36/files
Message-ID:  <201501212347.t0LNlTZN007100@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brooks
Date: Wed Jan 21 23:47:28 2015
New Revision: 377636
URL: https://svnweb.freebsd.org/changeset/ports/377636
QAT: https://qat.redports.org/buildarchive/r377636/

Log:
  Add ports of llvm/clang 3.6.0rc1.

Added:
  head/devel/llvm36/
     - copied from r377631, head/devel/llvm35/
  head/lang/clang36/
     - copied from r377631, head/lang/clang35/
Modified:
  head/devel/Makefile
  head/devel/llvm36/Makefile
  head/devel/llvm36/distinfo
  head/devel/llvm36/pkg-plist
  head/lang/Makefile
  head/lang/clang36/Makefile
  head/lang/clang36/distinfo
  head/lang/clang36/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp
  head/lang/clang36/pkg-plist

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Wed Jan 21 23:38:27 2015	(r377635)
+++ head/devel/Makefile	Wed Jan 21 23:47:28 2015	(r377636)
@@ -1230,6 +1230,7 @@
     SUBDIR += llvm33
     SUBDIR += llvm34
     SUBDIR += llvm35
+    SUBDIR += llvm36
     SUBDIR += lm4tools
     SUBDIR += lmdbg
     SUBDIR += lndir

Modified: head/devel/llvm36/Makefile
==============================================================================
--- head/devel/llvm35/Makefile	Wed Jan 21 22:58:16 2015	(r377631)
+++ head/devel/llvm36/Makefile	Wed Jan 21 23:47:28 2015	(r377636)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	llvm
-DISTVERSION=	3.5.1
+DISTVERSION=	3.6.0rc1
 CATEGORIES=	devel lang
-MASTER_SITES=	http://llvm.org/releases/3.5.1/
+MASTER_SITES=	http://llvm.org/pre-releases/3.6.0/rc1/
 DISTNAME=	${PORTNAME}-${DISTVERSION}.src
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 
@@ -11,6 +11,7 @@ MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Low Level Virtual Machine
 
 LLVM_SUFFIX=	${PORTVERSION:C/([0-9]\.[0-9]).*/\1/:S/.//g:C/r.//}
+LLVM_RELEASE=	${PORTVERSION:C/([0-9]\.[0-9].[0-9]).*/\1/}
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
@@ -29,7 +30,7 @@ SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" L
 # Suggested tweaks from http://llvm.org/docs/Packaging.html
 CONFIGURE_ARGS+=	--enable-shared
 MAKE_ARGS+=		REQUIRES_RTTI=1
-LIBNAME=		libLLVM-3.5.so
+LIBNAME=		libLLVM-${LLVM_RELEASE:C/([0-9]\.[0-9]).*/\1/}.so
 
 CONFIGURE_ARGS+=	--enable-bindings=none
 CONFIGURE_ARGS+=	--enable-optimized
@@ -45,11 +46,13 @@ OPTIONS_DEFAULT=	LIT MANPAGES
 OPTIONS_SUB=	yes
 
 PLIST_SUB+=		LLVM_SUFFIX=${LLVM_SUFFIX} \
-			PORTVERSION=${PORTVERSION}
+			LLVM_RELEASE=${LLVM_RELEASE}
 
 COMMANDS=	bugpoint \
+		count \
 		llc \
 		lli \
+		lli-child-target \
 		llvm-ar \
 		llvm-as \
 		llvm-bcanalyzer \
@@ -57,6 +60,7 @@ COMMANDS=	bugpoint \
 		llvm-cov \
 		llvm-diff \
 		llvm-dis \
+		llvm-dsymutil \
 		llvm-dwarfdump \
 		llvm-extract \
 		llvm-link \
@@ -64,6 +68,7 @@ COMMANDS=	bugpoint \
 		llvm-mcmarkup \
 		llvm-nm \
 		llvm-objdump \
+		llvm-profdata \
 		llvm-ranlib \
 		llvm-readobj \
 		llvm-rtdyld \
@@ -71,8 +76,13 @@ COMMANDS=	bugpoint \
 		llvm-stress \
 		llvm-symbolizer \
 		llvm-tblgen \
+		llvm-vtabledump \
 		macho-dump \
-		opt
+		not \
+		obj2yaml \
+		opt \
+		verify-uselistorder \
+		yaml2obj
 FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
 
 STRIP_LIBS=	BugpointPasses.so \
@@ -155,7 +165,7 @@ CONFIGURE_ARGS+=	--with-optimize-option=
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|${PORTVERSION}svn|${PORTVERSION}|g' \
+	${REINPLACE_CMD} -e 's|${LLVM_RELEASE}svn|${LLVM_RELEASE}|g' \
 	    ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|\(PROJ_docsdir.*:=\).*$$|\1${DOCSDIR}|g' \
 	    ${WRKSRC}/Makefile.config.in
@@ -257,7 +267,7 @@ build-plist:
 	    ${GREP} -v 'lit$$' | ${GREP} -v 'FileCheck$$' | \
 	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
 	    -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' \
-	    -e 's|${PORTVERSION}|%%PORTVERSION%%|' | \
+	    -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' | \
 	    ${SORT} >> ${PLIST}
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \
 	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \

Modified: head/devel/llvm36/distinfo
==============================================================================
--- head/devel/llvm35/distinfo	Wed Jan 21 22:58:16 2015	(r377631)
+++ head/devel/llvm36/distinfo	Wed Jan 21 23:47:28 2015	(r377636)
@@ -1,2 +1,2 @@
-SHA256 (llvm-3.5.1.src.tar.xz) = bf3275d2d7890015c8d8f5e6f4f882f8cf3bf51967297ebe74111d6d8b53be15
-SIZE (llvm-3.5.1.src.tar.xz) = 11869356
+SHA256 (llvm-3.6.0rc1.src.tar.xz) = a39f4dad833852694fca482b01ec6c8c92731d59889e4dc50b0471e6af2908c2
+SIZE (llvm-3.6.0rc1.src.tar.xz) = 12737544

Modified: head/devel/llvm36/pkg-plist
==============================================================================
--- head/devel/llvm35/pkg-plist	Wed Jan 21 22:58:16 2015	(r377631)
+++ head/devel/llvm36/pkg-plist	Wed Jan 21 23:47:28 2015	(r377636)
@@ -1,6 +1,8 @@
 bin/bugpoint%%LLVM_SUFFIX%%
+bin/count%%LLVM_SUFFIX%%
 bin/llc%%LLVM_SUFFIX%%
 bin/lli%%LLVM_SUFFIX%%
+bin/lli-child-target%%LLVM_SUFFIX%%
 bin/llvm-ar%%LLVM_SUFFIX%%
 bin/llvm-as%%LLVM_SUFFIX%%
 bin/llvm-bcanalyzer%%LLVM_SUFFIX%%
@@ -8,6 +10,7 @@ bin/llvm-config%%LLVM_SUFFIX%%
 bin/llvm-cov%%LLVM_SUFFIX%%
 bin/llvm-diff%%LLVM_SUFFIX%%
 bin/llvm-dis%%LLVM_SUFFIX%%
+bin/llvm-dsymutil%%LLVM_SUFFIX%%
 bin/llvm-dwarfdump%%LLVM_SUFFIX%%
 bin/llvm-extract%%LLVM_SUFFIX%%
 bin/llvm-link%%LLVM_SUFFIX%%
@@ -15,6 +18,7 @@ bin/llvm-mc%%LLVM_SUFFIX%%
 bin/llvm-mcmarkup%%LLVM_SUFFIX%%
 bin/llvm-nm%%LLVM_SUFFIX%%
 bin/llvm-objdump%%LLVM_SUFFIX%%
+bin/llvm-profdata%%LLVM_SUFFIX%%
 bin/llvm-ranlib%%LLVM_SUFFIX%%
 bin/llvm-readobj%%LLVM_SUFFIX%%
 bin/llvm-rtdyld%%LLVM_SUFFIX%%
@@ -22,8 +26,13 @@ bin/llvm-size%%LLVM_SUFFIX%%
 bin/llvm-stress%%LLVM_SUFFIX%%
 bin/llvm-symbolizer%%LLVM_SUFFIX%%
 bin/llvm-tblgen%%LLVM_SUFFIX%%
+bin/llvm-vtabledump%%LLVM_SUFFIX%%
 bin/macho-dump%%LLVM_SUFFIX%%
+bin/not%%LLVM_SUFFIX%%
+bin/obj2yaml%%LLVM_SUFFIX%%
 bin/opt%%LLVM_SUFFIX%%
+bin/verify-uselistorder%%LLVM_SUFFIX%%
+bin/yaml2obj%%LLVM_SUFFIX%%
 %%LIT%%bin/lit%%LLVM_SUFFIX%%
 %%LIT%%llvm%%LLVM_SUFFIX%%/bin/lit
 %%LIT%%bin/llvm-lit%%LLVM_SUFFIX%%
@@ -42,6 +51,7 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-config
 llvm%%LLVM_SUFFIX%%/bin/llvm-cov
 llvm%%LLVM_SUFFIX%%/bin/llvm-diff
 llvm%%LLVM_SUFFIX%%/bin/llvm-dis
+llvm%%LLVM_SUFFIX%%/bin/llvm-dsymutil
 llvm%%LLVM_SUFFIX%%/bin/llvm-dwarfdump
 llvm%%LLVM_SUFFIX%%/bin/llvm-extract
 llvm%%LLVM_SUFFIX%%/bin/llvm-link
@@ -57,9 +67,13 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-size
 llvm%%LLVM_SUFFIX%%/bin/llvm-stress
 llvm%%LLVM_SUFFIX%%/bin/llvm-symbolizer
 llvm%%LLVM_SUFFIX%%/bin/llvm-tblgen
+llvm%%LLVM_SUFFIX%%/bin/llvm-vtabledump
 llvm%%LLVM_SUFFIX%%/bin/macho-dump
 llvm%%LLVM_SUFFIX%%/bin/not
+llvm%%LLVM_SUFFIX%%/bin/obj2yaml
 llvm%%LLVM_SUFFIX%%/bin/opt
+llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder
+llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 llvm%%LLVM_SUFFIX%%/include/llvm-c/Analysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/BitReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm-c/BitWriter.h
@@ -140,6 +154,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/ADT/ite
 llvm%%LLVM_SUFFIX%%/include/llvm/ADT/iterator_range.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/AliasAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/AliasSetTracker.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/AssumptionCache.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/BlockFrequencyInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/BlockFrequencyInfoImpl.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/BranchProbabilityInfo.h
@@ -158,7 +173,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Analysi
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DomPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DominanceFrontier.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/DominanceFrontierImpl.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/FindUsedTypes.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/FunctionTargetTransformInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/IVUsers.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/InlineCost.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Analysis/InstructionSimplify.h
@@ -210,8 +225,10 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/CommandFlags.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/DAGCombine.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/DFAPacketizer.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/DIE.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/EdgeBundles.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/FastISel.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ForwardControlFlowIntegrity.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/FunctionLoweringInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GCMetadata.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GCMetadataPrinter.h
@@ -219,7 +236,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/GCs.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ISDOpcodes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/IntrinsicLowering.h
-llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/JITCodeEmitter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/JumpInstrTables.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LatencyPriorityQueue.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/LexicalScopes.h
@@ -237,8 +253,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineBasicBlock.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineBlockFrequencyInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineBranchProbabilityInfo.h
-llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineCodeEmitter.h
-llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineCodeInfo.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineCombinerPattern.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineConstantPool.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineDominanceFrontier.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineDominators.h
@@ -259,7 +274,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachinePostDominators.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineRegionInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineRegisterInfo.h
-llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineRelocation.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineSSAUpdater.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineScheduler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/MachineTraceMetrics.h
@@ -268,8 +282,8 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/PBQP/Graph.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/PBQP/Math.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/PBQP/ReductionRules.h
-llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/PBQP/RegAllocSolver.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/PBQP/Solution.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/PBQPRAConstraint.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/Passes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/PseudoSourceValue.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegAllocPBQP.h
@@ -304,18 +318,30 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Config/
 llvm%%LLVM_SUFFIX%%/include/llvm/Config/config.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Config/llvm-config.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DIContext.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARFAbbreviationDeclaration.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARFAcceleratorTable.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARFCompileUnit.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARFContext.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARFDebugAbbrev.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARFDebugArangeSet.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARFDebugAranges.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARFDebugFrame.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARFDebugInfoEntry.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARFDebugLine.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARFDebugLoc.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARFDebugRangeList.h
 llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARFFormValue.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARFRelocMap.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARFSection.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARFTypeUnit.h
+llvm%%LLVM_SUFFIX%%/include/llvm/DebugInfo/DWARFUnit.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/ExecutionEngine.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/GenericValue.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/Interpreter.h
-llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JIT.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITEventListener.h
-llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/JITMemoryManager.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/MCJIT.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/OProfileWrapper.h
-llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/ObjectBuffer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/ObjectCache.h
-llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/ObjectImage.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/RTDyldMemoryManager.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/RuntimeDyld.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ExecutionEngine/RuntimeDyldChecker.h
@@ -371,25 +397,30 @@ llvm%%LLVM_SUFFIX%%/include/llvm/IR/Intr
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsX86.td
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/IntrinsicsXCore.td
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/LLVMContext.h
-llvm%%LLVM_SUFFIX%%/include/llvm/IR/LeakDetector.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/LegacyPassManager.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/LegacyPassManagers.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/LegacyPassNameParser.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/MDBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Mangler.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/Metadata.def
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Metadata.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/MetadataTracking.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Module.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/NoFolder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/OperandTraits.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Operator.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/PassManager.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/PassManagerInternal.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/PatternMatch.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/PredIteratorCache.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/Statepoint.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/SymbolTableListTraits.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/TrackingMDRef.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Type.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/TypeBuilder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/TypeFinder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Use.h
+llvm%%LLVM_SUFFIX%%/include/llvm/IR/UseListOrder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/User.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/Value.h
 llvm%%LLVM_SUFFIX%%/include/llvm/IR/ValueHandle.h
@@ -405,10 +436,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/LinkAll
 llvm%%LLVM_SUFFIX%%/include/llvm/LinkAllPasses.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Linker/Linker.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/ConstantPools.h
-llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAnalysis/MCAtom.h
-llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAnalysis/MCFunction.h
-llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAnalysis/MCModule.h
-llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAnalysis/MCModuleYAML.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmBackend.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCAsmInfoCOFF.h
@@ -442,10 +469,8 @@ llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCLa
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCLinkerOptimizationHint.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCMachOSymbolFlags.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCMachObjectWriter.h
-llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCObjectDisassembler.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCObjectFileInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCObjectStreamer.h
-llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCObjectSymbolizer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCObjectWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCParser/AsmCond.h
 llvm%%LLVM_SUFFIX%%/include/llvm/MC/MCParser/AsmLexer.h
@@ -504,9 +529,15 @@ llvm%%LLVM_SUFFIX%%/include/llvm/PassInf
 llvm%%LLVM_SUFFIX%%/include/llvm/PassManager.h
 llvm%%LLVM_SUFFIX%%/include/llvm/PassRegistry.h
 llvm%%LLVM_SUFFIX%%/include/llvm/PassSupport.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/CoverageMapping.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/CoverageMappingReader.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/CoverageMappingWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/InstrProf.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/InstrProfReader.h
 llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/InstrProfWriter.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/SampleProf.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/SampleProfReader.h
+llvm%%LLVM_SUFFIX%%/include/llvm/ProfileData/SampleProfWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/AIXDataTypesFix.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ARMBuildAttributes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ARMEHABI.h
@@ -535,6 +566,16 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Dwarf.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/DynamicLibrary.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ELF.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/ELFRelocs/AArch64.def
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/ELFRelocs/ARM.def
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/ELFRelocs/Hexagon.def
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/ELFRelocs/Mips.def
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/ELFRelocs/PowerPC.def
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/ELFRelocs/PowerPC64.def
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/ELFRelocs/Sparc.def
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/ELFRelocs/SystemZ.def
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/ELFRelocs/i386.def
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/ELFRelocs/x86_64.def
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Endian.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/EndianStream.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Errc.h
@@ -551,7 +592,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/GenericDomTreeConstruction.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/GraphWriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Host.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Support/IncludeFile.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/LEB128.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/LICENSE.TXT
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/LineIterator.h
@@ -567,6 +607,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Mutex.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/MutexGuard.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/OnDiskHashTable.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/Options.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/OutputBuffer.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Path.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/PluginLoader.h
@@ -588,9 +629,8 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Solaris.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/SourceMgr.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/SpecialCaseList.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Support/StreamableMemoryObject.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/StreamingMemoryObject.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/StringPool.h
-llvm%%LLVM_SUFFIX%%/include/llvm/Support/StringRefMemoryObject.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/SwapByteOrder.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/SystemUtils.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/TargetRegistry.h
@@ -602,6 +642,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Support
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/ToolOutputFile.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Unicode.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/UnicodeCharRanges.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Support/UniqueLock.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Valgrind.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Watchdog.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Support/Win64EH.h
@@ -627,7 +668,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Target/
 llvm%%LLVM_SUFFIX%%/include/llvm/Target/TargetInstrInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Target/TargetIntrinsicInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Target/TargetItinerary.td
-llvm%%LLVM_SUFFIX%%/include/llvm/Target/TargetJITInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Target/TargetLibraryInfo.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Target/TargetLowering.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Target/TargetLoweringObjectFile.h
@@ -663,6 +703,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transfo
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SSAUpdaterImpl.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SimplifyIndVar.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SimplifyLibCalls.h
+llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/SymbolRewriter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/UnrollLoop.h
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Utils/ValueMapper.h
@@ -670,9 +711,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transfo
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Vectorize.h
 llvm%%LLVM_SUFFIX%%/lib/BugpointPasses.so
 llvm%%LLVM_SUFFIX%%/lib/LLVMHello.so
-llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%PORTVERSION%%.so
-llvm%%LLVM_SUFFIX%%/lib/libLLVM-3.5.so
-llvm%%LLVM_SUFFIX%%/lib/libLLVM-3.5.so.0
+llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_RELEASE%%.so
+llvm%%LLVM_SUFFIX%%/lib/libLLVM-3.6.so
+llvm%%LLVM_SUFFIX%%/lib/libLLVM-3.6.so.0
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64AsmParser.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64AsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64CodeGen.a
@@ -697,20 +738,18 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMCppBacken
 llvm%%LLVM_SUFFIX%%/lib/libLLVMCppBackendInfo.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfo.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMExecutionEngine.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMHexagonAsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMHexagonCodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMHexagonDesc.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMHexagonDisassembler.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMHexagonInfo.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMIRReader.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMInstCombine.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMInstrumentation.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMInterpreter.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMJIT.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMLTO.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMLineEditor.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMLinker.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMC.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVMMCAnalysis.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMCDisassembler.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMCJIT.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMMCParser.a
@@ -738,6 +777,7 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCDe
 llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCDisassembler.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMPowerPCInfo.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMProfileData.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMR600AsmParser.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMR600AsmPrinter.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMR600CodeGen.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMR600Desc.a
@@ -780,8 +820,11 @@ llvm%%LLVM_SUFFIX%%/lib/libLTO.a
 llvm%%LLVM_SUFFIX%%/lib/libLTO.so
 llvm%%LLVM_SUFFIX%%/share/llvm/cmake/AddLLVM.cmake
 llvm%%LLVM_SUFFIX%%/share/llvm/cmake/AddLLVMDefinitions.cmake
+llvm%%LLVM_SUFFIX%%/share/llvm/cmake/AddOCaml.cmake
 llvm%%LLVM_SUFFIX%%/share/llvm/cmake/AddSphinxTarget.cmake
 llvm%%LLVM_SUFFIX%%/share/llvm/cmake/ChooseMSVCCRT.cmake
+llvm%%LLVM_SUFFIX%%/share/llvm/cmake/CrossCompile.cmake
+llvm%%LLVM_SUFFIX%%/share/llvm/cmake/FindOCaml.cmake
 llvm%%LLVM_SUFFIX%%/share/llvm/cmake/FindSphinx.cmake
 llvm%%LLVM_SUFFIX%%/share/llvm/cmake/GetSVN.cmake
 llvm%%LLVM_SUFFIX%%/share/llvm/cmake/HandleLLVMOptions.cmake
@@ -842,6 +885,8 @@ llvm%%LLVM_SUFFIX%%/share/llvm/cmake/Tab
 %%PORTDOCS%%%%DOCSDIR%%/html/CommandLine.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/CompilerWriterInfo.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CompilerWriterInfo.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/CoverageMappingFormat.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CoverageMappingFormat.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/DebuggingJITedCode.html
 %%PORTDOCS%%%%DOCSDIR%%/html/DebuggingJITedCode.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/Deficiencies.html
@@ -906,6 +951,8 @@ llvm%%LLVM_SUFFIX%%/share/llvm/cmake/Tab
 %%PORTDOCS%%%%DOCSDIR%%/html/LangImpl7.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/LangImpl8.html
 %%PORTDOCS%%%%DOCSDIR%%/html/LangImpl8.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl9.html
+%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl9.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/LangIntro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/LangIntro.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/LangRef.html
@@ -926,6 +973,8 @@ llvm%%LLVM_SUFFIX%%/share/llvm/cmake/Tab
 %%PORTDOCS%%%%DOCSDIR%%/html/MakefileGuide.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/MarkedUpDisassembly.html
 %%PORTDOCS%%%%DOCSDIR%%/html/MarkedUpDisassembly.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/MergeFunctions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/MergeFunctions.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/NVPTXUsage.html
 %%PORTDOCS%%%%DOCSDIR%%/html/NVPTXUsage.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/OCamlLangImpl1.html
@@ -954,6 +1003,8 @@ llvm%%LLVM_SUFFIX%%/share/llvm/cmake/Tab
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersManual.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/Projects.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Projects.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/R600Usage.html
+%%PORTDOCS%%%%DOCSDIR%%/html/R600Usage.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/ReleaseNotes.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ReleaseNotes.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/ReleaseProcess.html
@@ -966,6 +1017,8 @@ llvm%%LLVM_SUFFIX%%/share/llvm/cmake/Tab
 %%PORTDOCS%%%%DOCSDIR%%/html/SphinxQuickstartTemplate.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/StackMaps.html
 %%PORTDOCS%%%%DOCSDIR%%/html/StackMaps.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/Statepoints.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Statepoints.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/SystemLibrary.html
 %%PORTDOCS%%%%DOCSDIR%%/html/SystemLibrary.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/TableGenFundamentals.html

Modified: head/lang/Makefile
==============================================================================
--- head/lang/Makefile	Wed Jan 21 23:38:27 2015	(r377635)
+++ head/lang/Makefile	Wed Jan 21 23:47:28 2015	(r377636)
@@ -35,6 +35,7 @@
     SUBDIR += clang33
     SUBDIR += clang34
     SUBDIR += clang35
+    SUBDIR += clang36
     SUBDIR += clojure
     SUBDIR += clojure-mode.el
     SUBDIR += cmucl

Modified: head/lang/clang36/Makefile
==============================================================================
--- head/lang/clang35/Makefile	Wed Jan 21 22:58:16 2015	(r377631)
+++ head/lang/clang36/Makefile	Wed Jan 21 23:47:28 2015	(r377636)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	clang
-DISTVERSION=	3.5.1
+DISTVERSION=	3.6.0rc1
 CATEGORIES=	lang devel
-MASTER_SITES=   http://llvm.org/releases/3.5.1/
+MASTER_SITES=   http://llvm.org/pre-releases/3.6.0/rc1/
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 DISTNAME=	${CLANG_NAME}
 DISTFILES=	${CLANG_SOURCE} \
@@ -18,7 +18,7 @@ CLANG_EXTRACT=	cfe-${DISTVERSION}.src
 LLVM_NAME=	llvm-${DISTVERSION}.src
 LLVM_SOURCE=	${LLVM_NAME}${EXTRACT_SUFX}
 LLVM_EXTRACT=	llvm-${DISTVERSION}.src
-LIBNAME=	libLLVM-3.5.so
+LIBNAME=	libLLVM-${LLVM_RELEASE:C/([0-9]\.[0-9]).*/\1/}.so
 
 WRKSRC=		${WRKDIR}/${LLVM_EXTRACT}
 BUILD_WRKSRC=	${WRKSRC}/tools/clang
@@ -28,6 +28,7 @@ BUILD_DEPENDS+=	llc${LLVM_SUFFIX}:${PORT
 RUN_DEPENDS+=	llc${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX}
 
 LLVM_SUFFIX=	${PORTVERSION:C/([0-9]\.[0-9]).*/\1/:S/.//g:C/r.//}
+LLVM_RELEASE=	${PORTVERSION:C/([0-9]\.[0-9].[0-9]).*/\1/}
 LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
@@ -53,9 +54,11 @@ ASSERTS_DESC=	Enable assertions (thread 
 CONFIGURE_ARGS+=	--enable-optimized --enable-shared
 # Build some docs manually later
 CONFIGURE_ARGS+=	--disable-docs
+# Don't build bindings, the ocaml ones break
+CONFIGURE_ARGS+=	--enable-bindings=none
 
 PLIST_SUB+=		LLVM_SUFFIX=${LLVM_SUFFIX} \
-			PORTVERSION=${PORTVERSION}
+			LLVM_RELEASE=${LLVM_RELEASE}
 COMMANDS=	c++-analyzer \
 		c-index-test \
 		ccc-analyzer \
@@ -103,7 +106,7 @@ post-extract:
 	${MV} ${WRKDIR}/${CLANG_EXTRACT} ${BUILD_WRKSRC}
 
 post-patch:
-	${REINPLACE_CMD} -e 's|${PORTVERSION}svn|${PORTVERSION}|g' \
+	${REINPLACE_CMD} -e 's|${LLVM_RELEASE}svn|${LLVM_RELEASE}|g' \
 	    ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|\(PROJ_docsdir.*:=\).*$$|\1${DOCSDIR}|g' \
 	    ${WRKSRC}/Makefile.config.in
@@ -181,7 +184,7 @@ build-plist:
 	    ${FIND} ${PLIST_DIR_LIST:S|^|${STAGEDIR}${LLVM_PREFIX}/|} -type f) \
 	    | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
 	    -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' \
-	    -e 's|${PORTVERSION}|%%PORTVERSION%%|' | ${SORT} >> ${PLIST}
+	    -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' | ${SORT} >> ${PLIST}
 	echo man/man1/clang%%LLVM_SUFFIX%%.1.gz >> ${PLIST}
 	echo man/man1/scan-build%%LLVM_SUFFIX%%.1.gz >> ${PLIST}
 	${FIND} ${STAGEDIR}${DOCSDIR} -type f | \

Modified: head/lang/clang36/distinfo
==============================================================================
--- head/lang/clang35/distinfo	Wed Jan 21 22:58:16 2015	(r377631)
+++ head/lang/clang36/distinfo	Wed Jan 21 23:47:28 2015	(r377636)
@@ -1,4 +1,4 @@
-SHA256 (cfe-3.5.1.src.tar.xz) = 6773f3f9cf815631cc7e779ec134ddd228dc8e9a250e1ea3a910610c59eb8f5c
-SIZE (cfe-3.5.1.src.tar.xz) = 8268140
-SHA256 (llvm-3.5.1.src.tar.xz) = bf3275d2d7890015c8d8f5e6f4f882f8cf3bf51967297ebe74111d6d8b53be15
-SIZE (llvm-3.5.1.src.tar.xz) = 11869356
+SHA256 (cfe-3.6.0rc1.src.tar.xz) = 86ee1037374d833292878f620f315771f8fdfdd5365f7c28b276279a8de45a10
+SIZE (cfe-3.6.0rc1.src.tar.xz) = 8637200
+SHA256 (llvm-3.6.0rc1.src.tar.xz) = a39f4dad833852694fca482b01ec6c8c92731d59889e4dc50b0471e6af2908c2
+SIZE (llvm-3.6.0rc1.src.tar.xz) = 12737544

Modified: head/lang/clang36/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp
==============================================================================
--- head/lang/clang35/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp	Wed Jan 21 22:58:16 2015	(r377631)
+++ head/lang/clang36/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp	Wed Jan 21 23:47:28 2015	(r377636)
@@ -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/clang36/pkg-plist
==============================================================================
--- head/lang/clang35/pkg-plist	Wed Jan 21 22:58:16 2015	(r377631)
+++ head/lang/clang36/pkg-plist	Wed Jan 21 23:47:28 2015	(r377636)
@@ -153,6 +153,7 @@ llvm%%LLVM_SUFFIX%%/include/clang/Analys
 llvm%%LLVM_SUFFIX%%/include/clang/Analysis/CFG.h
 llvm%%LLVM_SUFFIX%%/include/clang/Analysis/CFGStmtMap.h
 llvm%%LLVM_SUFFIX%%/include/clang/Analysis/CallGraph.h
+llvm%%LLVM_SUFFIX%%/include/clang/Analysis/CodeInjector.h
 llvm%%LLVM_SUFFIX%%/include/clang/Analysis/DomainSpecific/CocoaConventions.h
 llvm%%LLVM_SUFFIX%%/include/clang/Analysis/DomainSpecific/ObjCNoReturn.h
 llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/DataflowValues.h
@@ -170,6 +171,7 @@ llvm%%LLVM_SUFFIX%%/include/clang/Basic/
 llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsAArch64.def
 llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsARM.def
 llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsHexagon.def
+llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsLe64.def
 llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsMips.def
 llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsNEON.def
 llvm%%LLVM_SUFFIX%%/include/clang/Basic/BuiltinsNVPTX.def
@@ -220,7 +222,9 @@ llvm%%LLVM_SUFFIX%%/include/clang/Basic/
 llvm%%LLVM_SUFFIX%%/include/clang/Basic/PartialDiagnostic.h
 llvm%%LLVM_SUFFIX%%/include/clang/Basic/PlistSupport.h
 llvm%%LLVM_SUFFIX%%/include/clang/Basic/PrettyStackTrace.h
+llvm%%LLVM_SUFFIX%%/include/clang/Basic/SanitizerBlacklist.h
 llvm%%LLVM_SUFFIX%%/include/clang/Basic/Sanitizers.def
+llvm%%LLVM_SUFFIX%%/include/clang/Basic/Sanitizers.h
 llvm%%LLVM_SUFFIX%%/include/clang/Basic/SourceLocation.h
 llvm%%LLVM_SUFFIX%%/include/clang/Basic/SourceManager.h
 llvm%%LLVM_SUFFIX%%/include/clang/Basic/SourceManagerInternals.h
@@ -289,6 +293,8 @@ llvm%%LLVM_SUFFIX%%/include/clang/Fronte
 llvm%%LLVM_SUFFIX%%/include/clang/Frontend/MultiplexConsumer.h
 llvm%%LLVM_SUFFIX%%/include/clang/Frontend/PreprocessorOutputOptions.h
 llvm%%LLVM_SUFFIX%%/include/clang/Frontend/SerializedDiagnosticPrinter.h
+llvm%%LLVM_SUFFIX%%/include/clang/Frontend/SerializedDiagnosticReader.h
+llvm%%LLVM_SUFFIX%%/include/clang/Frontend/SerializedDiagnostics.h
 llvm%%LLVM_SUFFIX%%/include/clang/Frontend/TextDiagnostic.h
 llvm%%LLVM_SUFFIX%%/include/clang/Frontend/TextDiagnosticBuffer.h
 llvm%%LLVM_SUFFIX%%/include/clang/Frontend/TextDiagnosticPrinter.h
@@ -431,52 +437,60 @@ llvm%%LLVM_SUFFIX%%/include/clang/Static
 llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Frontend/AnalysisConsumer.h
 llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
 llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Frontend/FrontendActions.h
+llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Frontend/ModelConsumer.h
 llvm%%LLVM_SUFFIX%%/include/clang/Tooling/ArgumentsAdjusters.h
 llvm%%LLVM_SUFFIX%%/include/clang/Tooling/CommonOptionsParser.h
 llvm%%LLVM_SUFFIX%%/include/clang/Tooling/CompilationDatabase.h
 llvm%%LLVM_SUFFIX%%/include/clang/Tooling/CompilationDatabasePluginRegistry.h
+llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Core/Replacement.h
 llvm%%LLVM_SUFFIX%%/include/clang/Tooling/FileMatchTrie.h
 llvm%%LLVM_SUFFIX%%/include/clang/Tooling/JSONCompilationDatabase.h
 llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Refactoring.h
 llvm%%LLVM_SUFFIX%%/include/clang/Tooling/RefactoringCallbacks.h
 llvm%%LLVM_SUFFIX%%/include/clang/Tooling/ReplacementsYaml.h
 llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Tooling.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/__wmmintrin_aes.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/__wmmintrin_pclmul.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/altivec.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/ammintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/arm_neon.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/avx2intrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/avxintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/bmi2intrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/bmiintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/cpuid.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/emmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/f16cintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/fma4intrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/fmaintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/ia32intrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/immintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/lzcntintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/mm3dnow.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/mm_malloc.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/mmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/module.modulemap
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/nmmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/pmmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/popcntintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/prfchwintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/rdseedintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/rtmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/shaintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/smmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/tbmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/tmmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/unwind.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/wmmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/x86intrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/xmmintrin.h
-llvm%%LLVM_SUFFIX%%/lib/clang/%%PORTVERSION%%/include/xopintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__wmmintrin_aes.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__wmmintrin_pclmul.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/adxintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/altivec.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ammintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/arm_neon.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx2intrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512bwintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512erintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512fintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlbwintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avx512vlintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/avxintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/bmi2intrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/bmiintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/cpuid.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/emmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/f16cintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/fma4intrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/fmaintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ia32intrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/immintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/lzcntintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/mm3dnow.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/mm_malloc.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/mmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/module.modulemap
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/nmmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/pmmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/popcntintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/prfchwintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/rdseedintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/rtmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/shaintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/smmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/tbmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/tmmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/unwind.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/wmmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/x86intrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xmmintrin.h
+llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xopintrin.h
 llvm%%LLVM_SUFFIX%%/lib/libclang.a
 llvm%%LLVM_SUFFIX%%/lib/libclang.so
 llvm%%LLVM_SUFFIX%%/lib/libclangARCMigrate.a
@@ -502,6 +516,7 @@ llvm%%LLVM_SUFFIX%%/lib/libclangStaticAn
 llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerCore.a
 llvm%%LLVM_SUFFIX%%/lib/libclangStaticAnalyzerFrontend.a
 llvm%%LLVM_SUFFIX%%/lib/libclangTooling.a
+llvm%%LLVM_SUFFIX%%/lib/libclangToolingCore.a
 llvm%%LLVM_SUFFIX%%/lib/python/Reporter.py
 llvm%%LLVM_SUFFIX%%/lib/python/Resources/FileRadar.scpt
 llvm%%LLVM_SUFFIX%%/lib/python/Resources/GetRadarVersion.scpt



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501212347.t0LNlTZN007100>