Upgrade clang, dragonegg, and llvm -devel ports to r182968.

9 files changed, 64 insertions, 53 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index b77022113dba..6b845ba1be3a 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	llvm
 DISTVERSION=	3.4.r${SVN_REV}
-PORTREVISION=	2
 CATEGORIES=	devel lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -78,7 +77,7 @@ PLIST_FILES+=		lib/LLVMgold.so
 MAN1=		bugpoint.1 lit.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-ranlib.1 llvm-stress.1 opt.1 tblgen.1
+		llvm-prof.1 llvm-stress.1 opt.1 tblgen.1
 MLINKS=		lit.1 llvm-lit.1
 .endif
 
@@ -181,7 +180,28 @@ PLIST_FILE_LIST=	bin/FileCheck \
 			bin/lit \
 			bin/llc \
 			bin/lli \
-			bin/llvm* \
+			bin/llvm-ar \
+			bin/llvm-as \
+			bin/llvm-bcanalyzer \
+			bin/llvm-config \
+			bin/llvm-cov \
+			bin/llvm-diff \
+			bin/llvm-dis \
+			bin/llvm-dwarfdump \
+			bin/llvm-extract \
+			bin/llvm-link \
+			bin/llvm-lit \
+			bin/llvm-mc \
+			bin/llvm-mcmarkup \
+			bin/llvm-nm \
+			bin/llvm-objdump \
+			bin/llvm-prof \
+			bin/llvm-readobj \
+			bin/llvm-rtdyld \
+			bin/llvm-size \
+			bin/llvm-stress \
+			bin/llvm-symbolizer \
+			bin/llvm-tblgen \
 			bin/macho-dump \
 			bin/opt \
 			lib/BugpointPasses.so \
diff --git a/devel/llvm-devel/Makefile.svn_rev b/devel/llvm-devel/Makefile.svn_rev
index 68ee0e8f5217..8b0c8cd629fb 100644
--- a/devel/llvm-devel/Makefile.svn_rev
+++ b/devel/llvm-devel/Makefile.svn_rev
@@ -1 +1 @@
-SVN_REV=	182968
+SVN_REV=	189172
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 7d1a3ce410d5..632398da03e8 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (llvm-3.4.r182968.tar.bz2) = 5ec2af44c24ea5d0a2c0ebf9955e4653d4acf80a7cd1bd6e39296b0e0ca65e4e
-SIZE (llvm-3.4.r182968.tar.bz2) = 10669218
+SHA256 (llvm-3.4.r189172.tar.bz2) = b96be5856796b77747ea8cb1559b7806d96372f70f82f0b4727fa6353e2d3724
+SIZE (llvm-3.4.r189172.tar.bz2) = 11364615
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index f665f9dd3745..98205a41b333 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -4,13 +4,12 @@
 %%PYTHON_SITELIBDIR%%/lit/ShCommands.py
 %%PYTHON_SITELIBDIR%%/lit/ShUtil.py
 %%PYTHON_SITELIBDIR%%/lit/Test.py
-%%PYTHON_SITELIBDIR%%/lit/TestFormats.py
 %%PYTHON_SITELIBDIR%%/lit/TestRunner.py
 %%PYTHON_SITELIBDIR%%/lit/TestingConfig.py
-%%PYTHON_SITELIBDIR%%/lit/Util.py
 %%PYTHON_SITELIBDIR%%/lit/__init__.py
 %%PYTHON_SITELIBDIR%%/lit/discovery.py
 %%PYTHON_SITELIBDIR%%/lit/main.py
+%%PYTHON_SITELIBDIR%%/lit/util.py
 bin/FileCheck
 bin/bugpoint
 bin/lit
@@ -32,7 +31,6 @@ bin/llvm-mcmarkup
 bin/llvm-nm
 bin/llvm-objdump
 bin/llvm-prof
-bin/llvm-ranlib
 bin/llvm-readobj
 bin/llvm-rtdyld
 bin/llvm-size
@@ -83,7 +81,6 @@ include/llvm/ADT/IntervalMap.h
 include/llvm/ADT/IntrusiveRefCntPtr.h
 include/llvm/ADT/MapVector.h
 include/llvm/ADT/None.h
