Mon Dec 19 14:07:40 2011 UTC ()
Update LLVM/Clang snapshot to r146851. Most noticable, this fixes the
vfork issues with RUMP depending on inlining certain functions and a bad
stdio simplification.


(joerg)
diff -r1.26 -r1.27 src/external/bsd/llvm/Makefile.inc
diff -r1.11 -r1.12 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
diff -r1.6 -r1.7 src/external/bsd/llvm/lib/libLLVMSupport/Makefile
diff -r1.5 -r1.6 src/external/bsd/llvm/lib/libLLVMTarget/Makefile
diff -r1.6 -r1.7 src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile
diff -r1.1 -r1.2 src/external/bsd/llvm/lib/libclangDriver/Makefile
diff -r1.8 -r1.9 src/external/bsd/llvm/lib/libclangFrontend/Makefile
cvs diff -r1.26 -r1.27 src/external/bsd/llvm/Attic/Makefile.inc (expand / switch to unified diff)

--- src/external/bsd/llvm/Attic/Makefile.inc 2011/12/11 14:58:50 1.26
+++ src/external/bsd/llvm/Attic/Makefile.inc 2011/12/19 14:07:40 1.27
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile.inc,v 1.26 2011/12/11 14:58:50 joerg Exp $ 1# $NetBSD: Makefile.inc,v 1.27 2011/12/19 14:07:40 joerg Exp $
2 2
3.if !defined(LLVM_TOPLEVEL_MK) 3.if !defined(LLVM_TOPLEVEL_MK)
4LLVM_TOPLEVEL_MK= 4LLVM_TOPLEVEL_MK=
5 5
6.include <bsd.own.mk> 6.include <bsd.own.mk>
7 7
8LLVM_REVISION= 146325 8LLVM_REVISION= 146851
9CLANG_REVISION= 146325 9CLANG_REVISION= 146851
10 10
11LLVM_SRCDIR:= ${.PARSEDIR}/dist/llvm 11LLVM_SRCDIR:= ${.PARSEDIR}/dist/llvm
12CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang 12CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang
13LLVM_TOPLEVEL:= ${.PARSEDIR} 13LLVM_TOPLEVEL:= ${.PARSEDIR}
14 14
15CPPFLAGS+= -I. -I${LLVM_SRCDIR}/include -I${CLANG_SRCDIR}/include \ 15CPPFLAGS+= -I. -I${LLVM_SRCDIR}/include -I${CLANG_SRCDIR}/include \
16 -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS \ 16 -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS \
17 -D__STDC_FORMAT_MACROS 17 -D__STDC_FORMAT_MACROS
18 18
19.if defined(HOSTLIB) || defined(HOSTPROG) 19.if defined(HOSTLIB) || defined(HOSTPROG)
20LLVM_INCLUDE_CONFIG= ${LLVM_TOOLCONF_OBJDIR}/config/include 20LLVM_INCLUDE_CONFIG= ${LLVM_TOOLCONF_OBJDIR}/config/include
21LLVM_INCLUDE_OBJDIR!= cd ${NETBSDSRCDIR}/tools/llvm-include && ${PRINTOBJDIR} 21LLVM_INCLUDE_OBJDIR!= cd ${NETBSDSRCDIR}/tools/llvm-include && ${PRINTOBJDIR}
22LLVM_TOOLCONF_OBJDIR!= cd ${NETBSDSRCDIR}/tools/llvm && ${PRINTOBJDIR} 22LLVM_TOOLCONF_OBJDIR!= cd ${NETBSDSRCDIR}/tools/llvm && ${PRINTOBJDIR}
cvs diff -r1.11 -r1.12 src/external/bsd/llvm/lib/libLLVMCodeGen/Attic/Makefile (expand / switch to unified diff)

