LLVM 3.0 includes several major changes and big features:

* llvm-gcc is no longer supported, and not included in the release. We recommend
  switching to Clang or DragonEgg.
* The linear scan register allocator has been replaced with a new "greedy"
  register allocator, enabling live range splitting and many other optimizations  that lead to better code quality. Please see its blog post or its talk at the
  Developer Meeting for more information.
* LLVM IR now includes full support for atomics memory operations intended to
  support the C++'11 and C'1x memory models. This includes atomic load and
  store, compare and exchange, and read/modify/write instructions as well as
  a full set of memory ordering constraints. Please see the Atomics Guide for
  more information.
* The LLVM IR exception handling representation has been redesigned and
  reimplemented, making it more elegant, fixing a huge number of bugs, and
  enabling inlining and other optimizations. Please see its blog post and the
  Exception Handling documentation for more information.
* The LLVM IR Type system has been redesigned and reimplemented, making it
  faster and solving some long-standing problems. Please see its blog post for
  more information.
* The MIPS backend has made major leaps in this release, going from an
  experimental target to being virtually production quality and supporting
  a wide variety of MIPS subtargets. See the MIPS section below for more
  information.
* The optimizer and code generator now supports gprof and gcov-style coverage
  and profiling information, and includes a new llvm-cov tool (but also works
  with gcov). Clang exposes coverage and profiling through GCC-compatible
  command line options.

5 files changed, 145 insertions, 115 deletions

diff --git a/lang/clang/Makefile b/lang/clang/Makefile
index 6ef69505c6a..f2a17d29e4b 100644
--- a/lang/clang/Makefile
+++ b/lang/clang/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2011/05/07 16:54:56 adam Exp $
+# $NetBSD: Makefile,v 1.11 2011/12/02 14:42:12 adam Exp $
 
-DISTNAME=	clang-2.9
-PKGREVISION=	1
+DISTNAME=	clang-3.0
 CATEGORIES=	lang
 MASTER_SITES=	http://llvm.org/releases/${PKGVERSION_NOREV}/
-DISTFILES=	llvm-${PKGVERSION_NOREV}.tgz clang-${PKGVERSION_NOREV}.tgz
+DISTFILES=	llvm-${PKGVERSION_NOREV}.tar.gz clang-${PKGVERSION_NOREV}.tar.gz
 
 MAINTAINER=	adam.hoka@gmail.com
 HOMEPAGE=	http://llvm.org/
@@ -13,7 +12,7 @@ LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=			${WRKDIR}/llvm-${PKGVERSION_NOREV}
+WRKSRC=			${WRKDIR}/llvm-${PKGVERSION_NOREV}.src
 
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		chown perl:build gmake
@@ -46,6 +45,6 @@ SUBST_FILES.perl=	tools/llvm-config/llvm-config.in.in
 SUBST_SED.perl=		-e 's,@PERL@,${PERL5},'
 
 post-extract:
-	mv ${WRKDIR}/clang-${PKGVERSION_NOREV} ${WRKSRC}/tools/clang
+	mv ${WRKDIR}/clang-${PKGVERSION_NOREV}.src ${WRKSRC}/tools/clang
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/clang/PLIST b/lang/clang/PLIST
index 918c98b2398..cc095059dc9 100644
--- a/lang/clang/PLIST
+++ b/lang/clang/PLIST
@@ -1,15 +1,19 @@
-@comment $NetBSD: PLIST,v 1.4 2011/04/07 09:26:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/12/02 14:42:12 adam Exp $
 bin/bugpoint
+bin/c-index-test
 bin/clang
 bin/clang++
+bin/clang-tblgen
 bin/llc
 bin/lli
 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-ld
 bin/llvm-link
@@ -18,12 +22,16 @@ bin/llvm-nm
 bin/llvm-objdump
 bin/llvm-prof
 bin/llvm-ranlib
+bin/llvm-rtdyld
+bin/llvm-size
 bin/llvm-stub
-bin/llvmc
+bin/llvm-tblgen
 bin/macho-dump
 bin/opt
-bin/tblgen
 include/clang-c/Index.h
+include/clang/ARCMigrate/ARCMT.h
+include/clang/ARCMigrate/ARCMTActions.h
+include/clang/ARCMigrate/FileRemapper.h
 include/clang/AST/APValue.h
 include/clang/AST/AST.h
 include/clang/AST/ASTConsumer.h
@@ -35,6 +43,7 @@ include/clang/AST/ASTVector.h
 include/clang/AST/Attr.h
 include/clang/AST/AttrImpl.inc
 include/clang/AST/Attrs.inc
+include/clang/AST/BaseSubobject.h
 include/clang/AST/CXXInheritance.h
 include/clang/AST/CanonicalType.h
 include/clang/AST/CharUnits.h
@@ -56,6 +65,7 @@ include/clang/AST/Expr.h
 include/clang/AST/ExprCXX.h
 include/clang/AST/ExprObjC.h
 include/clang/AST/ExternalASTSource.h
