From eda9b0a29d553be7c339528f426a17789a66b870 Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 15 Aug 2014 15:41:52 +0000
Subject: [PATCH] Update to r211638.

---
 devel/llvm-devel/Makefile                     | 11 ++--
 devel/llvm-devel/Makefile.svn_rev             |  2 +-
 devel/llvm-devel/distinfo                     |  4 +-
 devel/llvm-devel/pkg-plist                    | 52 ++++++++++++++++---
 lang/clang-devel/Makefile                     |  2 +-
 lang/clang-devel/distinfo                     |  8 +--
 .../files/patch-include_llvm_ADT_Triple.h     | 17 ------
 ...atch-tools_clang_lib_Sema_SemaChecking.cpp |  4 +-
 lang/clang-devel/pkg-plist                    | 19 +++++--
 9 files changed, 75 insertions(+), 44 deletions(-)
 delete mode 100644 lang/clang-devel/files/patch-include_llvm_ADT_Triple.h

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 953f44994090..8f98ba7c2049 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -29,7 +29,6 @@ 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
@@ -88,7 +87,7 @@ FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
 
 STRIP_LIBS=	BugpointPasses.so \
 		LLVMHello.so \
-		${LIBNAME_REAL}.0 \
+		${LIBNAME}.0 \
 		libLTO.so
 
 .include <bsd.port.options.mk>
@@ -191,11 +190,9 @@ post-build:
 .endif
 
 post-install:
-	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}
+	${MV} ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME} \
+	    ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME}.0
+	${LN} -sf ${LIBNAME}.0 ${STAGEDIR}${LLVM_PREFIX}/lib/${LIBNAME}
 	${STRIP_CMD} ${STRIP_LIBS:S|^|${STAGEDIR}${LLVM_PREFIX}/lib/|}
 	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
 	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
diff --git a/devel/llvm-devel/Makefile.svn_rev b/devel/llvm-devel/Makefile.svn_rev
index bf66d0f5f36d..9bbf2978aef1 100644
--- a/devel/llvm-devel/Makefile.svn_rev
+++ b/devel/llvm-devel/Makefile.svn_rev
@@ -1 +1 @@
-SVN_REV=	203994
+SVN_REV=	211638
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 7e75d04b3989..bee156b188d5 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (llvm-3.5.r203994.tar.bz2) = 73bc4d19b25a8ab5824f6374f068b1ab345b760388f3f5764836f2c3317c380a
-SIZE (llvm-3.5.r203994.tar.bz2) = 12350225
+SHA256 (llvm-3.5.r211638.tar.bz2) = 8ea2dd01388ab59734c223052dc7c6e971ffced94df918a7684a96b46a4bd4ed
+SIZE (llvm-3.5.r211638.tar.bz2) = 13269862
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 0bae9d8ad040..f29f29bf2715 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -95,7 +95,6 @@ llvm-devel/include/llvm/ADT/EquivalenceClasses.h
 llvm-devel/include/llvm/ADT/FoldingSet.h
 llvm-devel/include/llvm/ADT/GraphTraits.h
 llvm-devel/include/llvm/ADT/Hashing.h
-llvm-devel/include/llvm/ADT/ImmutableIntervalMap.h
 llvm-devel/include/llvm/ADT/ImmutableList.h
 llvm-devel/include/llvm/ADT/ImmutableMap.h
 llvm-devel/include/llvm/ADT/ImmutableSet.h
@@ -106,7 +105,6 @@ llvm-devel/include/llvm/ADT/IntrusiveRefCntPtr.h
 llvm-devel/include/llvm/ADT/MapVector.h
 llvm-devel/include/llvm/ADT/None.h
 llvm-devel/include/llvm/ADT/Optional.h
-llvm-devel/include/llvm/ADT/OwningPtr.h
 llvm-devel/include/llvm/ADT/PackedVector.h
 llvm-devel/include/llvm/ADT/PointerIntPair.h
 llvm-devel/include/llvm/ADT/PointerUnion.h
@@ -139,14 +137,16 @@ 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.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
 llvm-devel/include/llvm/Analysis/BlockFrequencyInfo.h
+llvm-devel/include/llvm/Analysis/BlockFrequencyInfoImpl.h
 llvm-devel/include/llvm/Analysis/BranchProbabilityInfo.h
 llvm-devel/include/llvm/Analysis/CFG.h
 llvm-devel/include/llvm/Analysis/CFGPrinter.h
