LLVM 2.9 includes several major new capabilities:

* Type Based Alias Analysis (TBAA) is now implemented and turned on by default
  in Clang. This allows substantially better load/store optimization in some
  cases. TBAA can be disabled by passing -fno-strict-aliasing.
* This release has seen a continued focus on quality of debug information. LLVM
  now generates much higher fidelity debug information, particularly when
  debugging optimized code.
* Inline assembly now supports multiple alternative constraints.
* A new backend for the NVIDIA PTX virtual ISA (used to target its GPUs) is
  under rapid development. It is not generally useful in 2.9, but is making
  rapid progress.

5 files changed, 198 insertions, 194 deletions

diff --git a/lang/clang/Makefile b/lang/clang/Makefile
index 79b22f02057..d4c8bdcb07d 100644
--- a/lang/clang/Makefile
+++ b/lang/clang/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.8 2010/10/26 07:29:03 adam Exp $
+# $NetBSD: Makefile,v 1.9 2011/04/07 09:26:33 adam Exp $
 
-DISTNAME=	clang-2.8
+DISTNAME=	clang-2.9
 CATEGORIES=	lang
 MASTER_SITES=	http://llvm.org/releases/${PKGVERSION_NOREV}/
-# XXX remove on next update
-DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	llvm-${PKGVERSION_NOREV}.tgz clang-${PKGVERSION_NOREV}.tgz
 
 MAINTAINER=	adam.hoka@gmail.com
 HOMEPAGE=	http://llvm.org/
 COMMENT=	Low Level Virtual Machine compiler infrastructure
+LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -18,7 +17,10 @@ WRKSRC=			${WRKDIR}/llvm-${PKGVERSION_NOREV}
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		chown perl:build gmake
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-assertions
 CONFIGURE_ARGS+=	--disable-bindings	# disable OCaml
+CONFIGURE_ARGS+=	--disable-timestamps
+CONFIGURE_ARGS+=	--enable-optimized
 
 MAKE_DIRS+=		etc/llvm
 
@@ -28,6 +30,14 @@ CHECK_PORTABILITY_SKIP=	utils/buildit/build_llvm
 
 TEST_TARGET=	check unittests
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+PLIST_SUBST+=		SOEXT="dylib"
+.else
+PLIST_SUBST+=		SOEXT="so"
+.endif
+
 SUBST_CLASSES+=		perl
 SUBST_MESSAGE.perl=	Fixing llvm-configure PERL path
 SUBST_STAGE.perl=	post-patch
@@ -37,8 +47,4 @@ SUBST_SED.perl=		-e 's,@PERL@,${PERL5},'
 post-extract:
 	mv ${WRKDIR}/clang-${PKGVERSION_NOREV} ${WRKSRC}/tools/clang
 
-# XXX Darwin only?
-pre-install:
-	find ${WRKSRC}/tools/clang/include/clang -name '*.inc.tmp' -exec rm {} \;
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/clang/PLIST b/lang/clang/PLIST
index d417c29c709..918c98b2398 100644
--- a/lang/clang/PLIST
+++ b/lang/clang/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2010/10/21 13:52:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/04/07 09:26:33 adam Exp $
 bin/bugpoint
-bin/c-index-test
 bin/clang
 bin/clang++
 bin/llc
@@ -16,10 +15,12 @@ bin/llvm-ld
 bin/llvm-link
 bin/llvm-mc
 bin/llvm-nm
+bin/llvm-objdump
 bin/llvm-prof
 bin/llvm-ranlib
 bin/llvm-stub
 bin/llvmc
+bin/macho-dump
 bin/opt
 bin/tblgen
 include/clang-c/Index.h
@@ -29,6 +30,7 @@ include/clang/AST/ASTConsumer.h
 include/clang/AST/ASTContext.h
 include/clang/AST/ASTDiagnostic.h
 include/clang/AST/ASTImporter.h
+include/clang/AST/ASTMutationListener.h
 include/clang/AST/ASTVector.h
 include/clang/AST/Attr.h
 include/clang/AST/AttrImpl.inc
@@ -49,11 +51,12 @@ include/clang/AST/DeclTemplate.h
 include/clang/AST/DeclVisitor.h
 include/clang/AST/DeclarationName.h
 include/clang/AST/DependentDiagnostic.h
+include/clang/AST/EvaluatedExprVisitor.h
 include/clang/AST/Expr.h
 include/clang/AST/ExprCXX.h
 include/clang/AST/ExprObjC.h
 include/clang/AST/ExternalASTSource.h
-include/clang/AST/FullExpr.h
+include/clang/AST/Mangle.h
 include/clang/AST/NestedNameSpecifier.h
 include/clang/AST/OperationKinds.h
 include/clang/AST/ParentMap.h
@@ -72,7 +75,6 @@ include/clang/AST/TemplateBase.h
 include/clang/AST/TemplateName.h
 include/clang/AST/Type.h
 include/clang/AST/TypeLoc.h
-include/clang/AST/TypeLocBuilder.h
 include/clang/AST/TypeLocNodes.def
 include/clang/AST/TypeLocVisitor.h
 include/clang/AST/TypeNodes.def
@@ -80,15 +82,18 @@ include/clang/AST/TypeOrdering.h
 include/clang/AST/TypeVisitor.h
 include/clang/AST/UnresolvedSet.h
 include/clang/AST/UsuallyTinyPtrVector.h
+include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h
 include/clang/Analysis/Analyses/FormatString.h
 include/clang/Analysis/Analyses/LiveVariables.h
 include/clang/Analysis/Analyses/PseudoConstantAnalysis.h
 include/clang/Analysis/Analyses/ReachableCode.h
 include/clang/Analysis/Analyses/UninitializedValues.h