+include/clang/AST/GlobalDecl.h
 include/clang/AST/Mangle.h
 include/clang/AST/NestedNameSpecifier.h
 include/clang/AST/OperationKinds.h
@@ -64,6 +74,7 @@ include/clang/AST/PrettyPrinter.h
 include/clang/AST/RecordLayout.h
 include/clang/AST/RecursiveASTVisitor.h
 include/clang/AST/Redeclarable.h
+include/clang/AST/SelectorLocationsKind.h
 include/clang/AST/Stmt.h
 include/clang/AST/StmtCXX.h
 include/clang/AST/StmtGraphTraits.h
@@ -82,13 +93,15 @@ 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/FormatString.h
 include/clang/Analysis/Analyses/LiveVariables.h
 include/clang/Analysis/Analyses/PseudoConstantAnalysis.h
 include/clang/Analysis/Analyses/ReachableCode.h
+include/clang/Analysis/Analyses/ThreadSafety.h
 include/clang/Analysis/Analyses/UninitializedValues.h
-include/clang/Analysis/Analyses/UninitializedValuesV2.h
 include/clang/Analysis/AnalysisContext.h
 include/clang/Analysis/AnalysisDiagnostic.h
 include/clang/Analysis/CFG.h
@@ -104,33 +117,43 @@ 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/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/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
+include/clang/Basic/DiagnosticCategories.h
 include/clang/Basic/DiagnosticCommonKinds.inc
 include/clang/Basic/DiagnosticDriverKinds.inc
 include/clang/Basic/DiagnosticFrontendKinds.inc
 include/clang/Basic/DiagnosticGroups.inc
 include/clang/Basic/DiagnosticIDs.h
+include/clang/Basic/DiagnosticIndexName.inc
 include/clang/Basic/DiagnosticLexKinds.inc
 include/clang/Basic/DiagnosticParseKinds.inc
 include/clang/Basic/DiagnosticSemaKinds.inc
+include/clang/Basic/ExceptionSpecificationType.h
+include/clang/Basic/ExpressionTraits.h
 include/clang/Basic/FileManager.h
 include/clang/Basic/FileSystemOptions.h
 include/clang/Basic/FileSystemStatCache.h
 include/clang/Basic/IdentifierTable.h
+include/clang/Basic/LLVM.h
+include/clang/Basic/LangOptions.def
 include/clang/Basic/LangOptions.h
 include/clang/Basic/Linkage.h
 include/clang/Basic/MacroBuilder.h
 include/clang/Basic/OnDiskHashTable.h
+include/clang/Basic/OpenCL.h
 include/clang/Basic/OpenCLExtensions.def
 include/clang/Basic/OperatorKinds.def
 include/clang/Basic/OperatorKinds.h
@@ -149,6 +172,7 @@ include/clang/Basic/TokenKinds.h
 include/clang/Basic/TypeTraits.h
 include/clang/Basic/Version.h
 include/clang/Basic/Version.inc
+include/clang/Basic/VersionTuple.h
 include/clang/Basic/Visibility.h
 include/clang/Basic/arm_neon.inc
 include/clang/CodeGen/BackendUtil.h
@@ -166,6 +190,7 @@ 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
 include/clang/Driver/OptTable.h
 include/clang/Driver/Option.h
@@ -181,7 +206,7 @@ include/clang/Frontend/ASTConsumers.h
 include/clang/Frontend/ASTUnit.h
 include/clang/Frontend/Analyses.def
 include/clang/Frontend/AnalyzerOptions.h
-include/clang/Frontend/ChainedDiagnosticClient.h
+include/clang/Frontend/ChainedDiagnosticConsumer.h
 include/clang/Frontend/CodeGenOptions.h
 include/clang/Frontend/CommandLineSourceLoc.h
 include/clang/Frontend/CompilerInstance.h
@@ -196,13 +221,14 @@ include/clang/Frontend/FrontendPluginRegistry.h
 include/clang/Frontend/HeaderSearchOptions.h
 include/clang/Frontend/LangStandard.h
 include/clang/Frontend/LangStandards.def
+include/clang/Frontend/LogDiagnosticPrinter.h
 include/clang/Frontend/MultiplexConsumer.h
 include/clang/Frontend/PreprocessorOptions.h
 include/clang/Frontend/PreprocessorOutputOptions.h
 include/clang/Frontend/TextDiagnosticBuffer.h
 include/clang/Frontend/TextDiagnosticPrinter.h
 include/clang/Frontend/Utils.h
-include/clang/Frontend/VerifyDiagnosticsClient.h
+include/clang/Frontend/VerifyDiagnosticConsumer.h
 include/clang/FrontendTool/Utils.h
 include/clang/Index/ASTLocation.h
 include/clang/Index/Analyzer.h
@@ -227,6 +253,7 @@ include/clang/Lex/LexDiagnostic.h
 include/clang/Lex/Lexer.h
 include/clang/Lex/LiteralSupport.h
 include/clang/Lex/MacroInfo.h