+llvm-devel/include/llvm/Analysis/CGSCCPassManager.h
 llvm-devel/include/llvm/Analysis/CallGraph.h
 llvm-devel/include/llvm/Analysis/CallGraphSCCPass.h
 llvm-devel/include/llvm/Analysis/CallPrinter.h
@@ -165,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/JumpInstrTableInfo.h
 llvm-devel/include/llvm/Analysis/LazyCallGraph.h
 llvm-devel/include/llvm/Analysis/LazyValueInfo.h
 llvm-devel/include/llvm/Analysis/LibCallAliasAnalysis.h
@@ -218,6 +219,7 @@ 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
 llvm-devel/include/llvm/CodeGen/LinkAllAsmWriterComponents.h
@@ -338,6 +340,7 @@ 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/GlobalObject.h
 llvm-devel/include/llvm/IR/GlobalValue.h
 llvm-devel/include/llvm/IR/GlobalVariable.h
 llvm-devel/include/llvm/IR/IRBuilder.h
@@ -396,6 +399,7 @@ llvm-devel/include/llvm/LineEditor/LineEditor.h
 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/MCAsmBackend.h
 llvm-devel/include/llvm/MC/MCAsmInfo.h
 llvm-devel/include/llvm/MC/MCAsmInfoCOFF.h
@@ -428,6 +432,7 @@ llvm-devel/include/llvm/MC/MCInstrDesc.h
 llvm-devel/include/llvm/MC/MCInstrInfo.h
 llvm-devel/include/llvm/MC/MCInstrItineraries.h
 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/MCModule.h
@@ -455,9 +460,12 @@ llvm-devel/include/llvm/MC/MCSubtargetInfo.h
 llvm-devel/include/llvm/MC/MCSymbol.h
 llvm-devel/include/llvm/MC/MCSymbolizer.h
 llvm-devel/include/llvm/MC/MCTargetAsmParser.h
+llvm-devel/include/llvm/MC/MCTargetOptions.h
+llvm-devel/include/llvm/MC/MCTargetOptionsCommandFlags.h
 llvm-devel/include/llvm/MC/MCValue.h
 llvm-devel/include/llvm/MC/MCWin64EH.h
 llvm-devel/include/llvm/MC/MCWinCOFFObjectWriter.h
+llvm-devel/include/llvm/MC/MCWinCOFFStreamer.h
 llvm-devel/include/llvm/MC/MachineLocation.h
 llvm-devel/include/llvm/MC/SectionKind.h
 llvm-devel/include/llvm/MC/SubtargetFeature.h
@@ -475,6 +483,7 @@ 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/StringTableBuilder.h
 llvm-devel/include/llvm/Object/SymbolicFile.h
 llvm-devel/include/llvm/Object/YAML.h
 llvm-devel/include/llvm/Option/Arg.h
@@ -485,12 +494,17 @@ llvm-devel/include/llvm/Option/OptTable.h
 llvm-devel/include/llvm/Option/Option.h
 llvm-devel/include/llvm/Pass.h
 llvm-devel/include/llvm/PassAnalysisSupport.h
+llvm-devel/include/llvm/PassInfo.h
 llvm-devel/include/llvm/PassManager.h
 llvm-devel/include/llvm/PassRegistry.h
 llvm-devel/include/llvm/PassSupport.h
+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/Support/AIXDataTypesFix.h
 llvm-devel/include/llvm/Support/ARMBuildAttributes.h
 llvm-devel/include/llvm/Support/ARMEHABI.h
+llvm-devel/include/llvm/Support/ARMWinEH.h
 llvm-devel/include/llvm/Support/AlignOf.h
 llvm-devel/include/llvm/Support/Allocator.h
 llvm-devel/include/llvm/Support/ArrayRecycler.h
@@ -517,10 +531,11 @@ llvm-devel/include/llvm/Support/Dwarf.h
 llvm-devel/include/llvm/Support/DynamicLibrary.h
 llvm-devel/include/llvm/Support/ELF.h
 llvm-devel/include/llvm/Support/Endian.h
+llvm-devel/include/llvm/Support/EndianStream.h
+llvm-devel/include/llvm/Support/Errc.h
 llvm-devel/include/llvm/Support/Errno.h
 llvm-devel/include/llvm/Support/ErrorHandling.h
 llvm-devel/include/llvm/Support/ErrorOr.h
