Changes 3.1:

* Major New Features
  - AddressSanitizer, a fast memory error detector.
  - MachineInstr Bundles, Support to model instruction bundling / packing.
  - ARM Integrated Assembler, A full featured assembler and direct-to-object
    support for ARM.
  - Basic Block Placement Probability driven basic block placement.
* LLVM IR and Core Improvements
  - A new type representing 16 bit half floating point values has been added.
  - IR now supports vectors of pointers, including vector GEPs.
  - Module flags have been introduced. They convey information about the module
    as a whole to LLVM subsystems. This is currently used to encode Objective C
    ABI information.
  - Loads can now have range metadata attached to them to describe the possible
    values being loaded.
  - The llvm.ctlz and llvm.cttz intrinsics now have an additional argument which
    indicates whether the behavior of the intrinsic is undefined on a zero
    input. This can be used to generate more efficient code on platforms that
    only have instructions which don't return the type size when counting bits
    in 0.
* Optimizer Improvements
  - The loop unroll pass now is able to unroll loops with run-time trip counts.
    This feature is turned off by default, and is enabled with the
    -unroll-runtime flag.
  - A new basic-block autovectorization pass is available. Pass -vectorize to
    run this pass along with some associated post-vectorization cleanup passes.
    For more information, see the EuroLLVM 2012 slides: Autovectorization with
    LLVM.
  - Inline cost heuristics have been completely overhauled and now closely model
    constant propagation through call sites, disregard trivially dead code
    costs, and can model C++ STL iterator patterns.

3 files changed, 114 insertions, 62 deletions

diff --git a/lang/clang/Makefile b/lang/clang/Makefile
index f2a17d29e4b..ee5dfb187a7 100644
--- a/lang/clang/Makefile
+++ b/lang/clang/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2011/12/02 14:42:12 adam Exp $
+# $NetBSD: Makefile,v 1.12 2012/05/23 11:02:41 adam Exp $
 
-DISTNAME=	clang-3.0
+DISTNAME=	clang-3.1
 CATEGORIES=	lang
 MASTER_SITES=	http://llvm.org/releases/${PKGVERSION_NOREV}/
-DISTFILES=	llvm-${PKGVERSION_NOREV}.tar.gz clang-${PKGVERSION_NOREV}.tar.gz
+DISTFILES=	llvm-${PKGVERSION_NOREV}.src.tar.gz \
+		clang-${PKGVERSION_NOREV}.src.tar.gz
 
 MAINTAINER=	adam.hoka@gmail.com
 HOMEPAGE=	http://llvm.org/
@@ -15,12 +16,13 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 WRKSRC=			${WRKDIR}/llvm-${PKGVERSION_NOREV}.src
 
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		chown perl:build gmake
+USE_TOOLS+=		chown gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-assertions
 CONFIGURE_ARGS+=	--disable-bindings	# disable OCaml
 CONFIGURE_ARGS+=	--disable-timestamps
 CONFIGURE_ARGS+=	--enable-optimized
+#CONFIGURE_ARGS+=	--enable-shared
 
 MAKE_DIRS+=		etc/llvm
 
@@ -38,13 +40,8 @@ PLIST_SUBST+=		SOEXT="dylib"
 PLIST_SUBST+=		SOEXT="so"
 .endif
 
-SUBST_CLASSES+=		perl
-SUBST_MESSAGE.perl=	Fixing llvm-configure PERL path
-SUBST_STAGE.perl=	post-patch
-SUBST_FILES.perl=	tools/llvm-config/llvm-config.in.in
-SUBST_SED.perl=		-e 's,@PERL@,${PERL5},'
-
 post-extract:
 	mv ${WRKDIR}/clang-${PKGVERSION_NOREV}.src ${WRKSRC}/tools/clang
 
+.include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/clang/PLIST b/lang/clang/PLIST
index fa3926e52d2..d2cc8ae6d4d 100644
--- a/lang/clang/PLIST
+++ b/lang/clang/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2011/12/06 20:03:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/05/23 11:02:41 adam Exp $
 bin/bugpoint
 bin/c-index-test
 bin/clang
@@ -22,8 +22,10 @@ bin/llvm-nm
 bin/llvm-objdump
 bin/llvm-prof
 bin/llvm-ranlib
+bin/llvm-readobj
 bin/llvm-rtdyld
 bin/llvm-size
+bin/llvm-stress
 bin/llvm-stub
 bin/llvm-tblgen
 bin/macho-dump
@@ -44,6 +46,7 @@ include/clang/AST/Attr.h
 include/clang/AST/AttrImpl.inc
 include/clang/AST/Attrs.inc
 include/clang/AST/BaseSubobject.h
+include/clang/AST/BuiltinTypes.def
 include/clang/AST/CXXInheritance.h
 include/clang/AST/CanonicalType.h
 include/clang/AST/CharUnits.h
@@ -54,6 +57,7 @@ include/clang/AST/DeclCXX.h
 include/clang/AST/DeclContextInternals.h
 include/clang/AST/DeclFriend.h
 include/clang/AST/DeclGroup.h
