Update to LLVM 3.1.

Thanks Brad for pointing out a few problems with my original diff.

devel/llvm/Makefile

@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.41 2012/05/05 19:24:01 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.42 2012/05/25 09:05:49 sthen Exp $
 
 SHARED_LIBS +=  libclang                  0.0 # 3.0
 
 COMMENT =	modular, fast C/C++/ObjC compiler, static analyzer and tools
 
-LLVM_V =	3.0
+LLVM_V =	3.1
-REVISION =	2
+DISTNAME =	llvm-${LLVM_V}.src
-DISTNAME =	llvm-${LLVM_V}
+PKGNAME =	llvm-${LLVM_V}
 
 CATEGORIES =	devel
 
@@ -28,7 +28,7 @@ WANTLIB =	c m pthread stdc++
 
 MASTER_SITES =	http://llvm.org/releases/${LLVM_V}/
 
-DISTFILES =	${DISTNAME}${EXTRACT_SUFX} clang-${LLVM_V}${EXTRACT_SUFX}
+DISTFILES =	${DISTNAME}${EXTRACT_SUFX} clang-${LLVM_V}.src${EXTRACT_SUFX}
 WRKDIST =	${WRKDIR}/llvm-${LLVM_V}.src
 
 post-extract:
@@ -57,7 +57,6 @@ CLANG_INCLUDE_PATH =	lib/clang/${LLVM_V}/include
 SUBST_VARS +=		CLANG_INCLUDE_PATH
 
 pre-configure:
-	@perl -pi -e s,-lpthread,-pthread,g ${WRKSRC}/configure
 	@${SUBST_CMD} ${WRKSRC}/tools/clang/tools/scan-build/scan-build
 	-@ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
 

devel/llvm/distinfo

@@ -1,10 +1,10 @@
-MD5 (clang-3.0.tar.gz) = QzUHBq5s8F0AaIhXkuoFkQ==
+MD5 (clang-3.1.src.tar.gz) = Wb8tMSCjgF8nyv2jgjyq+A==
-MD5 (llvm-3.0.tar.gz) = qOX18cGt6657SmVMN2pgBQ==
+MD5 (llvm-3.1.src.tar.gz) = FuqnZ5+EET9lsSdg/f5O4Q==
-RMD160 (clang-3.0.tar.gz) = ZAswkRbbQ1difAuB67pdq4JNnus=
+RMD160 (clang-3.1.src.tar.gz) = WuCdPWnU8eUOB/a/NHTaluaoT+s=
-RMD160 (llvm-3.0.tar.gz) = hSEcr77Rxdg4rFRmkBe1KYYT+XU=
+RMD160 (llvm-3.1.src.tar.gz) = zrDvNqthCdp6hWiwTedZdS2+5ac=
-SHA1 (clang-3.0.tar.gz) = H6EfB/lXvZyd4APRtaepuh4AVeQ=
+SHA1 (clang-3.1.src.tar.gz) = GfM7GHpQ0i/aKm+e2Ylpmpqe/WI=
-SHA1 (llvm-3.0.tar.gz) = toPnKU/PaYh8DXCQJdRkD13KdVs=
+SHA1 (llvm-3.1.src.tar.gz) = I0yW5z74GuyaVNqS/CqQJNZTsFk=
-SHA256 (clang-3.0.tar.gz) = tk5y2jVtfDQoz9esYg1J7AQshOruE8JgJIefVV9OEm0=
+SHA256 (clang-3.1.src.tar.gz) = /2PiFdzT4oOP/eo4UC+NNbqxfkh/PDeZV5lh5FLVp4Y=
-SHA256 (llvm-3.0.tar.gz) = UZ6xHTSZzpnG/9uHGGUfyRQl7XaQ6skcjWhTR098BHc=
+SHA256 (llvm-3.1.src.tar.gz) = HqBRNRl7VADB+I0A/ygNd1znePj56gQuJaHh5zSkuas=
-SIZE (clang-3.0.tar.gz) = 7240578
+SIZE (clang-3.1.src.tar.gz) = 8158418
-SIZE (llvm-3.0.tar.gz) = 10350539
+SIZE (llvm-3.1.src.tar.gz) = 11077429

