Update to r211638.

5 files changed, 22 insertions, 28 deletions

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