+include/clang/AST/DeclLookups.h
 include/clang/AST/DeclNodes.inc
 include/clang/AST/DeclObjC.h
 include/clang/AST/DeclTemplate.h
@@ -66,7 +70,9 @@ 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/NSAPI.h
 include/clang/AST/NestedNameSpecifier.h
 include/clang/AST/OperationKinds.h
 include/clang/AST/ParentMap.h
@@ -92,12 +98,13 @@ include/clang/AST/TypeNodes.def
 include/clang/AST/TypeOrdering.h
 include/clang/AST/TypeVisitor.h
 include/clang/AST/UnresolvedSet.h
-include/clang/AST/UsuallyTinyPtrVector.h
 include/clang/AST/VTTBuilder.h
 include/clang/AST/VTableBuilder.h
 include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h
+include/clang/Analysis/Analyses/Dominators.h
 include/clang/Analysis/Analyses/FormatString.h
 include/clang/Analysis/Analyses/LiveVariables.h
+include/clang/Analysis/Analyses/PostOrderCFGView.h
 include/clang/Analysis/Analyses/PseudoConstantAnalysis.h
 include/clang/Analysis/Analyses/ReachableCode.h
 include/clang/Analysis/Analyses/ThreadSafety.h
@@ -106,28 +113,29 @@ include/clang/Analysis/AnalysisContext.h
 include/clang/Analysis/AnalysisDiagnostic.h
 include/clang/Analysis/CFG.h
 include/clang/Analysis/CFGStmtMap.h
+include/clang/Analysis/CallGraph.h
 include/clang/Analysis/DomainSpecific/CocoaConventions.h
 include/clang/Analysis/FlowSensitive/DataflowSolver.h
 include/clang/Analysis/FlowSensitive/DataflowValues.h
 include/clang/Analysis/ProgramPoint.h
 include/clang/Analysis/Support/BlkExprDeclBitVector.h
 include/clang/Analysis/Support/BumpVector.h
-include/clang/Analysis/Support/SaveAndRestore.h
 include/clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h
 include/clang/Analysis/Visitors/CFGRecStmtVisitor.h
 include/clang/Analysis/Visitors/CFGStmtVisitor.h
 include/clang/Basic/ABI.h
 include/clang/Basic/AddressSpaces.h
+include/clang/Basic/AllDiagnostics.h
 include/clang/Basic/AttrKinds.h
 include/clang/Basic/AttrList.inc
 include/clang/Basic/Builtins.def
 include/clang/Basic/Builtins.h
 include/clang/Basic/BuiltinsARM.def
+include/clang/Basic/BuiltinsHexagon.def
 include/clang/Basic/BuiltinsPPC.def
 include/clang/Basic/BuiltinsPTX.def
 include/clang/Basic/BuiltinsX86.def
 include/clang/Basic/ConvertUTF.h
-include/clang/Basic/DelayedCleanupPool.h
 include/clang/Basic/Diagnostic.h
 include/clang/Basic/DiagnosticASTKinds.inc
 include/clang/Basic/DiagnosticAnalysisKinds.inc
@@ -141,6 +149,7 @@ include/clang/Basic/DiagnosticIndexName.inc
 include/clang/Basic/DiagnosticLexKinds.inc
 include/clang/Basic/DiagnosticParseKinds.inc
 include/clang/Basic/DiagnosticSemaKinds.inc
+include/clang/Basic/DiagnosticSerializationKinds.inc
 include/clang/Basic/ExceptionSpecificationType.h
 include/clang/Basic/ExpressionTraits.h
 include/clang/Basic/FileManager.h
@@ -148,10 +157,12 @@ include/clang/Basic/FileSystemOptions.h
 include/clang/Basic/FileSystemStatCache.h
 include/clang/Basic/IdentifierTable.h
 include/clang/Basic/LLVM.h
+include/clang/Basic/Lambda.h
 include/clang/Basic/LangOptions.def
 include/clang/Basic/LangOptions.h
 include/clang/Basic/Linkage.h
 include/clang/Basic/MacroBuilder.h
+include/clang/Basic/Module.h
 include/clang/Basic/OnDiskHashTable.h
 include/clang/Basic/OpenCL.h
 include/clang/Basic/OpenCLExtensions.def
@@ -178,6 +189,7 @@ include/clang/Basic/arm_neon.inc
 include/clang/CodeGen/BackendUtil.h
 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
@@ -188,7 +200,6 @@ include/clang/Driver/CC1Options.inc
 include/clang/Driver/Compilation.h
 include/clang/Driver/Driver.h
 include/clang/Driver/DriverDiagnostic.h
-include/clang/Driver/HostInfo.h
 include/clang/Driver/Job.h
 include/clang/Driver/ObjCRuntime.h
 include/clang/Driver/OptSpecifier.h
@@ -202,17 +213,24 @@ include/clang/Driver/ToolChain.h
 include/clang/Driver/Types.def
 include/clang/Driver/Types.h
 include/clang/Driver/Util.h