devel/llvm/patches/patch-Makefile_config_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile_config_in,v 1.5 2011/12/14 22:58:23 sthen Exp $
+$OpenBSD: patch-Makefile_config_in,v 1.6 2012/05/25 09:05:49 sthen Exp $
---- Makefile.config.in.orig	Thu Oct 13 19:27:34 2011
+--- Makefile.config.in.orig	Tue May 15 23:06:08 2012
-+++ Makefile.config.in	Tue Oct 25 01:14:45 2011
++++ Makefile.config.in	Wed May 23 01:38:47 2012
-@@ -83,11 +83,11 @@ LLVMMAKE := $(LLVM_SRC_ROOT)/make
+@@ -96,11 +96,11 @@ endif
  PROJ_bindir     := $(PROJ_prefix)/bin
  PROJ_libdir     := $(PROJ_prefix)/lib
  PROJ_datadir    := $(PROJ_prefix)/share

devel/llvm/patches/patch-cmake_config-ix_cmake

@@ -1,9 +1,9 @@
-$OpenBSD: patch-cmake_config-ix_cmake,v 1.1 2012/05/05 19:24:01 dcoppa Exp $
+$OpenBSD: patch-cmake_config-ix_cmake,v 1.2 2012/05/25 09:05:49 sthen Exp $
 
 Fix CMake check for pthread_mutex_lock
 
---- cmake/config-ix.cmake.orig	Fri May  4 14:05:40 2012
+--- cmake/config-ix.cmake.orig	Mon Mar 26 22:56:56 2012
-+++ cmake/config-ix.cmake	Fri May  4 14:07:10 2012
++++ cmake/config-ix.cmake	Wed May 23 01:38:47 2012
 @@ -87,6 +87,7 @@ if( NOT PURE_WINDOWS )
    check_library_exists(pthread pthread_create "" HAVE_LIBPTHREAD)
    check_library_exists(pthread pthread_getspecific "" HAVE_PTHREAD_GETSPECIFIC)
@@ -12,7 +12,7 @@ Fix CMake check for pthread_mutex_lock
    check_library_exists(dl dlopen "" HAVE_LIBDL)
  endif()
  
-@@ -131,9 +132,6 @@ check_symbol_exists(strchr string.h HAVE_STRCHR)
+@@ -133,9 +134,6 @@ check_symbol_exists(strchr string.h HAVE_STRCHR)
  check_symbol_exists(strcmp string.h HAVE_STRCMP)
  check_symbol_exists(strdup string.h HAVE_STRDUP)
  check_symbol_exists(strrchr string.h HAVE_STRRCHR)

devel/llvm/patches/patch-configure

@@ -0,0 +1,29 @@
+$OpenBSD: patch-configure,v 1.1 2012/05/25 09:05:49 sthen Exp $
+--- configure.orig	Fri May 11 21:48:57 2012
++++ configure	Wed May 23 01:38:47 2012
+@@ -12741,13 +12741,13 @@ fi
+ 
+ if test "$LLVM_ENABLE_THREADS" -eq 1 && test "$ENABLE_PTHREADS" -eq 1 ; then
+ 
+-{ echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for pthread_mutex_init in -pthread" >&5
++echo $ECHO_N "checking for pthread_mutex_init in -pthread... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpthread  $LIBS"
++LIBS="-pthread  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -12823,7 +12823,7 @@ if test $ac_cv_lib_pthread_pthread_mutex_init = yes; t
+ #define HAVE_LIBPTHREAD 1
+ _ACEOF
+ 
+-  LIBS="-lpthread $LIBS"
++  LIBS="-pthread $LIBS"
+ 
+ fi
+ 

devel/llvm/patches/patch-lib_Transforms_Makefile

@@ -1,12 +1,12 @@
-$OpenBSD: patch-lib_Transforms_Makefile,v 1.3 2010/04/29 16:37:09 jsg Exp $
+$OpenBSD: patch-lib_Transforms_Makefile,v 1.4 2012/05/25 09:05:49 sthen Exp $
---- lib/Transforms/Makefile.orig	Mon Jan  4 07:23:24 2010
+--- lib/Transforms/Makefile.orig	Wed Feb  1 03:51:43 2012
-+++ lib/Transforms/Makefile	Tue Apr 27 21:05:19 2010
++++ lib/Transforms/Makefile	Wed May 23 01:39:52 2012
 @@ -8,7 +8,7 @@
  ##===----------------------------------------------------------------------===##
  
  LEVEL = ../..
--PARALLEL_DIRS = Utils Instrumentation Scalar InstCombine IPO Hello
+-PARALLEL_DIRS = Utils Instrumentation Scalar InstCombine IPO Vectorize Hello
-+PARALLEL_DIRS = Utils Instrumentation Scalar InstCombine IPO
++PARALLEL_DIRS = Utils Instrumentation Scalar InstCombine IPO Vectorize
  
  include $(LEVEL)/Makefile.config
  

devel/llvm/patches/patch-tools_clang_lib_Basic_Targets_cpp

@@ -1,40 +0,0 @@
-$OpenBSD: patch-tools_clang_lib_Basic_Targets_cpp,v 1.4 2012/04/23 23:11:01 sthen Exp $
-
-- let profiling work on OpenBSD
-- fix the symbol prefix to be empty rather than an underscore
-
---- tools/clang/lib/Basic/Targets.cpp.orig	Tue Oct 18 13:22:17 2011
-+++ tools/clang/lib/Basic/Targets.cpp	Mon Apr 23 10:37:10 2012
-@@ -363,11 +363,30 @@ class OpenBSDTargetInfo : public OSTargetInfo<Target> 
-     DefineStd(Builder, "unix", Opts);
-     Builder.defineMacro("__ELF__");
-     if (Opts.POSIXThreads)
--      Builder.defineMacro("_POSIX_THREADS");
-+      Builder.defineMacro("_REENTRANT");
-   }
- public:
-   OpenBSDTargetInfo(const std::string &triple)
--    : OSTargetInfo<Target>(triple) {}
-+    : OSTargetInfo<Target>(triple) {
-+      this->UserLabelPrefix = "";
-+
-+      llvm::Triple Triple(triple);
-+      switch (Triple.getArch()) {
-+        default:
-+        case llvm::Triple::x86:
-+        case llvm::Triple::x86_64:
-+        case llvm::Triple::arm:
-+       case llvm::Triple::sparc:
-+          this->MCountName = "__mcount";
-+          break;
-+        case llvm::Triple::mips64:
-+        case llvm::Triple::mips64el:
-+        case llvm::Triple::ppc:
-+       case llvm::Triple::sparcv9:
-+          this->MCountName = "_mcount";
-+          break;
-+      }
-+  }
- };
- 
- // PSP Target