+include/clang/Analysis/Analyses/UninitializedValuesV2.h
 include/clang/Analysis/AnalysisContext.h
 include/clang/Analysis/AnalysisDiagnostic.h
 include/clang/Analysis/CFG.h
 include/clang/Analysis/CFGStmtMap.h
+include/clang/Analysis/DomainSpecific/CocoaConventions.h
 include/clang/Analysis/FlowSensitive/DataflowSolver.h
 include/clang/Analysis/FlowSensitive/DataflowValues.h
 include/clang/Analysis/ProgramPoint.h
@@ -98,6 +103,7 @@ include/clang/Analysis/Support/SaveAndRestore.h
 include/clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h
 include/clang/Analysis/Visitors/CFGRecStmtVisitor.h
 include/clang/Analysis/Visitors/CFGStmtVisitor.h
+include/clang/Basic/ABI.h
 include/clang/Basic/AttrKinds.h
 include/clang/Basic/AttrList.inc
 include/clang/Basic/Builtins.def
@@ -113,15 +119,19 @@ include/clang/Basic/DiagnosticCommonKinds.inc
 include/clang/Basic/DiagnosticDriverKinds.inc
 include/clang/Basic/DiagnosticFrontendKinds.inc
 include/clang/Basic/DiagnosticGroups.inc
+include/clang/Basic/DiagnosticIDs.h
 include/clang/Basic/DiagnosticLexKinds.inc
 include/clang/Basic/DiagnosticParseKinds.inc
 include/clang/Basic/DiagnosticSemaKinds.inc
 include/clang/Basic/FileManager.h
+include/clang/Basic/FileSystemOptions.h
+include/clang/Basic/FileSystemStatCache.h
 include/clang/Basic/IdentifierTable.h
 include/clang/Basic/LangOptions.h
 include/clang/Basic/Linkage.h
 include/clang/Basic/MacroBuilder.h
 include/clang/Basic/OnDiskHashTable.h
+include/clang/Basic/OpenCLExtensions.def
 include/clang/Basic/OperatorKinds.def
 include/clang/Basic/OperatorKinds.h
 include/clang/Basic/PartialDiagnostic.h
@@ -139,44 +149,8 @@ include/clang/Basic/TokenKinds.h
 include/clang/Basic/TypeTraits.h
 include/clang/Basic/Version.h
 include/clang/Basic/Version.inc
+include/clang/Basic/Visibility.h
 include/clang/Basic/arm_neon.inc
-include/clang/Checker/AnalysisConsumer.h
-include/clang/Checker/BugReporter/BugReporter.h
-include/clang/Checker/BugReporter/BugType.h
-include/clang/Checker/BugReporter/PathDiagnostic.h
-include/clang/Checker/Checkers/DereferenceChecker.h
-include/clang/Checker/Checkers/LocalCheckers.h
-include/clang/Checker/DomainSpecific/CocoaConventions.h
-include/clang/Checker/FrontendActions.h
-include/clang/Checker/ManagerRegistry.h
-include/clang/Checker/PathDiagnosticClients.h
-include/clang/Checker/PathSensitive/AnalysisManager.h
-include/clang/Checker/PathSensitive/BasicValueFactory.h
-include/clang/Checker/PathSensitive/Checker.h
-include/clang/Checker/PathSensitive/CheckerHelpers.h
-include/clang/Checker/PathSensitive/CheckerVisitor.def
-include/clang/Checker/PathSensitive/CheckerVisitor.h
-include/clang/Checker/PathSensitive/ConstraintManager.h
-include/clang/Checker/PathSensitive/Environment.h
-include/clang/Checker/PathSensitive/ExplodedGraph.h
-include/clang/Checker/PathSensitive/GRAuditor.h
-include/clang/Checker/PathSensitive/GRBlockCounter.h
-include/clang/Checker/PathSensitive/GRCoreEngine.h
-include/clang/Checker/PathSensitive/GRExprEngine.h
-include/clang/Checker/PathSensitive/GRExprEngineBuilders.h
-include/clang/Checker/PathSensitive/GRSimpleAPICheck.h
-include/clang/Checker/PathSensitive/GRState.h
-include/clang/Checker/PathSensitive/GRStateTrait.h
-include/clang/Checker/PathSensitive/GRSubEngine.h
-include/clang/Checker/PathSensitive/GRTransferFuncs.h
-include/clang/Checker/PathSensitive/GRWorkList.h
-include/clang/Checker/PathSensitive/MemRegion.h
-include/clang/Checker/PathSensitive/SVals.h
-include/clang/Checker/PathSensitive/SValuator.h
-include/clang/Checker/PathSensitive/Store.h
-include/clang/Checker/PathSensitive/SummaryManager.h
-include/clang/Checker/PathSensitive/SymbolManager.h
-include/clang/Checker/PathSensitive/ValueManager.h
 include/clang/CodeGen/BackendUtil.h
 include/clang/CodeGen/CodeGenAction.h
 include/clang/CodeGen/ModuleBuilder.h
@@ -212,12 +186,8 @@ include/clang/Frontend/CodeGenOptions.h
 include/clang/Frontend/CommandLineSourceLoc.h
 include/clang/Frontend/CompilerInstance.h
 include/clang/Frontend/CompilerInvocation.h
-include/clang/Frontend/DeclContextXML.def
-include/clang/Frontend/DeclXML.def
 include/clang/Frontend/DependencyOutputOptions.h
 include/clang/Frontend/DiagnosticOptions.h
-include/clang/Frontend/DocumentXML.def
-include/clang/Frontend/DocumentXML.h
 include/clang/Frontend/FrontendAction.h
 include/clang/Frontend/FrontendActions.h
 include/clang/Frontend/FrontendDiagnostic.h