+include/clang/Edit/Commit.h
+include/clang/Edit/EditedSource.h
+include/clang/Edit/EditsReceiver.h
+include/clang/Edit/FileOffset.h
+include/clang/Edit/Rewriters.h
 include/clang/Frontend/ASTConsumers.h
 include/clang/Frontend/ASTUnit.h
 include/clang/Frontend/Analyses.def
 include/clang/Frontend/AnalyzerOptions.h
 include/clang/Frontend/ChainedDiagnosticConsumer.h
+include/clang/Frontend/ChainedIncludesSource.h
 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
@@ -221,28 +239,19 @@ 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
 include/clang/Frontend/TextDiagnosticBuffer.h
 include/clang/Frontend/TextDiagnosticPrinter.h
 include/clang/Frontend/Utils.h
 include/clang/Frontend/VerifyDiagnosticConsumer.h
 include/clang/FrontendTool/Utils.h
-include/clang/Index/ASTLocation.h
-include/clang/Index/Analyzer.h
-include/clang/Index/CallGraph.h
-include/clang/Index/DeclReferenceMap.h
-include/clang/Index/Entity.h
-include/clang/Index/GlobalSelector.h
-include/clang/Index/Handlers.h
-include/clang/Index/IndexProvider.h
-include/clang/Index/Indexer.h
-include/clang/Index/Program.h
-include/clang/Index/STLExtras.h
-include/clang/Index/SelectorMap.h
-include/clang/Index/TranslationUnit.h
 include/clang/Lex/AttrSpellings.inc
 include/clang/Lex/CodeCompletionHandler.h
 include/clang/Lex/DirectoryLookup.h
@@ -254,6 +263,7 @@ include/clang/Lex/Lexer.h
 include/clang/Lex/LiteralSupport.h
 include/clang/Lex/MacroInfo.h
 include/clang/Lex/ModuleLoader.h
+include/clang/Lex/ModuleMap.h
 include/clang/Lex/MultipleIncludeOpt.h
 include/clang/Lex/PPCallbacks.h
 include/clang/Lex/PTHLexer.h
@@ -280,6 +290,9 @@ include/clang/Rewrite/Rewriter.h
 include/clang/Rewrite/Rewriters.h
 include/clang/Rewrite/TokenRewriter.h
 include/clang/Sema/AnalysisBasedWarnings.h
+include/clang/Sema/AttrParsedAttrKinds.inc
+include/clang/Sema/AttrParsedAttrList.inc
+include/clang/Sema/AttrTemplateInstantiate.inc
 include/clang/Sema/AttributeList.h
 include/clang/Sema/CXXFieldCollector.h
 include/clang/Sema/CodeCompleteConsumer.h
@@ -291,7 +304,6 @@ include/clang/Sema/IdentifierResolver.h
 include/clang/Sema/Initialization.h
 include/clang/Sema/LocInfoType.h
 include/clang/Sema/Lookup.h
-include/clang/Sema/MultiInitializer.h
 include/clang/Sema/ObjCMethodList.h
 include/clang/Sema/Overload.h
 include/clang/Sema/Ownership.h
@@ -314,11 +326,12 @@ include/clang/Serialization/ASTReader.h
 include/clang/Serialization/ASTWriter.h
 include/clang/Serialization/AttrPCHRead.inc
 include/clang/Serialization/AttrPCHWrite.inc
-include/clang/Serialization/ChainedIncludesSource.h
 include/clang/Serialization/ContinuousRangeMap.h
 include/clang/Serialization/Module.h
 include/clang/Serialization/ModuleManager.h
+include/clang/Serialization/SerializationDiagnostic.h
 include/clang/StaticAnalyzer/Checkers/ClangCheckers.h
+include/clang/StaticAnalyzer/Checkers/CommonBugCategories.h
 include/clang/StaticAnalyzer/Checkers/DereferenceChecker.h
 include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
 include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
@@ -340,11 +353,12 @@ include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h
 include/clang/StaticAnalyzer/Core/PathSensitive/Environment.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
-include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngineBuilders.h
+include/clang/StaticAnalyzer/Core/PathSensitive/FunctionSummary.h
 include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ObjCMessage.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ProgramStateTrait.h
+include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState_Fwd.h
 include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h
 include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h
 include/clang/StaticAnalyzer/Core/PathSensitive/Store.h
@@ -352,9 +366,13 @@ include/clang/StaticAnalyzer/Core/PathSensitive/StoreRef.h
 include/clang/StaticAnalyzer/Core/PathSensitive/SubEngine.h
 include/clang/StaticAnalyzer/Core/PathSensitive/SummaryManager.h
 include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h
+include/clang/StaticAnalyzer/Core/PathSensitive/TaintManager.h
+include/clang/StaticAnalyzer/Core/PathSensitive/TaintTag.h
 include/clang/StaticAnalyzer/Core/PathSensitive/WorkList.h
 include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
 include/clang/StaticAnalyzer/Frontend/FrontendActions.h