+include/clang/Lex/ModuleLoader.h
 include/clang/Lex/MultipleIncludeOpt.h
 include/clang/Lex/PPCallbacks.h
 include/clang/Lex/PTHLexer.h
@@ -239,6 +266,7 @@ include/clang/Lex/ScratchBuffer.h
 include/clang/Lex/Token.h
 include/clang/Lex/TokenConcatenation.h
 include/clang/Lex/TokenLexer.h
+include/clang/Parse/AttrLateParsed.inc
 include/clang/Parse/ParseAST.h
 include/clang/Parse/ParseDiagnostic.h
 include/clang/Parse/Parser.h
@@ -261,7 +289,9 @@ include/clang/Sema/Designator.h
 include/clang/Sema/ExternalSemaSource.h
 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
@@ -272,25 +302,34 @@ include/clang/Sema/ScopeInfo.h
 include/clang/Sema/Sema.h
 include/clang/Sema/SemaConsumer.h
 include/clang/Sema/SemaDiagnostic.h
+include/clang/Sema/SemaFixItUtils.h
 include/clang/Sema/SemaInternal.h
 include/clang/Sema/Template.h
 include/clang/Sema/TemplateDeduction.h
+include/clang/Sema/TypoCorrection.h
+include/clang/Sema/Weak.h
 include/clang/Serialization/ASTBitCodes.h
 include/clang/Serialization/ASTDeserializationListener.h
 include/clang/Serialization/ASTReader.h
-include/clang/Serialization/ASTSerializationListener.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/StaticAnalyzer/Checkers/ClangCheckers.h
 include/clang/StaticAnalyzer/Checkers/DereferenceChecker.h
 include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
 include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
+include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitor.h
 include/clang/StaticAnalyzer/Core/BugReporter/BugType.h
 include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h
 include/clang/StaticAnalyzer/Core/Checker.h
 include/clang/StaticAnalyzer/Core/CheckerManager.h
-include/clang/StaticAnalyzer/Core/CheckerProvider.h
-include/clang/StaticAnalyzer/Core/PathDiagnosticClients.h
+include/clang/StaticAnalyzer/Core/CheckerOptInfo.h
+include/clang/StaticAnalyzer/Core/CheckerRegistry.h
+include/clang/StaticAnalyzer/Core/PathDiagnosticConsumers.h
 include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h
 include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h
 include/clang/StaticAnalyzer/Core/PathSensitive/BlockCounter.h
@@ -302,17 +341,17 @@ 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/GRState.h
-include/clang/StaticAnalyzer/Core/PathSensitive/GRStateTrait.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/SValBuilder.h
 include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h
 include/clang/StaticAnalyzer/Core/PathSensitive/Store.h
+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/TransferFuncs.h
 include/clang/StaticAnalyzer/Core/PathSensitive/WorkList.h
 include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
 include/clang/StaticAnalyzer/Frontend/FrontendActions.h
@@ -320,12 +359,15 @@ include/llvm-c/Analysis.h
 include/llvm-c/BitReader.h
 include/llvm-c/BitWriter.h
 include/llvm-c/Core.h
+include/llvm-c/Disassembler.h
 include/llvm-c/EnhancedDisassembly.h
 include/llvm-c/ExecutionEngine.h
 include/llvm-c/Initialization.h
 include/llvm-c/LinkTimeOptimizer.h
+include/llvm-c/Object.h
 include/llvm-c/Target.h
 include/llvm-c/Transforms/IPO.h
+include/llvm-c/Transforms/PassManagerBuilder.h
 include/llvm-c/Transforms/Scalar.h
 include/llvm-c/lto.h
 include/llvm/ADT/APFloat.h
@@ -354,6 +396,7 @@ include/llvm/ADT/IntrusiveRefCntPtr.h
 include/llvm/ADT/NullablePtr.h
 include/llvm/ADT/Optional.h
 include/llvm/ADT/OwningPtr.h
+include/llvm/ADT/PackedVector.h
 include/llvm/ADT/PointerIntPair.h
 include/llvm/ADT/PointerUnion.h
 include/llvm/ADT/PostOrderIterator.h
@@ -375,6 +418,7 @@ include/llvm/ADT/StringMap.h
 include/llvm/ADT/StringRef.h
 include/llvm/ADT/StringSet.h
 include/llvm/ADT/StringSwitch.h
+include/llvm/ADT/TinyPtrVector.h
 include/llvm/ADT/Trie.h
 include/llvm/ADT/Triple.h
 include/llvm/ADT/Twine.h
@@ -383,9 +427,11 @@ include/llvm/ADT/ValueMap.h
 include/llvm/ADT/VectorExtras.h
 include/llvm/ADT/ilist.h
 include/llvm/ADT/ilist_node.h
-include/llvm/AbstractTypeUser.h
 include/llvm/Analysis/AliasAnalysis.h
 include/llvm/Analysis/AliasSetTracker.h