@@ -226,12 +196,11 @@ include/clang/Frontend/FrontendPluginRegistry.h
 include/clang/Frontend/HeaderSearchOptions.h
 include/clang/Frontend/LangStandard.h
 include/clang/Frontend/LangStandards.def
+include/clang/Frontend/MultiplexConsumer.h
 include/clang/Frontend/PreprocessorOptions.h
 include/clang/Frontend/PreprocessorOutputOptions.h
-include/clang/Frontend/StmtXML.def
 include/clang/Frontend/TextDiagnosticBuffer.h
 include/clang/Frontend/TextDiagnosticPrinter.h
-include/clang/Frontend/TypeXML.def
 include/clang/Frontend/Utils.h
 include/clang/Frontend/VerifyDiagnosticsClient.h
 include/clang/FrontendTool/Utils.h
@@ -248,6 +217,7 @@ include/clang/Index/Program.h
 include/clang/Index/STLExtras.h
 include/clang/Index/SelectorMap.h
 include/clang/Index/TranslationUnit.h
+include/clang/Lex/AttrSpellings.inc
 include/clang/Lex/CodeCompletionHandler.h
 include/clang/Lex/DirectoryLookup.h
 include/clang/Lex/ExternalPreprocessorSource.h
@@ -308,15 +278,51 @@ include/clang/Sema/TemplateDeduction.h
 include/clang/Serialization/ASTBitCodes.h
 include/clang/Serialization/ASTDeserializationListener.h
 include/clang/Serialization/ASTReader.h
+include/clang/Serialization/ASTSerializationListener.h
 include/clang/Serialization/ASTWriter.h
 include/clang/Serialization/AttrPCHRead.inc
 include/clang/Serialization/AttrPCHWrite.inc
+include/clang/StaticAnalyzer/Checkers/DereferenceChecker.h
+include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
+include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
+include/clang/StaticAnalyzer/Core/BugReporter/BugType.h
+include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h
+include/clang/StaticAnalyzer/Core/Checker.h
+include/clang/StaticAnalyzer/Core/CheckerManager.h
+include/clang/StaticAnalyzer/Core/CheckerProvider.h
+include/clang/StaticAnalyzer/Core/PathDiagnosticClients.h
+include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h
+include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h
+include/clang/StaticAnalyzer/Core/PathSensitive/BlockCounter.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/Environment.h
+include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h
+include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
+include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngineBuilders.h
+include/clang/StaticAnalyzer/Core/PathSensitive/GRState.h
+include/clang/StaticAnalyzer/Core/PathSensitive/GRStateTrait.h
+include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h
+include/clang/StaticAnalyzer/Core/PathSensitive/ObjCMessage.h
+include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h
+include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h
+include/clang/StaticAnalyzer/Core/PathSensitive/Store.h
+include/clang/StaticAnalyzer/Core/PathSensitive/SubEngine.h
+include/clang/StaticAnalyzer/Core/PathSensitive/SummaryManager.h
+include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h
+include/clang/StaticAnalyzer/Core/PathSensitive/TransferFuncs.h
+include/clang/StaticAnalyzer/Core/PathSensitive/WorkList.h
+include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
+include/clang/StaticAnalyzer/Frontend/FrontendActions.h
 include/llvm-c/Analysis.h
 include/llvm-c/BitReader.h
 include/llvm-c/BitWriter.h
 include/llvm-c/Core.h
 include/llvm-c/EnhancedDisassembly.h
 include/llvm-c/ExecutionEngine.h
+include/llvm-c/Initialization.h
 include/llvm-c/LinkTimeOptimizer.h
 include/llvm-c/Target.h
 include/llvm-c/Transforms/IPO.h
@@ -325,6 +331,7 @@ include/llvm-c/lto.h
 include/llvm/ADT/APFloat.h
 include/llvm/ADT/APInt.h
 include/llvm/ADT/APSInt.h
+include/llvm/ADT/ArrayRef.h
 include/llvm/ADT/BitVector.h
 include/llvm/ADT/DAGDeltaAlgorithm.h
 include/llvm/ADT/DeltaAlgorithm.h
@@ -339,7 +346,10 @@ 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/NullablePtr.h
 include/llvm/ADT/Optional.h
@@ -382,9 +392,11 @@ 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/DomPrinter.h
+include/llvm/Analysis/DominanceFrontier.h
 include/llvm/Analysis/DominatorInternals.h
 include/llvm/Analysis/Dominators.h
 include/llvm/Analysis/FindUsedTypes.h
@@ -398,7 +410,6 @@ include/llvm/Analysis/LazyValueInfo.h
 include/llvm/Analysis/LibCallAliasAnalysis.h
 include/llvm/Analysis/LibCallSemantics.h
 include/llvm/Analysis/Lint.h
-include/llvm/Analysis/LiveValues.h
 include/llvm/Analysis/Loads.h
 include/llvm/Analysis/LoopDependenceAnalysis.h
 include/llvm/Analysis/LoopInfo.h
@@ -407,13 +418,15 @@ include/llvm/Analysis/MemoryBuiltins.h
 include/llvm/Analysis/MemoryDependenceAnalysis.h
 include/llvm/Analysis/PHITransAddr.h
 include/llvm/Analysis/Passes.h
-include/llvm/Analysis/PointerTracking.h
+include/llvm/Analysis/PathNumbering.h
+include/llvm/Analysis/PathProfileInfo.h
 include/llvm/Analysis/PostDominators.h
 include/llvm/Analysis/ProfileInfo.h
 include/llvm/Analysis/ProfileInfoLoader.h
 include/llvm/Analysis/ProfileInfoTypes.h
 include/llvm/Analysis/RegionInfo.h
 include/llvm/Analysis/RegionIterator.h
