10 files changed, 168 insertions, 168 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 3c5bb0e8affa..2d0570369c74 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	llvm
-DISTVERSION=	3.4.r${SVN_REV}
+DISTVERSION=	3.5.r${SVN_REV}
 CATEGORIES=	devel lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -30,6 +30,7 @@ SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
 CONFIGURE_ARGS+=	--enable-shared
 MAKE_ARGS+=		REQUIRES_RTTI=1
 LIBNAME=		libLLVM-${DISTVERSION:C/\.r[0-9]*//}svn.so
+LIBNAME_REAL=		libLLVM-${DISTVERSION:C/\.r[0-9]*//}.0svn.so
 
 CONFIGURE_ARGS+=	--enable-bindings=none
 CONFIGURE_ARGS+=	--enable-optimized
@@ -64,6 +65,7 @@ COMMANDS=	bugpoint \
 		llvm-mcmarkup \
 		llvm-nm \
 		llvm-objdump \
+		llvm-profdata \
 		llvm-ranlib \
 		llvm-readobj \
 		llvm-rtdyld \
@@ -77,7 +79,7 @@ FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
 
 STRIP_LIBS=	BugpointPasses.so \
 		LLVMHello.so \
-		${LIBNAME}.0 \
+		${LIBNAME_REAL}.0 \
 		libLTO.so
 
 .include <bsd.port.options.mk>
@@ -124,7 +126,8 @@ PLIST_FILES+=		llvm${LLVM_SUFFIX}/lib/LLVMgold.so
 MAN1SRCS+=	bugpoint.1 llc.1 lli.1 llvm-ar.1 llvm-as.1 \
 		llvm-bcanalyzer.1 llvm-config.1 llvm-cov.1 llvm-diff.1 \
 		llvm-dis.1 llvm-extract.1 llvm-link.1 llvm-nm.1 \
-		llvm-prof.1 llvm-stress.1 opt.1 tblgen.1
+		llvm-profdata.1 llvm-readobj.1 llvm-stress.1 llvm-symbolizer.1 \
+		opt.1 tblgen.1
 PLIST_FILES+=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
 .endif
 
@@ -190,9 +193,11 @@ post-build:
 .endif
 
 post-install:
-	${MV} ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME} \
-	    ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME}.0
-	${LN} -sf ${LIBNAME}.0 ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME}
+	ln -sf ${LIBNAME_REAL} ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME}
+	${MV} ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME_REAL} \
+	    ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME_REAL}.0
+	${LN} -sf ${LIBNAME_REAL}.0 \
+	    ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME_REAL}
 	${STRIP_CMD} ${STRIP_LIBS:S|^|${STAGEDIR}${LLVM_PREFIX}/lib/|}
 	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
 	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
