Changes 3.3:

The CellSPU port has been removed. It can still be found in older versions.
The IR-level extended linker APIs (for example, to link bitcode files out of archives) have been removed. Any existing clients of these features should move to using a linker with integrated LTO support.
LLVM and Clang’s documentation has been migrated to the Sphinx documentation generation system which uses easy-to-write reStructuredText. See llvm/docs/README.txt for more information.
TargetTransformInfo (TTI) is a new interface that can be used by IR-level passes to obtain target-specific information, such as the costs of instructions. Only “Lowering” passes such as LSR and the vectorizer are allowed to use the TTI infrastructure.
We’ve improved the X86 and ARM cost model.
The Attributes classes have been completely rewritten and expanded. They now support not only enumerated attributes and alignments, but “string” attributes, which are useful for passing information to code generation. See How To Use Attributes for more details.
TableGen’s syntax for instruction selection patterns has been simplified. Instead of specifying types indirectly with register classes, you should now specify types directly in the input patterns. See SparcInstrInfo.td for examples of the new syntax. The old syntax using register classes still works, but it will be removed in a future LLVM release.
MCJIT now supports exception handling. Support for it in the old jit will be removed in the 3.4 release.
Command line options can now be grouped into categories which are shown in the output of -help. See Grouping options into categories.
The appearance of command line options in -help that are inherited by linking with libraries that use the LLVM Command line support library can now be modified at runtime. See The cl::getRegisteredOptions function.

12 files changed, 191 insertions, 473 deletions

diff --git a/lang/clang/Makefile b/lang/clang/Makefile
index 188bcfc2745..ecf5295a3f9 100644
--- a/lang/clang/Makefile
+++ b/lang/clang/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2013/01/31 23:08:55 hans Exp $
+# $NetBSD: Makefile,v 1.22 2013/07/02 10:33:02 adam Exp $
 
-DISTNAME=	clang-3.2
+DISTNAME=	clang-3.3
 CATEGORIES=	lang
 MASTER_SITES=	http://llvm.org/releases/${PKGVERSION_NOREV}/
 DISTFILES=	llvm-${PKGVERSION_NOREV}.src.tar.gz \
-		clang-${PKGVERSION_NOREV}.src.tar.gz
+		cfe-${PKGVERSION_NOREV}.src.tar.gz
 
 MAINTAINER=	adam.hoka@gmail.com
 HOMEPAGE=	http://llvm.org/
@@ -41,7 +41,7 @@ PLIST_SUBST+=		SOEXT="so"
 CFLAGS.SunOS+=		-mimpure-text
 
 post-extract:
-	mv ${WRKDIR}/clang-${PKGVERSION_NOREV}.src ${WRKSRC}/tools/clang
+	mv ${WRKDIR}/cfe-${PKGVERSION_NOREV}.src ${WRKSRC}/tools/clang
 .if ${OPSYS} == "SunOS"
 	${ECHO} "int sun_ld_needs_a_symbol=0;" >> ${WRKSRC}/lib/Target/NVPTX/InstPrinter/NVPTXInstPrinter.cpp
 .endif
diff --git a/lang/clang/PLIST b/lang/clang/PLIST
index faf25996b57..5015673c1e3 100644
--- a/lang/clang/PLIST
+++ b/lang/clang/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.8 2013/01/03 15:19:53 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2013/07/02 10:33:02 adam Exp $
 bin/bugpoint
 bin/c-index-test
 bin/clang
 bin/clang++
 bin/clang-check
+bin/clang-format
 bin/clang-tblgen
 bin/llc
 bin/lli
@@ -27,6 +28,7 @@ bin/llvm-readobj
 bin/llvm-rtdyld
 bin/llvm-size
 bin/llvm-stress
+bin/llvm-symbolizer
 bin/llvm-tblgen
 bin/macho-dump
 bin/opt
@@ -44,9 +46,13 @@ include/clang/AST/ASTContext.h
 include/clang/AST/ASTDiagnostic.h
 include/clang/AST/ASTImporter.h
 include/clang/AST/ASTMutationListener.h
+include/clang/AST/ASTTypeTraits.h
+include/clang/AST/ASTUnresolvedSet.h
 include/clang/AST/ASTVector.h
 include/clang/AST/Attr.h
+include/clang/AST/AttrDump.inc
 include/clang/AST/AttrImpl.inc
+include/clang/AST/AttrIterator.h
 include/clang/AST/Attrs.inc
 include/clang/AST/BaseSubobject.h
 include/clang/AST/BuiltinTypes.def
@@ -56,8 +62,10 @@ include/clang/AST/CharUnits.h
 include/clang/AST/Comment.h
 include/clang/AST/CommentBriefParser.h
 include/clang/AST/CommentCommandInfo.inc
+include/clang/AST/CommentCommandList.inc
 include/clang/AST/CommentCommandTraits.h
 include/clang/AST/CommentDiagnostic.h
+include/clang/AST/CommentHTMLNamedCharacterReferences.inc
 include/clang/AST/CommentHTMLTags.inc
 include/clang/AST/CommentHTMLTagsProperties.inc
 include/clang/AST/CommentLexer.h
@@ -75,6 +83,7 @@ include/clang/AST/DeclGroup.h
 include/clang/AST/DeclLookups.h
 include/clang/AST/DeclNodes.inc
 include/clang/AST/DeclObjC.h
+include/clang/AST/DeclOpenMP.h
 include/clang/AST/DeclTemplate.h
 include/clang/AST/DeclVisitor.h
 include/clang/AST/DeclarationName.h
@@ -120,7 +129,6 @@ 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
@@ -152,13 +160,16 @@ include/clang/Basic/AttrKinds.h
 include/clang/Basic/AttrList.inc
 include/clang/Basic/Builtins.def
 include/clang/Basic/Builtins.h
+include/clang/Basic/BuiltinsAArch64.def
 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/BuiltinsX86.def
-include/clang/Basic/ConvertUTF.h
+include/clang/Basic/CapturedStmt.h
+include/clang/Basic/CharInfo.h
+include/clang/Basic/CommentOptions.h
 include/clang/Basic/Diagnostic.h
 include/clang/Basic/DiagnosticASTKinds.inc
 include/clang/Basic/DiagnosticAnalysisKinds.inc
@@ -193,8 +204,11 @@ include/clang/Basic/ObjCRuntime.h
 include/clang/Basic/OnDiskHashTable.h
 include/clang/Basic/OpenCL.h
 include/clang/Basic/OpenCLExtensions.def
+include/clang/Basic/OpenMPKinds.def
+include/clang/Basic/OpenMPKinds.h
 include/clang/Basic/OperatorKinds.def
 include/clang/Basic/OperatorKinds.h
+include/clang/Basic/OperatorPrecedence.h
 include/clang/Basic/PartialDiagnostic.h
 include/clang/Basic/PrettyStackTrace.h
 include/clang/Basic/Sanitizers.def