--- src/external/bsd/llvm/lib/libLLVMCodeGen/Attic/Makefile 2011/12/11 14:58:50 1.11
+++ src/external/bsd/llvm/lib/libLLVMCodeGen/Attic/Makefile 2011/12/19 14:07:40 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.11 2011/12/11 14:58:50 joerg Exp $ 1# $NetBSD: Makefile,v 1.12 2011/12/19 14:07:40 joerg Exp $
2 2
3LIB= LLVMCodeGen 3LIB= LLVMCodeGen
4 4
5.include <bsd.init.mk> 5.include <bsd.init.mk>
6 6
7.PATH: ${LLVM_SRCDIR}/lib/CodeGen 7.PATH: ${LLVM_SRCDIR}/lib/CodeGen
8 8
9SRCS+= AggressiveAntiDepBreaker.cpp \ 9SRCS+= AggressiveAntiDepBreaker.cpp \
10 AllocationOrder.cpp \ 10 AllocationOrder.cpp \
11 Analysis.cpp \ 11 Analysis.cpp \
12 BranchFolding.cpp \ 12 BranchFolding.cpp \
13 CalcSpillWeights.cpp \ 13 CalcSpillWeights.cpp \
14 CallingConvLower.cpp \ 14 CallingConvLower.cpp \
@@ -43,26 +43,27 @@ SRCS+= AggressiveAntiDepBreaker.cpp \ @@ -43,26 +43,27 @@ SRCS+= AggressiveAntiDepBreaker.cpp \
43 LiveRangeEdit.cpp \ 43 LiveRangeEdit.cpp \
44 LocalStackSlotAllocation.cpp \ 44 LocalStackSlotAllocation.cpp \
45 MachineBasicBlock.cpp \ 45 MachineBasicBlock.cpp \
46 MachineBranchProbabilityInfo.cpp \ 46 MachineBranchProbabilityInfo.cpp \
47 MachineBlockFrequencyInfo.cpp \ 47 MachineBlockFrequencyInfo.cpp \
48 MachineBlockPlacement.cpp \ 48 MachineBlockPlacement.cpp \
49 MachineCSE.cpp \ 49 MachineCSE.cpp \
50 MachineDominators.cpp \ 50 MachineDominators.cpp \
51 MachineFunction.cpp \ 51 MachineFunction.cpp \
52 MachineFunctionAnalysis.cpp \ 52 MachineFunctionAnalysis.cpp \
53 MachineFunctionPass.cpp \ 53 MachineFunctionPass.cpp \
54 MachineFunctionPrinterPass.cpp \ 54 MachineFunctionPrinterPass.cpp \
55 MachineInstr.cpp \ 55 MachineInstr.cpp \
 56 MachineInstrBundle.cpp \
56 MachineLICM.cpp \ 57 MachineLICM.cpp \
57 MachineLoopInfo.cpp \ 58 MachineLoopInfo.cpp \
58 MachineLoopRanges.cpp \ 59 MachineLoopRanges.cpp \
59 MachineModuleInfo.cpp \ 60 MachineModuleInfo.cpp \
60 MachineModuleInfoImpls.cpp \ 61 MachineModuleInfoImpls.cpp \
61 MachinePassRegistry.cpp \ 62 MachinePassRegistry.cpp \
62 MachineRegisterInfo.cpp \ 63 MachineRegisterInfo.cpp \
63 MachineSSAUpdater.cpp \ 64 MachineSSAUpdater.cpp \
64 MachineSink.cpp \ 65 MachineSink.cpp \
65 MachineVerifier.cpp \ 66 MachineVerifier.cpp \
66 ObjectCodeEmitter.cpp \ 67 ObjectCodeEmitter.cpp \
67 OcamlGC.cpp \ 68 OcamlGC.cpp \
68 OptimizePHIs.cpp \ 69 OptimizePHIs.cpp \
@@ -88,26 +89,28 @@ SRCS+= AggressiveAntiDepBreaker.cpp \ @@ -88,26 +89,28 @@ SRCS+= AggressiveAntiDepBreaker.cpp \
88 ScheduleDAGInstrs.cpp \ 89 ScheduleDAGInstrs.cpp \
89 ScheduleDAGPrinter.cpp \ 90 ScheduleDAGPrinter.cpp \
90 ShadowStackGC.cpp \ 91 ShadowStackGC.cpp \
91 ShrinkWrapping.cpp \ 92 ShrinkWrapping.cpp \
92 SjLjEHPrepare.cpp \ 93 SjLjEHPrepare.cpp \
93 SlotIndexes.cpp \ 94 SlotIndexes.cpp \
94 Spiller.cpp \ 95 Spiller.cpp \
95 SpillPlacement.cpp \ 96 SpillPlacement.cpp \
96 SplitKit.cpp \ 97 SplitKit.cpp \
97 StackProtector.cpp \ 98 StackProtector.cpp \
98 StackSlotColoring.cpp \ 99 StackSlotColoring.cpp \
99 StrongPHIElimination.cpp \ 100 StrongPHIElimination.cpp \
100 TailDuplication.cpp \ 101 TailDuplication.cpp \
 102 TargetFrameLoweringImpl.cpp \