-include/llvm/ADT/NullablePtr.h
 include/llvm/ADT/Optional.h
 include/llvm/ADT/OwningPtr.h
 include/llvm/ADT/PackedVector.h
@@ -124,6 +121,7 @@ include/llvm/Analysis/AliasSetTracker.h
 include/llvm/Analysis/BlockFrequencyImpl.h
 include/llvm/Analysis/BlockFrequencyInfo.h
 include/llvm/Analysis/BranchProbabilityInfo.h
+include/llvm/Analysis/CFG.h
 include/llvm/Analysis/CFGPrinter.h
 include/llvm/Analysis/CallGraph.h
 include/llvm/Analysis/CallGraphSCCPass.h
@@ -185,7 +183,6 @@ include/llvm/Assembly/Parser.h
 include/llvm/Assembly/PrintModulePass.h
 include/llvm/Assembly/Writer.h
 include/llvm/AutoUpgrade.h
-include/llvm/Bitcode/Archive.h
 include/llvm/Bitcode/BitCodes.h
 include/llvm/Bitcode/BitstreamReader.h
 include/llvm/Bitcode/BitstreamWriter.h
@@ -324,6 +321,7 @@ include/llvm/IR/IntrinsicInst.h
 include/llvm/IR/Intrinsics.gen
 include/llvm/IR/Intrinsics.h
 include/llvm/IR/Intrinsics.td
+include/llvm/IR/IntrinsicsAArch64.td
 include/llvm/IR/IntrinsicsARM.td
 include/llvm/IR/IntrinsicsHexagon.td
 include/llvm/IR/IntrinsicsMips.td
@@ -386,6 +384,7 @@ include/llvm/MC/MCLabel.h
 include/llvm/MC/MCMachOSymbolFlags.h
 include/llvm/MC/MCMachObjectWriter.h
 include/llvm/MC/MCModule.h
+include/llvm/MC/MCModuleYAML.h
 include/llvm/MC/MCObjectDisassembler.h
 include/llvm/MC/MCObjectFileInfo.h
 include/llvm/MC/MCObjectStreamer.h
@@ -418,13 +417,18 @@ include/llvm/MC/SubtargetFeature.h
 include/llvm/Object/Archive.h
 include/llvm/Object/Binary.h
 include/llvm/Object/COFF.h
-include/llvm/Object/COFFYaml.h
+include/llvm/Object/COFFYAML.h
 include/llvm/Object/ELF.h
+include/llvm/Object/ELFObjectFile.h
+include/llvm/Object/ELFTypes.h
+include/llvm/Object/ELFYAML.h
 include/llvm/Object/Error.h
 include/llvm/Object/MachO.h
 include/llvm/Object/MachOFormat.h
+include/llvm/Object/MachOUniversal.h
 include/llvm/Object/ObjectFile.h
 include/llvm/Object/RelocVisitor.h
+include/llvm/Object/YAML.h
 include/llvm/Option/Arg.h
 include/llvm/Option/ArgList.h
 include/llvm/Option/OptParser.td
@@ -505,8 +509,6 @@ include/llvm/Support/NoFolder.h
 include/llvm/Support/OutputBuffer.h
 include/llvm/Support/PassNameParser.h
 include/llvm/Support/Path.h
-include/llvm/Support/PathV1.h
-include/llvm/Support/PathV2.h
 include/llvm/Support/PatternMatch.h
 include/llvm/Support/PluginLoader.h
 include/llvm/Support/PointerLikeTypeTraits.h
@@ -538,6 +540,7 @@ include/llvm/Support/Threading.h
 include/llvm/Support/TimeValue.h
 include/llvm/Support/Timer.h
 include/llvm/Support/ToolOutputFile.h
+include/llvm/Support/UnicodeCharRanges.h
 include/llvm/Support/Valgrind.h
 include/llvm/Support/ValueHandle.h
 include/llvm/Support/Watchdog.h
@@ -582,7 +585,6 @@ include/llvm/Transforms/Instrumentation.h
 include/llvm/Transforms/ObjCARC.h
 include/llvm/Transforms/Scalar.h
 include/llvm/Transforms/Utils/BasicBlockUtils.h
-include/llvm/Transforms/Utils/BlackList.h
 include/llvm/Transforms/Utils/BuildLibCalls.h
 include/llvm/Transforms/Utils/BypassSlowDivision.h
 include/llvm/Transforms/Utils/Cloning.h