-llvm-devel/include/llvm/Support/FEnv.h
 llvm-devel/include/llvm/Support/FileOutputBuffer.h
 llvm-devel/include/llvm/Support/FileSystem.h
 llvm-devel/include/llvm/Support/FileUtilities.h
@@ -546,6 +561,7 @@ 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/OnDiskHashTable.h
 llvm-devel/include/llvm/Support/OutputBuffer.h
 llvm-devel/include/llvm/Support/Path.h
 llvm-devel/include/llvm/Support/PluginLoader.h
@@ -561,6 +577,7 @@ llvm-devel/include/llvm/Support/Registry.h
 llvm-devel/include/llvm/Support/RegistryParser.h
 llvm-devel/include/llvm/Support/SMLoc.h
 llvm-devel/include/llvm/Support/SaveAndRestore.h
+llvm-devel/include/llvm/Support/ScaledNumber.h
 llvm-devel/include/llvm/Support/Signals.h
 llvm-devel/include/llvm/Support/Solaris.h
 llvm-devel/include/llvm/Support/SourceMgr.h
@@ -581,16 +598,17 @@ llvm-devel/include/llvm/Support/UnicodeCharRanges.h
 llvm-devel/include/llvm/Support/Valgrind.h
 llvm-devel/include/llvm/Support/Watchdog.h
 llvm-devel/include/llvm/Support/Win64EH.h
+llvm-devel/include/llvm/Support/WindowsError.h
 llvm-devel/include/llvm/Support/YAMLParser.h
 llvm-devel/include/llvm/Support/YAMLTraits.h
 llvm-devel/include/llvm/Support/circular_raw_ostream.h
 llvm-devel/include/llvm/Support/raw_os_ostream.h
 llvm-devel/include/llvm/Support/raw_ostream.h
-llvm-devel/include/llvm/Support/system_error.h
 llvm-devel/include/llvm/Support/type_traits.h
 llvm-devel/include/llvm/TableGen/Error.h
 llvm-devel/include/llvm/TableGen/Main.h
 llvm-devel/include/llvm/TableGen/Record.h
+llvm-devel/include/llvm/TableGen/SetTheory.h
 llvm-devel/include/llvm/TableGen/StringMatcher.h
 llvm-devel/include/llvm/TableGen/StringToOffsetTable.h
 llvm-devel/include/llvm/TableGen/TableGenBackend.h
@@ -627,6 +645,7 @@ llvm-devel/include/llvm/Transforms/Utils/BypassSlowDivision.h
 llvm-devel/include/llvm/Transforms/Utils/Cloning.h
 llvm-devel/include/llvm/Transforms/Utils/CmpInstAnalysis.h
 llvm-devel/include/llvm/Transforms/Utils/CodeExtractor.h
+llvm-devel/include/llvm/Transforms/Utils/CtorUtils.h
 llvm-devel/include/llvm/Transforms/Utils/GlobalStatus.h
 llvm-devel/include/llvm/Transforms/Utils/IntegerDivision.h
 llvm-devel/include/llvm/Transforms/Utils/Local.h
@@ -641,12 +660,13 @@ llvm-devel/include/llvm/Transforms/Utils/SpecialCaseList.h
 llvm-devel/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
 llvm-devel/include/llvm/Transforms/Utils/UnrollLoop.h
 llvm-devel/include/llvm/Transforms/Utils/ValueMapper.h
+llvm-devel/include/llvm/Transforms/Utils/VectorUtils.h
 llvm-devel/include/llvm/Transforms/Vectorize.h
 llvm-devel/lib/BugpointPasses.so
 llvm-devel/lib/LLVMHello.so
 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/libLLVM-3.5svn.so.0
 llvm-devel/lib/libLLVMAArch64AsmParser.a
 llvm-devel/lib/libLLVMAArch64AsmPrinter.a
 llvm-devel/lib/libLLVMAArch64CodeGen.a
@@ -710,6 +730,7 @@ llvm-devel/lib/libLLVMPowerPCCodeGen.a
 llvm-devel/lib/libLLVMPowerPCDesc.a
 llvm-devel/lib/libLLVMPowerPCDisassembler.a
 llvm-devel/lib/libLLVMPowerPCInfo.a
