Tue Jan 17 15:51:56 2012 UTC ()
Update LLVM/Clang snapshot to r148262 for some bugfixes.


(joerg)
diff -r1.28 -r1.29 src/external/bsd/llvm/Makefile.inc
diff -r1.17 -r1.18 src/external/bsd/llvm/lib/Makefile
diff -r1.13 -r1.14 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
diff -r0 -r1.1 src/external/bsd/llvm/lib/libLLVMMipsAsmParser/Makefile
diff -r1.2 -r1.3 src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile
diff -r0 -r1.1 src/tools/llvm-lib/libLLVMMipsAsmParser/Makefile
cvs diff -r1.28 -r1.29 src/external/bsd/llvm/Attic/Makefile.inc (expand / switch to unified diff)

--- src/external/bsd/llvm/Attic/Makefile.inc 2012/01/11 23:24:46 1.28
+++ src/external/bsd/llvm/Attic/Makefile.inc 2012/01/17 15:51:55 1.29
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile.inc,v 1.28 2012/01/11 23:24:46 joerg Exp $ 1# $NetBSD: Makefile.inc,v 1.29 2012/01/17 15:51:55 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= 147888 8LLVM_REVISION= 148262
9CLANG_REVISION= 147888 9CLANG_REVISION= 148262
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.17 -r1.18 src/external/bsd/llvm/lib/Attic/Makefile (expand / switch to unified diff)

--- src/external/bsd/llvm/lib/Attic/Makefile 2011/11/03 17:52:53 1.17
+++ src/external/bsd/llvm/lib/Attic/Makefile 2012/01/17 15:51:55 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.17 2011/11/03 17:52:53 joerg Exp $ 1# $NetBSD: Makefile,v 1.18 2012/01/17 15:51:55 joerg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7SUBDIR= \ 7SUBDIR= \
8 libLLVMAnalysis \ 8 libLLVMAnalysis \
9 libLLVMAsmParser \ 9 libLLVMAsmParser \
10 libLLVMAsmPrinter \ 10 libLLVMAsmPrinter \
11 libLLVMBitReader \ 11 libLLVMBitReader \
12 libLLVMBitWriter \ 12 libLLVMBitWriter \
13 libLLVMCodeGen \ 13 libLLVMCodeGen \
14 libLLVMCore \ 14 libLLVMCore \
@@ -32,26 +32,27 @@ SUBDIR= \ @@ -32,26 +32,27 @@ SUBDIR= \
32 libLLVMSparcCodeGen \ 32 libLLVMSparcCodeGen \
33 libLLVMX86CodeGen 33 libLLVMX86CodeGen
34 34
35SUBDIR+= .WAIT 35SUBDIR+= .WAIT
36 36
37SUBDIR+= \ 37SUBDIR+= \
38 libLLVMARMAsmParser \ 38 libLLVMARMAsmParser \
39 libLLVMARMAsmPrinter \ 39 libLLVMARMAsmPrinter \
40 libLLVMARMDisassembler \ 40 libLLVMARMDisassembler \
41 libLLVMARMMCTargetDesc \ 41 libLLVMARMMCTargetDesc \
42 libLLVMARMTargetInfo 42 libLLVMARMTargetInfo
43 43
44SUBDIR+= \ 44SUBDIR+= \
 45 libLLVMMipsAsmParser \
45 libLLVMMipsAsmPrinter \ 46 libLLVMMipsAsmPrinter \
46 libLLVMMipsMCTargetDesc \ 47 libLLVMMipsMCTargetDesc \
47 libLLVMMipsTargetInfo 48 libLLVMMipsTargetInfo
48 49
49SUBDIR+= \ 50SUBDIR+= \
50 libLLVMPowerPCAsmPrinter \ 51 libLLVMPowerPCAsmPrinter \
51 libLLVMPowerPCMCTargetDesc \ 52 libLLVMPowerPCMCTargetDesc \
52 libLLVMPowerPCTargetInfo 53 libLLVMPowerPCTargetInfo
53 54
54SUBDIR+= \ 55SUBDIR+= \
55 libLLVMSparcMCTargetDesc \ 56 libLLVMSparcMCTargetDesc \
56 libLLVMSparcTargetInfo 57 libLLVMSparcTargetInfo
57 58
cvs diff -r1.13 -r1.14 src/external/bsd/llvm/lib/libLLVMCodeGen/Attic/Makefile (expand / switch to unified diff)

--- src/external/bsd/llvm/lib/libLLVMCodeGen/Attic/Makefile 2012/01/11 23:24:47 1.13
+++ src/external/bsd/llvm/lib/libLLVMCodeGen/Attic/Makefile 2012/01/17 15:51:55 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.13 2012/01/11 23:24:47 joerg Exp $ 1# $NetBSD: Makefile,v 1.14 2012/01/17 15:51:55 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 \
@@ -53,39 +53,41 @@ SRCS+= AggressiveAntiDepBreaker.cpp \ @@ -53,39 +53,41 @@ SRCS+= AggressiveAntiDepBreaker.cpp \
53 MachineFunctionAnalysis.cpp \ 53 MachineFunctionAnalysis.cpp \
54 MachineFunctionPass.cpp \ 54 MachineFunctionPass.cpp \
55 MachineFunctionPrinterPass.cpp \ 55 MachineFunctionPrinterPass.cpp \
56 MachineInstr.cpp \ 56 MachineInstr.cpp \
57 MachineInstrBundle.cpp \ 57 MachineInstrBundle.cpp \
58 MachineLICM.cpp \ 58 MachineLICM.cpp \
59 MachineLoopInfo.cpp \ 59 MachineLoopInfo.cpp \
60 MachineLoopRanges.cpp \ 60 MachineLoopRanges.cpp \
61 MachineModuleInfo.cpp \ 61 MachineModuleInfo.cpp \
62 MachineModuleInfoImpls.cpp \ 62 MachineModuleInfoImpls.cpp \
63 MachinePassRegistry.cpp \ 63 MachinePassRegistry.cpp \
64 MachineRegisterInfo.cpp \ 64 MachineRegisterInfo.cpp \
65 MachineSSAUpdater.cpp \ 65 MachineSSAUpdater.cpp \
 66 MachineScheduler.cpp \