+include/llvm/Analysis/RegionPass.h
 include/llvm/Analysis/RegionPrinter.h
 include/llvm/Analysis/ScalarEvolution.h
 include/llvm/Analysis/ScalarEvolutionExpander.h
@@ -437,7 +450,6 @@ include/llvm/Bitcode/BitstreamReader.h
 include/llvm/Bitcode/BitstreamWriter.h
 include/llvm/Bitcode/LLVMBitCodes.h
 include/llvm/Bitcode/ReaderWriter.h
-include/llvm/CMakeLists.txt
 include/llvm/CallGraphSCCPass.h
 include/llvm/CallingConv.h
 include/llvm/CodeGen/Analysis.h
@@ -445,6 +457,7 @@ include/llvm/CodeGen/AsmPrinter.h
 include/llvm/CodeGen/BinaryObject.h
 include/llvm/CodeGen/CalcSpillWeights.h
 include/llvm/CodeGen/CallingConvLower.h
+include/llvm/CodeGen/EdgeBundles.h
 include/llvm/CodeGen/FastISel.h
 include/llvm/CodeGen/FunctionLoweringInfo.h
 include/llvm/CodeGen/GCMetadata.h
@@ -476,6 +489,7 @@ include/llvm/CodeGen/MachineInstrBuilder.h
 include/llvm/CodeGen/MachineJumpTableInfo.h
 include/llvm/CodeGen/MachineLocation.h
 include/llvm/CodeGen/MachineLoopInfo.h
+include/llvm/CodeGen/MachineLoopRanges.h
 include/llvm/CodeGen/MachineMemOperand.h
 include/llvm/CodeGen/MachineModuleInfo.h
 include/llvm/CodeGen/MachineModuleInfoImpls.h
@@ -485,10 +499,16 @@ include/llvm/CodeGen/MachineRegisterInfo.h
 include/llvm/CodeGen/MachineRelocation.h
 include/llvm/CodeGen/MachineSSAUpdater.h
 include/llvm/CodeGen/ObjectCodeEmitter.h
+include/llvm/CodeGen/PBQP/Graph.h
+include/llvm/CodeGen/PBQP/HeuristicBase.h
+include/llvm/CodeGen/PBQP/HeuristicSolver.h
+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/PostRAHazardRecognizer.h
 include/llvm/CodeGen/ProcessImplicitDefs.h
 include/llvm/CodeGen/PseudoSourceValue.h
+include/llvm/CodeGen/RegAllocPBQP.h
 include/llvm/CodeGen/RegAllocRegistry.h
 include/llvm/CodeGen/RegisterCoalescer.h
 include/llvm/CodeGen/RegisterScavenging.h
@@ -496,6 +516,7 @@ include/llvm/CodeGen/RuntimeLibcalls.h
 include/llvm/CodeGen/ScheduleDAG.h
 include/llvm/CodeGen/ScheduleHazardRecognizer.h
 include/llvm/CodeGen/SchedulerRegistry.h
+include/llvm/CodeGen/ScoreboardHazardRecognizer.h
 include/llvm/CodeGen/SelectionDAG.h
 include/llvm/CodeGen/SelectionDAGISel.h
 include/llvm/CodeGen/SelectionDAGNodes.h
@@ -517,9 +538,7 @@ include/llvm/Config/AsmPrinters.def
 include/llvm/Config/Disassemblers.def
 include/llvm/Config/Targets.def
 include/llvm/Config/config.h
-include/llvm/Config/config.h.cmake
 include/llvm/Config/llvm-config.h
-include/llvm/Config/llvm-config.h.cmake
 include/llvm/Constant.h
 include/llvm/Constants.h
 include/llvm/DerivedTypes.h
@@ -529,11 +548,13 @@ 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/Function.h
 include/llvm/GVMaterializer.h
 include/llvm/GlobalAlias.h
 include/llvm/GlobalValue.h
 include/llvm/GlobalVariable.h
+include/llvm/InitializePasses.h
 include/llvm/InlineAsm.h
 include/llvm/InstrTypes.h
 include/llvm/Instruction.def
@@ -546,6 +567,7 @@ include/llvm/Intrinsics.td
 include/llvm/IntrinsicsARM.td
 include/llvm/IntrinsicsAlpha.td
 include/llvm/IntrinsicsCellSPU.td
+include/llvm/IntrinsicsPTX.td
 include/llvm/IntrinsicsPowerPC.td
 include/llvm/IntrinsicsX86.td
 include/llvm/IntrinsicsXCore.td
@@ -554,7 +576,6 @@ include/llvm/LinkAllPasses.h
 include/llvm/LinkAllVMCore.h
 include/llvm/Linker.h
 include/llvm/MC/EDInstInfo.h
-include/llvm/MC/ELFObjectWriter.h
 include/llvm/MC/MCAsmInfo.h
 include/llvm/MC/MCAsmInfoCOFF.h
 include/llvm/MC/MCAsmInfoDarwin.h
@@ -565,13 +586,16 @@ include/llvm/MC/MCContext.h
 include/llvm/MC/MCDirectives.h
 include/llvm/MC/MCDisassembler.h
 include/llvm/MC/MCDwarf.h
+include/llvm/MC/MCELFObjectWriter.h
 include/llvm/MC/MCELFSymbolFlags.h
 include/llvm/MC/MCExpr.h
 include/llvm/MC/MCFixup.h
+include/llvm/MC/MCFixupKindInfo.h
 include/llvm/MC/MCInst.h
 include/llvm/MC/MCInstPrinter.h
 include/llvm/MC/MCLabel.h
 include/llvm/MC/MCMachOSymbolFlags.h
+include/llvm/MC/MCMachObjectWriter.h
 include/llvm/MC/MCObjectStreamer.h
 include/llvm/MC/MCObjectWriter.h
 include/llvm/MC/MCParser/AsmCond.h
