Update the develoment version of the llvm, clang and dragonegg ports to

3.3.r172076.

6 files changed, 95 insertions, 48 deletions

diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index 8d6bf1b85bf1..5ca38ab00090 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	clang
-PORTVERSION=	3.2.r${SVN_REV}
-PORTREVISION=	2
+PORTVERSION=	3.3.r${SVN_REV}
 CATEGORIES=	lang devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -19,7 +18,7 @@ EXTRACT_ONLY=	${LLVM_SOURCE}
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	C, Objective-C, and (alpha-quality) C++ compiler
 
-CONFLICTS=	clang-[23]*
+CONFLICTS=	clang-[23]* clang31-*
 
 CLANG_NAME=	clang-${PORTVERSION}
 CLANG_RELEASE=	${PORTVERSION:C/\.r[0-9]*//}
@@ -109,9 +108,9 @@ do-fetch:
 	svn export -r ${SVN_REV} \
 	    http://llvm.org/svn/llvm-project/cfe/trunk ${WRKDIR}/${CLANG_NAME}
 	cd ${WRKDIR}; tar cvfy ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME}
-.if ${USER} == brooks
+.if ${USER} == brooks || ${USER} == bed22
 	scp ${DISTDIR}/${DISTNAME}.tar.bz2 \
-	    freefall.freebsd.org:public_distfiles/
+	    brooks@freefall.freebsd.org:public_distfiles/
 .endif
 .endif
 
@@ -134,7 +133,8 @@ post-patch:
 	    ${WRKSRC}/tools/clang/tools/scan-view/scan-view
 
 pre-build:
-	${LN} -sf ${LOCALBASE}/include/llvm/Intrinsics.gen ${WRKSRC}/include/llvm/
+	${LN} -sf ${LOCALBASE}/include/llvm/IR/Intrinsics.gen \
+	    ${WRKSRC}/include/llvm/IR/
 	${MKDIR} ${WRKSRC}/${RELTYPE}/lib
 	${LN} -sf ${LOCALBASE}/lib/libLLVMTableGen.a ${WRKSRC}/${RELTYPE}/lib/
 	${LN} -sf ${LOCALBASE}/lib/libLLVMSupport.a ${WRKSRC}/${RELTYPE}/lib/
@@ -172,6 +172,7 @@ regression-test: ${BUILD_COOKIE}
 
 PLIST_FILE_LIST=	bin/ccc-analyzer \
 			bin/c++-analyzer \
+			bin/c-index-test \
 			bin/clang \
 			bin/clang++ \
 			bin/clang-check \
diff --git a/lang/clang-devel/distinfo b/lang/clang-devel/distinfo
index ead42d2d0a11..6123eb37cb50 100644
--- a/lang/clang-devel/distinfo
+++ b/lang/clang-devel/distinfo
@@ -1,4 +1,4 @@
-SHA256 (clang-3.2.r163622.tar.bz2) = 29e31eea6697248a56e2dcd3b2318798d3cb7dff089f1453e7ab55c988c7bbeb
-SIZE (clang-3.2.r163622.tar.bz2) = 7277330
-SHA256 (llvm-3.2.r163622.tar.bz2) = 12cdd4eb5d3ee236f531be7c297889a251463033504c465b6267aac22baab9f8
-SIZE (llvm-3.2.r163622.tar.bz2) = 8961570
+SHA256 (clang-3.3.r172076.tar.bz2) = 599fa9ebab5ed995caf0449126c07d96ad8689c0b3366bc5ee934657deb8e470
+SIZE (clang-3.3.r172076.tar.bz2) = 7142820
+SHA256 (llvm-3.3.r172076.tar.bz2) = e6af04f790c94124c5b1abf93f3a24a07d6490bcfa4821e4e4425aa1e87085a2
+SIZE (llvm-3.3.r172076.tar.bz2) = 9587232
diff --git a/lang/clang-devel/files/patch-include_llvm_ADT_Triple.h b/lang/clang-devel/files/patch-include_llvm_ADT_Triple.h
new file mode 100644
index 000000000000..788c5bbd8909
--- /dev/null
+++ b/lang/clang-devel/files/patch-include_llvm_ADT_Triple.h
@@ -0,0 +1,17 @@
+
+$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_include_clang_Analysis_Analyses_FormatString.h b/lang/clang-devel/files/patch-tools_clang_include_clang_Analysis_Analyses_FormatString.h
index 611fa06f3733..0f5b901ad94c 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,14 +3,24 @@ $FreeBSD$
 
 --- tools/clang/include/clang/Analysis/Analyses/FormatString.h.orig
 +++ tools/clang/include/clang/Analysis/Analyses/FormatString.h