+include/clang/Tooling/CompilationDatabase.h
+include/clang/Tooling/Tooling.h
 include/llvm-c/Analysis.h
 include/llvm-c/BitReader.h
 include/llvm-c/BitWriter.h
@@ -366,9 +384,11 @@ include/llvm-c/Initialization.h
 include/llvm-c/LinkTimeOptimizer.h
 include/llvm-c/Object.h
 include/llvm-c/Target.h
+include/llvm-c/TargetMachine.h
 include/llvm-c/Transforms/IPO.h
 include/llvm-c/Transforms/PassManagerBuilder.h
 include/llvm-c/Transforms/Scalar.h
+include/llvm-c/Transforms/Vectorize.h
 include/llvm-c/lto.h
 include/llvm/ADT/APFloat.h
 include/llvm/ADT/APInt.h
@@ -384,6 +404,7 @@ include/llvm/ADT/DepthFirstIterator.h
 include/llvm/ADT/EquivalenceClasses.h
 include/llvm/ADT/FoldingSet.h
 include/llvm/ADT/GraphTraits.h
+include/llvm/ADT/Hashing.h
 include/llvm/ADT/ImmutableIntervalMap.h
 include/llvm/ADT/ImmutableList.h
 include/llvm/ADT/ImmutableMap.h
@@ -412,6 +433,7 @@ include/llvm/ADT/SmallSet.h
 include/llvm/ADT/SmallString.h
 include/llvm/ADT/SmallVector.h
 include/llvm/ADT/SparseBitVector.h
+include/llvm/ADT/SparseSet.h
 include/llvm/ADT/Statistic.h
 include/llvm/ADT/StringExtras.h
 include/llvm/ADT/StringMap.h
@@ -424,7 +446,8 @@ include/llvm/ADT/Triple.h
 include/llvm/ADT/Twine.h
 include/llvm/ADT/UniqueVector.h
 include/llvm/ADT/ValueMap.h
-include/llvm/ADT/VectorExtras.h
+include/llvm/ADT/VariadicFunction.h
+include/llvm/ADT/edit_distance.h
 include/llvm/ADT/ilist.h
 include/llvm/ADT/ilist_node.h
 include/llvm/Analysis/AliasAnalysis.h
@@ -501,9 +524,9 @@ include/llvm/CallGraphSCCPass.h
 include/llvm/CallingConv.h
 include/llvm/CodeGen/Analysis.h
 include/llvm/CodeGen/AsmPrinter.h
-include/llvm/CodeGen/BinaryObject.h
 include/llvm/CodeGen/CalcSpillWeights.h
 include/llvm/CodeGen/CallingConvLower.h
+include/llvm/CodeGen/DFAPacketizer.h
 include/llvm/CodeGen/EdgeBundles.h
 include/llvm/CodeGen/FastISel.h
 include/llvm/CodeGen/FunctionLoweringInfo.h
@@ -520,6 +543,7 @@ include/llvm/CodeGen/LinkAllAsmWriterComponents.h
 include/llvm/CodeGen/LinkAllCodegenComponents.h
 include/llvm/CodeGen/LiveInterval.h
 include/llvm/CodeGen/LiveIntervalAnalysis.h
+include/llvm/CodeGen/LiveRangeEdit.h
 include/llvm/CodeGen/LiveStackAnalysis.h
 include/llvm/CodeGen/LiveVariables.h
 include/llvm/CodeGen/MachORelocation.h
@@ -536,6 +560,7 @@ include/llvm/CodeGen/MachineFunctionAnalysis.h
 include/llvm/CodeGen/MachineFunctionPass.h
 include/llvm/CodeGen/MachineInstr.h
 include/llvm/CodeGen/MachineInstrBuilder.h
+include/llvm/CodeGen/MachineInstrBundle.h
 include/llvm/CodeGen/MachineJumpTableInfo.h
 include/llvm/CodeGen/MachineLoopInfo.h
 include/llvm/CodeGen/MachineLoopRanges.h
@@ -547,7 +572,7 @@ include/llvm/CodeGen/MachinePassRegistry.h
 include/llvm/CodeGen/MachineRegisterInfo.h
 include/llvm/CodeGen/MachineRelocation.h
 include/llvm/CodeGen/MachineSSAUpdater.h
-include/llvm/CodeGen/ObjectCodeEmitter.h
+include/llvm/CodeGen/MachineScheduler.h
 include/llvm/CodeGen/PBQP/Graph.h
 include/llvm/CodeGen/PBQP/HeuristicBase.h
 include/llvm/CodeGen/PBQP/HeuristicSolver.h
@@ -560,8 +585,10 @@ include/llvm/CodeGen/PseudoSourceValue.h
 include/llvm/CodeGen/RegAllocPBQP.h
 include/llvm/CodeGen/RegAllocRegistry.h
 include/llvm/CodeGen/RegisterScavenging.h