@@ -206,6 +211,9 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/cmake/modules/*.cmake \
 	    ${WRKDIR}/cmake/share/llvm/cmake/*.cmake \
 	    ${STAGEDIR}${DATADIR}/cmake/
+	${REINPLACE_CMD} -e 's|${STAGEDIR}||' \
+	    ${STAGEDIR}${DATADIR}/cmake/LLVMConfig.cmake
+	${RM} -f ${STAGEDIR}${DATADIR}/cmake/LLVMConfig.cmake.bak
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
diff --git a/devel/llvm-devel/Makefile.svn_rev b/devel/llvm-devel/Makefile.svn_rev
index fa4442d82f60..bf66d0f5f36d 100644
--- a/devel/llvm-devel/Makefile.svn_rev
+++ b/devel/llvm-devel/Makefile.svn_rev
@@ -1 +1 @@
-SVN_REV=	193887
+SVN_REV=	203994
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 97de3865d4a9..7e75d04b3989 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (llvm-3.4.r193887.tar.bz2) = 175e3034a0f19c0ca9ce2fc75ccdc796f3c3bfd29b69f595aa4fc857f53db955
-SIZE (llvm-3.4.r193887.tar.bz2) = 11845136
+SHA256 (llvm-3.5.r203994.tar.bz2) = 73bc4d19b25a8ab5824f6374f068b1ab345b760388f3f5764836f2c3317c380a
+SIZE (llvm-3.5.r203994.tar.bz2) = 12350225
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index a984e759e264..0bae9d8ad040 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -15,6 +15,7 @@ bin/llvm-mc-devel
 bin/llvm-mcmarkup-devel
 bin/llvm-nm-devel
 bin/llvm-objdump-devel
+bin/llvm-profdata-devel
 bin/llvm-ranlib-devel
 bin/llvm-readobj-devel
 bin/llvm-rtdyld-devel
@@ -31,6 +32,7 @@ bin/opt-devel
 %%LIT%%bin/FileCheck-devel
 %%LIT%%llvm-devel/bin/FileCheck
 llvm-devel/bin/bugpoint
+llvm-devel/bin/count
 llvm-devel/bin/llc
 llvm-devel/bin/lli
 llvm-devel/bin/lli-child-target
@@ -48,6 +50,7 @@ llvm-devel/bin/llvm-mc
 llvm-devel/bin/llvm-mcmarkup
 llvm-devel/bin/llvm-nm
 llvm-devel/bin/llvm-objdump
+llvm-devel/bin/llvm-profdata
 llvm-devel/bin/llvm-ranlib
 llvm-devel/bin/llvm-readobj
 llvm-devel/bin/llvm-rtdyld
@@ -56,6 +59,7 @@ llvm-devel/bin/llvm-stress
 llvm-devel/bin/llvm-symbolizer
 llvm-devel/bin/llvm-tblgen
 llvm-devel/bin/macho-dump
+llvm-devel/bin/not
 llvm-devel/bin/opt
 llvm-devel/include/llvm-c/Analysis.h
 llvm-devel/include/llvm-c/BitReader.h
@@ -63,10 +67,12 @@ llvm-devel/include/llvm-c/BitWriter.h
 llvm-devel/include/llvm-c/Core.h
 llvm-devel/include/llvm-c/Disassembler.h
 llvm-devel/include/llvm-c/ExecutionEngine.h
+llvm-devel/include/llvm-c/IRReader.h
 llvm-devel/include/llvm-c/Initialization.h
 llvm-devel/include/llvm-c/LinkTimeOptimizer.h
 llvm-devel/include/llvm-c/Linker.h
 llvm-devel/include/llvm-c/Object.h
+llvm-devel/include/llvm-c/Support.h
 llvm-devel/include/llvm-c/Target.h
 llvm-devel/include/llvm-c/TargetMachine.h
 llvm-devel/include/llvm-c/Transforms/IPO.h
@@ -129,11 +135,11 @@ llvm-devel/include/llvm/ADT/TinyPtrVector.h
 llvm-devel/include/llvm/ADT/Triple.h
 llvm-devel/include/llvm/ADT/Twine.h
 llvm-devel/include/llvm/ADT/UniqueVector.h
-llvm-devel/include/llvm/ADT/ValueMap.h
 llvm-devel/include/llvm/ADT/VariadicFunction.h
 llvm-devel/include/llvm/ADT/edit_distance.h
 llvm-devel/include/llvm/ADT/ilist.h
 llvm-devel/include/llvm/ADT/ilist_node.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/BlockFrequencyImpl.h
@@ -152,8 +158,6 @@ llvm-devel/include/llvm/Analysis/DOTGraphTraitsPass.h
 llvm-devel/include/llvm/Analysis/DependenceAnalysis.h
 llvm-devel/include/llvm/Analysis/DomPrinter.h
 llvm-devel/include/llvm/Analysis/DominanceFrontier.h
-llvm-devel/include/llvm/Analysis/DominatorInternals.h
-llvm-devel/include/llvm/Analysis/Dominators.h
 llvm-devel/include/llvm/Analysis/FindUsedTypes.h
 llvm-devel/include/llvm/Analysis/IVUsers.h
 llvm-devel/include/llvm/Analysis/InlineCost.h
@@ -161,6 +165,7 @@ llvm-devel/include/llvm/Analysis/InstructionSimplify.h
 llvm-devel/include/llvm/Analysis/Interval.h
 llvm-devel/include/llvm/Analysis/IntervalIterator.h
 llvm-devel/include/llvm/Analysis/IntervalPartition.h
+llvm-devel/include/llvm/Analysis/LazyCallGraph.h
 llvm-devel/include/llvm/Analysis/LazyValueInfo.h
 llvm-devel/include/llvm/Analysis/LibCallAliasAnalysis.h
 llvm-devel/include/llvm/Analysis/LibCallSemantics.h
@@ -185,16 +190,13 @@ llvm-devel/include/llvm/Analysis/ScalarEvolutionExpander.h
 llvm-devel/include/llvm/Analysis/ScalarEvolutionExpressions.h
 llvm-devel/include/llvm/Analysis/ScalarEvolutionNormalization.h
 llvm-devel/include/llvm/Analysis/SparsePropagation.h
+llvm-devel/include/llvm/Analysis/TargetFolder.h
 llvm-devel/include/llvm/Analysis/TargetTransformInfo.h
 llvm-devel/include/llvm/Analysis/Trace.h
 llvm-devel/include/llvm/Analysis/ValueTracking.h
-llvm-devel/include/llvm/Analysis/Verifier.h
-llvm-devel/include/llvm/Assembly/AssemblyAnnotationWriter.h
-llvm-devel/include/llvm/Assembly/Parser.h
-llvm-devel/include/llvm/Assembly/PrintModulePass.h
-llvm-devel/include/llvm/Assembly/Writer.h
-llvm-devel/include/llvm/AutoUpgrade.h
+llvm-devel/include/llvm/AsmParser/Parser.h
 llvm-devel/include/llvm/Bitcode/BitCodes.h
+llvm-devel/include/llvm/Bitcode/BitcodeWriterPass.h
 llvm-devel/include/llvm/Bitcode/BitstreamReader.h
 llvm-devel/include/llvm/Bitcode/BitstreamWriter.h
 llvm-devel/include/llvm/Bitcode/LLVMBitCodes.h
@@ -223,9 +225,9 @@ llvm-devel/include/llvm/CodeGen/LinkAllCodegenComponents.h
 llvm-devel/include/llvm/CodeGen/LiveInterval.h
 llvm-devel/include/llvm/CodeGen/LiveIntervalAnalysis.h
 llvm-devel/include/llvm/CodeGen/LiveIntervalUnion.h
+llvm-devel/include/llvm/CodeGen/LivePhysRegs.h
 llvm-devel/include/llvm/CodeGen/LiveRangeEdit.h
 llvm-devel/include/llvm/CodeGen/LiveRegMatrix.h
-llvm-devel/include/llvm/CodeGen/LiveRegUnits.h
 llvm-devel/include/llvm/CodeGen/LiveStackAnalysis.h
 llvm-devel/include/llvm/CodeGen/LiveVariables.h
 llvm-devel/include/llvm/CodeGen/MachORelocation.h
@@ -256,11 +258,12 @@ 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
+llvm-devel/include/llvm/CodeGen/MachineValueType.h
+llvm-devel/include/llvm/CodeGen/PBQP/CostAllocator.h
 llvm-devel/include/llvm/CodeGen/PBQP/Graph.h
-llvm-devel/include/llvm/CodeGen/PBQP/HeuristicBase.h
-llvm-devel/include/llvm/CodeGen/PBQP/HeuristicSolver.h
-llvm-devel/include/llvm/CodeGen/PBQP/Heuristics/Briggs.h
 llvm-devel/include/llvm/CodeGen/PBQP/Math.h
+llvm-devel/include/llvm/CodeGen/PBQP/ReductionRules.h
+llvm-devel/include/llvm/CodeGen/PBQP/RegAllocSolver.h
 llvm-devel/include/llvm/CodeGen/PBQP/Solution.h
 llvm-devel/include/llvm/CodeGen/Passes.h
 llvm-devel/include/llvm/CodeGen/PseudoSourceValue.h
@@ -281,6 +284,7 @@ llvm-devel/include/llvm/CodeGen/SelectionDAG.h
 llvm-devel/include/llvm/CodeGen/SelectionDAGISel.h
 llvm-devel/include/llvm/CodeGen/SelectionDAGNodes.h
 llvm-devel/include/llvm/CodeGen/SlotIndexes.h
+llvm-devel/include/llvm/CodeGen/StackMapLivenessAnalysis.h
 llvm-devel/include/llvm/CodeGen/StackMaps.h
 llvm-devel/include/llvm/CodeGen/StackProtector.h
 llvm-devel/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
@@ -294,8 +298,6 @@ llvm-devel/include/llvm/Config/Disassemblers.def
 llvm-devel/include/llvm/Config/Targets.def
 llvm-devel/include/llvm/Config/config.h
 llvm-devel/include/llvm/Config/llvm-config.h
-llvm-devel/include/llvm/DIBuilder.h
-llvm-devel/include/llvm/DebugInfo.h
 llvm-devel/include/llvm/DebugInfo/DIContext.h
 llvm-devel/include/llvm/DebugInfo/DWARFFormValue.h
 llvm-devel/include/llvm/ExecutionEngine/ExecutionEngine.h
@@ -312,21 +314,37 @@ llvm-devel/include/llvm/ExecutionEngine/ObjectImage.h
 llvm-devel/include/llvm/ExecutionEngine/RTDyldMemoryManager.h
 llvm-devel/include/llvm/ExecutionEngine/RuntimeDyld.h
 llvm-devel/include/llvm/ExecutionEngine/SectionMemoryManager.h
-llvm-devel/include/llvm/GVMaterializer.h
 llvm-devel/include/llvm/IR/Argument.h
+llvm-devel/include/llvm/IR/AssemblyAnnotationWriter.h
 llvm-devel/include/llvm/IR/Attributes.h
+llvm-devel/include/llvm/IR/AutoUpgrade.h
 llvm-devel/include/llvm/IR/BasicBlock.h
+llvm-devel/include/llvm/IR/CFG.h
+llvm-devel/include/llvm/IR/CallSite.h
 llvm-devel/include/llvm/IR/CallingConv.h
 llvm-devel/include/llvm/IR/Constant.h
+llvm-devel/include/llvm/IR/ConstantFolder.h
+llvm-devel/include/llvm/IR/ConstantRange.h
 llvm-devel/include/llvm/IR/Constants.h
+llvm-devel/include/llvm/IR/DIBuilder.h
 llvm-devel/include/llvm/IR/DataLayout.h
+llvm-devel/include/llvm/IR/DebugInfo.h
+llvm-devel/include/llvm/IR/DebugLoc.h
 llvm-devel/include/llvm/IR/DerivedTypes.h
+llvm-devel/include/llvm/IR/DiagnosticInfo.h
+llvm-devel/include/llvm/IR/DiagnosticPrinter.h
+llvm-devel/include/llvm/IR/Dominators.h
 llvm-devel/include/llvm/IR/Function.h
+llvm-devel/include/llvm/IR/GVMaterializer.h
+llvm-devel/include/llvm/IR/GetElementPtrTypeIterator.h
 llvm-devel/include/llvm/IR/GlobalAlias.h
 llvm-devel/include/llvm/IR/GlobalValue.h
 llvm-devel/include/llvm/IR/GlobalVariable.h
 llvm-devel/include/llvm/IR/IRBuilder.h
+llvm-devel/include/llvm/IR/IRPrintingPasses.h
 llvm-devel/include/llvm/IR/InlineAsm.h
+llvm-devel/include/llvm/IR/InstIterator.h
+llvm-devel/include/llvm/IR/InstVisitor.h
 llvm-devel/include/llvm/IR/InstrTypes.h
 llvm-devel/include/llvm/IR/Instruction.def
 llvm-devel/include/llvm/IR/Instruction.h
@@ -345,11 +363,20 @@ llvm-devel/include/llvm/IR/IntrinsicsR600.td
 llvm-devel/include/llvm/IR/IntrinsicsX86.td
 llvm-devel/include/llvm/IR/IntrinsicsXCore.td
 llvm-devel/include/llvm/IR/LLVMContext.h
+llvm-devel/include/llvm/IR/LeakDetector.h
+llvm-devel/include/llvm/IR/LegacyPassManager.h
+llvm-devel/include/llvm/IR/LegacyPassManagers.h
+llvm-devel/include/llvm/IR/LegacyPassNameParser.h
 llvm-devel/include/llvm/IR/MDBuilder.h
+llvm-devel/include/llvm/IR/Mangler.h
 llvm-devel/include/llvm/IR/Metadata.h
 llvm-devel/include/llvm/IR/Module.h
+llvm-devel/include/llvm/IR/NoFolder.h
 llvm-devel/include/llvm/IR/OperandTraits.h
 llvm-devel/include/llvm/IR/Operator.h
+llvm-devel/include/llvm/IR/PassManager.h
+llvm-devel/include/llvm/IR/PatternMatch.h
+llvm-devel/include/llvm/IR/PredIteratorCache.h
 llvm-devel/include/llvm/IR/SymbolTableListTraits.h
 llvm-devel/include/llvm/IR/Type.h
 llvm-devel/include/llvm/IR/TypeBuilder.h
@@ -357,15 +384,18 @@ llvm-devel/include/llvm/IR/TypeFinder.h
 llvm-devel/include/llvm/IR/Use.h
 llvm-devel/include/llvm/IR/User.h
 llvm-devel/include/llvm/IR/Value.h
+llvm-devel/include/llvm/IR/ValueHandle.h
+llvm-devel/include/llvm/IR/ValueMap.h
 llvm-devel/include/llvm/IR/ValueSymbolTable.h
+llvm-devel/include/llvm/IR/Verifier.h
 llvm-devel/include/llvm/IRReader/IRReader.h
 llvm-devel/include/llvm/InitializePasses.h
-llvm-devel/include/llvm/InstVisitor.h
 llvm-devel/include/llvm/LTO/LTOCodeGenerator.h
 llvm-devel/include/llvm/LTO/LTOModule.h
+llvm-devel/include/llvm/LineEditor/LineEditor.h
 llvm-devel/include/llvm/LinkAllIR.h
 llvm-devel/include/llvm/LinkAllPasses.h
-llvm-devel/include/llvm/Linker.h
+llvm-devel/include/llvm/Linker/Linker.h
 llvm-devel/include/llvm/MC/MCAsmBackend.h
 llvm-devel/include/llvm/MC/MCAsmInfo.h
 llvm-devel/include/llvm/MC/MCAsmInfoCOFF.h
@@ -440,10 +470,12 @@ llvm-devel/include/llvm/Object/ELFObjectFile.h
 llvm-devel/include/llvm/Object/ELFTypes.h
 llvm-devel/include/llvm/Object/ELFYAML.h
 llvm-devel/include/llvm/Object/Error.h
+llvm-devel/include/llvm/Object/IRObjectFile.h
 llvm-devel/include/llvm/Object/MachO.h
 llvm-devel/include/llvm/Object/MachOUniversal.h
 llvm-devel/include/llvm/Object/ObjectFile.h
 llvm-devel/include/llvm/Object/RelocVisitor.h
+llvm-devel/include/llvm/Object/SymbolicFile.h
 llvm-devel/include/llvm/Object/YAML.h
 llvm-devel/include/llvm/Option/Arg.h
 llvm-devel/include/llvm/Option/ArgList.h
@@ -454,10 +486,11 @@ llvm-devel/include/llvm/Option/Option.h
 llvm-devel/include/llvm/Pass.h
 llvm-devel/include/llvm/PassAnalysisSupport.h
 llvm-devel/include/llvm/PassManager.h
-llvm-devel/include/llvm/PassManagers.h
 llvm-devel/include/llvm/PassRegistry.h
 llvm-devel/include/llvm/PassSupport.h
 llvm-devel/include/llvm/Support/AIXDataTypesFix.h
+llvm-devel/include/llvm/Support/ARMBuildAttributes.h
+llvm-devel/include/llvm/Support/ARMEHABI.h
 llvm-devel/include/llvm/Support/AlignOf.h
 llvm-devel/include/llvm/Support/Allocator.h
 llvm-devel/include/llvm/Support/ArrayRecycler.h
@@ -465,26 +498,20 @@ llvm-devel/include/llvm/Support/Atomic.h
 llvm-devel/include/llvm/Support/BlockFrequency.h
 llvm-devel/include/llvm/Support/BranchProbability.h
 llvm-devel/include/llvm/Support/CBindingWrapping.h
-llvm-devel/include/llvm/Support/CFG.h
 llvm-devel/include/llvm/Support/COFF.h
-llvm-devel/include/llvm/Support/CallSite.h
 llvm-devel/include/llvm/Support/Capacity.h
 llvm-devel/include/llvm/Support/Casting.h
 llvm-devel/include/llvm/Support/CodeGen.h
 llvm-devel/include/llvm/Support/CommandLine.h
 llvm-devel/include/llvm/Support/Compiler.h
 llvm-devel/include/llvm/Support/Compression.h
-llvm-devel/include/llvm/Support/ConstantFolder.h
-llvm-devel/include/llvm/Support/ConstantRange.h
 llvm-devel/include/llvm/Support/ConvertUTF.h
 llvm-devel/include/llvm/Support/CrashRecoveryContext.h
 llvm-devel/include/llvm/Support/DOTGraphTraits.h
 llvm-devel/include/llvm/Support/DataExtractor.h
-llvm-devel/include/llvm/Support/DataFlow.h
 llvm-devel/include/llvm/Support/DataStream.h
 llvm-devel/include/llvm/Support/DataTypes.h
 llvm-devel/include/llvm/Support/Debug.h
-llvm-devel/include/llvm/Support/DebugLoc.h
 llvm-devel/include/llvm/Support/Disassembler.h
 llvm-devel/include/llvm/Support/Dwarf.h
 llvm-devel/include/llvm/Support/DynamicLibrary.h
@@ -500,14 +527,14 @@ llvm-devel/include/llvm/Support/FileUtilities.h
 llvm-devel/include/llvm/Support/Format.h
 llvm-devel/include/llvm/Support/FormattedStream.h
 llvm-devel/include/llvm/Support/GCOV.h
-llvm-devel/include/llvm/Support/GetElementPtrTypeIterator.h
+llvm-devel/include/llvm/Support/GenericDomTree.h
+llvm-devel/include/llvm/Support/GenericDomTreeConstruction.h
 llvm-devel/include/llvm/Support/GraphWriter.h
 llvm-devel/include/llvm/Support/Host.h
 llvm-devel/include/llvm/Support/IncludeFile.h
-llvm-devel/include/llvm/Support/InstIterator.h
 llvm-devel/include/llvm/Support/LEB128.h
 llvm-devel/include/llvm/Support/LICENSE.TXT
-llvm-devel/include/llvm/Support/LeakDetector.h
+llvm-devel/include/llvm/Support/LineIterator.h
 llvm-devel/include/llvm/Support/Locale.h
 llvm-devel/include/llvm/Support/LockFileManager.h
 llvm-devel/include/llvm/Support/MD5.h
@@ -519,14 +546,10 @@ llvm-devel/include/llvm/Support/MemoryBuffer.h
 llvm-devel/include/llvm/Support/MemoryObject.h
 llvm-devel/include/llvm/Support/Mutex.h
 llvm-devel/include/llvm/Support/MutexGuard.h
-llvm-devel/include/llvm/Support/NoFolder.h
 llvm-devel/include/llvm/Support/OutputBuffer.h
-llvm-devel/include/llvm/Support/PassNameParser.h
 llvm-devel/include/llvm/Support/Path.h
-llvm-devel/include/llvm/Support/PatternMatch.h
 llvm-devel/include/llvm/Support/PluginLoader.h
 llvm-devel/include/llvm/Support/PointerLikeTypeTraits.h
-llvm-devel/include/llvm/Support/PredIteratorCache.h
 llvm-devel/include/llvm/Support/PrettyStackTrace.h
 llvm-devel/include/llvm/Support/Process.h
 llvm-devel/include/llvm/Support/Program.h
@@ -546,7 +569,6 @@ llvm-devel/include/llvm/Support/StringPool.h
 llvm-devel/include/llvm/Support/StringRefMemoryObject.h
 llvm-devel/include/llvm/Support/SwapByteOrder.h
 llvm-devel/include/llvm/Support/SystemUtils.h
-llvm-devel/include/llvm/Support/TargetFolder.h
 llvm-devel/include/llvm/Support/TargetRegistry.h
 llvm-devel/include/llvm/Support/TargetSelect.h
 llvm-devel/include/llvm/Support/ThreadLocal.h
@@ -557,7 +579,6 @@ 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/Valgrind.h
-llvm-devel/include/llvm/Support/ValueHandle.h
 llvm-devel/include/llvm/Support/Watchdog.h
 llvm-devel/include/llvm/Support/Win64EH.h
 llvm-devel/include/llvm/Support/YAMLParser.h
@@ -574,7 +595,6 @@ llvm-devel/include/llvm/TableGen/StringMatcher.h
 llvm-devel/include/llvm/TableGen/StringToOffsetTable.h
 llvm-devel/include/llvm/TableGen/TableGenBackend.h
 llvm-devel/include/llvm/Target/CostTable.h
-llvm-devel/include/llvm/Target/Mangler.h
 llvm-devel/include/llvm/Target/Target.td
 llvm-devel/include/llvm/Target/TargetCallingConv.h
 llvm-devel/include/llvm/Target/TargetCallingConv.td
@@ -600,6 +620,7 @@ llvm-devel/include/llvm/Transforms/IPO/PassManagerBuilder.h
 llvm-devel/include/llvm/Transforms/Instrumentation.h
 llvm-devel/include/llvm/Transforms/ObjCARC.h
 llvm-devel/include/llvm/Transforms/Scalar.h
+llvm-devel/include/llvm/Transforms/Utils/ASanStackFrameLayout.h
 llvm-devel/include/llvm/Transforms/Utils/BasicBlockUtils.h
 llvm-devel/include/llvm/Transforms/Utils/BuildLibCalls.h
 llvm-devel/include/llvm/Transforms/Utils/BypassSlowDivision.h
@@ -623,8 +644,9 @@ llvm-devel/include/llvm/Transforms/Utils/ValueMapper.h
 llvm-devel/include/llvm/Transforms/Vectorize.h
 llvm-devel/lib/BugpointPasses.so
 llvm-devel/lib/LLVMHello.so
-llvm-devel/lib/libLLVM-3.4svn.so
-llvm-devel/lib/libLLVM-3.4svn.so.0
+llvm-devel/lib/libLLVM-3.5.0svn.so
+llvm-devel/lib/libLLVM-3.5.0svn.so.0
+llvm-devel/lib/libLLVM-3.5svn.so
 llvm-devel/lib/libLLVMAArch64AsmParser.a
 llvm-devel/lib/libLLVMAArch64AsmPrinter.a
 llvm-devel/lib/libLLVMAArch64CodeGen.a
@@ -659,6 +681,7 @@ 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/libLLVMMCDisassembler.a
@@ -685,6 +708,7 @@ llvm-devel/lib/libLLVMPowerPCAsmParser.a
 llvm-devel/lib/libLLVMPowerPCAsmPrinter.a
 llvm-devel/lib/libLLVMPowerPCCodeGen.a
 llvm-devel/lib/libLLVMPowerPCDesc.a
+llvm-devel/lib/libLLVMPowerPCDisassembler.a
 llvm-devel/lib/libLLVMPowerPCInfo.a
 llvm-devel/lib/libLLVMR600AsmPrinter.a
 llvm-devel/lib/libLLVMR600CodeGen.a
@@ -693,8 +717,11 @@ llvm-devel/lib/libLLVMR600Info.a
 llvm-devel/lib/libLLVMRuntimeDyld.a
 llvm-devel/lib/libLLVMScalarOpts.a
 llvm-devel/lib/libLLVMSelectionDAG.a
+llvm-devel/lib/libLLVMSparcAsmParser.a
+llvm-devel/lib/libLLVMSparcAsmPrinter.a
 llvm-devel/lib/libLLVMSparcCodeGen.a
 llvm-devel/lib/libLLVMSparcDesc.a
+llvm-devel/lib/libLLVMSparcDisassembler.a
 llvm-devel/lib/libLLVMSparcInfo.a
 llvm-devel/lib/libLLVMSupport.a
 llvm-devel/lib/libLLVMSystemZAsmParser.a
@@ -723,6 +750,19 @@ llvm-devel/lib/libLLVMipa.a
 llvm-devel/lib/libLLVMipo.a
 llvm-devel/lib/libLTO.a
 llvm-devel/lib/libLTO.so
+llvm-devel/share/llvm/cmake/AddLLVM.cmake
+llvm-devel/share/llvm/cmake/AddLLVMDefinitions.cmake
+llvm-devel/share/llvm/cmake/ChooseMSVCCRT.cmake
+llvm-devel/share/llvm/cmake/GetSVN.cmake
+llvm-devel/share/llvm/cmake/HandleLLVMOptions.cmake
+llvm-devel/share/llvm/cmake/HandleLLVMStdlib.cmake
+llvm-devel/share/llvm/cmake/LLVM-Config.cmake
+llvm-devel/share/llvm/cmake/LLVMConfig.cmake
+llvm-devel/share/llvm/cmake/LLVMConfigVersion.cmake
+llvm-devel/share/llvm/cmake/LLVMExports.cmake
+llvm-devel/share/llvm/cmake/LLVMParseArguments.cmake
+llvm-devel/share/llvm/cmake/LLVMProcessSources.cmake
+llvm-devel/share/llvm/cmake/TableGen.cmake
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/LitConfig.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/LitTestCase.py
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/ProgressBar.py
@@ -799,6 +839,8 @@ llvm-devel/lib/libLTO.so
 %%PORTDOCS%%%%DOCSDIR%%/html/HowToUseAttributes.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/HowToUseInstrMappings.html
 %%PORTDOCS%%%%DOCSDIR%%/html/HowToUseInstrMappings.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/InAlloca.html
+%%PORTDOCS%%%%DOCSDIR%%/html/InAlloca.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/LLVMBuild.html
 %%PORTDOCS%%%%DOCSDIR%%/html/LLVMBuild.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/LangImpl1.html
@@ -874,6 +916,8 @@ llvm-devel/lib/libLTO.so
 %%PORTDOCS%%%%DOCSDIR%%/html/SourceLevelDebugging.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/SphinxQuickstartTemplate.html
 %%PORTDOCS%%%%DOCSDIR%%/html/SphinxQuickstartTemplate.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/StackMaps.html
+%%PORTDOCS%%%%DOCSDIR%%/html/StackMaps.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/SystemLibrary.html
 %%PORTDOCS%%%%DOCSDIR%%/html/SystemLibrary.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/TableGenFundamentals.html
@@ -938,8 +982,8 @@ llvm-devel/lib/libLTO.so
 %%PORTDOCS%%%%DOCSDIR%%/html/llvm-link.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/llvm-nm.html
 %%PORTDOCS%%%%DOCSDIR%%/html/llvm-nm.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/llvm-prof.html
-%%PORTDOCS%%%%DOCSDIR%%/html/llvm-prof.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-profdata.html
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-profdata.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/llvm-readobj.html
 %%PORTDOCS%%%%DOCSDIR%%/html/llvm-readobj.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/llvm-stress.html
@@ -967,6 +1011,9 @@ llvm-devel/lib/libLTO.so
 %%PORTDOCS%%%%DOCSDIR%%/html/websupport.js
 %%PORTDOCS%%%%DOCSDIR%%/html/yaml2obj.html
 %%PORTDOCS%%%%DOCSDIR%%/html/yaml2obj.txt
+@dirrm llvm-devel/share/llvm/cmake
+@dirrm llvm-devel/share/llvm
+@dirrm llvm-devel/share
 @dirrm llvm-devel/lib
 @dirrm llvm-devel/include/llvm/Transforms/Utils
 @dirrm llvm-devel/include/llvm/Transforms/IPO
@@ -978,17 +1025,18 @@ llvm-devel/lib/libLTO.so
 @dirrm llvm-devel/include/llvm/Object
 @dirrm llvm-devel/include/llvm/MC/MCParser
 @dirrm llvm-devel/include/llvm/MC
+@dirrm llvm-devel/include/llvm/Linker
+@dirrm llvm-devel/include/llvm/LineEditor
 @dirrm llvm-devel/include/llvm/LTO
 @dirrm llvm-devel/include/llvm/IRReader
 @dirrm llvm-devel/include/llvm/IR
 @dirrm llvm-devel/include/llvm/ExecutionEngine
 @dirrm llvm-devel/include/llvm/DebugInfo
 @dirrm llvm-devel/include/llvm/Config
-@dirrm llvm-devel/include/llvm/CodeGen/PBQP/Heuristics
 @dirrm llvm-devel/include/llvm/CodeGen/PBQP
 @dirrm llvm-devel/include/llvm/CodeGen
 @dirrm llvm-devel/include/llvm/Bitcode
-@dirrm llvm-devel/include/llvm/Assembly
+@dirrm llvm-devel/include/llvm/AsmParser
 @dirrm llvm-devel/include/llvm/Analysis
 @dirrm llvm-devel/include/llvm/ADT
 @dirrm llvm-devel/include/llvm-c/Transforms
diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index f21465508820..defb4a16f63e 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	clang
-PORTVERSION=	3.4.r${SVN_REV}
-PORTREVISION=	1
+PORTVERSION=	3.5.r${SVN_REV}
 CATEGORIES=	lang devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -15,7 +14,7 @@ MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	C, Objective-C, and C++ compiler
 
 CLANG_NAME=	clang-${PORTVERSION}
-CLANG_RELEASE=	${PORTVERSION:C/\.r[0-9]*//}svn
+CLANG_RELEASE=	${PORTVERSION:C/\.r[0-9]*//}.0svn
 CLANG_SOURCE=	${CLANG_NAME}${EXTRACT_SUFX}
 LLVM_NAME=	llvm-${PORTVERSION}
 LLVM_SOURCE=	${LLVM_NAME}${EXTRACT_SUFX}
diff --git a/lang/clang-devel/distinfo b/lang/clang-devel/distinfo
index 98ad985b706e..575ce66e0018 100644
--- a/lang/clang-devel/distinfo
+++ b/lang/clang-devel/distinfo
@@ -1,4 +1,4 @@
-SHA256 (clang-3.4.r193887.tar.bz2) = ce034154e6ef98321b26c4c3fa82a1066fdfb49bd193e71767797c11eaea3f9c
-SIZE (clang-3.4.r193887.tar.bz2) = 8275346
-SHA256 (llvm-3.4.r193887.tar.bz2) = 175e3034a0f19c0ca9ce2fc75ccdc796f3c3bfd29b69f595aa4fc857f53db955
-SIZE (llvm-3.4.r193887.tar.bz2) = 11845136
+SHA256 (clang-3.5.r203994.tar.bz2) = dc6bb8ae84f32cfc38ac2d5f19a9a938806065d4d9f5be553d1003effa6d1f24
+SIZE (clang-3.5.r203994.tar.bz2) = 8623518
+SHA256 (llvm-3.5.r203994.tar.bz2) = 73bc4d19b25a8ab5824f6374f068b1ab345b760388f3f5764836f2c3317c380a
+SIZE (llvm-3.5.r203994.tar.bz2) = 12350225
diff --git a/lang/clang-devel/files/patch-tools_clang_lib_Driver_ToolChains.cpp b/lang/clang-devel/files/patch-tools_clang_lib_Driver_ToolChains.cpp
deleted file mode 100644
index d34e4d8781a4..000000000000
--- a/lang/clang-devel/files/patch-tools_clang_lib_Driver_ToolChains.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-
-$FreeBSD$
-
---- tools/clang/lib/Driver/ToolChains.cpp.orig
-+++ tools/clang/lib/Driver/ToolChains.cpp
-@@ -1950,6 +1950,38 @@
-   }
- }
- 
-+ToolChain::CXXStdlibType
-+FreeBSD::GetCXXStdlibType(const ArgList &Args) const {
-+  if (Arg *A = Args.getLastArg(options::OPT_stdlib_EQ)) {
-+    StringRef Value = A->getValue();
-+    if (Value == "libc++")
-+      return ToolChain::CST_Libcxx;
-+    if (Value == "libstdc++")
-+      return ToolChain::CST_Libstdcxx;
-+    getDriver().Diag(diag::err_drv_invalid_stdlib_name)
-+      << A->getAsString(Args);
-+  }
-+
-+  return getTriple().getOSMajorVersion() >= 10 ? ToolChain::CST_Libcxx :
-+         ToolChain::CST_Libstdcxx;
-+}
-+
-+void FreeBSD::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
-+                                          ArgStringList &CC1Args) const {
-+  if (DriverArgs.hasArg(options::OPT_nostdlibinc) ||
-+      DriverArgs.hasArg(options::OPT_nostdincxx))
-+    return;
-+
-+  if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx)
-+    addSystemInclude(DriverArgs, CC1Args,
-+                     getDriver().SysRoot + "/usr/include/c++/v1");
-+  else
-+    addSystemInclude(DriverArgs, CC1Args,
-+                     getDriver().SysRoot + "/usr/include/c++/4.2");
-+  return;
-+
-+}
-+
- /// NetBSD - NetBSD tool chain which can call as(1) and ld(1) directly.
- 
- NetBSD::NetBSD(const Driver &D, const llvm::Triple& Triple, const ArgList &Args)
diff --git a/lang/clang-devel/files/patch-tools_clang_lib_Driver_ToolChains.h b/lang/clang-devel/files/patch-tools_clang_lib_Driver_ToolChains.h
deleted file mode 100644
index 1c35a3f5f16d..000000000000
--- a/lang/clang-devel/files/patch-tools_clang_lib_Driver_ToolChains.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-$FreeBSD$
-
---- tools/clang/lib/Driver/ToolChains.h.orig
-+++ tools/clang/lib/Driver/ToolChains.h
-@@ -515,9 +515,14 @@
-   FreeBSD(const Driver &D, const llvm::Triple &Triple,
-           const llvm::opt::ArgList &Args);
- 
-+  virtual CXXStdlibType GetCXXStdlibType(const llvm::opt::ArgList &Args) const;
-+
-   virtual bool IsMathErrnoDefault() const { return false; }
-   virtual bool IsObjCNonFragileABIDefault() const { return true; }
- 
-+  virtual void AddClangCXXStdlibIncludeArgs(const llvm::opt::ArgList &DriverArgs,
-+                                            llvm::opt::ArgStringList &CC1Args) const;
-+
-   virtual bool UseSjLjExceptions() const;
- protected:
-   virtual Tool *buildAssembler() const;
diff --git a/lang/clang-devel/files/patch-tools_clang_tools_scan-build_scan-build b/lang/clang-devel/files/patch-tools_clang_tools_scan-build_scan-build
index f5bd884e8b2c..9872d6bf78b1 100644
--- a/lang/clang-devel/files/patch-tools_clang_tools_scan-build_scan-build
+++ b/lang/clang-devel/files/patch-tools_clang_tools_scan-build_scan-build
@@ -1,23 +1,23 @@
 