@@ -203,6 +217,7 @@ include/clang/Basic/SourceManager.h
 include/clang/Basic/SourceManagerInternals.h
 include/clang/Basic/Specifiers.h
 include/clang/Basic/TargetBuiltins.h
+include/clang/Basic/TargetCXXABI.h
 include/clang/Basic/TargetInfo.h
 include/clang/Basic/TargetOptions.h
 include/clang/Basic/TemplateKinds.h
@@ -244,6 +259,7 @@ include/clang/Edit/EditedSource.h
 include/clang/Edit/EditsReceiver.h
 include/clang/Edit/FileOffset.h
 include/clang/Edit/Rewriters.h
+include/clang/Format/Format.h
 include/clang/Frontend/ASTConsumers.h
 include/clang/Frontend/ASTUnit.h
 include/clang/Frontend/ChainedDiagnosticConsumer.h
@@ -284,12 +300,13 @@ include/clang/Lex/HeaderSearchOptions.h
 include/clang/Lex/LexDiagnostic.h
 include/clang/Lex/Lexer.h
 include/clang/Lex/LiteralSupport.h
+include/clang/Lex/MacroArgs.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/PPMutationListener.h
+include/clang/Lex/PPConditionalDirectiveRecord.h
 include/clang/Lex/PTHLexer.h
 include/clang/Lex/PTHManager.h
 include/clang/Lex/Pragma.h
@@ -301,6 +318,7 @@ include/clang/Lex/ScratchBuffer.h
 include/clang/Lex/Token.h
 include/clang/Lex/TokenConcatenation.h
 include/clang/Lex/TokenLexer.h
+include/clang/Parse/AttrExprArgs.inc
 include/clang/Parse/AttrLateParsed.inc
 include/clang/Parse/ParseAST.h
 include/clang/Parse/ParseDiagnostic.h
@@ -317,6 +335,7 @@ include/clang/Rewrite/Frontend/Rewriters.h
 include/clang/Sema/AnalysisBasedWarnings.h
 include/clang/Sema/AttrParsedAttrKinds.inc
 include/clang/Sema/AttrParsedAttrList.inc
+include/clang/Sema/AttrSpellingListIndex.inc
 include/clang/Sema/AttrTemplateInstantiate.inc
 include/clang/Sema/AttributeList.h
 include/clang/Sema/CXXFieldCollector.h
@@ -354,6 +373,7 @@ include/clang/Serialization/ASTWriter.h
 include/clang/Serialization/AttrPCHRead.inc
 include/clang/Serialization/AttrPCHWrite.inc
 include/clang/Serialization/ContinuousRangeMap.h
+include/clang/Serialization/GlobalModuleIndex.h
 include/clang/Serialization/Module.h
 include/clang/Serialization/ModuleManager.h
 include/clang/Serialization/SerializationDiagnostic.h
@@ -415,7 +435,6 @@ 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
@@ -447,12 +466,12 @@ include/llvm/ADT/ImmutableIntervalMap.h
 include/llvm/ADT/ImmutableList.h
 include/llvm/ADT/ImmutableMap.h
 include/llvm/ADT/ImmutableSet.h
-include/llvm/ADT/InMemoryStruct.h
 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/None.h
 include/llvm/ADT/NullablePtr.h
 include/llvm/ADT/Optional.h
 include/llvm/ADT/OwningPtr.h
@@ -472,6 +491,7 @@ include/llvm/ADT/SmallSet.h
 include/llvm/ADT/SmallString.h
 include/llvm/ADT/SmallVector.h
 include/llvm/ADT/SparseBitVector.h
+include/llvm/ADT/SparseMultiSet.h
 include/llvm/ADT/SparseSet.h
 include/llvm/ADT/Statistic.h
 include/llvm/ADT/StringExtras.h
@@ -488,7 +508,6 @@ 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
@@ -496,6 +515,8 @@ include/llvm/Analysis/BlockFrequencyInfo.h
 include/llvm/Analysis/BranchProbabilityInfo.h
 include/llvm/Analysis/CFGPrinter.h
 include/llvm/Analysis/CallGraph.h
+include/llvm/Analysis/CallGraphSCCPass.h
+include/llvm/Analysis/CallPrinter.h
 include/llvm/Analysis/CaptureTracking.h
 include/llvm/Analysis/CodeMetrics.h
 include/llvm/Analysis/ConstantFolding.h
@@ -534,6 +555,7 @@ include/llvm/Analysis/ProfileDataTypes.h
 include/llvm/Analysis/ProfileInfo.h
 include/llvm/Analysis/ProfileInfoLoader.h
 include/llvm/Analysis/ProfileInfoTypes.h
+include/llvm/Analysis/PtrUseVisitor.h
 include/llvm/Analysis/RegionInfo.h
 include/llvm/Analysis/RegionIterator.h
 include/llvm/Analysis/RegionPass.h
@@ -543,30 +565,27 @@ include/llvm/Analysis/ScalarEvolutionExpander.h
 include/llvm/Analysis/ScalarEvolutionExpressions.h
 include/llvm/Analysis/ScalarEvolutionNormalization.h
 include/llvm/Analysis/SparsePropagation.h
+include/llvm/Analysis/TargetTransformInfo.h
 include/llvm/Analysis/Trace.h
 include/llvm/Analysis/ValueTracking.h
 include/llvm/Analysis/Verifier.h
-include/llvm/Argument.h
 include/llvm/Assembly/AssemblyAnnotationWriter.h
 include/llvm/Assembly/Parser.h
 include/llvm/Assembly/PrintModulePass.h
 include/llvm/Assembly/Writer.h
-include/llvm/Attributes.h
 include/llvm/AutoUpgrade.h
-include/llvm/BasicBlock.h
 include/llvm/Bitcode/Archive.h
 include/llvm/Bitcode/BitCodes.h
 include/llvm/Bitcode/BitstreamReader.h
 include/llvm/Bitcode/BitstreamWriter.h
 include/llvm/Bitcode/LLVMBitCodes.h
 include/llvm/Bitcode/ReaderWriter.h
-include/llvm/CallGraphSCCPass.h
-include/llvm/CallingConv.h
 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/DAGCombine.h
 include/llvm/CodeGen/DFAPacketizer.h
 include/llvm/CodeGen/EdgeBundles.h
 include/llvm/CodeGen/FastISel.h
@@ -584,7 +603,9 @@ include/llvm/CodeGen/LinkAllAsmWriterComponents.h
 include/llvm/CodeGen/LinkAllCodegenComponents.h
 include/llvm/CodeGen/LiveInterval.h
 include/llvm/CodeGen/LiveIntervalAnalysis.h
+include/llvm/CodeGen/LiveIntervalUnion.h
 include/llvm/CodeGen/LiveRangeEdit.h
+include/llvm/CodeGen/LiveRegMatrix.h
 include/llvm/CodeGen/LiveStackAnalysis.h
 include/llvm/CodeGen/LiveVariables.h
 include/llvm/CodeGen/MachORelocation.h