+include/llvm/CodeGen/ResourcePriorityQueue.h
 include/llvm/CodeGen/RuntimeLibcalls.h
 include/llvm/CodeGen/ScheduleDAG.h
+include/llvm/CodeGen/ScheduleDAGInstrs.h
 include/llvm/CodeGen/ScheduleHazardRecognizer.h
 include/llvm/CodeGen/SchedulerRegistry.h
 include/llvm/CodeGen/ScoreboardHazardRecognizer.h
@@ -581,16 +608,17 @@ include/llvm/Config/llvm-config.h
 include/llvm/Constant.h
 include/llvm/Constants.h
 include/llvm/DebugInfo/DIContext.h
-include/llvm/DebugInfoProbe.h
 include/llvm/DefaultPasses.h
 include/llvm/DerivedTypes.h
 include/llvm/ExecutionEngine/ExecutionEngine.h
 include/llvm/ExecutionEngine/GenericValue.h
+include/llvm/ExecutionEngine/IntelJITEventsWrapper.h
 include/llvm/ExecutionEngine/Interpreter.h
 include/llvm/ExecutionEngine/JIT.h
 include/llvm/ExecutionEngine/JITEventListener.h
 include/llvm/ExecutionEngine/JITMemoryManager.h
 include/llvm/ExecutionEngine/MCJIT.h
+include/llvm/ExecutionEngine/OProfileWrapper.h
 include/llvm/ExecutionEngine/RuntimeDyld.h
 include/llvm/Function.h
 include/llvm/GVMaterializer.h
@@ -608,8 +636,8 @@ include/llvm/Intrinsics.gen
 include/llvm/Intrinsics.h
 include/llvm/Intrinsics.td
 include/llvm/IntrinsicsARM.td
-include/llvm/IntrinsicsAlpha.td
 include/llvm/IntrinsicsCellSPU.td
+include/llvm/IntrinsicsHexagon.td
 include/llvm/IntrinsicsPTX.td
 include/llvm/IntrinsicsPowerPC.td
 include/llvm/IntrinsicsX86.td
@@ -668,6 +696,7 @@ include/llvm/MC/MCTargetAsmLexer.h
 include/llvm/MC/MCTargetAsmParser.h
 include/llvm/MC/MCValue.h
 include/llvm/MC/MCWin64EH.h
+include/llvm/MC/MCWinCOFFObjectWriter.h
 include/llvm/MC/MachineLocation.h
 include/llvm/MC/SectionKind.h
 include/llvm/MC/SubtargetFeature.h
@@ -676,6 +705,7 @@ include/llvm/Module.h
 include/llvm/Object/Archive.h
 include/llvm/Object/Binary.h
 include/llvm/Object/COFF.h
+include/llvm/Object/ELF.h
 include/llvm/Object/Error.h
 include/llvm/Object/MachO.h
 include/llvm/Object/MachOFormat.h
@@ -709,6 +739,7 @@ include/llvm/Support/CrashRecoveryContext.h
 include/llvm/Support/DOTGraphTraits.h
 include/llvm/Support/DataExtractor.h
 include/llvm/Support/DataFlow.h
+include/llvm/Support/DataStream.h
 include/llvm/Support/DataTypes.h
 include/llvm/Support/Debug.h
 include/llvm/Support/DebugLoc.h
@@ -735,6 +766,9 @@ include/llvm/Support/InstIterator.h
 include/llvm/Support/InstVisitor.h
 include/llvm/Support/LICENSE.TXT
 include/llvm/Support/LeakDetector.h
+include/llvm/Support/Locale.h
+include/llvm/Support/LockFileManager.h
+include/llvm/Support/MDBuilder.h
 include/llvm/Support/MachO.h
 include/llvm/Support/ManagedStatic.h
 include/llvm/Support/MathExtras.h
@@ -763,9 +797,11 @@ include/llvm/Support/Regex.h
 include/llvm/Support/Registry.h
 include/llvm/Support/RegistryParser.h
 include/llvm/Support/SMLoc.h
+include/llvm/Support/SaveAndRestore.h
 include/llvm/Support/Signals.h
 include/llvm/Support/Solaris.h
 include/llvm/Support/SourceMgr.h
+include/llvm/Support/StreamableMemoryObject.h
 include/llvm/Support/StringPool.h
 include/llvm/Support/SwapByteOrder.h
 include/llvm/Support/SystemUtils.h
@@ -781,6 +817,7 @@ include/llvm/Support/TypeBuilder.h
 include/llvm/Support/Valgrind.h
 include/llvm/Support/ValueHandle.h
 include/llvm/Support/Win64EH.h
+include/llvm/Support/YAMLParser.h
 include/llvm/Support/circular_raw_ostream.h
 include/llvm/Support/raw_os_ostream.h
 include/llvm/Support/raw_ostream.h
@@ -820,11 +857,12 @@ include/llvm/Transforms/Instrumentation.h
 include/llvm/Transforms/Scalar.h
 include/llvm/Transforms/Utils/AddrModeMatcher.h
 include/llvm/Transforms/Utils/BasicBlockUtils.h