-$FreeBSD: /tmp/pcvs/ports/lang/clang-devel/files/patch-tools_clang_tools_scan-build_scan-build,v 1.1 2010-10-08 14:00:31 brooks Exp $
+$FreeBSD$
 
 --- tools/clang/tools/scan-build/scan-build.orig
 +++ tools/clang/tools/scan-build/scan-build
-@@ -423,7 +423,7 @@
+@@ -419,7 +419,7 @@
  
    my $Dir = shift;
  
 -  my $JS = Cwd::realpath("$RealBin/sorttable.js");
 +  my $JS = Cwd::realpath("%%DATADIR%%/sorttable.js");
-   
+ 
    DieDiag("Cannot find 'sorttable.js'.\n")
-     if (! -r $JS);  
-@@ -433,7 +433,7 @@
+     if (! -r $JS);
+@@ -429,7 +429,7 @@
    DieDiag("Could not copy 'sorttable.js' to '$Dir'.\n")
      if (! -r "$Dir/sorttable.js");
-     
+ 
 -  my $CSS = Cwd::realpath("$RealBin/scanview.css");
 +  my $CSS = Cwd::realpath("%%DATADIR%%/scanview.css");
-   
+ 
    DieDiag("Cannot find 'scanview.css'.\n")
      if (! -r $CSS);
