Changes 3.2:

* Improvements to Clang's diagnostics
* Support for tls_model attribute
* Type safety attributes
* Documentation comment support
More...

10 files changed, 181 insertions, 220 deletions

diff --git a/lang/clang/Makefile b/lang/clang/Makefile
index ba426e250e8..ee61b35314a 100644
--- a/lang/clang/Makefile
+++ b/lang/clang/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2012/11/29 11:42:24 marino Exp $
+# $NetBSD: Makefile,v 1.18 2013/01/03 15:19:53 adam Exp $
 
-DISTNAME=	clang-3.1
-PKGREVISION=	3
+DISTNAME=	clang-3.2
 CATEGORIES=	lang
 MASTER_SITES=	http://llvm.org/releases/${PKGVERSION_NOREV}/
 DISTFILES=	llvm-${PKGVERSION_NOREV}.src.tar.gz \
@@ -15,7 +14,7 @@ LICENSE=	modified-bsd
 WRKSRC=			${WRKDIR}/llvm-${PKGVERSION_NOREV}.src
 
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		chown gmake perl pod2man pod2html
+USE_TOOLS+=		chown gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-assertions
 CONFIGURE_ARGS+=	--disable-bindings	# disable OCaml
@@ -43,4 +42,5 @@ post-extract:
 	mv ${WRKDIR}/clang-${PKGVERSION_NOREV}.src ${WRKSRC}/tools/clang
 
 .include "../../lang/python/tool.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/clang/PLIST b/lang/clang/PLIST
index d2cc8ae6d4d..faf25996b57 100644
--- a/lang/clang/PLIST
+++ b/lang/clang/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2012/05/23 11:02:41 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/01/03 15:19:53 adam Exp $
 bin/bugpoint
 bin/c-index-test
 bin/clang
 bin/clang++
+bin/clang-check
 bin/clang-tblgen
 bin/llc
 bin/lli
@@ -15,9 +16,9 @@ bin/llvm-diff
 bin/llvm-dis
 bin/llvm-dwarfdump
 bin/llvm-extract
-bin/llvm-ld
 bin/llvm-link
 bin/llvm-mc
+bin/llvm-mcmarkup
 bin/llvm-nm
 bin/llvm-objdump
 bin/llvm-prof
@@ -26,11 +27,13 @@ bin/llvm-readobj
 bin/llvm-rtdyld
 bin/llvm-size
 bin/llvm-stress
-bin/llvm-stub
 bin/llvm-tblgen
 bin/macho-dump
 bin/opt
+include/clang-c/CXCompilationDatabase.h
+include/clang-c/CXString.h
 include/clang-c/Index.h
+include/clang-c/Platform.h
 include/clang/ARCMigrate/ARCMT.h
 include/clang/ARCMigrate/ARCMTActions.h
 include/clang/ARCMigrate/FileRemapper.h
@@ -50,6 +53,18 @@ include/clang/AST/BuiltinTypes.def
 include/clang/AST/CXXInheritance.h
 include/clang/AST/CanonicalType.h
 include/clang/AST/CharUnits.h
+include/clang/AST/Comment.h
+include/clang/AST/CommentBriefParser.h
+include/clang/AST/CommentCommandInfo.inc
+include/clang/AST/CommentCommandTraits.h
+include/clang/AST/CommentDiagnostic.h
+include/clang/AST/CommentHTMLTags.inc
+include/clang/AST/CommentHTMLTagsProperties.inc
+include/clang/AST/CommentLexer.h
+include/clang/AST/CommentNodes.inc
+include/clang/AST/CommentParser.h
+include/clang/AST/CommentSema.h
+include/clang/AST/CommentVisitor.h
 include/clang/AST/Decl.h
 include/clang/AST/DeclAccessPair.h
 include/clang/AST/DeclBase.h
@@ -77,6 +92,7 @@ include/clang/AST/NestedNameSpecifier.h
 include/clang/AST/OperationKinds.h
 include/clang/AST/ParentMap.h
 include/clang/AST/PrettyPrinter.h
+include/clang/AST/RawCommentList.h
 include/clang/AST/RecordLayout.h
 include/clang/AST/RecursiveASTVisitor.h
 include/clang/AST/Redeclarable.h
@@ -100,6 +116,11 @@ include/clang/AST/TypeVisitor.h
 include/clang/AST/UnresolvedSet.h
 include/clang/AST/VTTBuilder.h
 include/clang/AST/VTableBuilder.h
+include/clang/ASTMatchers/ASTMatchFinder.h
+include/clang/ASTMatchers/ASTMatchers.h
+include/clang/ASTMatchers/ASTMatchersInternal.h
+include/clang/ASTMatchers/ASTMatchersMacros.h
+include/clang/ASTMatchers/ASTTypeTraits.h
 include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h
 include/clang/Analysis/Analyses/Dominators.h
 include/clang/Analysis/Analyses/FormatString.h
@@ -115,6 +136,7 @@ include/clang/Analysis/CFG.h
 include/clang/Analysis/CFGStmtMap.h
 include/clang/Analysis/CallGraph.h
 include/clang/Analysis/DomainSpecific/CocoaConventions.h
+include/clang/Analysis/DomainSpecific/ObjCNoReturn.h
 include/clang/Analysis/FlowSensitive/DataflowSolver.h
 include/clang/Analysis/FlowSensitive/DataflowValues.h
 include/clang/Analysis/ProgramPoint.h
@@ -132,14 +154,16 @@ include/clang/Basic/Builtins.def
 include/clang/Basic/Builtins.h
 include/clang/Basic/BuiltinsARM.def
 include/clang/Basic/BuiltinsHexagon.def
+include/clang/Basic/BuiltinsMips.def
+include/clang/Basic/BuiltinsNVPTX.def
 include/clang/Basic/BuiltinsPPC.def
-include/clang/Basic/BuiltinsPTX.def
 include/clang/Basic/BuiltinsX86.def
 include/clang/Basic/ConvertUTF.h
 include/clang/Basic/Diagnostic.h
 include/clang/Basic/DiagnosticASTKinds.inc
 include/clang/Basic/DiagnosticAnalysisKinds.inc
 include/clang/Basic/DiagnosticCategories.h