101 TargetInstrInfoImpl.cpp \ 103 TargetInstrInfoImpl.cpp \
102 TargetLoweringObjectFileImpl.cpp \ 104 TargetLoweringObjectFileImpl.cpp \
 105 TargetOptionsImpl.cpp \
103 TwoAddressInstructionPass.cpp \ 106 TwoAddressInstructionPass.cpp \
104 UnreachableBlockElim.cpp \ 107 UnreachableBlockElim.cpp \
105 VirtRegMap.cpp 108 VirtRegMap.cpp
106 109
107.if defined(HOSTLIB) 110.if defined(HOSTLIB)
108.include <bsd.hostlib.mk> 111.include <bsd.hostlib.mk>
109# Crashes some versions of GCC 112# Crashes some versions of GCC
110CPPFLAGS.RenderMachineFunction.cpp+= -O0 113CPPFLAGS.RenderMachineFunction.cpp+= -O0
111.else 114.else
112.include <bsd.lib.mk> 115.include <bsd.lib.mk>
113.endif 116.endif
cvs diff -r1.6 -r1.7 src/external/bsd/llvm/lib/libLLVMSupport/Attic/Makefile (expand / switch to unified diff)

--- src/external/bsd/llvm/lib/libLLVMSupport/Attic/Makefile 2011/10/11 13:53:59 1.6
+++ src/external/bsd/llvm/lib/libLLVMSupport/Attic/Makefile 2011/12/19 14:07:40 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.6 2011/10/11 13:53:59 joerg Exp $ 1# $NetBSD: Makefile,v 1.7 2011/12/19 14:07:40 joerg Exp $
2 2
3LIB= LLVMSupport 3LIB= LLVMSupport
4 4
5NOGCCERROR= yes 5NOGCCERROR= yes
6 6
7.include <bsd.init.mk> 7.include <bsd.init.mk>
8 8
9.PATH: ${LLVM_SRCDIR}/lib/Support 9.PATH: ${LLVM_SRCDIR}/lib/Support
10 10
11SRCS+= APFloat.cpp \ 11SRCS+= APFloat.cpp \
12 APInt.cpp \ 12 APInt.cpp \
13 APSInt.cpp \ 13 APSInt.cpp \
14 Allocator.cpp \ 14 Allocator.cpp \
@@ -22,26 +22,27 @@ SRCS+= APFloat.cpp \ @@ -22,26 +22,27 @@ SRCS+= APFloat.cpp \
22 Debug.cpp \ 22 Debug.cpp \
23 DeltaAlgorithm.cpp \ 23 DeltaAlgorithm.cpp \
24 DAGDeltaAlgorithm.cpp \ 24 DAGDeltaAlgorithm.cpp \
25 Dwarf.cpp \ 25 Dwarf.cpp \
26 ErrorHandling.cpp \ 26 ErrorHandling.cpp \
27 FileUtilities.cpp \ 27 FileUtilities.cpp \
28 FoldingSet.cpp \ 28 FoldingSet.cpp \
29 FormattedStream.cpp \ 29 FormattedStream.cpp \
30 GraphWriter.cpp \ 30 GraphWriter.cpp \
31 IntEqClasses.cpp \ 31 IntEqClasses.cpp \
32 IntervalMap.cpp \ 32 IntervalMap.cpp \
33 IsInf.cpp \ 33 IsInf.cpp \
34 IsNAN.cpp \ 34 IsNAN.cpp \
 35 JSONParser.cpp \