@@ -604,7 +625,6 @@ 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
 include/llvm/CodeGen/MachineMemOperand.h
 include/llvm/CodeGen/MachineModuleInfo.h
 include/llvm/CodeGen/MachineModuleInfoImpls.h
@@ -615,6 +635,7 @@ include/llvm/CodeGen/MachineRegisterInfo.h
 include/llvm/CodeGen/MachineRelocation.h
 include/llvm/CodeGen/MachineSSAUpdater.h
 include/llvm/CodeGen/MachineScheduler.h
+include/llvm/CodeGen/MachineTraceMetrics.h
 include/llvm/CodeGen/PBQP/Graph.h
 include/llvm/CodeGen/PBQP/HeuristicBase.h
 include/llvm/CodeGen/PBQP/HeuristicSolver.h
@@ -631,8 +652,8 @@ 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/ScheduleDFS.h
 include/llvm/CodeGen/ScheduleHazardRecognizer.h
 include/llvm/CodeGen/SchedulerRegistry.h
 include/llvm/CodeGen/ScoreboardHazardRecognizer.h
@@ -644,20 +665,17 @@ include/llvm/CodeGen/TargetLoweringObjectFileImpl.h
 include/llvm/CodeGen/TargetSchedule.h
 include/llvm/CodeGen/ValueTypes.h
 include/llvm/CodeGen/ValueTypes.td
+include/llvm/CodeGen/VirtRegMap.h
 include/llvm/Config/AsmParsers.def
 include/llvm/Config/AsmPrinters.def
 include/llvm/Config/Disassemblers.def
 include/llvm/Config/Targets.def
 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/DebugInfo/DWARFFormValue.h
 include/llvm/ExecutionEngine/ExecutionEngine.h
 include/llvm/ExecutionEngine/GenericValue.h
 include/llvm/ExecutionEngine/Interpreter.h
@@ -667,37 +685,61 @@ include/llvm/ExecutionEngine/JITMemoryManager.h
 include/llvm/ExecutionEngine/MCJIT.h
 include/llvm/ExecutionEngine/OProfileWrapper.h
 include/llvm/ExecutionEngine/ObjectBuffer.h
+include/llvm/ExecutionEngine/ObjectCache.h
 include/llvm/ExecutionEngine/ObjectImage.h
 include/llvm/ExecutionEngine/RuntimeDyld.h
-include/llvm/Function.h
+include/llvm/ExecutionEngine/SectionMemoryManager.h
 include/llvm/GVMaterializer.h
-include/llvm/GlobalAlias.h
-include/llvm/GlobalValue.h
-include/llvm/GlobalVariable.h
-include/llvm/IRBuilder.h
+include/llvm/IR/Argument.h
+include/llvm/IR/Attributes.h
+include/llvm/IR/BasicBlock.h
+include/llvm/IR/CallingConv.h
+include/llvm/IR/Constant.h
+include/llvm/IR/Constants.h
+include/llvm/IR/DataLayout.h
+include/llvm/IR/DerivedTypes.h
+include/llvm/IR/Function.h
+include/llvm/IR/GlobalAlias.h
+include/llvm/IR/GlobalValue.h
+include/llvm/IR/GlobalVariable.h
+include/llvm/IR/IRBuilder.h
+include/llvm/IR/InlineAsm.h
+include/llvm/IR/InstrTypes.h
+include/llvm/IR/Instruction.def
+include/llvm/IR/Instruction.h
+include/llvm/IR/Instructions.h
+include/llvm/IR/IntrinsicInst.h
+include/llvm/IR/Intrinsics.gen
+include/llvm/IR/Intrinsics.h
+include/llvm/IR/Intrinsics.td
+include/llvm/IR/IntrinsicsARM.td
+include/llvm/IR/IntrinsicsHexagon.td
+include/llvm/IR/IntrinsicsMips.td
+include/llvm/IR/IntrinsicsNVVM.td
+include/llvm/IR/IntrinsicsPowerPC.td
+include/llvm/IR/IntrinsicsR600.td
+include/llvm/IR/IntrinsicsX86.td
+include/llvm/IR/IntrinsicsXCore.td
+include/llvm/IR/LLVMContext.h
+include/llvm/IR/MDBuilder.h
+include/llvm/IR/Metadata.h
+include/llvm/IR/Module.h
+include/llvm/IR/OperandTraits.h
+include/llvm/IR/Operator.h
+include/llvm/IR/SymbolTableListTraits.h
+include/llvm/IR/Type.h
+include/llvm/IR/TypeBuilder.h
+include/llvm/IR/TypeFinder.h
+include/llvm/IR/Use.h
+include/llvm/IR/User.h
+include/llvm/IR/Value.h
+include/llvm/IR/ValueSymbolTable.h
+include/llvm/IRReader/IRReader.h
 include/llvm/InitializePasses.h
-include/llvm/InlineAsm.h
-include/llvm/InstrTypes.h
-include/llvm/Instruction.def
-include/llvm/Instruction.h
-include/llvm/Instructions.h
-include/llvm/IntrinsicInst.h
-include/llvm/Intrinsics.gen
-include/llvm/Intrinsics.h
-include/llvm/Intrinsics.td
-include/llvm/IntrinsicsARM.td
-include/llvm/IntrinsicsCellSPU.td
-include/llvm/IntrinsicsHexagon.td
-include/llvm/IntrinsicsMips.td
-include/llvm/IntrinsicsNVVM.td
-include/llvm/IntrinsicsPowerPC.td
-include/llvm/IntrinsicsX86.td
-include/llvm/IntrinsicsXCore.td
-include/llvm/LLVMContext.h
+include/llvm/InstVisitor.h
+include/llvm/LinkAllIR.h
 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
@@ -711,13 +753,16 @@ include/llvm/MC/MCContext.h
 include/llvm/MC/MCDirectives.h
 include/llvm/MC/MCDisassembler.h
 include/llvm/MC/MCDwarf.h
+include/llvm/MC/MCELF.h
 include/llvm/MC/MCELFObjectWriter.h
+include/llvm/MC/MCELFStreamer.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
+include/llvm/MC/MCInstBuilder.h
 include/llvm/MC/MCInstPrinter.h
 include/llvm/MC/MCInstrAnalysis.h
 include/llvm/MC/MCInstrDesc.h
@@ -745,7 +790,6 @@ 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
@@ -753,9 +797,6 @@ 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
 include/llvm/Object/Binary.h
 include/llvm/Object/COFF.h
@@ -763,11 +804,14 @@ include/llvm/Object/ELF.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
 include/llvm/Object/RelocVisitor.h
-include/llvm/OperandTraits.h
-include/llvm/Operator.h
+include/llvm/Option/Arg.h
+include/llvm/Option/ArgList.h
+include/llvm/Option/OptParser.td
+include/llvm/Option/OptSpecifier.h
+include/llvm/Option/OptTable.h
+include/llvm/Option/Option.h
 include/llvm/Pass.h
 include/llvm/PassAnalysisSupport.h
 include/llvm/PassManager.h