+include/clang/Basic/DiagnosticCommentKinds.inc
 include/clang/Basic/DiagnosticCommonKinds.inc
 include/clang/Basic/DiagnosticDriverKinds.inc
 include/clang/Basic/DiagnosticFrontendKinds.inc
@@ -147,6 +171,8 @@ include/clang/Basic/DiagnosticGroups.inc
 include/clang/Basic/DiagnosticIDs.h
 include/clang/Basic/DiagnosticIndexName.inc
 include/clang/Basic/DiagnosticLexKinds.inc
+include/clang/Basic/DiagnosticOptions.def
+include/clang/Basic/DiagnosticOptions.h
 include/clang/Basic/DiagnosticParseKinds.inc
 include/clang/Basic/DiagnosticSemaKinds.inc
 include/clang/Basic/DiagnosticSerializationKinds.inc
@@ -163,6 +189,7 @@ include/clang/Basic/LangOptions.h
 include/clang/Basic/Linkage.h
 include/clang/Basic/MacroBuilder.h
 include/clang/Basic/Module.h
+include/clang/Basic/ObjCRuntime.h
 include/clang/Basic/OnDiskHashTable.h
 include/clang/Basic/OpenCL.h
 include/clang/Basic/OpenCLExtensions.def
@@ -170,6 +197,7 @@ include/clang/Basic/OperatorKinds.def
 include/clang/Basic/OperatorKinds.h
 include/clang/Basic/PartialDiagnostic.h
 include/clang/Basic/PrettyStackTrace.h
+include/clang/Basic/Sanitizers.def
 include/clang/Basic/SourceLocation.h
 include/clang/Basic/SourceManager.h
 include/clang/Basic/SourceManagerInternals.h
@@ -196,12 +224,10 @@ include/clang/Driver/ArgList.h
 include/clang/Driver/CC1AsOptions.h
 include/clang/Driver/CC1AsOptions.inc
 include/clang/Driver/CC1Options.h
-include/clang/Driver/CC1Options.inc
 include/clang/Driver/Compilation.h
 include/clang/Driver/Driver.h
 include/clang/Driver/DriverDiagnostic.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
@@ -220,30 +246,26 @@ 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.def
 include/clang/Frontend/CodeGenOptions.h
 include/clang/Frontend/CommandLineSourceLoc.h
 include/clang/Frontend/CompilerInstance.h
 include/clang/Frontend/CompilerInvocation.h
 include/clang/Frontend/DependencyOutputOptions.h
-include/clang/Frontend/DiagnosticOptions.h
 include/clang/Frontend/DiagnosticRenderer.h
 include/clang/Frontend/FrontendAction.h
 include/clang/Frontend/FrontendActions.h
 include/clang/Frontend/FrontendDiagnostic.h
 include/clang/Frontend/FrontendOptions.h
 include/clang/Frontend/FrontendPluginRegistry.h
-include/clang/Frontend/HeaderSearchOptions.h
 include/clang/Frontend/LangStandard.h
 include/clang/Frontend/LangStandards.def
 include/clang/Frontend/LayoutOverrideSource.h
 include/clang/Frontend/LogDiagnosticPrinter.h
 include/clang/Frontend/MigratorOptions.h
 include/clang/Frontend/MultiplexConsumer.h
-include/clang/Frontend/PreprocessorOptions.h
 include/clang/Frontend/PreprocessorOutputOptions.h
 include/clang/Frontend/SerializedDiagnosticPrinter.h
 include/clang/Frontend/TextDiagnostic.h
@@ -258,6 +280,7 @@ include/clang/Lex/DirectoryLookup.h
 include/clang/Lex/ExternalPreprocessorSource.h
 include/clang/Lex/HeaderMap.h
 include/clang/Lex/HeaderSearch.h
+include/clang/Lex/HeaderSearchOptions.h
 include/clang/Lex/LexDiagnostic.h
 include/clang/Lex/Lexer.h
 include/clang/Lex/LiteralSupport.h
@@ -266,12 +289,14 @@ include/clang/Lex/ModuleLoader.h
 include/clang/Lex/ModuleMap.h
 include/clang/Lex/MultipleIncludeOpt.h
 include/clang/Lex/PPCallbacks.h
+include/clang/Lex/PPMutationListener.h
 include/clang/Lex/PTHLexer.h
 include/clang/Lex/PTHManager.h
 include/clang/Lex/Pragma.h
 include/clang/Lex/PreprocessingRecord.h
 include/clang/Lex/Preprocessor.h
 include/clang/Lex/PreprocessorLexer.h
+include/clang/Lex/PreprocessorOptions.h
 include/clang/Lex/ScratchBuffer.h
 include/clang/Lex/Token.h
 include/clang/Lex/TokenConcatenation.h
@@ -280,15 +305,15 @@ include/clang/Parse/AttrLateParsed.inc
 include/clang/Parse/ParseAST.h
 include/clang/Parse/ParseDiagnostic.h
 include/clang/Parse/Parser.h
-include/clang/Rewrite/ASTConsumers.h
-include/clang/Rewrite/DeltaTree.h
-include/clang/Rewrite/FixItRewriter.h
-include/clang/Rewrite/FrontendActions.h
-include/clang/Rewrite/HTMLRewrite.h
-include/clang/Rewrite/RewriteRope.h
-include/clang/Rewrite/Rewriter.h
-include/clang/Rewrite/Rewriters.h
-include/clang/Rewrite/TokenRewriter.h
+include/clang/Rewrite/Core/DeltaTree.h
+include/clang/Rewrite/Core/HTMLRewrite.h
+include/clang/Rewrite/Core/RewriteRope.h
+include/clang/Rewrite/Core/Rewriter.h
+include/clang/Rewrite/Core/TokenRewriter.h
+include/clang/Rewrite/Frontend/ASTConsumers.h
+include/clang/Rewrite/Frontend/FixItRewriter.h
+include/clang/Rewrite/Frontend/FrontendActions.h
+include/clang/Rewrite/Frontend/Rewriters.h
 include/clang/Sema/AnalysisBasedWarnings.h
 include/clang/Sema/AttrParsedAttrKinds.inc
 include/clang/Sema/AttrParsedAttrList.inc