35 ManagedStatic.cpp \ 36 ManagedStatic.cpp \
36 MemoryBuffer.cpp \ 37 MemoryBuffer.cpp \
37 MemoryObject.cpp \ 38 MemoryObject.cpp \
38 PluginLoader.cpp \ 39 PluginLoader.cpp \
39 PrettyStackTrace.cpp \ 40 PrettyStackTrace.cpp \
40 Regex.cpp \ 41 Regex.cpp \
41 SmallPtrSet.cpp \ 42 SmallPtrSet.cpp \
42 SmallVector.cpp \ 43 SmallVector.cpp \
43 SourceMgr.cpp \ 44 SourceMgr.cpp \
44 Statistic.cpp \ 45 Statistic.cpp \
45 StringExtras.cpp \ 46 StringExtras.cpp \
46 StringMap.cpp \ 47 StringMap.cpp \
47 StringPool.cpp \ 48 StringPool.cpp \
cvs diff -r1.5 -r1.6 src/external/bsd/llvm/lib/libLLVMTarget/Attic/Makefile (expand / switch to unified diff)

--- src/external/bsd/llvm/lib/libLLVMTarget/Attic/Makefile 2011/09/01 12:24:36 1.5
+++ src/external/bsd/llvm/lib/libLLVMTarget/Attic/Makefile 2011/12/19 14:07:40 1.6
@@ -1,26 +1,25 @@ @@ -1,26 +1,25 @@
1# $NetBSD: Makefile,v 1.5 2011/09/01 12:24:36 joerg Exp $ 1# $NetBSD: Makefile,v 1.6 2011/12/19 14:07:40 joerg Exp $
2 2
3LIB= LLVMTarget 3LIB= LLVMTarget
4 4
5.include <bsd.init.mk> 5.include <bsd.init.mk>
6 6
7.PATH: ${LLVM_SRCDIR}/lib/Target 7.PATH: ${LLVM_SRCDIR}/lib/Target
8 8
9SRCS+= Mangler.cpp \ 9SRCS+= Mangler.cpp \
10 Target.cpp \ 10 Target.cpp \
11 TargetData.cpp \ 11 TargetData.cpp \
12 TargetELFWriterInfo.cpp \ 12 TargetELFWriterInfo.cpp \
13 TargetFrameLowering.cpp \ 
14 TargetInstrInfo.cpp \ 13 TargetInstrInfo.cpp \
15 TargetIntrinsicInfo.cpp \ 14 TargetIntrinsicInfo.cpp \
16 TargetLibraryInfo.cpp \ 15 TargetLibraryInfo.cpp \
17 TargetLoweringObjectFile.cpp \ 16 TargetLoweringObjectFile.cpp \
18 TargetMachine.cpp \ 17 TargetMachine.cpp \
19 TargetRegisterInfo.cpp \ 18 TargetRegisterInfo.cpp \
20 TargetSubtargetInfo.cpp 19 TargetSubtargetInfo.cpp
21 20
22.if defined(HOSTLIB) 21.if defined(HOSTLIB)
23.include <bsd.hostlib.mk> 22.include <bsd.hostlib.mk>
24.else 23.else
25.include <bsd.lib.mk> 24.include <bsd.lib.mk>
26.endif 25.endif
cvs diff -r1.6 -r1.7 src/external/bsd/llvm/lib/libLLVMTransformsUtils/Attic/Makefile (expand / switch to unified diff)