+llvm-devel/lib/libLLVMProfileData.a
 llvm-devel/lib/libLLVMR600AsmPrinter.a
 llvm-devel/lib/libLLVMR600CodeGen.a
 llvm-devel/lib/libLLVMR600Desc.a
@@ -752,7 +773,9 @@ 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/AddSphinxTarget.cmake
 llvm-devel/share/llvm/cmake/ChooseMSVCCRT.cmake
+llvm-devel/share/llvm/cmake/FindSphinx.cmake
 llvm-devel/share/llvm/cmake/GetSVN.cmake
 llvm-devel/share/llvm/cmake/HandleLLVMOptions.cmake
 llvm-devel/share/llvm/cmake/HandleLLVMStdlib.cmake
@@ -778,12 +801,22 @@ llvm-devel/share/llvm/cmake/TableGen.cmake
 %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/util.py
 %%PORTDOCS%%%%DOCSDIR%%/html.tar.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/.buildinfo
+%%PORTDOCS%%%%DOCSDIR%%/html/ARM-BE-bitcastfail.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ARM-BE-bitcastsuccess.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ARM-BE-ld1.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ARM-BE-ldr.png
 %%PORTDOCS%%%%DOCSDIR%%/html/AliasAnalysis.html
 %%PORTDOCS%%%%DOCSDIR%%/html/AliasAnalysis.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/Atomics.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Atomics.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/BackEnds.html
+%%PORTDOCS%%%%DOCSDIR%%/html/BackEnds.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/BigEndianNEON.html
+%%PORTDOCS%%%%DOCSDIR%%/html/BigEndianNEON.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/BitCodeFormat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/BitCodeFormat.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/BlockFrequencyTerminology.html
+%%PORTDOCS%%%%DOCSDIR%%/html/BlockFrequencyTerminology.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/BranchWeightMetadata.html
 %%PORTDOCS%%%%DOCSDIR%%/html/BranchWeightMetadata.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/Bugpoint.html
@@ -800,6 +833,8 @@ llvm-devel/share/llvm/cmake/TableGen.cmake
 %%PORTDOCS%%%%DOCSDIR%%/html/CompilerWriterInfo.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/DebuggingJITedCode.html
 %%PORTDOCS%%%%DOCSDIR%%/html/DebuggingJITedCode.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/Deficiencies.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Deficiencies.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/DeveloperPolicy.html
 %%PORTDOCS%%%%DOCSDIR%%/html/DeveloperPolicy.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/Dummy.html
@@ -860,6 +895,8 @@ llvm-devel/share/llvm/cmake/TableGen.cmake
 %%PORTDOCS%%%%DOCSDIR%%/html/LangImpl7.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/LangImpl8.html
 %%PORTDOCS%%%%DOCSDIR%%/html/LangImpl8.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/LangIntro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/LangIntro.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/LangRef.html
 %%PORTDOCS%%%%DOCSDIR%%/html/LangRef.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/Lexicon.html
@@ -976,6 +1013,8 @@ llvm-devel/share/llvm/cmake/TableGen.cmake
 %%PORTDOCS%%%%DOCSDIR%%/html/llvm-diff.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/llvm-dis.html
 %%PORTDOCS%%%%DOCSDIR%%/html/llvm-dis.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-dwarfdump.html
+%%PORTDOCS%%%%DOCSDIR%%/html/llvm-dwarfdump.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/llvm-extract.html
 %%PORTDOCS%%%%DOCSDIR%%/html/llvm-extract.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/llvm-link.html
@@ -1021,6 +1060,7 @@ llvm-devel/share/llvm/cmake/TableGen.cmake
 @dirrm llvm-devel/include/llvm/Target
 @dirrm llvm-devel/include/llvm/TableGen
 @dirrm llvm-devel/include/llvm/Support
+@dirrm llvm-devel/include/llvm/ProfileData
 @dirrm llvm-devel/include/llvm/Option
 @dirrm llvm-devel/include/llvm/Object
 @dirrm llvm-devel/include/llvm/MC/MCParser
diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index 93e8991a8141..95ec3e667fff 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -14,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]*//}.0svn
+CLANG_RELEASE=	${PORTVERSION:C/\.r[0-9]*//}svn
 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 575ce66e0018..2b0077f6217e 100644
--- a/lang/clang-devel/distinfo
+++ b/lang/clang-devel/distinfo
@@ -1,4 +1,4 @@
-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
+SHA256 (clang-3.5.r211638.tar.bz2) = dbd0c8deb2e989cbc3127528f0687a744b1dce70b24eb8fb016fde7df86237e8
+SIZE (clang-3.5.r211638.tar.bz2) = 8967411
+SHA256 (llvm-3.5.r211638.tar.bz2) = 8ea2dd01388ab59734c223052dc7c6e971ffced94df918a7684a96b46a4bd4ed
+SIZE (llvm-3.5.r211638.tar.bz2) = 13269862
diff --git a/lang/clang-devel/files/patch-include_llvm_ADT_Triple.h b/lang/clang-devel/files/patch-include_llvm_ADT_Triple.h
deleted file mode 100644
index 788c5bbd8909..000000000000
--- a/lang/clang-devel/files/patch-include_llvm_ADT_Triple.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- include/llvm/ADT/Triple.h.orig
-+++ include/llvm/ADT/Triple.h
-@@ -296,6 +296,11 @@
-     return isMacOSX() || getOS() == Triple::IOS;
-   }
- 
-+  /// isOSFreeBSD - Is this FreeBSD OS
-+  bool isOSFreeBSD() const {
-+    return getOS() == Triple::FreeBSD;
-+  }
-+
-   /// \brief Tests for either Cygwin or MinGW OS
-   bool isOSCygMing() const {
-     return getOS() == Triple::Cygwin || getOS() == Triple::MinGW32;
diff --git a/lang/clang-devel/files/patch-tools_clang_lib_Sema_SemaChecking.cpp b/lang/clang-devel/files/patch-tools_clang_lib_Sema_SemaChecking.cpp
index bad27d610598..0418dc6605aa 100644
--- a/lang/clang-devel/files/patch-tools_clang_lib_Sema_SemaChecking.cpp
+++ b/lang/clang-devel/files/patch-tools_clang_lib_Sema_SemaChecking.cpp
@@ -20,7 +20,7 @@ $FreeBSD: /tmp/pcvs/ports/lang/clang-devel/files/patch-tools_clang_lib_Sema_Sema
 +    const analyze_printf::ArgType &ATR = type;
 +    if (ATR.isValid() && !ATR.matchesType(S.Context, Ex->getType()))
 +      S.Diag(getLocationOfByte(CS.getStart()),
-+             diag::warn_printf_conversion_argument_type_mismatch)
++             diag::warn_format_conversion_argument_type_mismatch)
 +        << ATR.getRepresentativeType(S.Context) << Ex->getType()
 +        << getSpecifierRange(startSpecifier, specifierLen)
 +        << Ex->getSourceRange();
@@ -31,7 +31,7 @@ $FreeBSD: /tmp/pcvs/ports/lang/clang-devel/files/patch-tools_clang_lib_Sema_Sema
 +    const analyze_printf::ArgType &ATR2 = ArgType::CStrTy;
 +    if (ATR2.isValid() && !ATR2.matchesType(S.Context, Ex->getType()))
 +      S.Diag(getLocationOfByte(CS.getStart()),
-+             diag::warn_printf_conversion_argument_type_mismatch)
++             diag::warn_format_conversion_argument_type_mismatch)
 +        << ATR2.getRepresentativeType(S.Context) << Ex->getType()
 +        << getSpecifierRange(startSpecifier, specifierLen)
 +        << Ex->getSourceRange();
diff --git a/lang/clang-devel/pkg-plist b/lang/clang-devel/pkg-plist
index 398ff3bfc48a..53eb00fe703b 100644
--- a/lang/clang-devel/pkg-plist
+++ b/lang/clang-devel/pkg-plist
@@ -24,8 +24,10 @@ 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/Documentation.h
 llvm-devel/include/clang-c/Index.h
 llvm-devel/include/clang-c/Platform.h
+llvm-devel/include/clang-c/module.modulemap
 llvm-devel/include/clang/ARCMigrate/ARCMT.h
 llvm-devel/include/clang/ARCMigrate/ARCMTActions.h
 llvm-devel/include/clang/ARCMigrate/FileRemapper.h
@@ -88,6 +90,7 @@ llvm-devel/include/clang/AST/ExprCXX.h
 llvm-devel/include/clang/AST/ExprObjC.h
 llvm-devel/include/clang/AST/ExternalASTSource.h
 llvm-devel/include/clang/AST/GlobalDecl.h