diff --git a/lang/clang-devel/pkg-plist b/lang/clang-devel/pkg-plist
index be7d2756484d..398ff3bfc48a 100644
--- a/lang/clang-devel/pkg-plist
+++ b/lang/clang-devel/pkg-plist
@@ -20,7 +20,9 @@ llvm-devel/bin/clang-format
 llvm-devel/bin/clang-tblgen
 llvm-devel/bin/scan-build
 llvm-devel/bin/scan-view
+llvm-devel/include/clang-c/BuildSystem.h
 llvm-devel/include/clang-c/CXCompilationDatabase.h
+llvm-devel/include/clang-c/CXErrorCode.h
 llvm-devel/include/clang-c/CXString.h
 llvm-devel/include/clang-c/Index.h
 llvm-devel/include/clang-c/Platform.h
@@ -43,6 +45,7 @@ llvm-devel/include/clang/AST/Attr.h
 llvm-devel/include/clang/AST/AttrDump.inc
 llvm-devel/include/clang/AST/AttrImpl.inc
 llvm-devel/include/clang/AST/AttrIterator.h
+llvm-devel/include/clang/AST/AttrVisitor.inc
 llvm-devel/include/clang/AST/Attrs.inc
 llvm-devel/include/clang/AST/BaseSubobject.h
 llvm-devel/include/clang/AST/BuiltinTypes.def