@@ -597,6 +599,7 @@ include/llvm/Transforms/Utils/SSAUpdater.h
 include/llvm/Transforms/Utils/SSAUpdaterImpl.h
 include/llvm/Transforms/Utils/SimplifyIndVar.h
 include/llvm/Transforms/Utils/SimplifyLibCalls.h
+include/llvm/Transforms/Utils/SpecialCaseList.h
 include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
 include/llvm/Transforms/Utils/UnrollLoop.h
 include/llvm/Transforms/Utils/ValueMapper.h
@@ -619,7 +622,6 @@ lib/libLLVMARMDesc.a
 lib/libLLVMARMDisassembler.a
 lib/libLLVMARMInfo.a
 lib/libLLVMAnalysis.a
-lib/libLLVMArchive.a
 lib/libLLVMAsmParser.a
 lib/libLLVMAsmPrinter.a
 lib/libLLVMBitReader.a
@@ -640,12 +642,6 @@ lib/libLLVMInstrumentation.a
 lib/libLLVMInterpreter.a
 lib/libLLVMJIT.a
 lib/libLLVMLinker.a
-lib/libLLVMMBlazeAsmParser.a
-lib/libLLVMMBlazeAsmPrinter.a
-lib/libLLVMMBlazeCodeGen.a
-lib/libLLVMMBlazeDesc.a
-lib/libLLVMMBlazeDisassembler.a
-lib/libLLVMMBlazeInfo.a
 lib/libLLVMMC.a
 lib/libLLVMMCDisassembler.a
 lib/libLLVMMCJIT.a
@@ -797,6 +793,14 @@ lib/libprofile_rt.so
 %%PORTDOCS%%%%DOCSDIR%%/html/Lexicon.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/LinkTimeOptimization.html
 %%PORTDOCS%%%%DOCSDIR%%/html/LinkTimeOptimization.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/MCJIT-creation.png
+%%PORTDOCS%%%%DOCSDIR%%/html/MCJIT-dyld-load.png
+%%PORTDOCS%%%%DOCSDIR%%/html/MCJIT-engine-builder.png
+%%PORTDOCS%%%%DOCSDIR%%/html/MCJIT-load-object.png
+%%PORTDOCS%%%%DOCSDIR%%/html/MCJIT-load.png
+%%PORTDOCS%%%%DOCSDIR%%/html/MCJIT-resolve-relocations.png
+%%PORTDOCS%%%%DOCSDIR%%/html/MCJITDesignAndImplementation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/MCJITDesignAndImplementation.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/MakefileGuide.html
 %%PORTDOCS%%%%DOCSDIR%%/html/MakefileGuide.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/MarkedUpDisassembly.html
@@ -831,8 +835,6 @@ lib/libprofile_rt.so
 %%PORTDOCS%%%%DOCSDIR%%/html/Projects.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/ReleaseNotes.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ReleaseNotes.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/ReleaseNotes_34.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ReleaseNotes_34.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/ReleaseProcess.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ReleaseProcess.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/SegmentedStacks.html
@@ -907,8 +909,6 @@ lib/libprofile_rt.so
 %%PORTDOCS%%%%DOCSDIR%%/html/llvm-nm.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/llvm-prof.html
 %%PORTDOCS%%%%DOCSDIR%%/html/llvm-prof.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/llvm-ranlib.html
-%%PORTDOCS%%%%DOCSDIR%%/html/llvm-ranlib.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/llvm-readobj.html
 %%PORTDOCS%%%%DOCSDIR%%/html/llvm-readobj.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/llvm-stress.html
diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index 2fd4cf69b7a3..05a73262959a 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -18,7 +18,7 @@ EXTRACT_ONLY=	${LLVM_SOURCE}
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	C, Objective-C, and C++ compiler
 