@@ -296,6 +321,7 @@ include/clang/Sema/AttrTemplateInstantiate.inc
 include/clang/Sema/AttributeList.h
 include/clang/Sema/CXXFieldCollector.h
 include/clang/Sema/CodeCompleteConsumer.h
+include/clang/Sema/CodeCompleteOptions.h
 include/clang/Sema/DeclSpec.h
 include/clang/Sema/DelayedDiagnostic.h
 include/clang/Sema/Designator.h
@@ -304,6 +330,7 @@ include/clang/Sema/IdentifierResolver.h
 include/clang/Sema/Initialization.h
 include/clang/Sema/LocInfoType.h
 include/clang/Sema/Lookup.h
+include/clang/Sema/MultiplexExternalSemaSource.h
 include/clang/Sema/ObjCMethodList.h
 include/clang/Sema/Overload.h
 include/clang/Sema/Ownership.h
@@ -332,8 +359,9 @@ 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/Analyses.def
+include/clang/StaticAnalyzer/Core/AnalyzerOptions.h
 include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
 include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitor.h
 include/clang/StaticAnalyzer/Core/BugReporter/BugType.h
@@ -343,19 +371,21 @@ include/clang/StaticAnalyzer/Core/CheckerManager.h
 include/clang/StaticAnalyzer/Core/CheckerOptInfo.h
 include/clang/StaticAnalyzer/Core/CheckerRegistry.h
 include/clang/StaticAnalyzer/Core/PathDiagnosticConsumers.h
+include/clang/StaticAnalyzer/Core/PathSensitive/APSIntType.h
 include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h
 include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h
 include/clang/StaticAnalyzer/Core/PathSensitive/BlockCounter.h
+include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h
 include/clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h
 include/clang/StaticAnalyzer/Core/PathSensitive/CheckerHelpers.h
 include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h
 include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h
+include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeInfo.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/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
@@ -371,7 +401,14 @@ 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/ArgumentsAdjusters.h
+include/clang/Tooling/CommonOptionsParser.h
 include/clang/Tooling/CompilationDatabase.h
+include/clang/Tooling/CompilationDatabasePluginRegistry.h
+include/clang/Tooling/FileMatchTrie.h
+include/clang/Tooling/JSONCompilationDatabase.h
+include/clang/Tooling/Refactoring.h
+include/clang/Tooling/RefactoringCallbacks.h
 include/clang/Tooling/Tooling.h
 include/llvm-c/Analysis.h
 include/llvm-c/BitReader.h
@@ -382,6 +419,7 @@ include/llvm-c/EnhancedDisassembly.h
 include/llvm-c/ExecutionEngine.h
 include/llvm-c/Initialization.h
 include/llvm-c/LinkTimeOptimizer.h
+include/llvm-c/Linker.h
 include/llvm-c/Object.h
 include/llvm-c/Target.h
 include/llvm-c/TargetMachine.h
@@ -414,6 +452,7 @@ include/llvm/ADT/IndexedMap.h
 include/llvm/ADT/IntEqClasses.h
 include/llvm/ADT/IntervalMap.h
 include/llvm/ADT/IntrusiveRefCntPtr.h
+include/llvm/ADT/MapVector.h
 include/llvm/ADT/NullablePtr.h
 include/llvm/ADT/Optional.h
 include/llvm/ADT/OwningPtr.h
@@ -441,7 +480,6 @@ 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
 include/llvm/ADT/UniqueVector.h
@@ -450,6 +488,7 @@ include/llvm/ADT/VariadicFunction.h
 include/llvm/ADT/edit_distance.h
 include/llvm/ADT/ilist.h
 include/llvm/ADT/ilist_node.h
+include/llvm/AddressingMode.h
 include/llvm/Analysis/AliasAnalysis.h
 include/llvm/Analysis/AliasSetTracker.h
 include/llvm/Analysis/BlockFrequencyImpl.h
@@ -461,9 +500,8 @@ include/llvm/Analysis/CaptureTracking.h
 include/llvm/Analysis/CodeMetrics.h
 include/llvm/Analysis/ConstantFolding.h
 include/llvm/Analysis/ConstantsScanner.h
-include/llvm/Analysis/DIBuilder.h
 include/llvm/Analysis/DOTGraphTraitsPass.h
-include/llvm/Analysis/DebugInfo.h
+include/llvm/Analysis/DependenceAnalysis.h
 include/llvm/Analysis/DomPrinter.h
 include/llvm/Analysis/DominanceFrontier.h
 include/llvm/Analysis/DominatorInternals.h
@@ -480,8 +518,8 @@ include/llvm/Analysis/LibCallAliasAnalysis.h
 include/llvm/Analysis/LibCallSemantics.h
 include/llvm/Analysis/Lint.h
 include/llvm/Analysis/Loads.h
-include/llvm/Analysis/LoopDependenceAnalysis.h
 include/llvm/Analysis/LoopInfo.h
+include/llvm/Analysis/LoopInfoImpl.h
 include/llvm/Analysis/LoopIterator.h
 include/llvm/Analysis/LoopPass.h
 include/llvm/Analysis/MemoryBuiltins.h
@@ -491,6 +529,8 @@ include/llvm/Analysis/Passes.h
 include/llvm/Analysis/PathNumbering.h
 include/llvm/Analysis/PathProfileInfo.h
 include/llvm/Analysis/PostDominators.h
+include/llvm/Analysis/ProfileDataLoader.h
+include/llvm/Analysis/ProfileDataTypes.h
 include/llvm/Analysis/ProfileInfo.h
 include/llvm/Analysis/ProfileInfoLoader.h
 include/llvm/Analysis/ProfileInfoTypes.h
@@ -526,6 +566,7 @@ include/llvm/CodeGen/Analysis.h
 include/llvm/CodeGen/AsmPrinter.h
 include/llvm/CodeGen/CalcSpillWeights.h
 include/llvm/CodeGen/CallingConvLower.h