@@ -777,9 +821,11 @@ include/llvm/PassSupport.h
 include/llvm/Support/AIXDataTypesFix.h
 include/llvm/Support/AlignOf.h
 include/llvm/Support/Allocator.h
+include/llvm/Support/ArrayRecycler.h
 include/llvm/Support/Atomic.h
 include/llvm/Support/BlockFrequency.h
 include/llvm/Support/BranchProbability.h
+include/llvm/Support/CBindingWrapping.h
 include/llvm/Support/CFG.h
 include/llvm/Support/COFF.h
 include/llvm/Support/CallSite.h
@@ -788,8 +834,10 @@ include/llvm/Support/Casting.h
 include/llvm/Support/CodeGen.h
 include/llvm/Support/CommandLine.h
 include/llvm/Support/Compiler.h
+include/llvm/Support/Compression.h
 include/llvm/Support/ConstantFolder.h
 include/llvm/Support/ConstantRange.h
+include/llvm/Support/ConvertUTF.h
 include/llvm/Support/CrashRecoveryContext.h
 include/llvm/Support/DOTGraphTraits.h
 include/llvm/Support/DataExtractor.h
@@ -805,6 +853,7 @@ include/llvm/Support/ELF.h
 include/llvm/Support/Endian.h
 include/llvm/Support/Errno.h
 include/llvm/Support/ErrorHandling.h
+include/llvm/Support/ErrorOr.h
 include/llvm/Support/FEnv.h
 include/llvm/Support/FileOutputBuffer.h
 include/llvm/Support/FileSystem.h
@@ -815,10 +864,8 @@ include/llvm/Support/GCOV.h
 include/llvm/Support/GetElementPtrTypeIterator.h
 include/llvm/Support/GraphWriter.h
 include/llvm/Support/Host.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
@@ -872,19 +919,21 @@ include/llvm/Support/Timer.h
 include/llvm/Support/ToolOutputFile.h
 include/llvm/Support/Valgrind.h
 include/llvm/Support/ValueHandle.h
+include/llvm/Support/Watchdog.h
 include/llvm/Support/Win64EH.h
 include/llvm/Support/YAMLParser.h
+include/llvm/Support/YAMLTraits.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/StringMatcher.h
 include/llvm/TableGen/TableGenBackend.h
+include/llvm/Target/CostTable.h
 include/llvm/Target/Mangler.h
 include/llvm/Target/Target.td
 include/llvm/Target/TargetCallingConv.h
@@ -905,15 +954,14 @@ 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
 include/llvm/Transforms/Instrumentation.h
+include/llvm/Transforms/ObjCARC.h
 include/llvm/Transforms/Scalar.h
-include/llvm/Transforms/Utils/AddrModeMatcher.h
 include/llvm/Transforms/Utils/BasicBlockUtils.h
+include/llvm/Transforms/Utils/BlackList.h
 include/llvm/Transforms/Utils/BuildLibCalls.h
 include/llvm/Transforms/Utils/BypassSlowDivision.h
 include/llvm/Transforms/Utils/Cloning.h
@@ -931,16 +979,12 @@ 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
-include/llvm/ValueSymbolTable.h
 lib/BugpointPasses.${SOEXT}
 lib/LLVMHello.${SOEXT}
+lib/clang/${PKGVERSION}/include/__wmmintrin_aes.h
+lib/clang/${PKGVERSION}/include/__wmmintrin_pclmul.h
 lib/clang/${PKGVERSION}/include/altivec.h
+lib/clang/${PKGVERSION}/include/ammintrin.h
 lib/clang/${PKGVERSION}/include/arm_neon.h
 lib/clang/${PKGVERSION}/include/avx2intrin.h
 lib/clang/${PKGVERSION}/include/avxintrin.h
@@ -948,8 +992,10 @@ lib/clang/${PKGVERSION}/include/bmi2intrin.h
 lib/clang/${PKGVERSION}/include/bmiintrin.h
 lib/clang/${PKGVERSION}/include/cpuid.h
 lib/clang/${PKGVERSION}/include/emmintrin.h
+lib/clang/${PKGVERSION}/include/f16cintrin.h
 lib/clang/${PKGVERSION}/include/float.h
 lib/clang/${PKGVERSION}/include/fma4intrin.h
+lib/clang/${PKGVERSION}/include/fmaintrin.h
 lib/clang/${PKGVERSION}/include/immintrin.h
 lib/clang/${PKGVERSION}/include/iso646.h
 lib/clang/${PKGVERSION}/include/limits.h
@@ -961,12 +1007,16 @@ lib/clang/${PKGVERSION}/include/module.map
 lib/clang/${PKGVERSION}/include/nmmintrin.h
 lib/clang/${PKGVERSION}/include/pmmintrin.h
 lib/clang/${PKGVERSION}/include/popcntintrin.h
+lib/clang/${PKGVERSION}/include/prfchwintrin.h
+lib/clang/${PKGVERSION}/include/rdseedintrin.h
+lib/clang/${PKGVERSION}/include/rtmintrin.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
 lib/clang/${PKGVERSION}/include/stdint.h
+lib/clang/${PKGVERSION}/include/stdnoreturn.h
 lib/clang/${PKGVERSION}/include/tgmath.h
 lib/clang/${PKGVERSION}/include/tmmintrin.h
 lib/clang/${PKGVERSION}/include/unwind.h
@@ -974,13 +1024,14 @@ 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/clang/${PKGVERSION}/include/xopintrin.h
+lib/libLLVMAArch64AsmParser.a
+lib/libLLVMAArch64AsmPrinter.a
+lib/libLLVMAArch64CodeGen.a
+lib/libLLVMAArch64Desc.a
+lib/libLLVMAArch64Disassembler.a
+lib/libLLVMAArch64Info.a
+lib/libLLVMAArch64Utils.a
 lib/libLLVMARMAsmParser.a
 lib/libLLVMARMAsmPrinter.a
 lib/libLLVMARMCodeGen.a
@@ -993,9 +1044,6 @@ lib/libLLVMAsmParser.a
 lib/libLLVMAsmPrinter.a
 lib/libLLVMBitReader.a
 lib/libLLVMBitWriter.a
-lib/libLLVMCellSPUCodeGen.a
-lib/libLLVMCellSPUDesc.a
-lib/libLLVMCellSPUInfo.a
 lib/libLLVMCodeGen.a
 lib/libLLVMCore.a
 lib/libLLVMCppBackendCodeGen.a
@@ -1006,6 +1054,7 @@ lib/libLLVMHexagonAsmPrinter.a
 lib/libLLVMHexagonCodeGen.a
 lib/libLLVMHexagonDesc.a
 lib/libLLVMHexagonInfo.a