@@ -587,10 +611,12 @@ include/llvm/MC/MCSectionMachO.h
 include/llvm/MC/MCStreamer.h
 include/llvm/MC/MCSymbol.h
 include/llvm/MC/MCValue.h
-include/llvm/MC/MachObjectWriter.h
 include/llvm/MC/SectionKind.h
 include/llvm/Metadata.h
 include/llvm/Module.h
+include/llvm/Object/MachOFormat.h
+include/llvm/Object/MachOObject.h
+include/llvm/Object/ObjectFile.h
 include/llvm/OperandTraits.h
 include/llvm/Operator.h
 include/llvm/Pass.h
@@ -599,8 +625,10 @@ include/llvm/PassManager.h
 include/llvm/PassManagers.h
 include/llvm/PassRegistry.h
 include/llvm/PassSupport.h
+include/llvm/Support/AIXDataTypesFix.h
 include/llvm/Support/AlignOf.h
 include/llvm/Support/Allocator.h
+include/llvm/Support/Atomic.h
 include/llvm/Support/CFG.h
 include/llvm/Support/COFF.h
 include/llvm/Support/CallSite.h
@@ -612,95 +640,99 @@ include/llvm/Support/ConstantRange.h
 include/llvm/Support/CrashRecoveryContext.h
 include/llvm/Support/DOTGraphTraits.h
 include/llvm/Support/DataFlow.h
+include/llvm/Support/DataTypes.h
 include/llvm/Support/Debug.h
 include/llvm/Support/DebugLoc.h
+include/llvm/Support/Disassembler.h
 include/llvm/Support/Dwarf.h
-include/llvm/Support/DynamicLinker.h
+include/llvm/Support/DynamicLibrary.h
 include/llvm/Support/ELF.h
+include/llvm/Support/Endian.h
+include/llvm/Support/Errno.h
 include/llvm/Support/ErrorHandling.h
+include/llvm/Support/FEnv.h
+include/llvm/Support/FileSystem.h
 include/llvm/Support/FileUtilities.h
 include/llvm/Support/Format.h
 include/llvm/Support/FormattedStream.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/LICENSE.TXT
 include/llvm/Support/LeakDetector.h
 include/llvm/Support/MachO.h
 include/llvm/Support/ManagedStatic.h
 include/llvm/Support/MathExtras.h
+include/llvm/Support/Memory.h
 include/llvm/Support/MemoryBuffer.h
 include/llvm/Support/MemoryObject.h
+include/llvm/Support/Mutex.h
 include/llvm/Support/MutexGuard.h
 include/llvm/Support/NoFolder.h
 include/llvm/Support/OutputBuffer.h
 include/llvm/Support/PassNameParser.h
+include/llvm/Support/Path.h
+include/llvm/Support/PathV1.h
+include/llvm/Support/PathV2.h
 include/llvm/Support/PatternMatch.h
 include/llvm/Support/PluginLoader.h
 include/llvm/Support/PointerLikeTypeTraits.h
 include/llvm/Support/PredIteratorCache.h
 include/llvm/Support/PrettyStackTrace.h
+include/llvm/Support/Process.h
+include/llvm/Support/Program.h
+include/llvm/Support/RWMutex.h
 include/llvm/Support/Recycler.h
 include/llvm/Support/RecyclingAllocator.h
 include/llvm/Support/Regex.h
 include/llvm/Support/Registry.h
 include/llvm/Support/RegistryParser.h
 include/llvm/Support/SMLoc.h
+include/llvm/Support/Signals.h
+include/llvm/Support/Solaris.h
 include/llvm/Support/SourceMgr.h
-include/llvm/Support/StableBasicBlockNumbering.h
 include/llvm/Support/StandardPasses.h
 include/llvm/Support/StringPool.h
+include/llvm/Support/SwapByteOrder.h
 include/llvm/Support/SystemUtils.h
 include/llvm/Support/TargetFolder.h
+include/llvm/Support/ThreadLocal.h
+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/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/System/AIXDataTypesFix.h
-include/llvm/System/Alarm.h
-include/llvm/System/Atomic.h
-include/llvm/System/DataTypes.h
-include/llvm/System/DataTypes.h.cmake
-include/llvm/System/Disassembler.h
-include/llvm/System/DynamicLibrary.h
-include/llvm/System/Errno.h
-include/llvm/System/Host.h
-include/llvm/System/IncludeFile.h
-include/llvm/System/LICENSE.TXT
-include/llvm/System/Memory.h
-include/llvm/System/Mutex.h
-include/llvm/System/Path.h
-include/llvm/System/Process.h
-include/llvm/System/Program.h
-include/llvm/System/RWMutex.h
-include/llvm/System/Signals.h
-include/llvm/System/Solaris.h
-include/llvm/System/ThreadLocal.h
-include/llvm/System/Threading.h
-include/llvm/System/TimeValue.h
-include/llvm/System/Valgrind.h
 include/llvm/Target/Mangler.h
 include/llvm/Target/SubtargetFeature.h
 include/llvm/Target/Target.td
 include/llvm/Target/TargetAsmBackend.h
+include/llvm/Target/TargetAsmInfo.h
 include/llvm/Target/TargetAsmLexer.h
 include/llvm/Target/TargetAsmParser.h
 include/llvm/Target/TargetCallingConv.h
 include/llvm/Target/TargetCallingConv.td
 include/llvm/Target/TargetData.h
 include/llvm/Target/TargetELFWriterInfo.h
-include/llvm/Target/TargetFrameInfo.h
+include/llvm/Target/TargetFrameLowering.h
 include/llvm/Target/TargetInstrDesc.h
 include/llvm/Target/TargetInstrInfo.h
 include/llvm/Target/TargetInstrItineraries.h
 include/llvm/Target/TargetIntrinsicInfo.h
 include/llvm/Target/TargetJITInfo.h