+include/llvm/CodeGen/CommandFlags.h
 include/llvm/CodeGen/DFAPacketizer.h
 include/llvm/CodeGen/EdgeBundles.h
 include/llvm/CodeGen/FastISel.h
@@ -569,6 +610,7 @@ include/llvm/CodeGen/MachineModuleInfo.h
 include/llvm/CodeGen/MachineModuleInfoImpls.h
 include/llvm/CodeGen/MachineOperand.h
 include/llvm/CodeGen/MachinePassRegistry.h
+include/llvm/CodeGen/MachinePostDominators.h
 include/llvm/CodeGen/MachineRegisterInfo.h
 include/llvm/CodeGen/MachineRelocation.h
 include/llvm/CodeGen/MachineSSAUpdater.h
@@ -580,14 +622,16 @@ include/llvm/CodeGen/PBQP/Heuristics/Briggs.h
 include/llvm/CodeGen/PBQP/Math.h
 include/llvm/CodeGen/PBQP/Solution.h
 include/llvm/CodeGen/Passes.h
-include/llvm/CodeGen/ProcessImplicitDefs.h
 include/llvm/CodeGen/PseudoSourceValue.h
 include/llvm/CodeGen/RegAllocPBQP.h
 include/llvm/CodeGen/RegAllocRegistry.h
+include/llvm/CodeGen/RegisterClassInfo.h
+include/llvm/CodeGen/RegisterPressure.h
 include/llvm/CodeGen/RegisterScavenging.h
 include/llvm/CodeGen/ResourcePriorityQueue.h
 include/llvm/CodeGen/RuntimeLibcalls.h
 include/llvm/CodeGen/ScheduleDAG.h
+include/llvm/CodeGen/ScheduleDAGILP.h
 include/llvm/CodeGen/ScheduleDAGInstrs.h
 include/llvm/CodeGen/ScheduleHazardRecognizer.h
 include/llvm/CodeGen/SchedulerRegistry.h
@@ -597,6 +641,7 @@ include/llvm/CodeGen/SelectionDAGISel.h
 include/llvm/CodeGen/SelectionDAGNodes.h
 include/llvm/CodeGen/SlotIndexes.h
 include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
+include/llvm/CodeGen/TargetSchedule.h
 include/llvm/CodeGen/ValueTypes.h
 include/llvm/CodeGen/ValueTypes.td
 include/llvm/Config/AsmParsers.def
@@ -607,24 +652,29 @@ include/llvm/Config/config.h
 include/llvm/Config/llvm-config.h
 include/llvm/Constant.h
 include/llvm/Constants.h
+include/llvm/DIBuilder.h
+include/llvm/DataLayout.h
+include/llvm/DebugInfo.h
 include/llvm/DebugInfo/DIContext.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/ObjectBuffer.h
+include/llvm/ExecutionEngine/ObjectImage.h
 include/llvm/ExecutionEngine/RuntimeDyld.h
 include/llvm/Function.h
 include/llvm/GVMaterializer.h
 include/llvm/GlobalAlias.h
 include/llvm/GlobalValue.h
 include/llvm/GlobalVariable.h
+include/llvm/IRBuilder.h
 include/llvm/InitializePasses.h
 include/llvm/InlineAsm.h
 include/llvm/InstrTypes.h
@@ -638,7 +688,8 @@ include/llvm/Intrinsics.td
 include/llvm/IntrinsicsARM.td
 include/llvm/IntrinsicsCellSPU.td
 include/llvm/IntrinsicsHexagon.td
-include/llvm/IntrinsicsPTX.td
+include/llvm/IntrinsicsMips.td
+include/llvm/IntrinsicsNVVM.td
 include/llvm/IntrinsicsPowerPC.td
 include/llvm/IntrinsicsX86.td
 include/llvm/IntrinsicsXCore.td
@@ -663,6 +714,7 @@ include/llvm/MC/MCDwarf.h
 include/llvm/MC/MCELFObjectWriter.h
 include/llvm/MC/MCELFSymbolFlags.h
 include/llvm/MC/MCExpr.h
+include/llvm/MC/MCFixedLenDisassembler.h
 include/llvm/MC/MCFixup.h
 include/llvm/MC/MCFixupKindInfo.h
 include/llvm/MC/MCInst.h
@@ -685,6 +737,7 @@ 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/MCSchedule.h
 include/llvm/MC/MCSection.h
 include/llvm/MC/MCSectionCOFF.h
 include/llvm/MC/MCSectionELF.h
@@ -700,6 +753,7 @@ include/llvm/MC/MCWinCOFFObjectWriter.h
 include/llvm/MC/MachineLocation.h
 include/llvm/MC/SectionKind.h
 include/llvm/MC/SubtargetFeature.h
+include/llvm/MDBuilder.h
 include/llvm/Metadata.h
 include/llvm/Module.h
 include/llvm/Object/Archive.h
@@ -711,6 +765,7 @@ include/llvm/Object/MachO.h
 include/llvm/Object/MachOFormat.h
 include/llvm/Object/MachOObject.h
 include/llvm/Object/ObjectFile.h
+include/llvm/Object/RelocVisitor.h
 include/llvm/OperandTraits.h
 include/llvm/Operator.h
 include/llvm/Pass.h
@@ -751,6 +806,7 @@ include/llvm/Support/Endian.h
 include/llvm/Support/Errno.h
 include/llvm/Support/ErrorHandling.h
 include/llvm/Support/FEnv.h
+include/llvm/Support/FileOutputBuffer.h
 include/llvm/Support/FileSystem.h
 include/llvm/Support/FileUtilities.h
 include/llvm/Support/Format.h
@@ -759,16 +815,17 @@ include/llvm/Support/GCOV.h
 include/llvm/Support/GetElementPtrTypeIterator.h
 include/llvm/Support/GraphWriter.h
 include/llvm/Support/Host.h
-include/llvm/Support/IRBuilder.h
 include/llvm/Support/IRReader.h
 include/llvm/Support/IncludeFile.h
 include/llvm/Support/InstIterator.h
 include/llvm/Support/InstVisitor.h