-@@ -141,6 +141,10 @@
+@@ -115,9 +115,10 @@
+   enum Kind {
+     InvalidSpecifier = 0,
+       // C99 conversion specifiers.
++    bArg, // FreeBSD extension
+     cArg,
+     dArg,
+-    DArg, // Apple extension
++    DArg, // Apple or FreeBSD extension
+     iArg,
+     IntArgBeg = dArg, IntArgEnd = iArg,
+ 
+@@ -147,7 +148,7 @@
      SArg,
  
      // ** Printf-specific **
+-
 +    
-+    // FreeBSD specific specifiers
-+    bArg,
-+    DArg,
- 
      // Objective-C specific specifiers.
      ObjCObjArg,  // '@'
+     ObjCBeg = ObjCObjArg, ObjCEnd = ObjCObjArg,
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 5bfe4b850724..d4cfefbd9b59 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
@@ -1,26 +1,48 @@
 
-$FreeBSD: /tmp/pcvs/ports/lang/clang-devel/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp,v 1.1 2010-10-08 14:00:31 brooks Exp $
+$FreeBSD$
 
 --- tools/clang/lib/Analysis/PrintfFormatString.cpp.orig
 +++ tools/clang/lib/Analysis/PrintfFormatString.cpp
-@@ -192,11 +192,20 @@
+@@ -198,9 +198,10 @@
      case '@': k = ConversionSpecifier::ObjCObjArg; break;
      // Glibc specific.
      case 'm': k = ConversionSpecifier::PrintErrno; break;
-+    // FreeBSD format extensions
-+    case 'b': k = ConversionSpecifier::bArg; break; /* check for int and then char * */
-+    case 'r': k = ConversionSpecifier::xArg; break;
-+    case 'y': k = ConversionSpecifier::iArg; break;
-+    case 'D': k = ConversionSpecifier::DArg; break; /* check for u_char * pointer and a char * string */
+-    // Apple-specific
 +
++    // Apple-specific (and one FreeBSD)
+     case 'D':
+-      if (Target.getTriple().isOSDarwin())
++      if (Target.getTriple().isOSDarwin() || Target.getTriple().isOSFreeBSD())
+         k = ConversionSpecifier::DArg;
+       break;
+     case 'O':
+@@ -211,11 +212,29 @@
+       if (Target.getTriple().isOSDarwin())
+         k = ConversionSpecifier::UArg;
+       break;
++
++    // FreeBSD-specific
++    case 'b':
++      if (Target.getTriple().isOSFreeBSD())
++        k = ConversionSpecifier::bArg;
++      break;
++    case 'r':
++      if (Target.getTriple().isOSFreeBSD())
++        k = ConversionSpecifier::xArg;
++      break;
++    case 'y':
++      if (Target.getTriple().isOSFreeBSD())
++        k = ConversionSpecifier::iArg;
++      break;
    }
    PrintfConversionSpecifier CS(conversionPosition, k);
    FS.setConversionSpecifier(CS);
    if (CS.consumesDataArgument() && !FS.usesPositionalArg())
      FS.setArgIndex(argIndex++);
 +  // FreeBSD extension