+lib/libLLVMIRReader.a
 lib/libLLVMInstCombine.a
 lib/libLLVMInstrumentation.a
 lib/libLLVMInterpreter.a
@@ -1035,7 +1084,10 @@ lib/libLLVMNVPTXAsmPrinter.a
 lib/libLLVMNVPTXCodeGen.a
 lib/libLLVMNVPTXDesc.a
 lib/libLLVMNVPTXInfo.a
+lib/libLLVMObjCARCOpts.a
 lib/libLLVMObject.a
+lib/libLLVMOption.a
+lib/libLLVMPowerPCAsmParser.a
 lib/libLLVMPowerPCAsmPrinter.a
 lib/libLLVMPowerPCCodeGen.a
 lib/libLLVMPowerPCDesc.a
@@ -1047,6 +1099,11 @@ lib/libLLVMSparcCodeGen.a
 lib/libLLVMSparcDesc.a
 lib/libLLVMSparcInfo.a
 lib/libLLVMSupport.a
+lib/libLLVMSystemZAsmParser.a
+lib/libLLVMSystemZAsmPrinter.a
+lib/libLLVMSystemZCodeGen.a
+lib/libLLVMSystemZDesc.a
+lib/libLLVMSystemZInfo.a
 lib/libLLVMTableGen.a
 lib/libLLVMTarget.a
 lib/libLLVMTransformUtils.a
@@ -1058,8 +1115,10 @@ lib/libLLVMX86Desc.a
 lib/libLLVMX86Disassembler.a
 lib/libLLVMX86Info.a
 lib/libLLVMX86Utils.a
+lib/libLLVMXCoreAsmPrinter.a
 lib/libLLVMXCoreCodeGen.a
 lib/libLLVMXCoreDesc.a
+lib/libLLVMXCoreDisassembler.a
 lib/libLLVMXCoreInfo.a
 lib/libLLVMipa.a
 lib/libLLVMipo.a
@@ -1075,6 +1134,7 @@ lib/libclangBasic.a
 lib/libclangCodeGen.a
 lib/libclangDriver.a
 lib/libclangEdit.a
+lib/libclangFormat.a
 lib/libclangFrontend.a
 lib/libclangFrontendTool.a
 lib/libclangLex.a
@@ -1091,41 +1151,8 @@ lib/libprofile_rt.${SOEXT}
 lib/libprofile_rt.a
 man/man1/clang.1
 share/doc/llvm/html.tar.gz
-share/doc/llvm/html/AddressSanitizer.html
-share/doc/llvm/html/AnalyzerRegions.html
-share/doc/llvm/html/AutomaticReferenceCounting.html
-share/doc/llvm/html/ClangPlugins.html
-share/doc/llvm/html/ClangTools.html
-share/doc/llvm/html/DriverInternals.html
-share/doc/llvm/html/GCCFEBuildInstrs.html
-share/doc/llvm/html/GarbageCollection.html
-share/doc/llvm/html/HowToReleaseLLVM.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/LibASTMatchers.html
+share/doc/llvm/html/Dummy.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/Passes.html
-share/doc/llvm/html/ProgrammersManual.html
-share/doc/llvm/html/RAVFrontendAction.html
-share/doc/llvm/html/ReleaseNotes.html
-share/doc/llvm/html/SourceLevelDebugging.html
-share/doc/llvm/html/SystemLibrary.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
diff --git a/lang/clang/distinfo b/lang/clang/distinfo
index 2b3782c97df..3e944371e52 100644
--- a/lang/clang/distinfo
+++ b/lang/clang/distinfo
@@ -1,17 +1,13 @@
-$NetBSD: distinfo,v 1.19 2013/06/30 12:58:37 obache Exp $
+$NetBSD: distinfo,v 1.20 2013/07/02 10:33:02 adam Exp $
 
-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 (cfe-3.3.src.tar.gz) = ccd6dbf2cdb1189a028b70bcb8a22509c25c74c8
+RMD160 (cfe-3.3.src.tar.gz) = ff5d684c83b0c1aa36595dcb457da80b58eaf58f
+Size (cfe-3.3.src.tar.gz) = 9425539 bytes
+SHA1 (llvm-3.3.src.tar.gz) = c6c22d5593419e3cb47cbcf16d967640e5cce133
+RMD160 (llvm-3.3.src.tar.gz) = 22878ad746c50b02a7ac8713dd6f8c95c7af4220
+Size (llvm-3.3.src.tar.gz) = 13602421 bytes
 SHA1 (patch-ab) = 8dd0da6d47a57ac25eea358996cf874dd3289e08
-SHA1 (patch-ac) = ea5d76979c9cee4fa9012f29150e6b0f08f9f497
+SHA1 (patch-ac) = d94fdd7508302e6fb6acbf58f7b2305c3db5cf08
 SHA1 (patch-ad) = ad1f6720e4c73e57fce10ba968b03637a133602d
-SHA1 (patch-include_llvm_Support_CFG.h) = 7ea9caf7f483f65c33e79a5e03bc02a48ffdd1f3
-SHA1 (patch-lib_Target_X86_X86JITInfo.cpp) = 8090d84a164a85ac3d2fccc475d2eeb541574f56
-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
+SHA1 (patch-utils_lit_utils_check-coverage) = aec7c140d5b9e8cc38a0022533a5848d6b1ff0b8
+SHA1 (patch-utils_lit_utils_check-sdist) = df63c41b07f7531e787b54f6994458869023b66c
diff --git a/lang/clang/patches/patch-ac b/lang/clang/patches/patch-ac
index fe5528ae97a..378438b4297 100644
--- a/lang/clang/patches/patch-ac
+++ b/lang/clang/patches/patch-ac
@@ -1,17 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2013/06/30 12:58:37 obache Exp $
+$NetBSD: patch-ac,v 1.8 2013/07/02 10:33:02 adam Exp $
 
---- Makefile.rules.orig	2012-10-12 21:48:14.000000000 +0000
+--- Makefile.rules.orig	2013-05-03 21:53:50.000000000 +0000
 +++ Makefile.rules
-@@ -97,7 +97,7 @@ endif
- $(LLVMBuildMakeFrag): $(PROJ_SRC_ROOT)/Makefile.rules \
- 		      $(PROJ_OBJ_ROOT)/Makefile.config
- 	$(Echo) Constructing LLVMBuild project information.
--	$(Verb) $(LLVMBuildTool) \
-+	$(Verb) python $(LLVMBuildTool) \
- 	  --native-target "$(TARGET_NATIVE_ARCH)" \
- 	  --enable-targets "$(TARGETS_TO_BUILD)" \
- 	  --enable-optional-components "$(OPTIONAL_COMPONENTS)" \
-@@ -638,11 +638,6 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), 
+@@ -640,11 +640,6 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), 
    ifneq ($(HOST_OS), Darwin)
      ifdef TOOLNAME
        LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