@@ -63,6 +66,7 @@ llvm-devel/include/clang/AST/CommentNodes.inc
 llvm-devel/include/clang/AST/CommentParser.h
 llvm-devel/include/clang/AST/CommentSema.h
 llvm-devel/include/clang/AST/CommentVisitor.h
+llvm-devel/include/clang/AST/DataRecursiveASTVisitor.h
 llvm-devel/include/clang/AST/Decl.h
 llvm-devel/include/clang/AST/DeclAccessPair.h
 llvm-devel/include/clang/AST/DeclBase.h
@@ -88,6 +92,7 @@ llvm-devel/include/clang/AST/Mangle.h
 llvm-devel/include/clang/AST/MangleNumberingContext.h
 llvm-devel/include/clang/AST/NSAPI.h
 llvm-devel/include/clang/AST/NestedNameSpecifier.h
+llvm-devel/include/clang/AST/OpenMPClause.h
 llvm-devel/include/clang/AST/OperationKinds.h
 llvm-devel/include/clang/AST/ParentMap.h
 llvm-devel/include/clang/AST/PrettyPrinter.h
@@ -195,7 +200,6 @@ llvm-devel/include/clang/Basic/MacroBuilder.h
 llvm-devel/include/clang/Basic/Module.h
 llvm-devel/include/clang/Basic/ObjCRuntime.h
 llvm-devel/include/clang/Basic/OnDiskHashTable.h