-+  if (k == ConversionSpecifier::bArg || k == ConversionSpecifier::DArg)
-+    argIndex++;
++  if (Target.getTriple().isOSFreeBSD() && (k == ConversionSpecifier::bArg ||
++    k == ConversionSpecifier::DArg))
++      argIndex++;
  
    if (k == ConversionSpecifier::InvalidSpecifier) {
      // Assume the conversion takes one argument.
diff --git a/lang/clang-devel/pkg-plist b/lang/clang-devel/pkg-plist
index 52ac3dcafc7c..d88d0b8fe8bc 100644
--- a/lang/clang-devel/pkg-plist
+++ b/lang/clang-devel/pkg-plist
@@ -1,4 +1,5 @@
 bin/c++-analyzer
+bin/c-index-test
 bin/ccc-analyzer
 bin/clang
 bin/clang++
@@ -20,9 +21,12 @@ include/clang/AST/ASTContext.h
 include/clang/AST/ASTDiagnostic.h
 include/clang/AST/ASTImporter.h
 include/clang/AST/ASTMutationListener.h
+include/clang/AST/ASTUnresolvedSet.h
 include/clang/AST/ASTVector.h
 include/clang/AST/Attr.h
+include/clang/AST/AttrDump.inc
 include/clang/AST/AttrImpl.inc
+include/clang/AST/AttrIterator.h
 include/clang/AST/Attrs.inc
 include/clang/AST/BaseSubobject.h
 include/clang/AST/BuiltinTypes.def
@@ -112,6 +116,7 @@ include/clang/Analysis/CFG.h
 include/clang/Analysis/CFGStmtMap.h
 include/clang/Analysis/CallGraph.h
 include/clang/Analysis/DomainSpecific/CocoaConventions.h
+include/clang/Analysis/DomainSpecific/ObjCNoReturn.h
 include/clang/Analysis/FlowSensitive/DataflowSolver.h
 include/clang/Analysis/FlowSensitive/DataflowValues.h
 include/clang/Analysis/ProgramPoint.h
@@ -146,6 +151,8 @@ include/clang/Basic/DiagnosticGroups.inc
 include/clang/Basic/DiagnosticIDs.h
 include/clang/Basic/DiagnosticIndexName.inc
 include/clang/Basic/DiagnosticLexKinds.inc
+include/clang/Basic/DiagnosticOptions.def
+include/clang/Basic/DiagnosticOptions.h
 include/clang/Basic/DiagnosticParseKinds.inc
 include/clang/Basic/DiagnosticSemaKinds.inc
 include/clang/Basic/DiagnosticSerializationKinds.inc
@@ -168,8 +175,10 @@ include/clang/Basic/OpenCL.h
 include/clang/Basic/OpenCLExtensions.def
 include/clang/Basic/OperatorKinds.def
 include/clang/Basic/OperatorKinds.h
+include/clang/Basic/OperatorPrecedence.h
 include/clang/Basic/PartialDiagnostic.h
 include/clang/Basic/PrettyStackTrace.h
+include/clang/Basic/Sanitizers.def
 include/clang/Basic/SourceLocation.h
 include/clang/Basic/SourceManager.h
 include/clang/Basic/SourceManagerInternals.h
@@ -216,30 +225,29 @@ include/clang/Edit/EditedSource.h
 include/clang/Edit/EditsReceiver.h
 include/clang/Edit/FileOffset.h
 include/clang/Edit/Rewriters.h
+include/clang/Format/Format.h
 include/clang/Frontend/ASTConsumers.h
 include/clang/Frontend/ASTUnit.h
 include/clang/Frontend/ChainedDiagnosticConsumer.h
 include/clang/Frontend/ChainedIncludesSource.h
+include/clang/Frontend/CodeGenOptions.def
 include/clang/Frontend/CodeGenOptions.h
 include/clang/Frontend/CommandLineSourceLoc.h
 include/clang/Frontend/CompilerInstance.h
 include/clang/Frontend/CompilerInvocation.h
 include/clang/Frontend/DependencyOutputOptions.h
-include/clang/Frontend/DiagnosticOptions.h
 include/clang/Frontend/DiagnosticRenderer.h
 include/clang/Frontend/FrontendAction.h
 include/clang/Frontend/FrontendActions.h
 include/clang/Frontend/FrontendDiagnostic.h
 include/clang/Frontend/FrontendOptions.h
 include/clang/Frontend/FrontendPluginRegistry.h
-include/clang/Frontend/HeaderSearchOptions.h
 include/clang/Frontend/LangStandard.h
 include/clang/Frontend/LangStandards.def
 include/clang/Frontend/LayoutOverrideSource.h
 include/clang/Frontend/LogDiagnosticPrinter.h
 include/clang/Frontend/MigratorOptions.h
 include/clang/Frontend/MultiplexConsumer.h
-include/clang/Frontend/PreprocessorOptions.h
 include/clang/Frontend/PreprocessorOutputOptions.h
 include/clang/Frontend/SerializedDiagnosticPrinter.h
 include/clang/Frontend/TextDiagnostic.h
@@ -254,6 +262,7 @@ include/clang/Lex/DirectoryLookup.h
 include/clang/Lex/ExternalPreprocessorSource.h
 include/clang/Lex/HeaderMap.h
 include/clang/Lex/HeaderSearch.h
+include/clang/Lex/HeaderSearchOptions.h
 include/clang/Lex/LexDiagnostic.h
 include/clang/Lex/Lexer.h
 include/clang/Lex/LiteralSupport.h
@@ -262,12 +271,15 @@ include/clang/Lex/ModuleLoader.h
 include/clang/Lex/ModuleMap.h
 include/clang/Lex/MultipleIncludeOpt.h
 include/clang/Lex/PPCallbacks.h
+include/clang/Lex/PPConditionalDirectiveRecord.h
+include/clang/Lex/PPMutationListener.h
 include/clang/Lex/PTHLexer.h
 include/clang/Lex/PTHManager.h
 include/clang/Lex/Pragma.h
 include/clang/Lex/PreprocessingRecord.h
 include/clang/Lex/Preprocessor.h
 include/clang/Lex/PreprocessorLexer.h
+include/clang/Lex/PreprocessorOptions.h
 include/clang/Lex/ScratchBuffer.h
 include/clang/Lex/Token.h
 include/clang/Lex/TokenConcatenation.h
@@ -301,6 +313,7 @@ include/clang/Sema/IdentifierResolver.h
 include/clang/Sema/Initialization.h
 include/clang/Sema/LocInfoType.h
 include/clang/Sema/Lookup.h
+include/clang/Sema/MultiplexExternalSemaSource.h
 include/clang/Sema/ObjCMethodList.h
 include/clang/Sema/Overload.h
 include/clang/Sema/Ownership.h
@@ -375,10 +388,13 @@ include/clang/Tooling/ArgumentsAdjusters.h
 include/clang/Tooling/CommonOptionsParser.h
 include/clang/Tooling/CompilationDatabase.h
 include/clang/Tooling/CompilationDatabasePluginRegistry.h
+include/clang/Tooling/FileMatchTrie.h
 include/clang/Tooling/JSONCompilationDatabase.h
 include/clang/Tooling/Refactoring.h
 include/clang/Tooling/RefactoringCallbacks.h
 include/clang/Tooling/Tooling.h
+lib/clang/%%CLANG_RELEASE%%/include/__wmmintrin_aes.h
+lib/clang/%%CLANG_RELEASE%%/include/__wmmintrin_pclmul.h
 lib/clang/%%CLANG_RELEASE%%/include/ammintrin.h
 lib/clang/%%CLANG_RELEASE%%/include/arm_neon.h
 lib/clang/%%CLANG_RELEASE%%/include/emmintrin.h
@@ -403,6 +419,7 @@ lib/libclangBasic.a
 lib/libclangCodeGen.a
 lib/libclangDriver.a
 lib/libclangEdit.a
+lib/libclangFormat.a
 lib/libclangFrontend.a
 lib/libclangFrontendTool.a
 lib/libclangLex.a
@@ -418,28 +435,7 @@ lib/libclangTooling.a
 %%DATADIR%%/scanview.css
 %%DATADIR%%/sorttable.js
 %%PORTDOCS%%%%DOCSDIR%%/html.tar.gz
-%%PORTDOCS%%%%DOCSDIR%%/html/AddressSanitizer.html
-%%PORTDOCS%%%%DOCSDIR%%/html/AnalyzerRegions.html
-%%PORTDOCS%%%%DOCSDIR%%/html/AutomaticReferenceCounting.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ClangPlugins.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ClangTools.html
-%%PORTDOCS%%%%DOCSDIR%%/html/DriverInternals.html
-%%PORTDOCS%%%%DOCSDIR%%/html/HowToSetupToolingForLLVM.html
-%%PORTDOCS%%%%DOCSDIR%%/html/InternalsManual.html
-%%PORTDOCS%%%%DOCSDIR%%/html/IntroductionToTheClangAST.html
-%%PORTDOCS%%%%DOCSDIR%%/html/JSONCompilationDatabase.html
-%%PORTDOCS%%%%DOCSDIR%%/html/LanguageExtensions.html
-%%PORTDOCS%%%%DOCSDIR%%/html/LibASTMatchers.html
 %%PORTDOCS%%%%DOCSDIR%%/html/LibASTMatchersReference.html
-%%PORTDOCS%%%%DOCSDIR%%/html/LibTooling.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ObjectiveCLiterals.html
-%%PORTDOCS%%%%DOCSDIR%%/html/PCHInternals.html
-%%PORTDOCS%%%%DOCSDIR%%/html/PTHInternals.html
-%%PORTDOCS%%%%DOCSDIR%%/html/RAVFrontendAction.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ReleaseNotes.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ThreadSanitizer.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Tooling.html
-%%PORTDOCS%%%%DOCSDIR%%/html/UsersManual.html
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/clang.html
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/manpage.css
 %%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
@@ -469,6 +465,7 @@ lib/libclangTooling.a
 @dirrm include/clang/Lex
 @dirrm include/clang/FrontendTool
 @dirrm include/clang/Frontend
+@dirrm include/clang/Format
 @dirrm include/clang/Edit
 @dirrm include/clang/Driver
 @dirrm include/clang/Config