+llvm-devel/include/clang/AST/LambdaCapture.h
 llvm-devel/include/clang/AST/Mangle.h
 llvm-devel/include/clang/AST/MangleNumberingContext.h
 llvm-devel/include/clang/AST/NSAPI.h
@@ -138,6 +141,12 @@ llvm-devel/include/clang/Analysis/Analyses/PostOrderCFGView.h
 llvm-devel/include/clang/Analysis/Analyses/PseudoConstantAnalysis.h
 llvm-devel/include/clang/Analysis/Analyses/ReachableCode.h
 llvm-devel/include/clang/Analysis/Analyses/ThreadSafety.h
+llvm-devel/include/clang/Analysis/Analyses/ThreadSafetyCommon.h
+llvm-devel/include/clang/Analysis/Analyses/ThreadSafetyLogical.h
+llvm-devel/include/clang/Analysis/Analyses/ThreadSafetyOps.def
+llvm-devel/include/clang/Analysis/Analyses/ThreadSafetyTIL.h
+llvm-devel/include/clang/Analysis/Analyses/ThreadSafetyTraverse.h
+llvm-devel/include/clang/Analysis/Analyses/ThreadSafetyUtil.h
 llvm-devel/include/clang/Analysis/Analyses/UninitializedValues.h
 llvm-devel/include/clang/Analysis/AnalysisContext.h
 llvm-devel/include/clang/Analysis/AnalysisDiagnostic.h
@@ -146,23 +155,26 @@ llvm-devel/include/clang/Analysis/CFGStmtMap.h
 llvm-devel/include/clang/Analysis/CallGraph.h
 llvm-devel/include/clang/Analysis/DomainSpecific/CocoaConventions.h
 llvm-devel/include/clang/Analysis/DomainSpecific/ObjCNoReturn.h
-llvm-devel/include/clang/Analysis/FlowSensitive/DataflowSolver.h
 llvm-devel/include/clang/Analysis/FlowSensitive/DataflowValues.h
 llvm-devel/include/clang/Analysis/ProgramPoint.h
 llvm-devel/include/clang/Analysis/Support/BumpVector.h
 llvm-devel/include/clang/Basic/ABI.h
 llvm-devel/include/clang/Basic/AddressSpaces.h
 llvm-devel/include/clang/Basic/AllDiagnostics.h
+llvm-devel/include/clang/Basic/AttrHasAttributeImpl.inc
 llvm-devel/include/clang/Basic/AttrKinds.h
 llvm-devel/include/clang/Basic/AttrList.inc
+llvm-devel/include/clang/Basic/Attributes.h
 llvm-devel/include/clang/Basic/Builtins.def
 llvm-devel/include/clang/Basic/Builtins.h
 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/BuiltinsMips.def
+llvm-devel/include/clang/Basic/BuiltinsNEON.def
 llvm-devel/include/clang/Basic/BuiltinsNVPTX.def
 llvm-devel/include/clang/Basic/BuiltinsPPC.def
+llvm-devel/include/clang/Basic/BuiltinsR600.def
 llvm-devel/include/clang/Basic/BuiltinsX86.def
 llvm-devel/include/clang/Basic/BuiltinsXCore.def
 llvm-devel/include/clang/Basic/CapturedStmt.h
@@ -199,7 +211,6 @@ llvm-devel/include/clang/Basic/Linkage.h
 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/OpenCLExtensions.def
 llvm-devel/include/clang/Basic/OpenMPKinds.def
 llvm-devel/include/clang/Basic/OpenMPKinds.h
@@ -289,7 +300,6 @@ 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
 llvm-devel/include/clang/Lex/DirectoryLookup.h
 llvm-devel/include/clang/Lex/ExternalPreprocessorSource.h
@@ -348,6 +358,7 @@ llvm-devel/include/clang/Sema/IdentifierResolver.h
 llvm-devel/include/clang/Sema/Initialization.h
 llvm-devel/include/clang/Sema/LocInfoType.h
 llvm-devel/include/clang/Sema/Lookup.h
+llvm-devel/include/clang/Sema/LoopHint.h
 llvm-devel/include/clang/Sema/MultiplexExternalSemaSource.h
 llvm-devel/include/clang/Sema/ObjCMethodList.h
 llvm-devel/include/clang/Sema/Overload.h
@@ -453,7 +464,7 @@ 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/module.modulemap
 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