-CONFLICTS=	clang-[23]* clang31-*
+CONFLICTS=	clang-3.[012]* clang31-*
 
 CLANG_NAME=	clang-${PORTVERSION}
 CLANG_RELEASE=	${PORTVERSION:C/\.r[0-9]*//}
diff --git a/lang/clang-devel/distinfo b/lang/clang-devel/distinfo
index 5454d40f2e1f..a827f144cd73 100644
--- a/lang/clang-devel/distinfo
+++ b/lang/clang-devel/distinfo
@@ -1,4 +1,4 @@
-SHA256 (clang-3.4.r182968.tar.bz2) = 6efec3ebdccfb8c19acc7ca9fc72c2406f262dd937cdba1c98b4ded35be63917
-SIZE (clang-3.4.r182968.tar.bz2) = 7716534
-SHA256 (llvm-3.4.r182968.tar.bz2) = 5ec2af44c24ea5d0a2c0ebf9955e4653d4acf80a7cd1bd6e39296b0e0ca65e4e
-SIZE (llvm-3.4.r182968.tar.bz2) = 10669218
+SHA256 (clang-3.4.r189172.tar.bz2) = 5b2d5a479316b856e95bfa09ac63e005977a0b948326fe2c6b7209ffc0b324c7
+SIZE (clang-3.4.r189172.tar.bz2) = 8040234
+SHA256 (llvm-3.4.r189172.tar.bz2) = b96be5856796b77747ea8cb1559b7806d96372f70f82f0b4727fa6353e2d3724
+SIZE (llvm-3.4.r189172.tar.bz2) = 11364615
diff --git a/lang/clang-devel/files/patch-tools_clang_lib_Basic_Targets.cpp b/lang/clang-devel/files/patch-tools_clang_lib_Basic_Targets.cpp
deleted file mode 100644
index 31432876d6ee..000000000000
--- a/lang/clang-devel/files/patch-tools_clang_lib_Basic_Targets.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- tools/clang/lib/Basic/Targets.cpp.orig
-+++ tools/clang/lib/Basic/Targets.cpp
-@@ -271,6 +271,8 @@
-           break;
-         case llvm::Triple::mips:
-         case llvm::Triple::mipsel:
-+        case llvm::Triple::mips64:
-+        case llvm::Triple::mips64el:
-         case llvm::Triple::ppc:
-         case llvm::Triple::ppc64:
-           this->MCountName = "_mcount";
diff --git a/lang/clang-devel/pkg-plist b/lang/clang-devel/pkg-plist
index 163ec7b62db6..321f9faf8d7c 100644
--- a/lang/clang-devel/pkg-plist
+++ b/lang/clang-devel/pkg-plist
@@ -21,6 +21,7 @@ include/clang/AST/AST.h
 include/clang/AST/ASTConsumer.h
 include/clang/AST/ASTContext.h
 include/clang/AST/ASTDiagnostic.h
+include/clang/AST/ASTFwd.h
 include/clang/AST/ASTImporter.h
 include/clang/AST/ASTMutationListener.h
 include/clang/AST/ASTTypeTraits.h
@@ -71,8 +72,8 @@ include/clang/AST/ExprCXX.h
 include/clang/AST/ExprObjC.h
 include/clang/AST/ExternalASTSource.h
 include/clang/AST/GlobalDecl.h
-include/clang/AST/LambdaMangleContext.h
 include/clang/AST/Mangle.h
+include/clang/AST/MangleNumberingContext.h
 include/clang/AST/NSAPI.h
 include/clang/AST/NestedNameSpecifier.h
 include/clang/AST/OperationKinds.h
@@ -89,6 +90,7 @@ include/clang/AST/StmtGraphTraits.h
 include/clang/AST/StmtIterator.h
 include/clang/AST/StmtNodes.inc
 include/clang/AST/StmtObjC.h
+include/clang/AST/StmtOpenMP.h
 include/clang/AST/StmtVisitor.h
 include/clang/AST/TemplateBase.h
 include/clang/AST/TemplateName.h
@@ -111,6 +113,7 @@ include/clang/ASTMatchers/Dynamic/Parser.h
 include/clang/ASTMatchers/Dynamic/Registry.h
 include/clang/ASTMatchers/Dynamic/VariantValue.h
 include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h
+include/clang/Analysis/Analyses/Consumed.h
 include/clang/Analysis/Analyses/Dominators.h
 include/clang/Analysis/Analyses/FormatString.h
 include/clang/Analysis/Analyses/LiveVariables.h
@@ -144,6 +147,7 @@ include/clang/Basic/BuiltinsMips.def
 include/clang/Basic/BuiltinsNVPTX.def
 include/clang/Basic/BuiltinsPPC.def
 include/clang/Basic/BuiltinsX86.def
+include/clang/Basic/BuiltinsXCore.def
 include/clang/Basic/CapturedStmt.h
 include/clang/Basic/CharInfo.h
 include/clang/Basic/CommentOptions.h
@@ -211,8 +215,6 @@ include/clang/CodeGen/CodeGenAction.h
 include/clang/CodeGen/ModuleBuilder.h
 include/clang/Config/config.h
 include/clang/Driver/Action.h
-include/clang/Driver/Arg.h
-include/clang/Driver/ArgList.h
 include/clang/Driver/CC1AsOptions.h
 include/clang/Driver/CC1AsOptions.inc
 include/clang/Driver/CC1Options.h
@@ -220,12 +222,10 @@ include/clang/Driver/Compilation.h
 include/clang/Driver/Driver.h
 include/clang/Driver/DriverDiagnostic.h
 include/clang/Driver/Job.h
-include/clang/Driver/OptSpecifier.h
-include/clang/Driver/OptTable.h
-include/clang/Driver/Option.h
 include/clang/Driver/Options.h
 include/clang/Driver/Options.inc
 include/clang/Driver/Phases.h
+include/clang/Driver/SanitizerArgs.h
 include/clang/Driver/Tool.h
 include/clang/Driver/ToolChain.h
 include/clang/Driver/Types.def
@@ -267,6 +267,7 @@ include/clang/Frontend/TextDiagnosticPrinter.h
 include/clang/Frontend/Utils.h
 include/clang/Frontend/VerifyDiagnosticConsumer.h
 include/clang/FrontendTool/Utils.h
+include/clang/Index/USRGeneration.h
 include/clang/Lex/AttrSpellings.inc
 include/clang/Lex/CodeCompletionHandler.h
 include/clang/Lex/DirectoryLookup.h
@@ -357,6 +358,7 @@ include/clang/Serialization/SerializationDiagnostic.h
 include/clang/StaticAnalyzer/Checkers/ClangCheckers.h
 include/clang/StaticAnalyzer/Checkers/CommonBugCategories.h
 include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
+include/clang/StaticAnalyzer/Checkers/ObjCRetainCount.h
 include/clang/StaticAnalyzer/Core/Analyses.def
 include/clang/StaticAnalyzer/Core/AnalyzerOptions.h
 include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
@@ -406,6 +408,7 @@ include/clang/Tooling/FileMatchTrie.h
 include/clang/Tooling/JSONCompilationDatabase.h
 include/clang/Tooling/Refactoring.h
 include/clang/Tooling/RefactoringCallbacks.h
+include/clang/Tooling/ReplacementsYaml.h
 include/clang/Tooling/Tooling.h
 lib/clang/%%CLANG_RELEASE%%/include/__wmmintrin_aes.h
 lib/clang/%%CLANG_RELEASE%%/include/__wmmintrin_pclmul.h
@@ -451,6 +454,7 @@ lib/libclangEdit.a
 lib/libclangFormat.a
 lib/libclangFrontend.a
 lib/libclangFrontendTool.a
+lib/libclangIndex.a
 lib/libclangLex.a
 lib/libclangParse.a
 lib/libclangRewriteCore.a
@@ -492,6 +496,7 @@ lib/libclangTooling.a
 @dirrm include/clang/Rewrite
 @dirrm include/clang/Parse
 @dirrm include/clang/Lex
+@dirrm include/clang/Index
 @dirrm include/clang/FrontendTool
 @dirrm include/clang/Frontend
 @dirrm include/clang/Format
diff --git a/lang/dragonegg-devel46/distinfo b/lang/dragonegg-devel46/distinfo
index bf27f851869d..abd3e88aec43 100644
--- a/lang/dragonegg-devel46/distinfo
+++ b/lang/dragonegg-devel46/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dragonegg-3.4.r182968.tar.bz2) = 27cb24cf4b38d243805515c4a8526cc35928c576546733824c39be95013aed6a
-SIZE (dragonegg-3.4.r182968.tar.bz2) = 397540
+SHA256 (dragonegg-3.4.r189172.tar.bz2) = f44cb89ae8bb302af8694cf000e90d376e296b2635b64c2de73c85fae51973e6
+SIZE (dragonegg-3.4.r189172.tar.bz2) = 397796