Upgrade to r218451.

USES=python

Give llvm a chance to build on arm* and powerpc64 systems. [0]

PR:		191996 [0]
Submitted by:	direct727@gmail.com [0]
Sponsored by:	DARPA, AFRL

6 files changed, 22 insertions, 33 deletions

diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index 9d7d0d0e5cf6..fe730079a6f1 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	clang
 PORTVERSION=	3.6.r${SVN_REV}
-PORTREVISION=	1
 CATEGORIES=	lang devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -34,8 +33,7 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_PREFIX=	${LLVM_PREFIX}
-USES=		compiler:c++11-lib gmake perl5 tar:bzip2
-USE_PYTHON=	yes
+USES=		compiler:c++11-lib gmake perl5 python tar:bzip2
 
 MAKE_ARGS=	CLANG_TBLGEN=${WRKSRC}/${RELTYPE}/bin/clang-tblgen \
 		LLVMIncDir=${LLVM_PREFIX}/include \
diff --git a/lang/clang-devel/distinfo b/lang/clang-devel/distinfo
index 491c0b7d33ee..ff27b736cc94 100644
--- a/lang/clang-devel/distinfo
+++ b/lang/clang-devel/distinfo
@@ -1,4 +1,4 @@
-SHA256 (clang-3.6.r216160.tar.bz2) = 1d383becbde1aea79528f63ce13587c4c7f9d021f0a531574f0eaaa816db76d1
-SIZE (clang-3.6.r216160.tar.bz2) = 9165471
-SHA256 (llvm-3.6.r216160.tar.bz2) = ee6707ff2a62edb0cbf70421330054c6323fdb257320eb7e9e3b420f4cad0534
-SIZE (llvm-3.6.r216160.tar.bz2) = 13714057
+SHA256 (clang-3.6.r218451.tar.bz2) = 9bed7bb78ded4cd5724471ed7c267343c477d99482d73c1f2cc250209edbb39b
+SIZE (clang-3.6.r218451.tar.bz2) = 9253945
+SHA256 (llvm-3.6.r218451.tar.bz2) = 6a59280d79529333e8ae86eeb48f389a9bbb630e590bde62f7e6491e5d30eda1
+SIZE (llvm-3.6.r218451.tar.bz2) = 13830528
diff --git a/lang/clang-devel/files/patch-tools_clang_include_clang_Analysis_Analyses_FormatString.h b/lang/clang-devel/files/patch-tools_clang_include_clang_Analysis_Analyses_FormatString.h
index 0f5b901ad94c..8fc3c6e7e354 100644
--- a/lang/clang-devel/files/patch-tools_clang_include_clang_Analysis_Analyses_FormatString.h
+++ b/lang/clang-devel/files/patch-tools_clang_include_clang_Analysis_Analyses_FormatString.h
@@ -3,7 +3,7 @@ $FreeBSD$
 
 --- tools/clang/include/clang/Analysis/Analyses/FormatString.h.orig
 +++ tools/clang/include/clang/Analysis/Analyses/FormatString.h
-@@ -115,9 +115,10 @@
+@@ -122,9 +122,10 @@
    enum Kind {
      InvalidSpecifier = 0,
        // C99 conversion specifiers.
@@ -15,12 +15,3 @@ $FreeBSD$
      iArg,
      IntArgBeg = dArg, IntArgEnd = iArg,
  
-@@ -147,7 +148,7 @@
-     SArg,
- 
-     // ** Printf-specific **
--
-+    
-     // Objective-C specific specifiers.
-     ObjCObjArg,  // '@'
-     ObjCBeg = ObjCObjArg, ObjCEnd = ObjCObjArg,
diff --git a/lang/clang-devel/files/patch-tools_clang_lib_Analysis_FormatString.cpp b/lang/clang-devel/files/patch-tools_clang_lib_Analysis_FormatString.cpp
index 141cb0f4c2b3..dcecd0687043 100644
--- a/lang/clang-devel/files/patch-tools_clang_lib_Analysis_FormatString.cpp
+++ b/lang/clang-devel/files/patch-tools_clang_lib_Analysis_FormatString.cpp
@@ -3,20 +3,20 @@ $FreeBSD$
 
 --- tools/clang/lib/Analysis/FormatString.cpp.orig
 +++ tools/clang/lib/Analysis/FormatString.cpp
-@@ -550,6 +550,9 @@
+@@ -557,6 +557,9 @@
  
-   // GlibC specific specifiers.
-   case PrintErrno: return "m";
+   // MS specific specifiers.
+   case ZArg: return "Z";
 +
 +  // FreeBSD specfic specifiers.
 +  case bArg: return "b";
    }
    return nullptr;
  }