+include/llvm/Support/IntegersSubset.h
+include/llvm/Support/IntegersSubsetMapping.h
+include/llvm/Support/LEB128.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,7 +870,6 @@ include/llvm/Support/Threading.h
 include/llvm/Support/TimeValue.h
 include/llvm/Support/Timer.h
 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
@@ -827,17 +883,16 @@ 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/StringMatcher.h
 include/llvm/TableGen/TableGenBackend.h
 include/llvm/Target/Mangler.h
 include/llvm/Target/Target.td
 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/TargetInstrInfo.h
 include/llvm/Target/TargetIntrinsicInfo.h
+include/llvm/Target/TargetItinerary.td
 include/llvm/Target/TargetJITInfo.h
 include/llvm/Target/TargetLibraryInfo.h
 include/llvm/Target/TargetLowering.h
@@ -850,6 +905,8 @@ include/llvm/Target/TargetSchedule.td
 include/llvm/Target/TargetSelectionDAG.td
 include/llvm/Target/TargetSelectionDAGInfo.h
 include/llvm/Target/TargetSubtargetInfo.h
+include/llvm/Target/TargetTransformImpl.h
+include/llvm/TargetTransformInfo.h
 include/llvm/Transforms/IPO.h
 include/llvm/Transforms/IPO/InlinerPass.h
 include/llvm/Transforms/IPO/PassManagerBuilder.h
@@ -858,20 +915,25 @@ include/llvm/Transforms/Scalar.h
 include/llvm/Transforms/Utils/AddrModeMatcher.h
 include/llvm/Transforms/Utils/BasicBlockUtils.h
 include/llvm/Transforms/Utils/BuildLibCalls.h
+include/llvm/Transforms/Utils/BypassSlowDivision.h
 include/llvm/Transforms/Utils/Cloning.h
 include/llvm/Transforms/Utils/CmpInstAnalysis.h
-include/llvm/Transforms/Utils/FunctionUtils.h
+include/llvm/Transforms/Utils/CodeExtractor.h
+include/llvm/Transforms/Utils/IntegerDivision.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
 include/llvm/Transforms/Utils/SimplifyIndVar.h
+include/llvm/Transforms/Utils/SimplifyLibCalls.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/TypeBuilder.h
+include/llvm/TypeFinder.h
 include/llvm/Use.h
 include/llvm/User.h
 include/llvm/Value.h
@@ -912,6 +974,13 @@ 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/clang/3.2/include/__wmmintrin_aes.h
+lib/clang/3.2/include/__wmmintrin_pclmul.h
+lib/clang/3.2/include/ammintrin.h
+lib/clang/3.2/include/f16cintrin.h
+lib/clang/3.2/include/fmaintrin.h
+lib/clang/3.2/include/rtmintrin.h
+lib/clang/3.2/include/xopintrin.h
 lib/libLLVMARMAsmParser.a
 lib/libLLVMARMAsmPrinter.a
 lib/libLLVMARMCodeGen.a
@@ -962,11 +1031,11 @@ lib/libLLVMMipsCodeGen.a
 lib/libLLVMMipsDesc.a
 lib/libLLVMMipsDisassembler.a
 lib/libLLVMMipsInfo.a
+lib/libLLVMNVPTXAsmPrinter.a
+lib/libLLVMNVPTXCodeGen.a
+lib/libLLVMNVPTXDesc.a
+lib/libLLVMNVPTXInfo.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
@@ -1000,6 +1069,7 @@ lib/libclang.a
 lib/libclang.so
 lib/libclangARCMigrate.a
 lib/libclangAST.a
+lib/libclangASTMatchers.a
 lib/libclangAnalysis.a
 lib/libclangBasic.a
 lib/libclangCodeGen.a
@@ -1009,7 +1079,8 @@ lib/libclangFrontend.a
 lib/libclangFrontendTool.a
 lib/libclangLex.a
 lib/libclangParse.a
-lib/libclangRewrite.a
+lib/libclangRewriteCore.a
+lib/libclangRewriteFrontend.a
 lib/libclangSema.a
 lib/libclangSerialization.a
 lib/libclangStaticAnalyzerCheckers.a
@@ -1018,152 +1089,44 @@ lib/libclangStaticAnalyzerFrontend.a
 lib/libclangTooling.a
 lib/libprofile_rt.${SOEXT}
 lib/libprofile_rt.a
-man/man1/bugpoint.1
 man/man1/clang.1
-man/man1/lit.1
-man/man1/llc.1
-man/man1/lli.1
-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
-man/man1/llvm-ld.1
-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
 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/CMake.html
-share/doc/llvm/html/CodeGenerator.html
-share/doc/llvm/html/CodingStandards.html
-share/doc/llvm/html/CommandGuide/FileCheck.html
-share/doc/llvm/html/CommandGuide/bugpoint.html
-share/doc/llvm/html/CommandGuide/index.html
-share/doc/llvm/html/CommandGuide/lit.html
-share/doc/llvm/html/CommandGuide/llc.html
-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
-share/doc/llvm/html/CommandGuide/llvm-ld.html
-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
-share/doc/llvm/html/CommandLine.html
-share/doc/llvm/html/CompilerWriterInfo.html
-share/doc/llvm/html/DebuggingJITedCode.html
-share/doc/llvm/html/DeveloperPolicy.html
+share/doc/llvm/html/ClangPlugins.html
+share/doc/llvm/html/ClangTools.html
 share/doc/llvm/html/DriverInternals.html
-share/doc/llvm/html/ExceptionHandling.html
-share/doc/llvm/html/ExtendingLLVM.html
-share/doc/llvm/html/FAQ.html
 share/doc/llvm/html/GCCFEBuildInstrs.html
 share/doc/llvm/html/GarbageCollection.html
-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/HowToSetupToolingForLLVM.html
 share/doc/llvm/html/InternalsManual.html
+share/doc/llvm/html/IntroductionToTheClangAST.html
+share/doc/llvm/html/JSONCompilationDatabase.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/LibASTMatchers.html
+share/doc/llvm/html/LibASTMatchersReference.html
+share/doc/llvm/html/LibTooling.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
 share/doc/llvm/html/Passes.html
 share/doc/llvm/html/ProgrammersManual.html