-include/llvm/Transforms/Utils/BasicInliner.h
 include/llvm/Transforms/Utils/BuildLibCalls.h
 include/llvm/Transforms/Utils/Cloning.h
+include/llvm/Transforms/Utils/CmpInstAnalysis.h
 include/llvm/Transforms/Utils/FunctionUtils.h
 include/llvm/Transforms/Utils/Local.h
+include/llvm/Transforms/Utils/ModuleUtils.h
 include/llvm/Transforms/Utils/PromoteMemToReg.h
 include/llvm/Transforms/Utils/SSAUpdater.h
 include/llvm/Transforms/Utils/SSAUpdaterImpl.h
@@ -832,6 +870,7 @@ include/llvm/Transforms/Utils/SimplifyIndVar.h
 include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
 include/llvm/Transforms/Utils/UnrollLoop.h
 include/llvm/Transforms/Utils/ValueMapper.h
+include/llvm/Transforms/Vectorize.h
 include/llvm/Type.h
 include/llvm/Use.h
 include/llvm/User.h
@@ -841,17 +880,25 @@ lib/BugpointPasses.${SOEXT}
 lib/LLVMHello.${SOEXT}
 lib/clang/${PKGVERSION}/include/altivec.h
 lib/clang/${PKGVERSION}/include/arm_neon.h
+lib/clang/${PKGVERSION}/include/avx2intrin.h
 lib/clang/${PKGVERSION}/include/avxintrin.h
+lib/clang/${PKGVERSION}/include/bmi2intrin.h
+lib/clang/${PKGVERSION}/include/bmiintrin.h
+lib/clang/${PKGVERSION}/include/cpuid.h
 lib/clang/${PKGVERSION}/include/emmintrin.h
 lib/clang/${PKGVERSION}/include/float.h
+lib/clang/${PKGVERSION}/include/fma4intrin.h
 lib/clang/${PKGVERSION}/include/immintrin.h
 lib/clang/${PKGVERSION}/include/iso646.h
 lib/clang/${PKGVERSION}/include/limits.h
-lib/clang/${PKGVERSION}/include/mm_malloc.h
+lib/clang/${PKGVERSION}/include/lzcntintrin.h
 lib/clang/${PKGVERSION}/include/mm3dnow.h
+lib/clang/${PKGVERSION}/include/mm_malloc.h
 lib/clang/${PKGVERSION}/include/mmintrin.h
+lib/clang/${PKGVERSION}/include/module.map
 lib/clang/${PKGVERSION}/include/nmmintrin.h
 lib/clang/${PKGVERSION}/include/pmmintrin.h
+lib/clang/${PKGVERSION}/include/popcntintrin.h
 lib/clang/${PKGVERSION}/include/smmintrin.h
 lib/clang/${PKGVERSION}/include/stdalign.h
 lib/clang/${PKGVERSION}/include/stdarg.h
@@ -860,40 +907,36 @@ lib/clang/${PKGVERSION}/include/stddef.h
 lib/clang/${PKGVERSION}/include/stdint.h
 lib/clang/${PKGVERSION}/include/tgmath.h
 lib/clang/${PKGVERSION}/include/tmmintrin.h
+lib/clang/${PKGVERSION}/include/unwind.h
 lib/clang/${PKGVERSION}/include/varargs.h
 lib/clang/${PKGVERSION}/include/wmmintrin.h
 lib/clang/${PKGVERSION}/include/x86intrin.h
 lib/clang/${PKGVERSION}/include/xmmintrin.h
-lib/libEnhancedDisassembly.a
 lib/libLLVMARMAsmParser.a
 lib/libLLVMARMAsmPrinter.a
 lib/libLLVMARMCodeGen.a
 lib/libLLVMARMDesc.a
 lib/libLLVMARMDisassembler.a
 lib/libLLVMARMInfo.a
-lib/libLLVMAlphaCodeGen.a
-lib/libLLVMAlphaDesc.a
-lib/libLLVMAlphaInfo.a
 lib/libLLVMAnalysis.a
 lib/libLLVMArchive.a
 lib/libLLVMAsmParser.a
 lib/libLLVMAsmPrinter.a
 lib/libLLVMBitReader.a
 lib/libLLVMBitWriter.a
-lib/libLLVMBlackfinCodeGen.a
-lib/libLLVMBlackfinDesc.a
-lib/libLLVMBlackfinInfo.a
-lib/libLLVMCBackend.a
-lib/libLLVMCBackendInfo.a
 lib/libLLVMCellSPUCodeGen.a
 lib/libLLVMCellSPUDesc.a
 lib/libLLVMCellSPUInfo.a
 lib/libLLVMCodeGen.a
 lib/libLLVMCore.a
-lib/libLLVMCppBackend.a
+lib/libLLVMCppBackendCodeGen.a
 lib/libLLVMCppBackendInfo.a
 lib/libLLVMDebugInfo.a
 lib/libLLVMExecutionEngine.a