+include/llvm/Target/TargetLibraryInfo.h
 include/llvm/Target/TargetLowering.h
 include/llvm/Target/TargetLoweringObjectFile.h
 include/llvm/Target/TargetMachine.h
@@ -716,7 +748,6 @@ include/llvm/Target/TargetSubtarget.h
 include/llvm/Transforms/IPO.h
 include/llvm/Transforms/IPO/InlinerPass.h
 include/llvm/Transforms/Instrumentation.h
-include/llvm/Transforms/RSProfiling.h
 include/llvm/Transforms/Scalar.h
 include/llvm/Transforms/Utils/AddrModeMatcher.h
 include/llvm/Transforms/Utils/BasicBlockUtils.h
@@ -737,30 +768,31 @@ include/llvm/Use.h
 include/llvm/User.h
 include/llvm/Value.h
 include/llvm/ValueSymbolTable.h
-lib/clang/2.8/include/altivec.h
-lib/clang/2.8/include/arm_neon.h
-lib/clang/2.8/include/avxintrin.h
-lib/clang/2.8/include/emmintrin.h
-lib/clang/2.8/include/float.h
-lib/clang/2.8/include/immintrin.h
-lib/clang/2.8/include/iso646.h
-lib/clang/2.8/include/limits.h
-lib/clang/2.8/include/mm_malloc.h
-lib/clang/2.8/include/mmintrin.h
-lib/clang/2.8/include/nmmintrin.h
-lib/clang/2.8/include/pmmintrin.h
-lib/clang/2.8/include/smmintrin.h
-lib/clang/2.8/include/stdarg.h
-lib/clang/2.8/include/stdbool.h
-lib/clang/2.8/include/stddef.h
-lib/clang/2.8/include/stdint.h
-lib/clang/2.8/include/tgmath.h
-lib/clang/2.8/include/tmmintrin.h
-lib/clang/2.8/include/varargs.h
-lib/clang/2.8/include/wmmintrin.h
-lib/clang/2.8/include/x86intrin.h
-lib/clang/2.8/include/xmmintrin.h
-lib/libBugpointPasses.so
+lib/BugpointPasses.${SOEXT}
+lib/LLVMHello.${SOEXT}
+lib/clang/${PKGVERSION}/include/altivec.h
+lib/clang/${PKGVERSION}/include/arm_neon.h
+lib/clang/${PKGVERSION}/include/avxintrin.h
+lib/clang/${PKGVERSION}/include/emmintrin.h
+lib/clang/${PKGVERSION}/include/float.h
+lib/clang/${PKGVERSION}/include/immintrin.h
+lib/clang/${PKGVERSION}/include/iso646.h
+lib/clang/${PKGVERSION}/include/limits.h
+lib/clang/${PKGVERSION}/include/mm_malloc.h
+lib/clang/${PKGVERSION}/include/mmintrin.h
+lib/clang/${PKGVERSION}/include/nmmintrin.h
+lib/clang/${PKGVERSION}/include/pmmintrin.h
+lib/clang/${PKGVERSION}/include/smmintrin.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/tgmath.h
+lib/clang/${PKGVERSION}/include/tmmintrin.h
+lib/clang/${PKGVERSION}/include/varargs.h
+lib/clang/${PKGVERSION}/include/wmmintrin.h
+lib/clang/${PKGVERSION}/include/x86intrin.h
+lib/clang/${PKGVERSION}/include/xmmintrin.h
 lib/libCompilerDriver.a
 lib/libEnhancedDisassembly.a
 lib/libEnhancedDisassembly.so
@@ -769,7 +801,6 @@ lib/libLLVMARMAsmPrinter.a
 lib/libLLVMARMCodeGen.a
 lib/libLLVMARMDisassembler.a
 lib/libLLVMARMInfo.a
-lib/libLLVMAlphaAsmPrinter.a
 lib/libLLVMAlphaCodeGen.a
 lib/libLLVMAlphaInfo.a
 lib/libLLVMAnalysis.a
@@ -778,12 +809,10 @@ lib/libLLVMAsmParser.a
 lib/libLLVMAsmPrinter.a
 lib/libLLVMBitReader.a
 lib/libLLVMBitWriter.a
-lib/libLLVMBlackfinAsmPrinter.a
 lib/libLLVMBlackfinCodeGen.a
 lib/libLLVMBlackfinInfo.a
 lib/libLLVMCBackend.a
 lib/libLLVMCBackendInfo.a
-lib/libLLVMCellSPUAsmPrinter.a
 lib/libLLVMCellSPUCodeGen.a
 lib/libLLVMCellSPUInfo.a
 lib/libLLVMCodeGen.a
@@ -791,38 +820,36 @@ lib/libLLVMCore.a
 lib/libLLVMCppBackend.a
 lib/libLLVMCppBackendInfo.a
 lib/libLLVMExecutionEngine.a
-lib/libLLVMHello.so
 lib/libLLVMInstCombine.a
 lib/libLLVMInstrumentation.a
 lib/libLLVMInterpreter.a
 lib/libLLVMJIT.a
 lib/libLLVMLinker.a
+lib/libLLVMMBlazeAsmParser.a
 lib/libLLVMMBlazeAsmPrinter.a
 lib/libLLVMMBlazeCodeGen.a
+lib/libLLVMMBlazeDisassembler.a
 lib/libLLVMMBlazeInfo.a
 lib/libLLVMMC.a
 lib/libLLVMMCDisassembler.a
+lib/libLLVMMCJIT.a
 lib/libLLVMMCParser.a
 lib/libLLVMMSP430AsmPrinter.a
 lib/libLLVMMSP430CodeGen.a
 lib/libLLVMMSP430Info.a