-share/doc/llvm/html/Projects.html
+share/doc/llvm/html/RAVFrontendAction.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
 share/doc/llvm/html/TestSuiteMakefileGuide.html
 share/doc/llvm/html/TestingGuide.html
+share/doc/llvm/html/ThreadSanitizer.html
+share/doc/llvm/html/Tooling.html
 share/doc/llvm/html/UsersManual.html
 share/doc/llvm/html/WritingAnLLVMBackend.html
 share/doc/llvm/html/WritingAnLLVMPass.html
 share/doc/llvm/html/clang/clang.html
 share/doc/llvm/html/clang/manpage.css
 share/doc/llvm/html/doxygen.css
-share/doc/llvm/html/img/Debugging.gif
-share/doc/llvm/html/img/libdeps.gif
-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/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
-share/doc/llvm/html/tutorial/LangImpl8.html
-share/doc/llvm/html/tutorial/OCamlLangImpl1.html
-share/doc/llvm/html/tutorial/OCamlLangImpl2.html
-share/doc/llvm/html/tutorial/OCamlLangImpl3.html
-share/doc/llvm/html/tutorial/OCamlLangImpl4.html
-share/doc/llvm/html/tutorial/OCamlLangImpl5.html
-share/doc/llvm/html/tutorial/OCamlLangImpl6.html
-share/doc/llvm/html/tutorial/OCamlLangImpl7.html
-share/doc/llvm/html/tutorial/OCamlLangImpl8.html
-share/doc/llvm/html/tutorial/index.html
-share/doc/llvm/ps/FileCheck.ps
-share/doc/llvm/ps/bugpoint.ps
 share/doc/llvm/ps/clang.ps
-share/doc/llvm/ps/lit.ps
-share/doc/llvm/ps/llc.ps
-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
-share/doc/llvm/ps/llvm-ld.ps
-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 77c00cffab6..f6efcbde1f6 100644
--- a/lang/clang/distinfo
+++ b/lang/clang/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.13 2012/11/29 11:42:24 marino Exp $
+$NetBSD: distinfo,v 1.14 2013/01/03 15:19:53 adam Exp $
 
-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) = 676fbc85e25a8d338a7ac13f79af53666b27da4a
-SHA1 (patch-ad) = 2767a9931b157552f8d6796641e23cce7979dc3d
-SHA1 (patch-projects_sample_autoconf_config.sub) = 7e8449c46ed0c3e5530235d33a35f7f4e083d0b0
-SHA1 (patch-tools_clang_lib_Driver_ToolChains.cpp) = 8298ea94d4a69354be9a6e535e539887eb322ab8
-SHA1 (patch-tools_clang_lib_Driver_Tools.cpp) = f932d4e56bb0c35441a75afd7844358deb5d4361
-SHA1 (patch-tools_clang_lib_Frontend_InitHeaderSearch.cpp) = 18b558f48e73e73e2b90dfb40d512357c0d40da4
+SHA1 (clang-3.2.src.tar.gz) = b0515298c4088aa294edc08806bd671f8819f870
+RMD160 (clang-3.2.src.tar.gz) = 99468c17f3262d8af5dd5a6672fb958a72963ffc
+Size (clang-3.2.src.tar.gz) = 8805311 bytes
+SHA1 (llvm-3.2.src.tar.gz) = 42d139ab4c9f0c539c60f5ac07486e9d30fc1280
+RMD160 (llvm-3.2.src.tar.gz) = 924d85e6129a49b1b639be472b365bed7cd49072
+Size (llvm-3.2.src.tar.gz) = 12275252 bytes
+SHA1 (patch-ab) = 8dd0da6d47a57ac25eea358996cf874dd3289e08
+SHA1 (patch-ac) = 7fce5070338dcee073aa429b70b47855cd213ec4
+SHA1 (patch-ad) = f563a1016b17632afaa68639d59ee427b6c760f5
+SHA1 (patch-projects_sample_autoconf_config.sub) = 58beef723445df6fa5767ccdc16670c11dcda762
+SHA1 (patch-tools_clang_lib_Driver_ToolChains.cpp) = 1e184e83636b4089e694a079e168188cb60b7e9c
+SHA1 (patch-tools_clang_lib_Driver_Tools.cpp) = 5359329457a2acf7854beef19369679074b44f43
+SHA1 (patch-tools_clang_lib_Frontend_InitHeaderSearch.cpp) = 3c85154a49d0b762fc367584d0faee169516d2b9
 SHA1 (patch-tools_clang_test_Driver_dragonfly.c) = 7e2cf2e40bce1037eb229f8cb399d095385f293e
diff --git a/lang/clang/patches/patch-ab b/lang/clang/patches/patch-ab
index 47dbef5b2d3..5be014fcf92 100644
--- a/lang/clang/patches/patch-ab
+++ b/lang/clang/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2011/04/07 09:26:33 adam Exp $
+$NetBSD: patch-ab,v 1.3 2013/01/03 15:19:53 adam Exp $
 
---- docs/Makefile.orig	2011-02-11 07:43:27.000000000 +0000
+--- docs/Makefile.orig	2012-12-22 12:26:15.000000000 +0000
 +++ docs/Makefile
-@@ -53,13 +53,12 @@ endif
+@@ -52,11 +52,10 @@ endif
  # 'make generated BUILD_FOR_WEBSITE=1'
  generated:: $(generated_targets)
  
@@ -10,9 +10,7 @@ $NetBSD: patch-ab,v 1.2 2011/04/07 09:26:33 adam Exp $
 +install-html:
  	$(Echo) Installing HTML documentation
  	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html