+include/llvm/Analysis/BlockFrequencyImpl.h
+include/llvm/Analysis/BlockFrequencyInfo.h
+include/llvm/Analysis/BranchProbabilityInfo.h
 include/llvm/Analysis/CFGPrinter.h
 include/llvm/Analysis/CallGraph.h
 include/llvm/Analysis/CaptureTracking.h
@@ -413,6 +459,7 @@ include/llvm/Analysis/Lint.h
 include/llvm/Analysis/Loads.h
 include/llvm/Analysis/LoopDependenceAnalysis.h
 include/llvm/Analysis/LoopInfo.h
+include/llvm/Analysis/LoopIterator.h
 include/llvm/Analysis/LoopPass.h
 include/llvm/Analysis/MemoryBuiltins.h
 include/llvm/Analysis/MemoryDependenceAnalysis.h
@@ -468,6 +515,7 @@ include/llvm/CodeGen/ISDOpcodes.h
 include/llvm/CodeGen/IntrinsicLowering.h
 include/llvm/CodeGen/JITCodeEmitter.h
 include/llvm/CodeGen/LatencyPriorityQueue.h
+include/llvm/CodeGen/LexicalScopes.h
 include/llvm/CodeGen/LinkAllAsmWriterComponents.h
 include/llvm/CodeGen/LinkAllCodegenComponents.h
 include/llvm/CodeGen/LiveInterval.h
@@ -476,6 +524,8 @@ include/llvm/CodeGen/LiveStackAnalysis.h
 include/llvm/CodeGen/LiveVariables.h
 include/llvm/CodeGen/MachORelocation.h
 include/llvm/CodeGen/MachineBasicBlock.h
+include/llvm/CodeGen/MachineBlockFrequencyInfo.h
+include/llvm/CodeGen/MachineBranchProbabilityInfo.h
 include/llvm/CodeGen/MachineCodeEmitter.h
 include/llvm/CodeGen/MachineCodeInfo.h
 include/llvm/CodeGen/MachineConstantPool.h
@@ -487,7 +537,6 @@ include/llvm/CodeGen/MachineFunctionPass.h
 include/llvm/CodeGen/MachineInstr.h
 include/llvm/CodeGen/MachineInstrBuilder.h
 include/llvm/CodeGen/MachineJumpTableInfo.h
-include/llvm/CodeGen/MachineLocation.h
 include/llvm/CodeGen/MachineLoopInfo.h
 include/llvm/CodeGen/MachineLoopRanges.h
 include/llvm/CodeGen/MachineMemOperand.h
@@ -510,7 +559,6 @@ include/llvm/CodeGen/ProcessImplicitDefs.h
 include/llvm/CodeGen/PseudoSourceValue.h
 include/llvm/CodeGen/RegAllocPBQP.h
 include/llvm/CodeGen/RegAllocRegistry.h
-include/llvm/CodeGen/RegisterCoalescer.h
 include/llvm/CodeGen/RegisterScavenging.h
 include/llvm/CodeGen/RuntimeLibcalls.h
 include/llvm/CodeGen/ScheduleDAG.h
@@ -524,15 +572,6 @@ include/llvm/CodeGen/SlotIndexes.h
 include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
 include/llvm/CodeGen/ValueTypes.h
 include/llvm/CodeGen/ValueTypes.td
-include/llvm/CompilerDriver/Action.h
-include/llvm/CompilerDriver/AutoGenerated.h
-include/llvm/CompilerDriver/BuiltinOptions.h
-include/llvm/CompilerDriver/Common.td
-include/llvm/CompilerDriver/CompilationGraph.h
-include/llvm/CompilerDriver/Error.h
-include/llvm/CompilerDriver/Main.h
-include/llvm/CompilerDriver/Main.inc
-include/llvm/CompilerDriver/Tool.h
 include/llvm/Config/AsmParsers.def
 include/llvm/Config/AsmPrinters.def
 include/llvm/Config/Disassemblers.def
@@ -541,6 +580,9 @@ include/llvm/Config/config.h
 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
@@ -549,6 +591,7 @@ include/llvm/ExecutionEngine/JIT.h
 include/llvm/ExecutionEngine/JITEventListener.h
 include/llvm/ExecutionEngine/JITMemoryManager.h
 include/llvm/ExecutionEngine/MCJIT.h
+include/llvm/ExecutionEngine/RuntimeDyld.h
 include/llvm/Function.h
 include/llvm/GVMaterializer.h
 include/llvm/GlobalAlias.h
@@ -576,12 +619,15 @@ include/llvm/LinkAllPasses.h
 include/llvm/LinkAllVMCore.h
 include/llvm/Linker.h
 include/llvm/MC/EDInstInfo.h
+include/llvm/MC/MCAsmBackend.h
 include/llvm/MC/MCAsmInfo.h
 include/llvm/MC/MCAsmInfoCOFF.h
 include/llvm/MC/MCAsmInfoDarwin.h
 include/llvm/MC/MCAsmLayout.h
 include/llvm/MC/MCAssembler.h