-lib/libLLVMMipsAsmPrinter.a
 lib/libLLVMMipsCodeGen.a
 lib/libLLVMMipsInfo.a
-lib/libLLVMPIC16AsmPrinter.a
-lib/libLLVMPIC16CodeGen.a
-lib/libLLVMPIC16Info.a
+lib/libLLVMObject.a
+lib/libLLVMPTXCodeGen.a
+lib/libLLVMPTXInfo.a
 lib/libLLVMPowerPCAsmPrinter.a
 lib/libLLVMPowerPCCodeGen.a
 lib/libLLVMPowerPCInfo.a
 lib/libLLVMScalarOpts.a
 lib/libLLVMSelectionDAG.a
-lib/libLLVMSparcAsmPrinter.a
 lib/libLLVMSparcCodeGen.a
 lib/libLLVMSparcInfo.a
 lib/libLLVMSupport.a
-lib/libLLVMSystem.a
-lib/libLLVMSystemZAsmPrinter.a
 lib/libLLVMSystemZCodeGen.a
 lib/libLLVMSystemZInfo.a
 lib/libLLVMTarget.a
@@ -832,21 +859,18 @@ lib/libLLVMX86AsmPrinter.a
 lib/libLLVMX86CodeGen.a
 lib/libLLVMX86Disassembler.a
 lib/libLLVMX86Info.a
-lib/libLLVMXCoreAsmPrinter.a
+lib/libLLVMX86Utils.a
 lib/libLLVMXCoreCodeGen.a
 lib/libLLVMXCoreInfo.a
 lib/libLLVMipa.a
 lib/libLLVMipo.a
-lib/libLLVMpic16passes.a
 lib/libLTO.a
 lib/libLTO.so
-lib/libUnitTestMain.a
 lib/libclang.a
 lib/libclang.so
 lib/libclangAST.a
 lib/libclangAnalysis.a
 lib/libclangBasic.a
-lib/libclangChecker.a
 lib/libclangCodeGen.a
 lib/libclangDriver.a
 lib/libclangFrontend.a
@@ -857,7 +881,10 @@ lib/libclangParse.a
 lib/libclangRewrite.a
 lib/libclangSema.a
 lib/libclangSerialization.a
-lib/libprofile_rt.so
+lib/libclangStaticAnalyzerCheckers.a
+lib/libclangStaticAnalyzerCore.a
+lib/libclangStaticAnalyzerFrontend.a
+lib/profile_rt.${SOEXT}
 man/man1/bugpoint.1
 man/man1/clang.1
 man/man1/lit.1
@@ -978,6 +1005,7 @@ 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
diff --git a/lang/clang/distinfo b/lang/clang/distinfo
index 777a616eaac..ead25f691ed 100644
--- a/lang/clang/distinfo
+++ b/lang/clang/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2010/10/25 12:47:09 adam Exp $
+$NetBSD: distinfo,v 1.7 2011/04/07 09:26:33 adam Exp $
 
-SHA1 (clang-2.8/clang-2.8.tgz) = 94977c84ce136307dbbeade95e67bfe3c25161ff
-RMD160 (clang-2.8/clang-2.8.tgz) = f00956b6de29cc09f3992aeabd140f2189c6cf39
-Size (clang-2.8/clang-2.8.tgz) = 5666777 bytes
-SHA1 (clang-2.8/llvm-2.8.tgz) = 6d49fe039d28e8664de25491c775cb2c599e30c1
-RMD160 (clang-2.8/llvm-2.8.tgz) = 3f5a71d07e105a7cf46eafc7a9006a927035012c
-Size (clang-2.8/llvm-2.8.tgz) = 9112527 bytes
-SHA1 (patch-ab) = 0a2f0cca347d3f305e6e648cf811a4190d7f7b11
-SHA1 (patch-ac) = e82e112bbbb294a3880f7445a7d1b755a6e9ab43
+SHA1 (clang-2.9.tgz) = 5fd3b5cec050ec12858c1602b23cf096282ad4a4
+RMD160 (clang-2.9.tgz) = 4ab79cbd0e2ad25a2272e6ee2fbbf546818dbd73
+Size (clang-2.9.tgz) = 6243772 bytes
+SHA1 (llvm-2.9.tgz) = 500f587f840199ac53c4fc7572839d08fa9d9123
+RMD160 (llvm-2.9.tgz) = caeaa067fda1eb34196b356a087645f83731cfb7
+Size (llvm-2.9.tgz) = 9574781 bytes
+SHA1 (patch-ab) = 140ac84d513cf20c9eb30a9e8e2f6b87bdd074fe
+SHA1 (patch-ac) = 252f6a1f2cb79fed19668310c72d1079b47eca3c
 SHA1 (patch-ad) = 4cd7223d1660a4e8d81b33b6c99efbb680664164
diff --git a/lang/clang/patches/patch-ab b/lang/clang/patches/patch-ab
index 677cdc9468c..47dbef5b2d3 100644
--- a/lang/clang/patches/patch-ab
+++ b/lang/clang/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.1 2010/10/21 13:52:16 adam Exp $
+$NetBSD: patch-ab,v 1.2 2011/04/07 09:26:33 adam Exp $
 
---- docs/Makefile.orig	2010-07-29 12:46:24.000000000 +0000
+--- docs/Makefile.orig	2011-02-11 07:43:27.000000000 +0000
 +++ docs/Makefile
-@@ -46,20 +46,19 @@ install-local:: $(install_targets)
+@@ -53,13 +53,12 @@ endif
  # 'make generated BUILD_FOR_WEBSITE=1'
- generated:: doxygen ocamldoc
+ generated:: $(generated_targets)
  
 -install-html: $(PROJ_OBJ_DIR)/html.tar.gz
 +install-html:
@@ -17,29 +17,3 @@ $NetBSD: patch-ab,v 1.1 2010/10/21 13:52:16 adam Exp $
  
  $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
  	$(Echo) Packaging HTML documentation
- 	$(Verb) $(RM) -rf $@ $(PROJ_OBJ_DIR)/html.tar
- 	$(Verb) cd $(PROJ_SRC_DIR) && \
- 	  $(TAR) cf $(PROJ_OBJ_DIR)/html.tar *.html
--	$(Verb) $(GZIP) $(PROJ_OBJ_DIR)/html.tar
-+	$(Verb) $(GZIPBIN) $(PROJ_OBJ_DIR)/html.tar
- 
- install-doxygen: doxygen
- 	$(Echo) Installing doxygen documentation
-@@ -82,7 +81,7 @@ $(PROJ_OBJ_DIR)/doxygen.tar.gz: $(DOXYFI
- 	$(Echo) Packaging doxygen documentation
- 	$(Verb) $(RM) -rf $@ $(PROJ_OBJ_DIR)/doxygen.tar
- 	$(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/doxygen.tar doxygen
--	$(Verb) $(GZIP) $(PROJ_OBJ_DIR)/doxygen.tar
-+	$(Verb) $(GZIPBIN) $(PROJ_OBJ_DIR)/doxygen.tar
- 	$(Verb) $(CP) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_OBJ_DIR)/doxygen/html/
- 
- userloc: $(LLVM_SRC_ROOT)/docs/userloc.html
-@@ -104,7 +103,7 @@ ocamldoc: regen-ocamldoc
- 	$(Echo) Packaging ocamldoc documentation
- 	$(Verb) $(RM) -rf $(PROJ_OBJ_DIR)/ocamldoc.tar*
- 	$(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/ocamldoc.tar ocamldoc
--	$(Verb) $(GZIP) $(PROJ_OBJ_DIR)/ocamldoc.tar
-+	$(Verb) $(GZIPBIN) $(PROJ_OBJ_DIR)/ocamldoc.tar
- 	$(Verb) $(CP) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_OBJ_DIR)/ocamldoc/html/
- 
- regen-ocamldoc:
diff --git a/lang/clang/patches/patch-ac b/lang/clang/patches/patch-ac
index 4b36c1a18e8..32e319c6805 100644
--- a/lang/clang/patches/patch-ac
+++ b/lang/clang/patches/patch-ac
@@ -1,33 +1,20 @@
-$NetBSD: patch-ac,v 1.3 2010/10/21 13:52:16 adam Exp $
+$NetBSD: patch-ac,v 1.4 2011/04/07 09:26:33 adam Exp $
 
---- Makefile.rules.orig	2010-08-26 08:27:26.000000000 +0000
+--- Makefile.rules.orig	2011-03-25 06:26:58.000000000 +0000
 +++ Makefile.rules
-@@ -517,9 +517,9 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), 
- ifneq ($(HOST_OS),Darwin)
-   LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
- else
--ifneq ($(DARWIN_MAJVERS),4)
--  LD.Flags += $(RPATH) -Wl,$(SharedLibDir)
--endif
-+#ifneq ($(DARWIN_MAJVERS),4)
-+#  LD.Flags += $(RPATH) -Wl,$(SharedLibDir)
-+#endif
- endif
- endif
- endif
-@@ -553,9 +553,9 @@ ifneq ($(HOST_OS), Darwin)
+@@ -564,11 +564,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) $(RDYNAMIC)
-+    LD.Flags += $(RDYNAMIC)
-   else
--    LD.Flags += $(RPATH) -Wl,$(ToolDir) $(RDYNAMIC)
-+    LD.Flags += $(RDYNAMIC)
-   endif
+-  ifdef EXAMPLE_TOOL
+-    LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag)
+-  else
+-    LD.Flags += $(RPATH) -Wl,$(ToolDir) $(DynamicFlag)
+-  endif
  endif
  else
-@@ -716,9 +716,6 @@ ObjectsBC := $(BaseNameSources:%=$(ObjDi
+ ifneq ($(DARWIN_MAJVERS),4)
+@@ -746,9 +741,6 @@ endif
  # in the file so they get built before dependencies
  #---------------------------------------------------------
  
@@ -37,7 +24,7 @@ $NetBSD: patch-ac,v 1.3 2010/10/21 13:52:16 adam Exp $
  # To create other directories, as needed, and timestamp their creation
  %/.dir:
  	$(Verb) $(MKDIR) $* > /dev/null
-@@ -844,7 +841,9 @@ install-local::
+@@ -876,7 +868,9 @@ install-local::
  uninstall-local::
  	$(Echo) UnInstall circumvented with NO_INSTALL
  else
@@ -48,3 +35,12 @@ $NetBSD: patch-ac,v 1.3 2010/10/21 13:52:16 adam Exp $
  	$(Echo) Installing Configuration Files To $(DESTDIR)$(PROJ_etcdir)
  	$(Verb)for file in $(CONFIG_FILES); do \
            if test -f $(PROJ_OBJ_DIR)/$${file} ; then \
+@@ -1298,7 +1292,7 @@ install-local:: $(DestArchiveLib)
+ $(DestArchiveLib): $(LibName.A) $(DESTDIR)$(PROJ_libdir)
+ 	$(Echo) Installing $(BuildMode) Archive Library $(DestArchiveLib)
+ 	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_libdir)
+-	$(Verb) $(INSTALL) $(LibName.A) $(DestArchiveLib)
++	$(Verb) $(DataInstall) $(LibName.A) $(DestArchiveLib)
+ 
+ uninstall-local::
+ 	$(Echo) Uninstalling $(BuildMode) Archive Library $(DestArchiveLib)