-llvm-devel/include/clang/Basic/OpenCL.h
 llvm-devel/include/clang/Basic/OpenCLExtensions.def
 llvm-devel/include/clang/Basic/OpenMPKinds.def
 llvm-devel/include/clang/Basic/OpenMPKinds.h
@@ -203,6 +207,7 @@ llvm-devel/include/clang/Basic/OperatorKinds.def
 llvm-devel/include/clang/Basic/OperatorKinds.h
 llvm-devel/include/clang/Basic/OperatorPrecedence.h
 llvm-devel/include/clang/Basic/PartialDiagnostic.h
+llvm-devel/include/clang/Basic/PlistSupport.h
 llvm-devel/include/clang/Basic/PrettyStackTrace.h
 llvm-devel/include/clang/Basic/Sanitizers.def
 llvm-devel/include/clang/Basic/SourceLocation.h
@@ -220,6 +225,7 @@ llvm-devel/include/clang/Basic/TypeTraits.h
 llvm-devel/include/clang/Basic/Version.h
 llvm-devel/include/clang/Basic/Version.inc
 llvm-devel/include/clang/Basic/VersionTuple.h
+llvm-devel/include/clang/Basic/VirtualFileSystem.h
 llvm-devel/include/clang/Basic/Visibility.h
 llvm-devel/include/clang/Basic/arm_neon.inc
 llvm-devel/include/clang/CodeGen/BackendUtil.h