+include/llvm/MC/MCAtom.h
 include/llvm/MC/MCCodeEmitter.h
+include/llvm/MC/MCCodeGenInfo.h
 include/llvm/MC/MCContext.h
 include/llvm/MC/MCDirectives.h
 include/llvm/MC/MCDisassembler.h
@@ -593,9 +639,15 @@ include/llvm/MC/MCFixup.h
 include/llvm/MC/MCFixupKindInfo.h
 include/llvm/MC/MCInst.h
 include/llvm/MC/MCInstPrinter.h
+include/llvm/MC/MCInstrAnalysis.h
+include/llvm/MC/MCInstrDesc.h
+include/llvm/MC/MCInstrInfo.h
+include/llvm/MC/MCInstrItineraries.h
 include/llvm/MC/MCLabel.h
 include/llvm/MC/MCMachOSymbolFlags.h
 include/llvm/MC/MCMachObjectWriter.h
+include/llvm/MC/MCModule.h
+include/llvm/MC/MCObjectFileInfo.h
 include/llvm/MC/MCObjectStreamer.h
 include/llvm/MC/MCObjectWriter.h
 include/llvm/MC/MCParser/AsmCond.h
@@ -604,16 +656,28 @@ include/llvm/MC/MCParser/MCAsmLexer.h
 include/llvm/MC/MCParser/MCAsmParser.h
 include/llvm/MC/MCParser/MCAsmParserExtension.h
 include/llvm/MC/MCParser/MCParsedAsmOperand.h
+include/llvm/MC/MCRegisterInfo.h
 include/llvm/MC/MCSection.h
 include/llvm/MC/MCSectionCOFF.h
 include/llvm/MC/MCSectionELF.h
 include/llvm/MC/MCSectionMachO.h
 include/llvm/MC/MCStreamer.h
+include/llvm/MC/MCSubtargetInfo.h
 include/llvm/MC/MCSymbol.h
+include/llvm/MC/MCTargetAsmLexer.h
+include/llvm/MC/MCTargetAsmParser.h
 include/llvm/MC/MCValue.h
+include/llvm/MC/MCWin64EH.h
+include/llvm/MC/MachineLocation.h
 include/llvm/MC/SectionKind.h
+include/llvm/MC/SubtargetFeature.h
 include/llvm/Metadata.h
 include/llvm/Module.h
+include/llvm/Object/Archive.h
+include/llvm/Object/Binary.h
+include/llvm/Object/COFF.h
+include/llvm/Object/Error.h
+include/llvm/Object/MachO.h
 include/llvm/Object/MachOFormat.h
 include/llvm/Object/MachOObject.h
 include/llvm/Object/ObjectFile.h
@@ -629,16 +693,21 @@ include/llvm/Support/AIXDataTypesFix.h
 include/llvm/Support/AlignOf.h
 include/llvm/Support/Allocator.h
 include/llvm/Support/Atomic.h
+include/llvm/Support/BlockFrequency.h
+include/llvm/Support/BranchProbability.h
 include/llvm/Support/CFG.h
 include/llvm/Support/COFF.h
 include/llvm/Support/CallSite.h
+include/llvm/Support/Capacity.h
 include/llvm/Support/Casting.h
+include/llvm/Support/CodeGen.h
 include/llvm/Support/CommandLine.h
 include/llvm/Support/Compiler.h
 include/llvm/Support/ConstantFolder.h
 include/llvm/Support/ConstantRange.h
 include/llvm/Support/CrashRecoveryContext.h
 include/llvm/Support/DOTGraphTraits.h
+include/llvm/Support/DataExtractor.h
 include/llvm/Support/DataFlow.h
 include/llvm/Support/DataTypes.h
 include/llvm/Support/Debug.h
@@ -655,6 +724,7 @@ include/llvm/Support/FileSystem.h
 include/llvm/Support/FileUtilities.h
 include/llvm/Support/Format.h
 include/llvm/Support/FormattedStream.h
+include/llvm/Support/GCOV.h
 include/llvm/Support/GetElementPtrTypeIterator.h
 include/llvm/Support/GraphWriter.h
 include/llvm/Support/Host.h
@@ -696,11 +766,12 @@ include/llvm/Support/SMLoc.h
 include/llvm/Support/Signals.h
 include/llvm/Support/Solaris.h
 include/llvm/Support/SourceMgr.h
-include/llvm/Support/StandardPasses.h
 include/llvm/Support/StringPool.h
 include/llvm/Support/SwapByteOrder.h
 include/llvm/Support/SystemUtils.h
 include/llvm/Support/TargetFolder.h
+include/llvm/Support/TargetRegistry.h
+include/llvm/Support/TargetSelect.h
 include/llvm/Support/ThreadLocal.h
 include/llvm/Support/Threading.h
 include/llvm/Support/TimeValue.h
@@ -709,27 +780,26 @@ include/llvm/Support/ToolOutputFile.h
 include/llvm/Support/TypeBuilder.h
 include/llvm/Support/Valgrind.h
 include/llvm/Support/ValueHandle.h