- 	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img
  	$(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html
- 	$(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img
 -	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir)
  
  $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
diff --git a/lang/clang/patches/patch-ac b/lang/clang/patches/patch-ac
index 1bd60f399b1..93299ce7a77 100644
--- a/lang/clang/patches/patch-ac
+++ b/lang/clang/patches/patch-ac
@@ -1,20 +1,20 @@
-$NetBSD: patch-ac,v 1.5 2012/11/22 22:45:15 marino Exp $
+$NetBSD: patch-ac,v 1.6 2013/01/03 15:19:53 adam Exp $
 
---- Makefile.rules.orig	2012-05-15 22:06:08.000000000 +0000
+--- Makefile.rules.orig	2012-10-12 21:48:14.000000000 +0000
 +++ Makefile.rules
-@@ -625,11 +625,6 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS),
- ifneq ($(HOST_OS), Darwin)
- ifdef TOOLNAME
-   LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
--  ifdef EXAMPLE_TOOL
--    LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag)
--  else
--    LD.Flags += $(RPATH) -Wl,$(ToolDir) $(DynamicFlag)
--  endif
- endif
+@@ -638,11 +638,6 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), 
+   ifneq ($(HOST_OS), Darwin)
+     ifdef TOOLNAME
+       LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
+-      ifdef EXAMPLE_TOOL
+-        LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag)
+-      else
+-        LD.Flags += $(RPATH) -Wl,$(ToolDir) $(DynamicFlag)
+-    endif
+   endif
  else
- ifneq ($(DARWIN_MAJVERS),4)
-@@ -821,9 +816,6 @@ endif
+   ifneq ($(DARWIN_MAJVERS),4)
+@@ -838,9 +833,6 @@ endif
  # in the file so they get built before dependencies
  #---------------------------------------------------------
  
@@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.5 2012/11/22 22:45:15 marino Exp $
  # To create other directories, as needed, and timestamp their creation
  %/.dir:
  	$(Verb) $(MKDIR) $* > /dev/null
-@@ -958,7 +950,9 @@ install-local::
+@@ -975,7 +967,9 @@ install-local::
  uninstall-local::
  	$(Echo) UnInstall circumvented with NO_INSTALL
  else
@@ -35,7 +35,7 @@ $NetBSD: patch-ac,v 1.5 2012/11/22 22:45:15 marino Exp $
  	$(Echo) Installing Configuration Files To $(DESTDIR)$(PROJ_etcdir)
  	$(Verb)for file in $(CONFIG_FILES); do \
            if test -f $(PROJ_OBJ_DIR)/$${file} ; then \
-@@ -1380,7 +1374,7 @@ install-local:: $(DestArchiveLib)
+@@ -1397,7 +1391,7 @@ install-local:: $(DestArchiveLib)
  $(DestArchiveLib): $(LibName.A) $(DESTDIR)$(PROJ_libdir)
  	$(Echo) Installing $(BuildMode) Archive Library $(DestArchiveLib)
  	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_libdir)
diff --git a/lang/clang/patches/patch-ad b/lang/clang/patches/patch-ad
index 10e55d8d6ac..ad1501a8da1 100644
--- a/lang/clang/patches/patch-ad
+++ b/lang/clang/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2012/11/22 22:45:15 marino Exp $
+$NetBSD: patch-ad,v 1.5 2013/01/03 15:19:53 adam Exp $
 
 --- Makefile.config.in.orig	2012-05-15 22:06:08.000000000 +0000
 +++ Makefile.config.in
-@@ -96,11 +96,11 @@ endif
+@@ -97,11 +97,11 @@ endif
  PROJ_bindir     := $(PROJ_prefix)/bin
  PROJ_libdir     := $(PROJ_prefix)/lib
  PROJ_datadir    := $(PROJ_prefix)/share
diff --git a/lang/clang/patches/patch-projects_sample_autoconf_config.sub b/lang/clang/patches/patch-projects_sample_autoconf_config.sub
index 0b8b3dfd647..db35958bba8 100644
--- a/lang/clang/patches/patch-projects_sample_autoconf_config.sub
+++ b/lang/clang/patches/patch-projects_sample_autoconf_config.sub
@@ -1,12 +1,12 @@
-$NetBSD: patch-projects_sample_autoconf_config.sub,v 1.1 2012/05/25 09:06:53 marino Exp $
+$NetBSD: patch-projects_sample_autoconf_config.sub,v 1.2 2013/01/03 15:19:53 adam Exp $
 
---- projects/sample/autoconf/config.sub.orig	2003-10-16 01:44:20.000000000 +0000
+--- projects/sample/autoconf/config.sub.orig	2012-04-27 10:27:32.000000000 +0000
 +++ projects/sample/autoconf/config.sub
-@@ -1114,6 +1114,7 @@ case $os in
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+@@ -1333,6 +1333,7 @@ case $os in
+ 	      | -sym* | -kopensolaris* \
  	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- 	      | -aos* \
+ 	      | -aos* | -aros* \
 +	      | -dragonfly* \
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+ 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
diff --git a/lang/clang/patches/patch-tools_clang_lib_Driver_ToolChains.cpp b/lang/clang/patches/patch-tools_clang_lib_Driver_ToolChains.cpp
index 42a6d081c24..752346437b3 100644
--- a/lang/clang/patches/patch-tools_clang_lib_Driver_ToolChains.cpp
+++ b/lang/clang/patches/patch-tools_clang_lib_Driver_ToolChains.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-tools_clang_lib_Driver_ToolChains.cpp,v 1.2 2012/11/29 11:42:25 marino Exp $
+$NetBSD: patch-tools_clang_lib_Driver_ToolChains.cpp,v 1.3 2013/01/03 15:19:53 adam Exp $
 
 DragonFly no longer has gcc 4.1 in base, so clang stopped working.
 We prefer to use gcc 4.7 if available due to a better libstdc++.
@@ -6,7 +6,7 @@ The fallback is gcc 4.4 which has been available for several years.
 
 --- tools/clang/lib/Driver/ToolChains.cpp.orig	2012-05-12 00:16:02.000000000 +0000
 +++ tools/clang/lib/Driver/ToolChains.cpp