@@ -231,11 +237,11 @@ llvm-devel/include/clang/Config/config.h
 llvm-devel/include/clang/Driver/Action.h
 llvm-devel/include/clang/Driver/CC1AsOptions.h
 llvm-devel/include/clang/Driver/CC1AsOptions.inc
-llvm-devel/include/clang/Driver/CC1Options.h
 llvm-devel/include/clang/Driver/Compilation.h
 llvm-devel/include/clang/Driver/Driver.h
 llvm-devel/include/clang/Driver/DriverDiagnostic.h
 llvm-devel/include/clang/Driver/Job.h
+llvm-devel/include/clang/Driver/Multilib.h
 llvm-devel/include/clang/Driver/Options.h
 llvm-devel/include/clang/Driver/Options.inc
 llvm-devel/include/clang/Driver/Phases.h
@@ -281,6 +287,7 @@ llvm-devel/include/clang/Frontend/TextDiagnosticPrinter.h
 llvm-devel/include/clang/Frontend/Utils.h
 llvm-devel/include/clang/Frontend/VerifyDiagnosticConsumer.h
 llvm-devel/include/clang/FrontendTool/Utils.h
+llvm-devel/include/clang/Index/CommentToXML.h
 llvm-devel/include/clang/Index/USRGeneration.h
 llvm-devel/include/clang/Lex/AttrSpellings.inc
 llvm-devel/include/clang/Lex/CodeCompletionHandler.h
@@ -310,8 +317,7 @@ llvm-devel/include/clang/Lex/ScratchBuffer.h
 llvm-devel/include/clang/Lex/Token.h
 llvm-devel/include/clang/Lex/TokenConcatenation.h
 llvm-devel/include/clang/Lex/TokenLexer.h
-llvm-devel/include/clang/Parse/AttrIdentifierArg.inc
-llvm-devel/include/clang/Parse/AttrLateParsed.inc
+llvm-devel/include/clang/Parse/AttrParserStringSwitches.inc
 llvm-devel/include/clang/Parse/ParseAST.h
 llvm-devel/include/clang/Parse/ParseDiagnostic.h
 llvm-devel/include/clang/Parse/Parser.h
@@ -355,6 +361,7 @@ llvm-devel/include/clang/Sema/SemaConsumer.h
 llvm-devel/include/clang/Sema/SemaDiagnostic.h
 llvm-devel/include/clang/Sema/SemaFixItUtils.h
 llvm-devel/include/clang/Sema/SemaInternal.h