--- src/external/bsd/llvm/lib/libLLVMTransformsUtils/Attic/Makefile 2011/12/11 14:58:50 1.6
+++ src/external/bsd/llvm/lib/libLLVMTransformsUtils/Attic/Makefile 2011/12/19 14:07:40 1.7
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile,v 1.6 2011/12/11 14:58:50 joerg Exp $ 1# $NetBSD: Makefile,v 1.7 2011/12/19 14:07:40 joerg Exp $
2 2
3LIB= LLVMTransformsUtils 3LIB= LLVMTransformsUtils
4 4
5.include <bsd.init.mk> 5.include <bsd.init.mk>
6 6
7.PATH: ${LLVM_SRCDIR}/lib/Transforms/Utils 7.PATH: ${LLVM_SRCDIR}/lib/Transforms/Utils
8 8
9SRCS+= AddrModeMatcher.cpp \ 9SRCS+= AddrModeMatcher.cpp \
10 BasicBlockUtils.cpp \ 10 BasicBlockUtils.cpp \
11 BasicInliner.cpp \ 11 BasicInliner.cpp \
12 BreakCriticalEdges.cpp \ 12 BreakCriticalEdges.cpp \
13 BuildLibCalls.cpp \ 13 BuildLibCalls.cpp \
14 CloneFunction.cpp \ 14 CloneFunction.cpp \
15 CloneModule.cpp \ 15 CloneModule.cpp \
 16 CmpInstAnalysis.cpp \
16 CodeExtractor.cpp \ 17 CodeExtractor.cpp \
17 DemoteRegToStack.cpp \ 18 DemoteRegToStack.cpp \
18 InlineFunction.cpp \ 19 InlineFunction.cpp \
19 InstructionNamer.cpp \ 20 InstructionNamer.cpp \
20 LCSSA.cpp \ 21 LCSSA.cpp \
21 Local.cpp \ 22 Local.cpp \
22 LoopSimplify.cpp \ 23 LoopSimplify.cpp \
23 LoopUnroll.cpp \ 24 LoopUnroll.cpp \
24 LoopUnrollRuntime.cpp \ 25 LoopUnrollRuntime.cpp \
25 LowerExpectIntrinsic.cpp \ 26 LowerExpectIntrinsic.cpp \
26 LowerInvoke.cpp \ 27 LowerInvoke.cpp \
27 LowerSwitch.cpp \ 28 LowerSwitch.cpp \
28 Mem2Reg.cpp \ 29 Mem2Reg.cpp \
cvs diff -r1.1 -r1.2 src/external/bsd/llvm/lib/libclangDriver/Attic/Makefile (expand / switch to unified diff)

--- src/external/bsd/llvm/lib/libclangDriver/Attic/Makefile 2011/02/06 01:14:06 1.1
+++ src/external/bsd/llvm/lib/libclangDriver/Attic/Makefile 2011/12/19 14:07:40 1.2
@@ -1,32 +1,33 @@ @@ -1,32 +1,33 @@
1# $NetBSD: Makefile,v 1.1 2011/02/06 01:14:06 joerg Exp $ 1# $NetBSD: Makefile,v 1.2 2011/12/19 14:07:40 joerg Exp $
2 2
3LIB= clangDriver 3LIB= clangDriver
4 4
5.include <bsd.init.mk> 5.include <bsd.init.mk>
6 6
7.PATH: ${CLANG_SRCDIR}/lib/Driver 7.PATH: ${CLANG_SRCDIR}/lib/Driver
8 8
9SRCS+= Action.cpp \ 9SRCS+= Action.cpp \
10 Arg.cpp \ 10 Arg.cpp \
11 ArgList.cpp \ 11 ArgList.cpp \
12 CC1Options.cpp \ 12 CC1Options.cpp \
13 CC1AsOptions.cpp \ 13 CC1AsOptions.cpp \
14 Compilation.cpp \ 14 Compilation.cpp \
15 Driver.cpp \ 15 Driver.cpp \
16 DriverOptions.cpp \ 16 DriverOptions.cpp \
17 HostInfo.cpp \ 17 HostInfo.cpp \
18 Job.cpp \ 18 Job.cpp \
19 Option.cpp \ 19 Option.cpp \
20 OptTable.cpp \ 20 OptTable.cpp \
21 Phases.cpp \ 21 Phases.cpp \
22 Tool.cpp \ 22 Tool.cpp \
23 ToolChain.cpp \ 23 ToolChain.cpp \
24 ToolChains.cpp \ 24 ToolChains.cpp \
25 Tools.cpp \ 25 Tools.cpp \
26 Types.cpp 26 Types.cpp \
 27 WindowsToolChain.cpp