+lib/libLLVMHexagonAsmPrinter.a
+lib/libLLVMHexagonCodeGen.a
+lib/libLLVMHexagonDesc.a
+lib/libLLVMHexagonInfo.a
 lib/libLLVMInstCombine.a
 lib/libLLVMInstrumentation.a
 lib/libLLVMInterpreter.a
@@ -913,9 +956,11 @@ lib/libLLVMMSP430AsmPrinter.a
 lib/libLLVMMSP430CodeGen.a
 lib/libLLVMMSP430Desc.a
 lib/libLLVMMSP430Info.a
+lib/libLLVMMipsAsmParser.a
 lib/libLLVMMipsAsmPrinter.a
 lib/libLLVMMipsCodeGen.a
 lib/libLLVMMipsDesc.a
+lib/libLLVMMipsDisassembler.a
 lib/libLLVMMipsInfo.a
 lib/libLLVMObject.a
 lib/libLLVMPTXAsmPrinter.a
@@ -933,12 +978,10 @@ lib/libLLVMSparcCodeGen.a
 lib/libLLVMSparcDesc.a
 lib/libLLVMSparcInfo.a
 lib/libLLVMSupport.a
-lib/libLLVMSystemZCodeGen.a
-lib/libLLVMSystemZDesc.a
-lib/libLLVMSystemZInfo.a
 lib/libLLVMTableGen.a
 lib/libLLVMTarget.a
 lib/libLLVMTransformUtils.a
+lib/libLLVMVectorize.a
 lib/libLLVMX86AsmParser.a
 lib/libLLVMX86AsmPrinter.a
 lib/libLLVMX86CodeGen.a
@@ -961,9 +1004,9 @@ lib/libclangAnalysis.a
 lib/libclangBasic.a
 lib/libclangCodeGen.a
 lib/libclangDriver.a
+lib/libclangEdit.a
 lib/libclangFrontend.a
 lib/libclangFrontendTool.a
-lib/libclangIndex.a
 lib/libclangLex.a
 lib/libclangParse.a
 lib/libclangRewrite.a
@@ -972,8 +1015,9 @@ lib/libclangSerialization.a
 lib/libclangStaticAnalyzerCheckers.a
 lib/libclangStaticAnalyzerCore.a
 lib/libclangStaticAnalyzerFrontend.a
-lib/libprofile_rt.a
+lib/libclangTooling.a
 lib/libprofile_rt.${SOEXT}
+lib/libprofile_rt.a
 man/man1/bugpoint.1
 man/man1/clang.1
 man/man1/lit.1
@@ -983,6 +1027,7 @@ man/man1/llvm-ar.1
 man/man1/llvm-as.1
 man/man1/llvm-bcanalyzer.1
 man/man1/llvm-config.1
+man/man1/llvm-cov.1
 man/man1/llvm-diff.1
 man/man1/llvm-dis.1
 man/man1/llvm-extract.1
@@ -991,9 +1036,11 @@ man/man1/llvm-link.1
 man/man1/llvm-nm.1
 man/man1/llvm-prof.1
 man/man1/llvm-ranlib.1
+man/man1/llvm-stress.1
 man/man1/opt.1
 man/man1/tblgen.1
 share/doc/llvm/html.tar.gz
+share/doc/llvm/html/AddressSanitizer.html
 share/doc/llvm/html/AliasAnalysis.html
 share/doc/llvm/html/AnalyzerRegions.html
 share/doc/llvm/html/Atomics.html
@@ -1001,7 +1048,6 @@ share/doc/llvm/html/AutomaticReferenceCounting.html
 share/doc/llvm/html/BitCodeFormat.html
 share/doc/llvm/html/BranchWeightMetadata.html
 share/doc/llvm/html/Bugpoint.html
-share/doc/llvm/html/CFEBuildInstrs.html
 share/doc/llvm/html/CMake.html
 share/doc/llvm/html/CodeGenerator.html
 share/doc/llvm/html/CodingStandards.html
@@ -1014,7 +1060,9 @@ share/doc/llvm/html/CommandGuide/lli.html
 share/doc/llvm/html/CommandGuide/llvm-ar.html
 share/doc/llvm/html/CommandGuide/llvm-as.html
 share/doc/llvm/html/CommandGuide/llvm-bcanalyzer.html
+share/doc/llvm/html/CommandGuide/llvm-build.html
 share/doc/llvm/html/CommandGuide/llvm-config.html
+share/doc/llvm/html/CommandGuide/llvm-cov.html
 share/doc/llvm/html/CommandGuide/llvm-diff.html
 share/doc/llvm/html/CommandGuide/llvm-dis.html
 share/doc/llvm/html/CommandGuide/llvm-extract.html
@@ -1023,6 +1071,7 @@ share/doc/llvm/html/CommandGuide/llvm-link.html
 share/doc/llvm/html/CommandGuide/llvm-nm.html
 share/doc/llvm/html/CommandGuide/llvm-prof.html
 share/doc/llvm/html/CommandGuide/llvm-ranlib.html