+llvm-devel/include/clang/Sema/SemaLambda.h
 llvm-devel/include/clang/Sema/Template.h
 llvm-devel/include/clang/Sema/TemplateDeduction.h
 llvm-devel/include/clang/Sema/TypoCorrection.h
@@ -413,6 +420,7 @@ llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h
 llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/TaintManager.h
 llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/TaintTag.h
 llvm-devel/include/clang/StaticAnalyzer/Core/PathSensitive/WorkList.h
+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/Tooling/ArgumentsAdjusters.h
@@ -425,40 +433,41 @@ llvm-devel/include/clang/Tooling/Refactoring.h
 llvm-devel/include/clang/Tooling/RefactoringCallbacks.h
 llvm-devel/include/clang/Tooling/ReplacementsYaml.h
 llvm-devel/include/clang/Tooling/Tooling.h
-llvm-devel/lib/clang/3.4/include/__wmmintrin_aes.h
-llvm-devel/lib/clang/3.4/include/__wmmintrin_pclmul.h
-llvm-devel/lib/clang/3.4/include/altivec.h
-llvm-devel/lib/clang/3.4/include/ammintrin.h
-llvm-devel/lib/clang/3.4/include/arm_neon.h
-llvm-devel/lib/clang/3.4/include/avx2intrin.h
-llvm-devel/lib/clang/3.4/include/avxintrin.h
-llvm-devel/lib/clang/3.4/include/bmi2intrin.h
-llvm-devel/lib/clang/3.4/include/bmiintrin.h
-llvm-devel/lib/clang/3.4/include/cpuid.h
-llvm-devel/lib/clang/3.4/include/emmintrin.h
-llvm-devel/lib/clang/3.4/include/f16cintrin.h
-llvm-devel/lib/clang/3.4/include/fma4intrin.h
-llvm-devel/lib/clang/3.4/include/fmaintrin.h
-llvm-devel/lib/clang/3.4/include/immintrin.h
-llvm-devel/lib/clang/3.4/include/lzcntintrin.h
-llvm-devel/lib/clang/3.4/include/mm3dnow.h
-llvm-devel/lib/clang/3.4/include/mm_malloc.h
-llvm-devel/lib/clang/3.4/include/mmintrin.h
-llvm-devel/lib/clang/3.4/include/module.map
-llvm-devel/lib/clang/3.4/include/nmmintrin.h
-llvm-devel/lib/clang/3.4/include/pmmintrin.h
-llvm-devel/lib/clang/3.4/include/popcntintrin.h
-llvm-devel/lib/clang/3.4/include/prfchwintrin.h
-llvm-devel/lib/clang/3.4/include/rdseedintrin.h
-llvm-devel/lib/clang/3.4/include/rtmintrin.h
-llvm-devel/lib/clang/3.4/include/shaintrin.h
-llvm-devel/lib/clang/3.4/include/smmintrin.h
-llvm-devel/lib/clang/3.4/include/tbmintrin.h
-llvm-devel/lib/clang/3.4/include/tmmintrin.h
-llvm-devel/lib/clang/3.4/include/wmmintrin.h
-llvm-devel/lib/clang/3.4/include/x86intrin.h
-llvm-devel/lib/clang/3.4/include/xmmintrin.h
-llvm-devel/lib/clang/3.4/include/xopintrin.h
+llvm-devel/lib/clang/3.5.0/include/__wmmintrin_aes.h
+llvm-devel/lib/clang/3.5.0/include/__wmmintrin_pclmul.h
+llvm-devel/lib/clang/3.5.0/include/altivec.h
+llvm-devel/lib/clang/3.5.0/include/ammintrin.h
+llvm-devel/lib/clang/3.5.0/include/arm_neon.h
+llvm-devel/lib/clang/3.5.0/include/avx2intrin.h
+llvm-devel/lib/clang/3.5.0/include/avxintrin.h
+llvm-devel/lib/clang/3.5.0/include/bmi2intrin.h
+llvm-devel/lib/clang/3.5.0/include/bmiintrin.h
+llvm-devel/lib/clang/3.5.0/include/cpuid.h
+llvm-devel/lib/clang/3.5.0/include/emmintrin.h
+llvm-devel/lib/clang/3.5.0/include/f16cintrin.h
+llvm-devel/lib/clang/3.5.0/include/fma4intrin.h
+llvm-devel/lib/clang/3.5.0/include/fmaintrin.h
+llvm-devel/lib/clang/3.5.0/include/ia32intrin.h
+llvm-devel/lib/clang/3.5.0/include/immintrin.h
+llvm-devel/lib/clang/3.5.0/include/lzcntintrin.h
+llvm-devel/lib/clang/3.5.0/include/mm3dnow.h
+llvm-devel/lib/clang/3.5.0/include/mm_malloc.h
+llvm-devel/lib/clang/3.5.0/include/mmintrin.h
+llvm-devel/lib/clang/3.5.0/include/module.map
+llvm-devel/lib/clang/3.5.0/include/nmmintrin.h
+llvm-devel/lib/clang/3.5.0/include/pmmintrin.h
+llvm-devel/lib/clang/3.5.0/include/popcntintrin.h
+llvm-devel/lib/clang/3.5.0/include/prfchwintrin.h
+llvm-devel/lib/clang/3.5.0/include/rdseedintrin.h
+llvm-devel/lib/clang/3.5.0/include/rtmintrin.h
+llvm-devel/lib/clang/3.5.0/include/shaintrin.h
+llvm-devel/lib/clang/3.5.0/include/smmintrin.h
+llvm-devel/lib/clang/3.5.0/include/tbmintrin.h
+llvm-devel/lib/clang/3.5.0/include/tmmintrin.h
+llvm-devel/lib/clang/3.5.0/include/wmmintrin.h
+llvm-devel/lib/clang/3.5.0/include/x86intrin.h
+llvm-devel/lib/clang/3.5.0/include/xmmintrin.h
+llvm-devel/lib/clang/3.5.0/include/xopintrin.h
 llvm-devel/lib/libclang.a
 llvm-devel/lib/libclang.so
 llvm-devel/lib/libclangARCMigrate.a
@@ -488,8 +497,8 @@ man/man1/clang-devel.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/clang.html
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/manpage.css
 %%PORTDOCS%%%%DOCSDIR%%/ps/clang.ps
-@dirrm llvm-devel/lib/clang/3.4/include
-@dirrm llvm-devel/lib/clang/3.4
+@dirrm llvm-devel/lib/clang/3.5.0/include
+@dirrm llvm-devel/lib/clang/3.5.0
 @dirrm llvm-devel/lib/clang
 @dirrm llvm-devel/include/clang/Tooling
 @dirrm llvm-devel/include/clang/StaticAnalyzer/Frontend