+include/llvm/Support/Win64EH.h
 include/llvm/Support/circular_raw_ostream.h
 include/llvm/Support/raw_os_ostream.h
 include/llvm/Support/raw_ostream.h
 include/llvm/Support/system_error.h
 include/llvm/Support/type_traits.h
 include/llvm/SymbolTableListTraits.h
+include/llvm/TableGen/Error.h
+include/llvm/TableGen/Main.h
+include/llvm/TableGen/Record.h
+include/llvm/TableGen/TableGenAction.h
+include/llvm/TableGen/TableGenBackend.h
 include/llvm/Target/Mangler.h
-include/llvm/Target/SubtargetFeature.h
 include/llvm/Target/Target.td
-include/llvm/Target/TargetAsmBackend.h
-include/llvm/Target/TargetAsmInfo.h
-include/llvm/Target/TargetAsmLexer.h
-include/llvm/Target/TargetAsmParser.h
 include/llvm/Target/TargetCallingConv.h
 include/llvm/Target/TargetCallingConv.td
 include/llvm/Target/TargetData.h
 include/llvm/Target/TargetELFWriterInfo.h
 include/llvm/Target/TargetFrameLowering.h
-include/llvm/Target/TargetInstrDesc.h
 include/llvm/Target/TargetInstrInfo.h
-include/llvm/Target/TargetInstrItineraries.h
 include/llvm/Target/TargetIntrinsicInfo.h
 include/llvm/Target/TargetJITInfo.h
 include/llvm/Target/TargetLibraryInfo.h
@@ -739,14 +809,13 @@ include/llvm/Target/TargetMachine.h
 include/llvm/Target/TargetOpcodes.h
 include/llvm/Target/TargetOptions.h
 include/llvm/Target/TargetRegisterInfo.h
-include/llvm/Target/TargetRegistry.h
 include/llvm/Target/TargetSchedule.td
-include/llvm/Target/TargetSelect.h
 include/llvm/Target/TargetSelectionDAG.td
 include/llvm/Target/TargetSelectionDAGInfo.h
-include/llvm/Target/TargetSubtarget.h
+include/llvm/Target/TargetSubtargetInfo.h
 include/llvm/Transforms/IPO.h
 include/llvm/Transforms/IPO/InlinerPass.h
+include/llvm/Transforms/IPO/PassManagerBuilder.h
 include/llvm/Transforms/Instrumentation.h
 include/llvm/Transforms/Scalar.h
 include/llvm/Transforms/Utils/AddrModeMatcher.h
@@ -759,11 +828,11 @@ include/llvm/Transforms/Utils/Local.h
 include/llvm/Transforms/Utils/PromoteMemToReg.h
 include/llvm/Transforms/Utils/SSAUpdater.h
 include/llvm/Transforms/Utils/SSAUpdaterImpl.h
+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/Type.h
-include/llvm/TypeSymbolTable.h
 include/llvm/Use.h
 include/llvm/User.h
 include/llvm/Value.h
@@ -779,10 +848,12 @@ 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/mm3dnow.h
 lib/clang/${PKGVERSION}/include/mmintrin.h
 lib/clang/${PKGVERSION}/include/nmmintrin.h
 lib/clang/${PKGVERSION}/include/pmmintrin.h
 lib/clang/${PKGVERSION}/include/smmintrin.h
+lib/clang/${PKGVERSION}/include/stdalign.h
 lib/clang/${PKGVERSION}/include/stdarg.h
 lib/clang/${PKGVERSION}/include/stdbool.h
 lib/clang/${PKGVERSION}/include/stddef.h
@@ -793,15 +864,16 @@ 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/libCompilerDriver.a
 lib/libEnhancedDisassembly.a
 lib/libEnhancedDisassembly.so
 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
@@ -810,15 +882,18 @@ 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/libLLVMCppBackendInfo.a
+lib/libLLVMDebugInfo.a
 lib/libLLVMExecutionEngine.a
 lib/libLLVMInstCombine.a
 lib/libLLVMInstrumentation.a
@@ -828,6 +903,7 @@ lib/libLLVMLinker.a
 lib/libLLVMMBlazeAsmParser.a
 lib/libLLVMMBlazeAsmPrinter.a
 lib/libLLVMMBlazeCodeGen.a
+lib/libLLVMMBlazeDesc.a
 lib/libLLVMMBlazeDisassembler.a
 lib/libLLVMMBlazeInfo.a
 lib/libLLVMMC.a
@@ -836,31 +912,43 @@ lib/libLLVMMCJIT.a
 lib/libLLVMMCParser.a
 lib/libLLVMMSP430AsmPrinter.a
 lib/libLLVMMSP430CodeGen.a
+lib/libLLVMMSP430Desc.a
 lib/libLLVMMSP430Info.a
+lib/libLLVMMipsAsmPrinter.a
 lib/libLLVMMipsCodeGen.a
+lib/libLLVMMipsDesc.a
 lib/libLLVMMipsInfo.a
 lib/libLLVMObject.a