66 MachineSink.cpp \ 67 MachineSink.cpp \
67 MachineVerifier.cpp \ 68 MachineVerifier.cpp \
68 OcamlGC.cpp \ 69 OcamlGC.cpp \
69 OptimizePHIs.cpp \ 70 OptimizePHIs.cpp \
70 PHIElimination.cpp \ 71 PHIElimination.cpp \
71 PHIEliminationUtils.cpp \ 72 PHIEliminationUtils.cpp \
72 Passes.cpp \ 73 Passes.cpp \
73 PeepholeOptimizer.cpp \ 74 PeepholeOptimizer.cpp \
74 ScoreboardHazardRecognizer.cpp \ 75 ScoreboardHazardRecognizer.cpp \
75 PostRASchedulerList.cpp \ 76 PostRASchedulerList.cpp \
76 ProcessImplicitDefs.cpp \ 77 ProcessImplicitDefs.cpp \
77 PrologEpilogInserter.cpp \ 78 PrologEpilogInserter.cpp \
78 PseudoSourceValue.cpp \ 79 PseudoSourceValue.cpp \
 80 RegAllocBase.cpp \
79 RegAllocBasic.cpp \ 81 RegAllocBasic.cpp \
80 RegAllocFast.cpp \ 82 RegAllocFast.cpp \
81 RegAllocGreedy.cpp \ 83 RegAllocGreedy.cpp \
82 RegAllocPBQP.cpp \ 84 RegAllocPBQP.cpp \
83 RegisterClassInfo.cpp \ 85 RegisterClassInfo.cpp \
84 RegisterCoalescer.cpp \ 86 RegisterCoalescer.cpp \
85 RegisterScavenging.cpp \ 87 RegisterScavenging.cpp \
86 RenderMachineFunction.cpp \ 88 RenderMachineFunction.cpp \
87 ScheduleDAG.cpp \ 89 ScheduleDAG.cpp \
88 ScheduleDAGEmit.cpp \ 90 ScheduleDAGEmit.cpp \
89 ScheduleDAGInstrs.cpp \ 91 ScheduleDAGInstrs.cpp \
90 ScheduleDAGPrinter.cpp \ 92 ScheduleDAGPrinter.cpp \
91 ShadowStackGC.cpp \ 93 ShadowStackGC.cpp \
File Added: src/external/bsd/llvm/lib/libLLVMMipsAsmParser/Attic/Makefile
#	$NetBSD: Makefile,v 1.1 2012/01/17 15:51:55 joerg Exp $

LIB=	LLVMMipsAsmParser

.include <bsd.init.mk>

MIPS_OBJDIR!=	cd ${.CURDIR}/../libLLVMMipsCodeGen && ${PRINTOBJDIR}
CPPFLAGS+=	-I${MIPS_OBJDIR} -I${LLVM_SRCDIR}/lib/Target/Mips

.PATH: ${LLVM_SRCDIR}/lib/Target/Mips/AsmParser

SRCS+=	MipsAsmParser.cpp

.if defined(HOSTLIB)
.include <bsd.hostlib.mk>
.else
.include <bsd.lib.mk>
.endif
cvs diff -r1.2 -r1.3 src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Attic/Makefile (expand / switch to unified diff)

--- src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Attic/Makefile 2011/07/13 23:48:30 1.2
+++ src/external/bsd/llvm/lib/libLLVMRuntimeDyld/Attic/Makefile 2012/01/17 15:51:56 1.3
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1# $NetBSD: Makefile,v 1.2 2011/07/13 23:48:30 joerg Exp $ 1# $NetBSD: Makefile,v 1.3 2012/01/17 15:51:56 joerg Exp $
2 2
3LIB= LLVMRuntimeDyld 3LIB= LLVMRuntimeDyld
4 4
5.include <bsd.init.mk> 5.include <bsd.init.mk>
6 6
7.PATH: ${LLVM_SRCDIR}/lib/ExecutionEngine/RuntimeDyld 7.PATH: ${LLVM_SRCDIR}/lib/ExecutionEngine/RuntimeDyld
8 8
9SRCS+= RuntimeDyld.cpp \ 9SRCS+= RuntimeDyld.cpp \
 10 RuntimeDyldELF.cpp \
10 RuntimeDyldMachO.cpp 11 RuntimeDyldMachO.cpp
11 12
12.include <bsd.lib.mk> 13.include <bsd.lib.mk>
File Added: src/tools/llvm-lib/libLLVMMipsAsmParser/Makefile
#	$NetBSD: Makefile,v 1.1 2012/01/17 15:51:55 joerg Exp $

.include <bsd.init.mk>