@@ -23,7 +14,7 @@ $NetBSD: patch-ac,v 1.7 2013/06/30 12:58:37 obache Exp $
    endif
  else
    ifneq ($(DARWIN_MAJVERS),4)
-@@ -838,9 +833,6 @@ endif
+@@ -842,9 +837,6 @@ endif
  # in the file so they get built before dependencies
  #---------------------------------------------------------
  
@@ -33,7 +24,7 @@ $NetBSD: patch-ac,v 1.7 2013/06/30 12:58:37 obache Exp $
  # To create other directories, as needed, and timestamp their creation
  %/.dir:
  	$(Verb) $(MKDIR) $* > /dev/null
-@@ -975,7 +967,9 @@ install-local::
+@@ -979,7 +971,9 @@ install-local::
  uninstall-local::
  	$(Echo) UnInstall circumvented with NO_INSTALL
  else
@@ -44,7 +35,7 @@ $NetBSD: patch-ac,v 1.7 2013/06/30 12:58:37 obache Exp $
  	$(Echo) Installing Configuration Files To $(DESTDIR)$(PROJ_etcdir)
  	$(Verb)for file in $(CONFIG_FILES); do \
            if test -f $(PROJ_OBJ_DIR)/$${file} ; then \
-@@ -1397,7 +1391,7 @@ install-local:: $(DestArchiveLib)
+@@ -1401,7 +1395,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-include_llvm_Support_CFG.h b/lang/clang/patches/patch-include_llvm_Support_CFG.h
deleted file mode 100644
index c91b5720d3e..00000000000
--- a/lang/clang/patches/patch-include_llvm_Support_CFG.h
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-include_llvm_Support_CFG.h,v 1.1 2013/05/06 14:50:30 joerg Exp $
-
-LLVM r178240: Fix iterator interface.
-
---- include/llvm/Support/CFG.h.orig	2012-02-17 18:59:53.000000000 +0000
-+++ include/llvm/Support/CFG.h
-@@ -27,8 +27,9 @@ namespace llvm {
- 
- template <class Ptr, class USE_iterator> // Predecessor Iterator
- class PredIterator : public std::iterator<std::forward_iterator_tag,
--                                          Ptr, ptrdiff_t> {
--  typedef std::iterator<std::forward_iterator_tag, Ptr, ptrdiff_t> super;
-+                                          Ptr, ptrdiff_t, Ptr*, Ptr*> {
-+  typedef std::iterator<std::forward_iterator_tag, Ptr, ptrdiff_t, Ptr*,
-+                                                                    Ptr*> super;
-   typedef PredIterator<Ptr, USE_iterator> Self;
-   USE_iterator It;
- 
-@@ -40,6 +41,7 @@ class PredIterator : public std::iterato
- 
- public:
-   typedef typename super::pointer pointer;
-+  typedef typename super::reference reference;
- 
-   PredIterator() {}
-   explicit inline PredIterator(Ptr *bb) : It(bb->use_begin()) {
-@@ -50,7 +52,7 @@ public:
-   inline bool operator==(const Self& x) const { return It == x.It; }
-   inline bool operator!=(const Self& x) const { return !operator==(x); }
- 
--  inline pointer operator*() const {
-+  inline reference operator*() const {
-     assert(!It.atEnd() && "pred_iterator out of range!");
-     return cast<TerminatorInst>(*It)->getParent();
-   }
-@@ -100,10 +102,11 @@ inline const_pred_iterator pred_end(cons
- 
- template <class Term_, class BB_>           // Successor Iterator
- class SuccIterator : public std::iterator<std::bidirectional_iterator_tag,
--                                          BB_, ptrdiff_t> {
-+                                          BB_, ptrdiff_t, BB_*, BB_*> {
-   const Term_ Term;
-   unsigned idx;
--  typedef std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t> super;
-+  typedef std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t, BB_*,
-+                                                                    BB_*> super;
-   typedef SuccIterator<Term_, BB_> Self;
- 
-   inline bool index_is_valid(int idx) {
-@@ -112,6 +115,7 @@ class SuccIterator : public std::iterato
- 
- public:
-   typedef typename super::pointer pointer;
-+  typedef typename super::reference reference;
-   // TODO: This can be random access iterator, only operator[] missing.
- 
-   explicit inline SuccIterator(Term_ T) : Term(T), idx(0) {// begin iterator
-@@ -142,7 +146,7 @@ public:
-   inline bool operator==(const Self& x) const { return idx == x.idx; }
-   inline bool operator!=(const Self& x) const { return !operator==(x); }
- 
--  inline pointer operator*() const { return Term->getSuccessor(idx); }
-+  inline reference operator*() const { return Term->getSuccessor(idx); }
-   inline pointer operator->() const { return operator*(); }
- 
-   inline Self& operator++() { ++idx; return *this; } // Preincrement
diff --git a/lang/clang/patches/patch-lib_Target_X86_X86JITInfo.cpp b/lang/clang/patches/patch-lib_Target_X86_X86JITInfo.cpp
deleted file mode 100644
index 76f91830551..00000000000
--- a/lang/clang/patches/patch-lib_Target_X86_X86JITInfo.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-lib_Target_X86_X86JITInfo.cpp,v 1.1 2013/04/02 12:00:05 joerg Exp $
-
-It is not yet decided whether extern "C" applies to static functions, so
-be explicit for now.
-
---- lib/Target/X86/X86JITInfo.cpp.orig	2013-04-01 12:16:22.000000000 +0000
-+++ lib/Target/X86/X86JITInfo.cpp
-@@ -342,6 +342,17 @@ extern "C" {
- /// must locate the start of the stub or call site and pass it into the JIT
- /// compiler function.
- extern "C" {
-+
-+#if !(defined (X86_64_JIT) && defined(_MSC_VER))
-+ // the following function is called only from this translation unit,
-+ // unless we are under 64bit Windows with MSC, where there is
-+ // no support for inline assembly
-+static
-+#endif
-+void LLVM_ATTRIBUTE_USED
-+X86CompilationCallback2(intptr_t *StackPtr, intptr_t RetAddr)
-+__asm__("X86CompilationCallback2");
-+
- #if !(defined (X86_64_JIT) && defined(_MSC_VER))
-  // the following function is called only from this translation unit,
-  // unless we are under 64bit Windows with MSC, where there is
diff --git a/lang/clang/patches/patch-tools_clang_lib_Driver_ToolChains.cpp b/lang/clang/patches/patch-tools_clang_lib_Driver_ToolChains.cpp
deleted file mode 100644
index 752346437b3..00000000000
--- a/lang/clang/patches/patch-tools_clang_lib_Driver_ToolChains.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-$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++.
-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
-@@ -2404,7 +2404,10 @@ DragonFly::DragonFly(const Driver &D, co
- 
-   getFilePaths().push_back(getDriver().Dir + "/../lib");
-   getFilePaths().push_back("/usr/lib");
--  getFilePaths().push_back("/usr/lib/gcc41");
-+  if (llvm::sys::fs::exists("/usr/lib/gcc47"))
-+    getFilePaths().push_back("/usr/lib/gcc47");
-+  else
-+    getFilePaths().push_back("/usr/lib/gcc44");
- }
- 
- Tool &DragonFly::SelectTool(const Compilation &C, const JobAction &JA,
diff --git a/lang/clang/patches/patch-tools_clang_lib_Driver_Tools.cpp b/lang/clang/patches/patch-tools_clang_lib_Driver_Tools.cpp
deleted file mode 100644
index 213a476c915..00000000000
--- a/lang/clang/patches/patch-tools_clang_lib_Driver_Tools.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-$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++.
-  The fallback is gcc 4.4 which has been available for several years.
-  The libgcc specs are different between 4.4 and 4.7
-* DragonFly: Removed duplicate libgcc handling
-* DragonFly: Removed redundant rpath-link
-* DragonFly: Added -export-dynamic (matches gcc dumpspecs)
-* DragonFly: Added gnu-hash to shared objects
-
---- tools/clang/lib/Driver/Tools.cpp.orig	2012-11-21 07:56:23.000000000 +0000
-+++ tools/clang/lib/Driver/Tools.cpp
-@@ -6238,21 +6238,28 @@ void dragonfly::Link::ConstructJob(Compi
-                                    const InputInfoList &Inputs,
-                                    const ArgList &Args,
-                                    const char *LinkingOutput) const {
-+  bool UseGCC47;
-   const Driver &D = getToolChain().getDriver();
-   ArgStringList CmdArgs;
- 
-+  llvm::sys::fs::exists("/usr/lib/gcc47", UseGCC47);
-+
-   if (!D.SysRoot.empty())
-     CmdArgs.push_back(Args.MakeArgString("--sysroot=" + D.SysRoot));
- 
-+  CmdArgs.push_back("--eh-frame-hdr");
-   if (Args.hasArg(options::OPT_static)) {
-     CmdArgs.push_back("-Bstatic");
-   } else {
-+    if (Args.hasArg(options::OPT_rdynamic))
-+      CmdArgs.push_back("-export-dynamic");
-     if (Args.hasArg(options::OPT_shared))
-       CmdArgs.push_back("-Bshareable");
-     else {
-       CmdArgs.push_back("-dynamic-linker");
-       CmdArgs.push_back("/usr/libexec/ld-elf.so.2");
-     }
-+    CmdArgs.push_back("--hash-style=both");
-   }
- 
-   // When building 32-bit code on DragonFly/pc64, we have to explicitly
-@@ -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)) {
--      CmdArgs.push_back(
--            Args.MakeArgString(getToolChain().GetFilePath("crt1.o")));
--      CmdArgs.push_back(
--            Args.MakeArgString(getToolChain().GetFilePath("crti.o")));
--      CmdArgs.push_back(
--            Args.MakeArgString(getToolChain().GetFilePath("crtbegin.o")));
--    } else {
--      CmdArgs.push_back(
--            Args.MakeArgString(getToolChain().GetFilePath("crti.o")));
--      CmdArgs.push_back(
--            Args.MakeArgString(getToolChain().GetFilePath("crtbeginS.o")));
-+      if (Args.hasArg(options::OPT_pg))
-+        CmdArgs.push_back(Args.MakeArgString(
-+                                getToolChain().GetFilePath("gcrt1.o")));
-+      else {
-+        if (Args.hasArg(options::OPT_pie))
-+          CmdArgs.push_back(Args.MakeArgString(
-+                                  getToolChain().GetFilePath("Scrt1.o")));
-+        else
-+          CmdArgs.push_back(Args.MakeArgString(
-+                                  getToolChain().GetFilePath("crt1.o")));
-+      }
-     }
-+    CmdArgs.push_back(Args.MakeArgString(
-+                            getToolChain().GetFilePath("crti.o")));
-+    if (Args.hasArg(options::OPT_shared) || Args.hasArg(options::OPT_pie))
-+      CmdArgs.push_back(Args.MakeArgString(
-+                              getToolChain().GetFilePath("crtbeginS.o")));
-+    else    
-+      CmdArgs.push_back(Args.MakeArgString(
-+                              getToolChain().GetFilePath("crtbegin.o")));
-   }
- 
-   Args.AddAllArgs(CmdArgs, options::OPT_L);
-@@ -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
--    CmdArgs.push_back("-L/usr/lib/gcc41");
-+    if (UseGCC47)
-+      CmdArgs.push_back("-L/usr/lib/gcc47");
-+    else
-+      CmdArgs.push_back("-L/usr/lib/gcc44");
- 
-     if (!Args.hasArg(options::OPT_static)) {
--      CmdArgs.push_back("-rpath");
--      CmdArgs.push_back("/usr/lib/gcc41");
--
--      CmdArgs.push_back("-rpath-link");
--      CmdArgs.push_back("/usr/lib/gcc41");
--
--      CmdArgs.push_back("-rpath");
--      CmdArgs.push_back("/usr/lib");
--
--      CmdArgs.push_back("-rpath-link");
--      CmdArgs.push_back("/usr/lib");
-+      if (UseGCC47) {
-+        CmdArgs.push_back("-rpath");
-+        CmdArgs.push_back("/usr/lib/gcc47");
-+      } else {
-+        CmdArgs.push_back("-rpath");
-+        CmdArgs.push_back("/usr/lib/gcc44");
-+      }
-     }
- 
-     if (D.CCCIsCXX) {
-@@ -6317,13 +6331,6 @@ void dragonfly::Link::ConstructJob(Compi
-       CmdArgs.push_back("-lm");
-     }
- 
--    if (Args.hasArg(options::OPT_shared)) {
--      CmdArgs.push_back("-lgcc_pic");
--    } else {
--      CmdArgs.push_back("-lgcc");
--    }
--
--
-     if (Args.hasArg(options::OPT_pthread))
-       CmdArgs.push_back("-lpthread");
- 
-@@ -6331,23 +6338,42 @@ void dragonfly::Link::ConstructJob(Compi
-       CmdArgs.push_back("-lc");
-     }
- 
--    if (Args.hasArg(options::OPT_shared)) {
--      CmdArgs.push_back("-lgcc_pic");
-+    if (UseGCC47) {
-+      if (Args.hasArg(options::OPT_static) ||
-+          Args.hasArg(options::OPT_static_libgcc)) {
-+        CmdArgs.push_back("-lgcc");
-+        CmdArgs.push_back("-lgcc_eh");
-+      } else {
-+        if (Args.hasArg(options::OPT_shared_libgcc)) {
-+          CmdArgs.push_back("-lgcc_pic");
-+          if (!Args.hasArg(options::OPT_shared))
-+            CmdArgs.push_back("-lgcc");
-+        } else {
-+          CmdArgs.push_back("-lgcc");
-+          CmdArgs.push_back("--as-needed");
-+          CmdArgs.push_back("-lgcc_pic");
-+          CmdArgs.push_back("--no-as-needed");
-+        }
-+      }
-     } else {
--      CmdArgs.push_back("-lgcc");
-+      if (Args.hasArg(options::OPT_shared)) {
-+        CmdArgs.push_back("-lgcc_pic");
-+      } else {
-+        CmdArgs.push_back("-lgcc");
-+      }
-     }
-   }
- 
-   if (!Args.hasArg(options::OPT_nostdlib) &&
-       !Args.hasArg(options::OPT_nostartfiles)) {
--    if (!Args.hasArg(options::OPT_shared))
-+    if (Args.hasArg(options::OPT_shared) || Args.hasArg(options::OPT_pie))
-       CmdArgs.push_back(Args.MakeArgString(
--                              getToolChain().GetFilePath("crtend.o")));
-+                              getToolChain().GetFilePath("crtendS.o")));
-     else
-       CmdArgs.push_back(Args.MakeArgString(
--                              getToolChain().GetFilePath("crtendS.o")));
-+                              getToolChain().GetFilePath("crtend.o")));
-     CmdArgs.push_back(Args.MakeArgString(
--                              getToolChain().GetFilePath("crtn.o")));
-+                            getToolChain().GetFilePath("crtn.o")));
-   }
- 
-   addProfileRT(getToolChain(), Args, CmdArgs, getToolChain().getTriple());
diff --git a/lang/clang/patches/patch-tools_clang_lib_Frontend_InitHeaderSearch.cpp b/lang/clang/patches/patch-tools_clang_lib_Frontend_InitHeaderSearch.cpp
deleted file mode 100644
index fd88a0c5728..00000000000
--- a/lang/clang/patches/patch-tools_clang_lib_Frontend_InitHeaderSearch.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-$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-10-24 16:19:39.000000000 +0000
-+++ tools/clang/lib/Frontend/InitHeaderSearch.cpp
-@@ -24,6 +24,7 @@
- #include "llvm/ADT/Twine.h"
- #include "llvm/Support/raw_ostream.h"
- #include "llvm/Support/ErrorHandling.h"
-+#include "llvm/Support/FileSystem.h"
- #include "llvm/Support/Path.h"
- 
- #include "clang/Config/config.h" // C_INCLUDE_DIRS
-@@ -408,7 +409,10 @@ AddDefaultCPlusPlusIncludePaths(const ll
- #endif
-     break;
-   case llvm::Triple::DragonFly:
--    AddPath("/usr/include/c++/4.1", CXXSystem, true, false, false);
-+    if (llvm::sys::fs::exists("/usr/lib/gcc47"))
-+      AddPath("/usr/include/c++/4.7", CXXSystem, true, false, false);
-+    else
-+      AddPath("/usr/include/c++/4.4", CXXSystem, true, false, false);
-     break;
-   case llvm::Triple::FreeBSD:
-     // FreeBSD 8.0
diff --git a/lang/clang/patches/patch-tools_clang_test_Driver_dragonfly.c b/lang/clang/patches/patch-tools_clang_test_Driver_dragonfly.c
deleted file mode 100644
index 445b2370d71..00000000000
--- a/lang/clang/patches/patch-tools_clang_test_Driver_dragonfly.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-tools_clang_test_Driver_dragonfly.c,v 1.1 2012/11/29 11:42:25 marino Exp $
-
-Update DragonFly driver test to reflect the current reality
-
---- tools/clang/test/Driver/dragonfly.c.orig	2012-01-24 01:55:55.000000000 +0000
-+++ tools/clang/test/Driver/dragonfly.c
-@@ -1,7 +1,7 @@
--// RUN: %clang -no-canonical-prefixes -target amd64-pc-dragonfly %s -### 2> %t.log
-+// RUN: %clang -no-canonical-prefixes -target x86_64-pc-dragonfly %s -### 2> %t.log
- // RUN: FileCheck -input-file %t.log %s
- 
--// CHECK: clang{{.*}}" "-cc1" "-triple" "amd64-pc-dragonfly"
--// CHECK: ld{{.*}}" "-dynamic-linker" "{{.*}}ld-elf.{{.*}}" "-o" "a.out" "{{.*}}crt1.o" "{{.*}}crti.o" "{{.*}}crtbegin.o" "{{.*}}.o" "-L{{.*}}/gcc{{.*}}" {{.*}} "-lc" "-lgcc" "{{.*}}crtend.o" "{{.*}}crtn.o"
-+// CHECK: clang{{.*}}" "-cc1" "-triple" "x86_64-pc-dragonfly"
-+// CHECK: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/usr/libexec/ld-elf.so.{{.*}}" "--hash-style=both" "-o" "a.out" "/usr/lib/crt1.o" "/usr/lib/crti.o" "{{.*}}crtbegin.o" "{{.*}}.o" "-L/usr/lib/gcc4{{.*}}" "-rpath" "/usr/lib/gcc4{{.*}}" "-lc" "-lgcc" "{{.*}}crtend.o" "/usr/lib/crtn.o"
- 
- 
diff --git a/lang/clang/patches/patch-utils_lit_utils_check-coverage b/lang/clang/patches/patch-utils_lit_utils_check-coverage
new file mode 100644
index 00000000000..4abe9bf0ffe
--- /dev/null
+++ b/lang/clang/patches/patch-utils_lit_utils_check-coverage
@@ -0,0 +1,22 @@
+$NetBSD: patch-utils_lit_utils_check-coverage,v 1.1 2013/07/02 10:33:02 adam Exp $
+
+Portability fix.
+
+--- utils/lit/utils/check-coverage.orig	2013-06-05 10:33:06.000000000 +0000
++++ utils/lit/utils/check-coverage
+@@ -9,13 +9,13 @@ if [ ! -f setup.py ] || [ ! -d lit ]; th
+ fi
+ 
+ # Parse command line arguments.
+-if [ "$1" == "--generate-html" ]; then
++if [ "$1" = "--generate-html" ]; then
+     GENERATE_HTML=1
+     shift
+ fi
+ 
+ # If invoked with no arguments, run all the tests.
+-if [ $# == "0" ]; then
++if [ $# = "0" ]; then
+     set -- "tests"
+ fi
+ 
diff --git a/lang/clang/patches/patch-utils_lit_utils_check-sdist b/lang/clang/patches/patch-utils_lit_utils_check-sdist
new file mode 100644
index 00000000000..15716c755cd
--- /dev/null
+++ b/lang/clang/patches/patch-utils_lit_utils_check-sdist
@@ -0,0 +1,14 @@
+$NetBSD: patch-utils_lit_utils_check-sdist,v 1.1 2013/07/02 10:33:02 adam Exp $
+
+Portability fix.
+
+--- utils/lit/utils/check-sdist.orig	2013-06-05 10:35:39.000000000 +0000
++++ utils/lit/utils/check-sdist
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-if [ $# == 1 ]; then
++if [ $# = 1 ]; then
+     cd $1
+ fi
+