27 28
28.if defined(HOSTLIB) 29.if defined(HOSTLIB)
29.include <bsd.hostlib.mk> 30.include <bsd.hostlib.mk>
30.else 31.else
31.include <bsd.lib.mk> 32.include <bsd.lib.mk>
32.endif 33.endif
cvs diff -r1.8 -r1.9 src/external/bsd/llvm/lib/libclangFrontend/Attic/Makefile (expand / switch to unified diff)

--- src/external/bsd/llvm/lib/libclangFrontend/Attic/Makefile 2011/12/11 14:58:50 1.8
+++ src/external/bsd/llvm/lib/libclangFrontend/Attic/Makefile 2011/12/19 14:07:40 1.9
@@ -1,30 +1,31 @@ @@ -1,30 +1,31 @@
1# $NetBSD: Makefile,v 1.8 2011/12/11 14:58:50 joerg Exp $ 1# $NetBSD: Makefile,v 1.9 2011/12/19 14:07:40 joerg Exp $
2 2
3LIB= clangFrontend 3LIB= clangFrontend
4 4
5.include <bsd.init.mk> 5.include <bsd.init.mk>
6 6
7.PATH: ${CLANG_SRCDIR}/lib/Frontend 7.PATH: ${CLANG_SRCDIR}/lib/Frontend
8 8
9SRCS+= ASTConsumers.cpp \ 9SRCS+= ASTConsumers.cpp \
10 ASTMerge.cpp \ 10 ASTMerge.cpp \
11 ASTUnit.cpp \ 11 ASTUnit.cpp \
12 CacheTokens.cpp \ 12 CacheTokens.cpp \
13 ChainedIncludesSource.cpp \ 13 ChainedIncludesSource.cpp \
14 CompilerInstance.cpp \ 14 CompilerInstance.cpp \
15 CompilerInvocation.cpp \ 15 CompilerInvocation.cpp \
16 CreateInvocationFromCommandLine.cpp \ 16 CreateInvocationFromCommandLine.cpp \
17 DependencyFile.cpp \ 17 DependencyFile.cpp \
 18 DiagnosticRenderer.cpp \
18 FrontendAction.cpp \ 19 FrontendAction.cpp \
19 FrontendActions.cpp \ 20 FrontendActions.cpp \
20 FrontendOptions.cpp \ 21 FrontendOptions.cpp \
21 HeaderIncludeGen.cpp \ 22 HeaderIncludeGen.cpp \
22 InitHeaderSearch.cpp \ 23 InitHeaderSearch.cpp \
23 InitPreprocessor.cpp \ 24 InitPreprocessor.cpp \
24 LangStandards.cpp \ 25 LangStandards.cpp \
25 LogDiagnosticPrinter.cpp \ 26 LogDiagnosticPrinter.cpp \
26 MultiplexConsumer.cpp \ 27 MultiplexConsumer.cpp \
27 PrintPreprocessedOutput.cpp \ 28 PrintPreprocessedOutput.cpp \
28 SerializedDiagnosticPrinter.cpp \ 29 SerializedDiagnosticPrinter.cpp \
29 TextDiagnostic.cpp \ 30 TextDiagnostic.cpp \
30 TextDiagnosticBuffer.cpp \ 31 TextDiagnosticBuffer.cpp \