-@@ -778,6 +781,7 @@
-     case ConversionSpecifier::DArg:
+@@ -812,6 +815,7 @@
      case ConversionSpecifier::OArg:
      case ConversionSpecifier::UArg:
+     case ConversionSpecifier::ZArg:
 +    case ConversionSpecifier::bArg:
        return false;
    }
diff --git a/lang/clang-devel/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp b/lang/clang-devel/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp
index d4cfefbd9b59..ab29c87f92ed 100644
--- a/lang/clang-devel/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp
+++ b/lang/clang-devel/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp
@@ -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++);
diff --git a/lang/clang-devel/pkg-plist b/lang/clang-devel/pkg-plist
index e7a141663a8f..8346f42315b7 100644
--- a/lang/clang-devel/pkg-plist
+++ b/lang/clang-devel/pkg-plist
@@ -134,7 +134,6 @@ llvm-devel/include/clang/ASTMatchers/Dynamic/Registry.h
 llvm-devel/include/clang/ASTMatchers/Dynamic/VariantValue.h
 llvm-devel/include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h
 llvm-devel/include/clang/Analysis/Analyses/Consumed.h
-llvm-devel/include/clang/Analysis/Analyses/DataflowWorklist.h
 llvm-devel/include/clang/Analysis/Analyses/Dominators.h
 llvm-devel/include/clang/Analysis/Analyses/FormatString.h
 llvm-devel/include/clang/Analysis/Analyses/LiveVariables.h
@@ -154,6 +153,7 @@ llvm-devel/include/clang/Analysis/AnalysisDiagnostic.h
 llvm-devel/include/clang/Analysis/CFG.h
 llvm-devel/include/clang/Analysis/CFGStmtMap.h
 llvm-devel/include/clang/Analysis/CallGraph.h
+llvm-devel/include/clang/Analysis/CodeInjector.h
 llvm-devel/include/clang/Analysis/DomainSpecific/CocoaConventions.h
 llvm-devel/include/clang/Analysis/DomainSpecific/ObjCNoReturn.h
 llvm-devel/include/clang/Analysis/FlowSensitive/DataflowValues.h
@@ -171,6 +171,7 @@ llvm-devel/include/clang/Basic/Builtins.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/BuiltinsLe64.def
 llvm-devel/include/clang/Basic/BuiltinsMips.def
 llvm-devel/include/clang/Basic/BuiltinsNEON.def
 llvm-devel/include/clang/Basic/BuiltinsNVPTX.def
@@ -432,6 +433,7 @@ llvm-devel/include/clang/StaticAnalyzer/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/StaticAnalyzer/Frontend/ModelConsumer.h
 llvm-devel/include/clang/Tooling/ArgumentsAdjusters.h
 llvm-devel/include/clang/Tooling/CommonOptionsParser.h
 llvm-devel/include/clang/Tooling/CompilationDatabase.h
@@ -444,6 +446,7 @@ llvm-devel/include/clang/Tooling/ReplacementsYaml.h
 llvm-devel/include/clang/Tooling/Tooling.h
 llvm-devel/lib/clang/3.6.0/include/__wmmintrin_aes.h
 llvm-devel/lib/clang/3.6.0/include/__wmmintrin_pclmul.h
+llvm-devel/lib/clang/3.6.0/include/adxintrin.h
 llvm-devel/lib/clang/3.6.0/include/altivec.h
 llvm-devel/lib/clang/3.6.0/include/ammintrin.h
 llvm-devel/lib/clang/3.6.0/include/arm_neon.h