devel/llvm/patches/patch-tools_clang_lib_Driver_Tools_cpp

@@ -1,46 +0,0 @@
-$OpenBSD: patch-tools_clang_lib_Driver_Tools_cpp,v 1.8 2011/12/14 22:58:23 sthen Exp $
-
-- let profiling work on OpenBSD
-
---- tools/clang/lib/Driver/Tools.cpp.orig	Mon Nov  7 10:27:39 2011
-+++ tools/clang/lib/Driver/Tools.cpp	Wed Dec 14 20:23:29 2011
-@@ -3805,9 +3805,13 @@ void openbsd::Link::ConstructJob(Compilation &C, const
-   if (!Args.hasArg(options::OPT_nostdlib) &&
-       !Args.hasArg(options::OPT_nostartfiles)) {
-     if (!Args.hasArg(options::OPT_shared)) {
-+      if (Args.hasArg(options::OPT_pg))  
-+        CmdArgs.push_back(Args.MakeArgString(
-+                                getToolChain().GetFilePath("gcrt0.o")));
-+      else
-+        CmdArgs.push_back(Args.MakeArgString(
-+                                getToolChain().GetFilePath("crt0.o")));
-       CmdArgs.push_back(Args.MakeArgString(
--                              getToolChain().GetFilePath("crt0.o")));
--      CmdArgs.push_back(Args.MakeArgString(
-                               getToolChain().GetFilePath("crtbegin.o")));
-     } else {
-       CmdArgs.push_back(Args.MakeArgString(
-@@ -3831,7 +3835,10 @@ void openbsd::Link::ConstructJob(Compilation &C, const
-       !Args.hasArg(options::OPT_nodefaultlibs)) {
-     if (D.CCCIsCXX) {
-       getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
--      CmdArgs.push_back("-lm");
-+      if (Args.hasArg(options::OPT_pg)) 
-+        CmdArgs.push_back("-lm_p");
-+      else
-+        CmdArgs.push_back("-lm");
-     }
- 
-     // FIXME: For some reason GCC passes -lgcc before adding
-@@ -3841,7 +3848,10 @@ void openbsd::Link::ConstructJob(Compilation &C, const
-     if (Args.hasArg(options::OPT_pthread))
-       CmdArgs.push_back("-lpthread");
-     if (!Args.hasArg(options::OPT_shared))
--      CmdArgs.push_back("-lc");
-+      if (Args.hasArg(options::OPT_pg)) 
-+         CmdArgs.push_back("-lc_p");
-+      else
-+         CmdArgs.push_back("-lc");
-     CmdArgs.push_back("-lgcc");
-   }
- 

devel/llvm/pkg/PLIST

@@ -1,11 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.15 2011/12/14 22:58:24 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.16 2012/05/25 09:05:49 sthen Exp $
 @bin bin/bugpoint
 bin/c++-analyzer
 @bin bin/c-index-test
 bin/ccc-analyzer
 bin/clang
 bin/clang++
-@bin bin/clang-3.0
+@bin bin/clang-3.1
 @bin bin/clang-tblgen
 @bin bin/diagtool
 @bin bin/llc
@@ -13,7 +13,8 @@ bin/clang++
 @bin bin/llvm-ar
 @bin bin/llvm-as
 @bin bin/llvm-bcanalyzer
-bin/llvm-config
+@bin bin/llvm-config
+@bin bin/llvm-cov
 @bin bin/llvm-diff
 @bin bin/llvm-dis
 @bin bin/llvm-dwarfdump
@@ -26,8 +27,10 @@ bin/llvm-lit
 @bin bin/llvm-objdump
 @bin bin/llvm-prof
 @bin bin/llvm-ranlib
+@bin bin/llvm-readobj
 @bin bin/llvm-rtdyld
 @bin bin/llvm-size
+@bin bin/llvm-stress
 @bin bin/llvm-stub
 @bin bin/llvm-tblgen
 @bin bin/macho-dump
@@ -53,6 +56,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
@@ -63,6 +67,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
@@ -75,7 +80,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
@@ -101,14 +108,15 @@ 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/
 include/clang/Analysis/Analyses/
 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
@@ -117,6 +125,7 @@ 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/
 include/clang/Analysis/DomainSpecific/CocoaConventions.h
 include/clang/Analysis/FlowSensitive/
@@ -126,7 +135,6 @@ include/clang/Analysis/ProgramPoint.h
 include/clang/Analysis/Support/
 include/clang/Analysis/Support/BlkExprDeclBitVector.h
 include/clang/Analysis/Support/BumpVector.h
-include/clang/Analysis/Support/SaveAndRestore.h
 include/clang/Analysis/Visitors/
 include/clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h
 include/clang/Analysis/Visitors/CFGRecStmtVisitor.h
@@ -134,16 +142,17 @@ include/clang/Analysis/Visitors/CFGStmtVisitor.h
 include/clang/Basic/
 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
@@ -157,6 +166,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
@@ -164,10 +174,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
@@ -207,7 +219,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
@@ -221,18 +232,26 @@ include/clang/Driver/ToolChain.h
 include/clang/Driver/Types.def
 include/clang/Driver/Types.h
 include/clang/Driver/Util.h
+include/clang/Edit/
+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/
 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
@@ -241,30 +260,20 @@ 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/
 include/clang/FrontendTool/Utils.h
-include/clang/Index/
-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/
 include/clang/Lex/AttrSpellings.inc
 include/clang/Lex/CodeCompletionHandler.h
@@ -277,6 +286,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
@@ -306,6 +316,9 @@ include/clang/Rewrite/Rewriters.h
 include/clang/Rewrite/TokenRewriter.h
 include/clang/Sema/
 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
@@ -317,7 +330,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
@@ -341,13 +353,14 @@ 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/
 include/clang/StaticAnalyzer/Checkers/
 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/
@@ -372,11 +385,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
@@ -384,10 +398,15 @@ 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/
 include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
 include/clang/StaticAnalyzer/Frontend/FrontendActions.h
+include/clang/Tooling/
+include/clang/Tooling/CompilationDatabase.h
+include/clang/Tooling/Tooling.h
 include/llvm/
 include/llvm-c/
 include/llvm-c/Analysis.h
@@ -401,10 +420,12 @@ 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/
 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/
 include/llvm/ADT/APFloat.h
@@ -421,6 +442,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
@@ -449,6 +471,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
@@ -461,7 +484,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/
@@ -542,9 +566,9 @@ include/llvm/CallingConv.h
 include/llvm/CodeGen/
 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
@@ -561,6 +585,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
@@ -577,6 +602,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
@@ -588,7 +614,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/
 include/llvm/CodeGen/PBQP/Graph.h
 include/llvm/CodeGen/PBQP/HeuristicBase.h
@@ -603,8 +629,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
@@ -626,17 +654,18 @@ include/llvm/Constant.h
 include/llvm/Constants.h
 include/llvm/DebugInfo/
 include/llvm/DebugInfo/DIContext.h
-include/llvm/DebugInfoProbe.h
 include/llvm/DefaultPasses.h
 include/llvm/DerivedTypes.h
 include/llvm/ExecutionEngine/
 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
@@ -654,8 +683,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
@@ -716,6 +745,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
@@ -725,6 +755,7 @@ include/llvm/Object/
 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
@@ -759,6 +790,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
@@ -785,6 +817,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
@@ -813,9 +848,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
@@ -831,6 +868,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
@@ -875,11 +913,12 @@ include/llvm/Transforms/Scalar.h
 include/llvm/Transforms/Utils/
 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
@@ -887,6 +926,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
@@ -894,22 +934,32 @@ include/llvm/Value.h
 include/llvm/ValueSymbolTable.h
 lib/BugpointPasses.so
 lib/LLVMHello.so
+lib/PrintFunctionNames.so
+lib/SampleAnalyzerPlugin.so
 lib/clang/
-lib/clang/3.0/
+lib/clang/3.1/
 ${CLANG_INCLUDE_PATH}/
 ${CLANG_INCLUDE_PATH}/altivec.h
 ${CLANG_INCLUDE_PATH}/arm_neon.h
+${CLANG_INCLUDE_PATH}/avx2intrin.h
 ${CLANG_INCLUDE_PATH}/avxintrin.h
+${CLANG_INCLUDE_PATH}/bmi2intrin.h
+${CLANG_INCLUDE_PATH}/bmiintrin.h
+${CLANG_INCLUDE_PATH}/cpuid.h
 ${CLANG_INCLUDE_PATH}/emmintrin.h
 ${CLANG_INCLUDE_PATH}/float.h
+${CLANG_INCLUDE_PATH}/fma4intrin.h
 ${CLANG_INCLUDE_PATH}/immintrin.h
 ${CLANG_INCLUDE_PATH}/iso646.h
 ${CLANG_INCLUDE_PATH}/limits.h
+${CLANG_INCLUDE_PATH}/lzcntintrin.h
 ${CLANG_INCLUDE_PATH}/mm3dnow.h
 ${CLANG_INCLUDE_PATH}/mm_malloc.h
 ${CLANG_INCLUDE_PATH}/mmintrin.h
+${CLANG_INCLUDE_PATH}/module.map
 ${CLANG_INCLUDE_PATH}/nmmintrin.h
 ${CLANG_INCLUDE_PATH}/pmmintrin.h
+${CLANG_INCLUDE_PATH}/popcntintrin.h
 ${CLANG_INCLUDE_PATH}/smmintrin.h
 ${CLANG_INCLUDE_PATH}/stdalign.h
 ${CLANG_INCLUDE_PATH}/stdarg.h
@@ -918,40 +968,36 @@ ${CLANG_INCLUDE_PATH}/stddef.h
 ${CLANG_INCLUDE_PATH}/stdint.h
 ${CLANG_INCLUDE_PATH}/tgmath.h
 ${CLANG_INCLUDE_PATH}/tmmintrin.h
+${CLANG_INCLUDE_PATH}/unwind.h
 ${CLANG_INCLUDE_PATH}/varargs.h
 ${CLANG_INCLUDE_PATH}/wmmintrin.h
 ${CLANG_INCLUDE_PATH}/x86intrin.h
 ${CLANG_INCLUDE_PATH}/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
@@ -971,9 +1017,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
@@ -991,12 +1039,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
@@ -1017,9 +1063,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
@@ -1028,6 +1074,7 @@ lib/libclangSerialization.a
 lib/libclangStaticAnalyzerCheckers.a
 lib/libclangStaticAnalyzerCore.a
 lib/libclangStaticAnalyzerFrontend.a
+lib/libclangTooling.a
 @comment lib/libgtest.a
 @comment lib/libgtest_main.a
 lib/liblibclang.a
@@ -1043,7 +1090,9 @@ lib/profile_rt.so
 @man man/man1/llvm-ar.1
 @man man/man1/llvm-as.1
 @man man/man1/llvm-bcanalyzer.1
+@man man/man1/llvm-build.1
 @man man/man1/llvm-config.1
+@man man/man1/llvm-cov.1
 @man man/man1/llvm-diff.1
 @man man/man1/llvm-dis.1
 @man man/man1/llvm-extract.1
@@ -1052,6 +1101,7 @@ lib/profile_rt.so
 @man man/man1/llvm-nm.1
 @man man/man1/llvm-prof.1
 @man man/man1/llvm-ranlib.1
+@man man/man1/llvm-stress.1
 @man man/man1/opt.1
 @man man/man1/tblgen.1
 share/llvm/