+lib/libLLVMPTXAsmPrinter.a
 lib/libLLVMPTXCodeGen.a
+lib/libLLVMPTXDesc.a
 lib/libLLVMPTXInfo.a
 lib/libLLVMPowerPCAsmPrinter.a
 lib/libLLVMPowerPCCodeGen.a
+lib/libLLVMPowerPCDesc.a
 lib/libLLVMPowerPCInfo.a
+lib/libLLVMRuntimeDyld.a
 lib/libLLVMScalarOpts.a
 lib/libLLVMSelectionDAG.a
 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/libLLVMX86AsmParser.a
 lib/libLLVMX86AsmPrinter.a
 lib/libLLVMX86CodeGen.a
+lib/libLLVMX86Desc.a
 lib/libLLVMX86Disassembler.a
 lib/libLLVMX86Info.a
 lib/libLLVMX86Utils.a
 lib/libLLVMXCoreCodeGen.a
+lib/libLLVMXCoreDesc.a
 lib/libLLVMXCoreInfo.a
 lib/libLLVMipa.a
 lib/libLLVMipo.a
@@ -868,6 +956,7 @@ lib/libLTO.a
 lib/libLTO.so
 lib/libclang.a
 lib/libclang.so
+lib/libclangARCMigrate.a
 lib/libclangAST.a
 lib/libclangAnalysis.a
 lib/libclangBasic.a
@@ -884,7 +973,8 @@ lib/libclangSerialization.a
 lib/libclangStaticAnalyzerCheckers.a
 lib/libclangStaticAnalyzerCore.a
 lib/libclangStaticAnalyzerFrontend.a
-lib/profile_rt.${SOEXT}
+lib/libprofile_rt.a
+lib/libprofile_rt.${SOEXT}
 man/man1/bugpoint.1
 man/man1/clang.1
 man/man1/lit.1
@@ -902,15 +992,15 @@ man/man1/llvm-link.1
 man/man1/llvm-nm.1
 man/man1/llvm-prof.1
 man/man1/llvm-ranlib.1
-man/man1/llvmc.1
-man/man1/llvmgcc.1
-man/man1/llvmgxx.1
 man/man1/opt.1
 man/man1/tblgen.1
 share/doc/llvm/html.tar.gz
 share/doc/llvm/html/AliasAnalysis.html
 share/doc/llvm/html/AnalyzerRegions.html
+share/doc/llvm/html/Atomics.html
+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
@@ -934,15 +1024,10 @@ 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/llvmc.html
-share/doc/llvm/html/CommandGuide/llvmgcc.html
-share/doc/llvm/html/CommandGuide/llvmgxx.html
 share/doc/llvm/html/CommandGuide/manpage.css
 share/doc/llvm/html/CommandGuide/opt.html
 share/doc/llvm/html/CommandGuide/tblgen.html
 share/doc/llvm/html/CommandLine.html
-share/doc/llvm/html/CompilerDriver.html
-share/doc/llvm/html/CompilerDriverTutorial.html
 share/doc/llvm/html/CompilerWriterInfo.html
 share/doc/llvm/html/DebuggingJITedCode.html
 share/doc/llvm/html/DeveloperPolicy.html
@@ -971,6 +1056,7 @@ share/doc/llvm/html/Passes.html
 share/doc/llvm/html/ProgrammersManual.html
 share/doc/llvm/html/Projects.html
 share/doc/llvm/html/ReleaseNotes.html
+share/doc/llvm/html/SegmentedStacks.html
 share/doc/llvm/html/SourceLevelDebugging.html
 share/doc/llvm/html/SystemLibrary.html
 share/doc/llvm/html/TableGenFundamentals.html
@@ -988,12 +1074,12 @@ share/doc/llvm/html/img/lines.gif
 share/doc/llvm/html/img/objdeps.gif
 share/doc/llvm/html/img/venusflytrap.jpg
 share/doc/llvm/html/index.html
-share/doc/llvm/html/libIndex.html
 share/doc/llvm/html/llvm.css
 share/doc/llvm/html/tutorial/LangImpl1.html
 share/doc/llvm/html/tutorial/LangImpl2.html
 share/doc/llvm/html/tutorial/LangImpl3.html
 share/doc/llvm/html/tutorial/LangImpl4.html
+share/doc/llvm/html/tutorial/LangImpl5-cfg.png
 share/doc/llvm/html/tutorial/LangImpl5.html
 share/doc/llvm/html/tutorial/LangImpl6.html
 share/doc/llvm/html/tutorial/LangImpl7.html
@@ -1025,8 +1111,5 @@ 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/llvmc.ps
-share/doc/llvm/ps/llvmgcc.ps
-share/doc/llvm/ps/llvmgxx.ps
 share/doc/llvm/ps/opt.ps
 share/doc/llvm/ps/tblgen.ps