-@@ -2307,7 +2307,10 @@ DragonFly::DragonFly(const Driver &D, co
+@@ -2404,7 +2404,10 @@ DragonFly::DragonFly(const Driver &D, co
  
    getFilePaths().push_back(getDriver().Dir + "/../lib");
    getFilePaths().push_back("/usr/lib");
diff --git a/lang/clang/patches/patch-tools_clang_lib_Driver_Tools.cpp b/lang/clang/patches/patch-tools_clang_lib_Driver_Tools.cpp
index d7b85b2dbf4..213a476c915 100644
--- a/lang/clang/patches/patch-tools_clang_lib_Driver_Tools.cpp
+++ b/lang/clang/patches/patch-tools_clang_lib_Driver_Tools.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-tools_clang_lib_Driver_Tools.cpp,v 1.2 2012/11/29 11:42:25 marino Exp $
+$NetBSD: patch-tools_clang_lib_Driver_Tools.cpp,v 1.3 2013/01/03 15:19:53 adam Exp $
 
 * DragonFly no longer has gcc 4.1 in base, so clang stopped working.
   We prefer to use gcc 4.7 if available due to a better libstdc++.
@@ -9,9 +9,9 @@ $NetBSD: patch-tools_clang_lib_Driver_Tools.cpp,v 1.2 2012/11/29 11:42:25 marino
 * DragonFly: Added -export-dynamic (matches gcc dumpspecs)
 * DragonFly: Added gnu-hash to shared objects
 
---- tools/clang/lib/Driver/Tools.cpp.orig	2012-04-18 21:32:25.000000000 +0000
+--- tools/clang/lib/Driver/Tools.cpp.orig	2012-11-21 07:56:23.000000000 +0000
 +++ tools/clang/lib/Driver/Tools.cpp
-@@ -5441,21 +5441,28 @@ void dragonfly::Link::ConstructJob(Compi
+@@ -6238,21 +6238,28 @@ void dragonfly::Link::ConstructJob(Compi
                                     const InputInfoList &Inputs,
                                     const ArgList &Args,
                                     const char *LinkingOutput) const {
@@ -40,7 +40,7 @@ $NetBSD: patch-tools_clang_lib_Driver_Tools.cpp,v 1.2 2012/11/29 11:42:25 marino
    }
  
    // When building 32-bit code on DragonFly/pc64, we have to explicitly
-@@ -5475,18 +5482,26 @@ void dragonfly::Link::ConstructJob(Compi
+@@ -6272,18 +6279,26 @@ void dragonfly::Link::ConstructJob(Compi
    if (!Args.hasArg(options::OPT_nostdlib) &&
        !Args.hasArg(options::OPT_nostartfiles)) {
      if (!Args.hasArg(options::OPT_shared)) {
@@ -78,7 +78,7 @@ $NetBSD: patch-tools_clang_lib_Driver_Tools.cpp,v 1.2 2012/11/29 11:42:25 marino
    }
  
    Args.AddAllArgs(CmdArgs, options::OPT_L);
-@@ -5499,20 +5514,19 @@ void dragonfly::Link::ConstructJob(Compi
+@@ -6296,20 +6311,19 @@ void dragonfly::Link::ConstructJob(Compi
        !Args.hasArg(options::OPT_nodefaultlibs)) {
      // FIXME: GCC passes on -lgcc, -lgcc_pic and a whole lot of
      //         rpaths
@@ -110,7 +110,7 @@ $NetBSD: patch-tools_clang_lib_Driver_Tools.cpp,v 1.2 2012/11/29 11:42:25 marino
      }
  
      if (D.CCCIsCXX) {
-@@ -5520,13 +5534,6 @@ void dragonfly::Link::ConstructJob(Compi
+@@ -6317,13 +6331,6 @@ void dragonfly::Link::ConstructJob(Compi
        CmdArgs.push_back("-lm");
      }
  
@@ -124,7 +124,7 @@ $NetBSD: patch-tools_clang_lib_Driver_Tools.cpp,v 1.2 2012/11/29 11:42:25 marino
      if (Args.hasArg(options::OPT_pthread))
        CmdArgs.push_back("-lpthread");
  
-@@ -5534,23 +5541,42 @@ void dragonfly::Link::ConstructJob(Compi
+@@ -6331,23 +6338,42 @@ void dragonfly::Link::ConstructJob(Compi
        CmdArgs.push_back("-lc");
      }
  
diff --git a/lang/clang/patches/patch-tools_clang_lib_Frontend_InitHeaderSearch.cpp b/lang/clang/patches/patch-tools_clang_lib_Frontend_InitHeaderSearch.cpp
index 5ea627d2793..fd88a0c5728 100644
--- a/lang/clang/patches/patch-tools_clang_lib_Frontend_InitHeaderSearch.cpp
+++ b/lang/clang/patches/patch-tools_clang_lib_Frontend_InitHeaderSearch.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-tools_clang_lib_Frontend_InitHeaderSearch.cpp,v 1.1 2012/11/29 11:42:25 marino Exp $
+$NetBSD: patch-tools_clang_lib_Frontend_InitHeaderSearch.cpp,v 1.2 2013/01/03 15:19:53 adam Exp $
 
 DragonFly no longer has gcc 4.1 in base, so clang stopped working.
 We prefer to use gcc 4.7 if available due to a better libstdc++.
 The fallback is gcc 4.4 which has been available for several years.
 
---- tools/clang/lib/Frontend/InitHeaderSearch.cpp.orig	2012-03-25 22:46:17.000000000 +0000
+--- tools/clang/lib/Frontend/InitHeaderSearch.cpp.orig	2012-10-24 16:19:39.000000000 +0000
 +++ tools/clang/lib/Frontend/InitHeaderSearch.cpp
 @@ -24,6 +24,7 @@
  #include "llvm/ADT/Twine.h"
@@ -14,8 +14,8 @@ The fallback is gcc 4.4 which has been available for several years.
  #include "llvm/Support/Path.h"
  
  #include "clang/Config/config.h" // C_INCLUDE_DIRS
-@@ -395,7 +396,10 @@ AddDefaultCPlusPlusIncludePaths(const ll
-     AddMinGWCPlusPlusIncludePaths("c:/MinGW/lib/gcc", "mingw32", "4.3.0");
+@@ -408,7 +409,10 @@ AddDefaultCPlusPlusIncludePaths(const ll
+ #endif
      break;
    case llvm::Triple::DragonFly:
 -    AddPath("/usr/include/c++/4.1", CXXSystem, true, false, false);