+share/doc/llvm/html/CommandGuide/llvm-stress.html
 share/doc/llvm/html/CommandGuide/manpage.css
 share/doc/llvm/html/CommandGuide/opt.html
 share/doc/llvm/html/CommandGuide/tblgen.html
@@ -1040,14 +1089,17 @@ share/doc/llvm/html/GetElementPtr.html
 share/doc/llvm/html/GettingStarted.html
 share/doc/llvm/html/GettingStartedVS.html
 share/doc/llvm/html/GoldPlugin.html
+share/doc/llvm/html/HowToAddABuilder.html
 share/doc/llvm/html/HowToReleaseLLVM.html
 share/doc/llvm/html/HowToSubmitABug.html
 share/doc/llvm/html/InternalsManual.html
+share/doc/llvm/html/LLVMBuild.html
 share/doc/llvm/html/LangRef.html
 share/doc/llvm/html/LanguageExtensions.html
 share/doc/llvm/html/Lexicon.html
 share/doc/llvm/html/LinkTimeOptimization.html
 share/doc/llvm/html/MakefileGuide.html
+share/doc/llvm/html/ObjectiveCLiterals.html
 share/doc/llvm/html/PCHInternals.html
 share/doc/llvm/html/PTHInternals.html
 share/doc/llvm/html/Packaging.html
@@ -1059,9 +1111,9 @@ share/doc/llvm/html/SegmentedStacks.html
 share/doc/llvm/html/SourceLevelDebugging.html
 share/doc/llvm/html/SystemLibrary.html
 share/doc/llvm/html/TableGenFundamentals.html
+share/doc/llvm/html/TestSuiteMakefileGuide.html
 share/doc/llvm/html/TestingGuide.html
 share/doc/llvm/html/UsersManual.html
-share/doc/llvm/html/UsingLibraries.html
 share/doc/llvm/html/WritingAnLLVMBackend.html
 share/doc/llvm/html/WritingAnLLVMPass.html
 share/doc/llvm/html/clang/clang.html
@@ -1101,7 +1153,9 @@ share/doc/llvm/ps/lli.ps
 share/doc/llvm/ps/llvm-ar.ps
 share/doc/llvm/ps/llvm-as.ps
 share/doc/llvm/ps/llvm-bcanalyzer.ps
+share/doc/llvm/ps/llvm-build.ps
 share/doc/llvm/ps/llvm-config.ps
+share/doc/llvm/ps/llvm-cov.ps
 share/doc/llvm/ps/llvm-diff.ps
 share/doc/llvm/ps/llvm-dis.ps
 share/doc/llvm/ps/llvm-extract.ps
@@ -1110,5 +1164,6 @@ share/doc/llvm/ps/llvm-link.ps
 share/doc/llvm/ps/llvm-nm.ps
 share/doc/llvm/ps/llvm-prof.ps
 share/doc/llvm/ps/llvm-ranlib.ps
+share/doc/llvm/ps/llvm-stress.ps
 share/doc/llvm/ps/opt.ps
 share/doc/llvm/ps/tblgen.ps
diff --git a/lang/clang/distinfo b/lang/clang/distinfo
index 1226797fe20..1a41b20b60b 100644
--- a/lang/clang/distinfo
+++ b/lang/clang/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2011/12/02 14:42:12 adam Exp $
+$NetBSD: distinfo,v 1.10 2012/05/23 11:02:41 adam Exp $
 
-SHA1 (clang-3.0.tar.gz) = 1fa11f07f957bd9c9de003d1b5a7a9ba1e0055e4
-RMD160 (clang-3.0.tar.gz) = 640b309116db4357627c0b81ebba5dab824d9eeb
-Size (clang-3.0.tar.gz) = 7240578 bytes
-SHA1 (llvm-3.0.tar.gz) = b683e7294fcf69887c0d709025d4640f5dca755b
-RMD160 (llvm-3.0.tar.gz) = 85211cafbed1c5d838ac54669017b5298613f975
-Size (llvm-3.0.tar.gz) = 10350539 bytes
+SHA1 (clang-3.1.src.tar.gz) = 19f33b187a50d22fda2a6f9ed989699a9a9efd62
+RMD160 (clang-3.1.src.tar.gz) = 5ae09d3d69d4f1e50e07f6bf3474da96e6a84feb
+Size (clang-3.1.src.tar.gz) = 8158418 bytes
+SHA1 (llvm-3.1.src.tar.gz) = 234c96e73ef81aec9a54da92fc2a9024d653b059
+RMD160 (llvm-3.1.src.tar.gz) = ceb0ef36ab6109da7a8568b04de759752dbee5a7
+Size (llvm-3.1.src.tar.gz) = 11077429 bytes
 SHA1 (patch-ab) = 140ac84d513cf20c9eb30a9e8e2f6b87bdd074fe
 SHA1 (patch-ac) = 252f6a1f2cb79fed19668310c72d1079b47eca3c
 SHA1 (patch-ad) = 4cd7223d1660a4e8d81b33b6c99efbb680664164