diff --git a/lang/clang/distinfo b/lang/clang/distinfo
index feed143eb91..1226797fe20 100644
--- a/lang/clang/distinfo
+++ b/lang/clang/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.8 2011/05/07 16:54:56 adam Exp $
+$NetBSD: distinfo,v 1.9 2011/12/02 14:42:12 adam Exp $
 
-SHA1 (clang-2.9.tgz) = 5fd3b5cec050ec12858c1602b23cf096282ad4a4
-RMD160 (clang-2.9.tgz) = 4ab79cbd0e2ad25a2272e6ee2fbbf546818dbd73
-Size (clang-2.9.tgz) = 6243772 bytes
-SHA1 (llvm-2.9.tgz) = 500f587f840199ac53c4fc7572839d08fa9d9123
-RMD160 (llvm-2.9.tgz) = caeaa067fda1eb34196b356a087645f83731cfb7
-Size (llvm-2.9.tgz) = 9574781 bytes
+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 (patch-ab) = 140ac84d513cf20c9eb30a9e8e2f6b87bdd074fe
 SHA1 (patch-ac) = 252f6a1f2cb79fed19668310c72d1079b47eca3c
 SHA1 (patch-ad) = 4cd7223d1660a4e8d81b33b6c99efbb680664164
-SHA1 (patch-tools_clang_lib_AST_DumpXML.cpp) = d41863bf349f59f7e784fad0c7a5dfc28398e22c
-SHA1 (patch-tools_clang_lib_CodeGen_CodeGenModule.cpp) = 3075e531c550a663de5c3a2a61bc64a9bc664728
diff --git a/lang/clang/patches/patch-tools_clang_lib_AST_DumpXML.cpp b/lang/clang/patches/patch-tools_clang_lib_AST_DumpXML.cpp
deleted file mode 100644
index 42a39cb91c6..00000000000
--- a/lang/clang/patches/patch-tools_clang_lib_AST_DumpXML.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-tools_clang_lib_AST_DumpXML.cpp,v 1.1 2011/05/07 16:54:56 adam Exp $
-
-Fix LLVM bug 8765: longjmp issue on NetBSD.
-
---- tools/clang/lib/AST/DumpXML.cpp.orig	2011-04-22 06:32:06.000000000 +0000
-+++ tools/clang/lib/AST/DumpXML.cpp
-@@ -487,6 +487,8 @@ struct XMLDumper : public XMLDeclVisitor
-       set("storage",
-           VarDecl::getStorageClassSpecifierString(D->getStorageClass()));
-     setFlag("inline", D->isInlineSpecified());
-+    if (const AsmLabelAttr *ALA = D->getAttr<AsmLabelAttr>())
-+      set("asmlabel", ALA->getLabel());
-     // TODO: instantiation, etc.
-   }
-   void visitFunctionDeclChildren(FunctionDecl *D) {
diff --git a/lang/clang/patches/patch-tools_clang_lib_CodeGen_CodeGenModule.cpp b/lang/clang/patches/patch-tools_clang_lib_CodeGen_CodeGenModule.cpp
deleted file mode 100644
index 9c4796de90b..00000000000
--- a/lang/clang/patches/patch-tools_clang_lib_CodeGen_CodeGenModule.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-tools_clang_lib_CodeGen_CodeGenModule.cpp,v 1.1 2011/05/07 16:54:56 adam Exp $
-
-Fix LLVM bug 8765: longjmp issue on NetBSD.
-
---- tools/clang/lib/CodeGen/CodeGenModule.cpp.orig	2011-05-05 06:23:06.000000000 +0000
-+++ tools/clang/lib/CodeGen/CodeGenModule.cpp
-@@ -1561,14 +1561,24 @@
-          "isn't a lib fn");
- 
-   // Get the name, skip over the __builtin_ prefix (if necessary).
--  const char *Name = Context.BuiltinInfo.GetName(BuiltinID);
--  if (Context.BuiltinInfo.isLibFunction(BuiltinID))
--    Name += 10;
-+  llvm::StringRef Name;
-+  GlobalDecl D(FD);
- 
-+  // If the builtin has been declared explicitly with an assembler label,
-+  // use the mangled name. This differs from the plain label on platforms
-+  // that prefix labels.
-+  if (FD->hasAttr<AsmLabelAttr>())
-+    Name = getMangledName(D);
-+  else if (Context.BuiltinInfo.isLibFunction(BuiltinID))
-+    Name = Context.BuiltinInfo.GetName(BuiltinID) + 10;
-+  else
-+    Name = Context.BuiltinInfo.GetName(BuiltinID);
-+
-+
-   const llvm::FunctionType *Ty =
-     cast<llvm::FunctionType>(getTypes().ConvertType(FD->getType()));
- 
--  return GetOrCreateLLVMFunction(Name, Ty, GlobalDecl(FD), /*ForVTable=*/false);
-+  return GetOrCreateLLVMFunction(Name, Ty, D, /*ForVTable=*/false);
- }
- 
- llvm::Function *CodeGenModule::getIntrinsic(unsigned IID,const llvm::Type **Tys,