Update LLVM and Clang snapshot trunk
authorjoerg <joerg@NetBSD.org>
Thu, 12 May 2011 14:56:22 +0000
branchtrunk
changeset 200686 93892257d1e6
parent 200685 56cfc20caef2
child 200687 6b2d37ab59ff
Update LLVM and Clang snapshot
distrib/sets/lists/comp/md.amd64
distrib/sets/lists/comp/md.i386
external/bsd/llvm/Makefile.inc
external/bsd/llvm/bin/clang/Makefile
external/bsd/llvm/bin/lli/Makefile
external/bsd/llvm/include/Makefile
external/bsd/llvm/lib/Makefile
external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile
external/bsd/llvm/lib/libLLVMCodeGen/Makefile
external/bsd/llvm/lib/libLLVMInstrumentation/Makefile
external/bsd/llvm/lib/libLLVMMCDisassembler/Makefile
external/bsd/llvm/lib/libLLVMMCJIT/Makefile
external/bsd/llvm/lib/libLLVMObject/Makefile
external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile
external/bsd/llvm/lib/libLLVMX86AsmPrinter/Makefile
external/bsd/llvm/lib/libLLVMipo/Makefile
external/bsd/llvm/lib/libclangBasic/Makefile
external/bsd/llvm/lib/libclangCodeGen/Makefile
external/bsd/llvm/lib/libclangFrontend/Makefile
external/bsd/llvm/lib/libclangSema/Makefile
external/bsd/llvm/lib/libclangTooling/Makefile
tools/llvm-lib/libLLVMInstrumentation/Makefile
tools/llvm-lib/libLLVMRuntimeDyld/Makefile
--- a/distrib/sets/lists/comp/md.amd64	Thu May 12 10:32:41 2011 +0000
+++ b/distrib/sets/lists/comp/md.amd64	Thu May 12 14:56:22 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.113 2011/05/09 17:13:20 manu Exp $
+# $NetBSD: md.amd64,v 1.114 2011/05/12 14:56:22 joerg Exp $
 ./usr/include/amd64				comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
 ./usr/include/amd64/aout_machdep.h		comp-c-include
@@ -70,8 +70,9 @@
 ./usr/include/clang-3.0/avxintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/emmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/immintrin.h		comp-c-include		llvm
+./usr/include/clang-3.0/mm3dnow.h		comp-c-include		llvm
+./usr/include/clang-3.0/mmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/mm_malloc.h		comp-c-include		llvm
-./usr/include/clang-3.0/mmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/pmmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/smmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/tmmintrin.h		comp-c-include		llvm
--- a/distrib/sets/lists/comp/md.i386	Thu May 12 10:32:41 2011 +0000
+++ b/distrib/sets/lists/comp/md.i386	Thu May 12 14:56:22 2011 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: md.i386,v 1.117 2011/04/15 19:31:06 joerg Exp $
+# $NetBSD: md.i386,v 1.118 2011/05/12 14:56:22 joerg Exp $
 ./usr/include/clang-3.0/avxintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/emmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/immintrin.h		comp-c-include		llvm
+./usr/include/clang-3.0/mm3dnow.h		comp-c-include		llvm
+./usr/include/clang-3.0/mmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/mm_malloc.h		comp-c-include		llvm
-./usr/include/clang-3.0/mmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/pmmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/smmintrin.h		comp-c-include		llvm
 ./usr/include/clang-3.0/tmmintrin.h		comp-c-include		llvm
--- a/external/bsd/llvm/Makefile.inc	Thu May 12 10:32:41 2011 +0000
+++ b/external/bsd/llvm/Makefile.inc	Thu May 12 14:56:22 2011 +0000
@@ -1,12 +1,12 @@
-#	$NetBSD: Makefile.inc,v 1.5 2011/03/21 16:50:12 joerg Exp $
+#	$NetBSD: Makefile.inc,v 1.6 2011/05/12 14:56:22 joerg Exp $
 
 .if !defined(LLVM_TOPLEVEL_MK)
 LLVM_TOPLEVEL_MK=
 
 .include <bsd.own.mk>
 
-LLVM_REVISION=	127996
-CLANG_REVISION=	127996
+LLVM_REVISION=	130695
+CLANG_REVISION=	130695
 
 LLVM_SRCDIR:=	${.PARSEDIR}/dist/llvm
 CLANG_SRCDIR:=	${.PARSEDIR}/dist/clang
--- a/external/bsd/llvm/bin/clang/Makefile	Thu May 12 10:32:41 2011 +0000
+++ b/external/bsd/llvm/bin/clang/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2011/02/23 03:09:03 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2011/05/12 14:56:22 joerg Exp $
 
 PROG_CXX=	clang
 NOMAN=		yes
@@ -48,6 +48,7 @@
 	CodeGen \
 	Target \
 	InstCombine \
+	Instrumentation \
 	ScalarOpts \
 	Analysis \
 	MCDisassembler \
--- a/external/bsd/llvm/bin/lli/Makefile	Thu May 12 10:32:41 2011 +0000
+++ b/external/bsd/llvm/bin/lli/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2011/03/28 11:41:48 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2011/05/12 14:56:23 joerg Exp $
 
 PROG_CXX=	lli
 NOMAN=		yes
@@ -20,8 +20,10 @@
 	BitReader \
 	JIT \
 	MCJIT \
+	RuntimeDyld \
 	Interpreter \
 	ExecutionEngine \
+	Object \
 	SelectionDAG \
 	CodeGen \
 	Target \
--- a/external/bsd/llvm/include/Makefile	Thu May 12 10:32:41 2011 +0000
+++ b/external/bsd/llvm/include/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2011/04/15 19:31:07 joerg Exp $
+#	$NetBSD: Makefile,v 1.3 2011/05/12 14:56:23 joerg Exp $
 
 .include <bsd.init.mk>
 
@@ -8,8 +8,9 @@
 INCS=	avxintrin.h \
 	emmintrin.h \
 	immintrin.h \
+	mm3dnow.h \
+	mmintrin.h \
 	mm_malloc.h \
-	mmintrin.h \
 	pmmintrin.h \
 	smmintrin.h \
 	tmmintrin.h \
@@ -64,7 +65,8 @@
 	clang/Basic/DiagnosticLexKinds.inc|-gen-clang-diags-defs^-clang-component=Lex \
 	clang/Basic/DiagnosticParseKinds.inc|-gen-clang-diags-defs^-clang-component=Parse \
 	clang/Basic/DiagnosticSemaKinds.inc|-gen-clang-diags-defs^-clang-component=Sema \
-	clang/Basic/DiagnosticGroups.inc|-gen-clang-diag-groups
+	clang/Basic/DiagnosticGroups.inc|-gen-clang-diag-groups \
+	clang/Basic/DiagnosticIndexName.inc|-gen-clang-diags-index-name
 
 TABLEGEN_OUTPUT.arm_neon.td= \
 	clang/Basic/arm_neon.inc|-gen-arm-neon-sema \
--- a/external/bsd/llvm/lib/Makefile	Thu May 12 10:32:41 2011 +0000
+++ b/external/bsd/llvm/lib/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2011/03/28 11:41:48 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2011/05/12 14:56:23 joerg Exp $
+
+.include <bsd.own.mk>
 
 .include <bsd.own.mk>
 
@@ -11,6 +13,7 @@
 	libLLVMCodeGen \
 	libLLVMCore \
 	libLLVMInstCombine \
+	libLLVMInstrumentation \
 	libLLVMipa \
 	libLLVMipo \
 	libLLVMMC \
@@ -41,12 +44,12 @@
 	libLLVMCppBackendInfo \
 	libLLVMExecutionEngine \
 	libLLVMHello \
-	libLLVMInstrumentation \
 	libLLVMInterpreter \
 	libLLVMJIT \
 	libLLVMLinker \
 	libLLVMMCJIT \
-	libLLVMObject
+	libLLVMObject \
+	libLLVMRuntimeDyld
 .endif
 
 SUBDIR+= \
--- a/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile	Thu May 12 10:32:41 2011 +0000
+++ b/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2011/03/18 23:32:02 joerg Exp $
+#	$NetBSD: Makefile,v 1.3 2011/05/12 14:56:23 joerg Exp $
 
 LIB=	LLVMAsmPrinter
 
@@ -12,6 +12,7 @@
 	AsmPrinterInlineAsm.cpp \
 	DIE.cpp \
 	DwarfCFIException.cpp \
+	DwarfCompileUnit.cpp \
 	DwarfDebug.cpp \
 	DwarfException.cpp \
 	DwarfTableException.cpp \
--- a/external/bsd/llvm/lib/libLLVMCodeGen/Makefile	Thu May 12 10:32:41 2011 +0000
+++ b/external/bsd/llvm/lib/libLLVMCodeGen/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:13:55 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2011/05/12 14:56:23 joerg Exp $
 
 LIB=	LLVMCodeGen
 
@@ -26,6 +26,7 @@
 	GCStrategy.cpp \
 	IfConversion.cpp \
 	InlineSpiller.cpp \
+	InterferenceCache.cpp \
 	IntrinsicLowering.cpp \
 	LLVMTargetMachine.cpp \
 	LatencyPriorityQueue.cpp \
@@ -103,6 +104,8 @@
 
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>
+# Crashes some versions of GCC
+CPPFLAGS.RenderMachineFunction.cpp+= -O0
 .else
 .include <bsd.lib.mk>
 .endif
--- a/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile	Thu May 12 10:32:41 2011 +0000
+++ b/external/bsd/llvm/lib/libLLVMInstrumentation/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:13:57 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2011/05/12 14:56:23 joerg Exp $
 
 LIB=	LLVMInstrumentation
 
@@ -7,9 +7,14 @@
 .PATH: ${LLVM_SRCDIR}/lib/Transforms/Instrumentation
 
 SRCS+=	EdgeProfiling.cpp \
+	GCOVProfiling.cpp \
 	Instrumentation.cpp \
 	OptimalEdgeProfiling.cpp \
 	PathProfiling.cpp \
 	ProfilingUtils.cpp
 
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
 .include <bsd.lib.mk>
+.endif
--- a/external/bsd/llvm/lib/libLLVMMCDisassembler/Makefile	Thu May 12 10:32:41 2011 +0000
+++ b/external/bsd/llvm/lib/libLLVMMCDisassembler/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:13:59 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2011/05/12 14:56:23 joerg Exp $
 
 LIB=	LLVMMCDisassembler
 
@@ -6,7 +6,8 @@
 
 .PATH: ${LLVM_SRCDIR}/lib/MC/MCDisassembler
 
-SRCS+=	EDDisassembler.cpp \
+SRCS+=	Disassembler.cpp \
+	EDDisassembler.cpp \
 	EDOperand.cpp \
 	EDInst.cpp \
 	EDToken.cpp
--- a/external/bsd/llvm/lib/libLLVMMCJIT/Makefile	Thu May 12 10:32:41 2011 +0000
+++ b/external/bsd/llvm/lib/libLLVMMCJIT/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:14:00 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2011/05/12 14:56:23 joerg Exp $
 
 LIB=	LLVMMCJIT
 
@@ -6,7 +6,8 @@
 
 .PATH: ${LLVM_SRCDIR}/lib/ExecutionEngine/MCJIT
 
-SRCS+=	MCJIT.cpp \
+SRCS+=	Intercept.cpp \
+	MCJIT.cpp \
 	TargetSelect.cpp
 
 .include <bsd.lib.mk>
--- a/external/bsd/llvm/lib/libLLVMObject/Makefile	Thu May 12 10:32:41 2011 +0000
+++ b/external/bsd/llvm/lib/libLLVMObject/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:14:00 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2011/05/12 14:56:23 joerg Exp $
 
 LIB=	LLVMObject
 NOGCCERROR=	yes
@@ -10,6 +10,8 @@
 SRCS+=	COFFObjectFile.cpp \
 	ELFObjectFile.cpp \
 	MachOObject.cpp \
+	MachOObjectFile.cpp \
+	Object.cpp \
 	ObjectFile.cpp
 
 .include <bsd.lib.mk>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/llvm/lib/libLLVMRuntimeDyld/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -0,0 +1,11 @@
+#	$NetBSD: Makefile,v 1.1 2011/05/12 14:56:24 joerg Exp $
+
+LIB=	LLVMRuntimeDyld
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/lib/ExecutionEngine/RuntimeDyld
+
+SRCS+=	RuntimeDyld.cpp
+
+.include <bsd.lib.mk>
--- a/external/bsd/llvm/lib/libLLVMX86AsmPrinter/Makefile	Thu May 12 10:32:41 2011 +0000
+++ b/external/bsd/llvm/lib/libLLVMX86AsmPrinter/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:14:02 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2011/05/12 14:56:24 joerg Exp $
 
 LIB=	LLVMX86AsmPrinter
 NOGCCERROR=	yes
@@ -6,7 +6,7 @@
 .include <bsd.init.mk>
 
 X86_OBJDIR!=	cd ${.CURDIR}/../libLLVMX86CodeGen && ${PRINTOBJDIR}
-CPPFLAGS+=	-I${X86_OBJDIR}
+CPPFLAGS+=	-I${X86_OBJDIR} -I${LLVM_SRCDIR}/lib/Target/X86
 
 .PATH: ${LLVM_SRCDIR}/lib/Target/X86/InstPrinter
 
--- a/external/bsd/llvm/lib/libLLVMipo/Makefile	Thu May 12 10:32:41 2011 +0000
+++ b/external/bsd/llvm/lib/libLLVMipo/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:14:05 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2011/05/12 14:56:24 joerg Exp $
 
 LIB=	LLVMipo
 
@@ -26,8 +26,7 @@
 	PartialInlining.cpp \
 	PruneEH.cpp \
 	StripDeadPrototypes.cpp \
-	StripSymbols.cpp \
-	StructRetPromotion.cpp
+	StripSymbols.cpp
 
 .if defined(HOSTLIB)
 .include <bsd.hostlib.mk>
--- a/external/bsd/llvm/lib/libclangBasic/Makefile	Thu May 12 10:32:41 2011 +0000
+++ b/external/bsd/llvm/lib/libclangBasic/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:14:06 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2011/05/12 14:56:24 joerg Exp $
 
 LIB=	clangBasic
 
@@ -18,7 +18,8 @@
 	TargetInfo.cpp \
 	Targets.cpp \
 	TokenKinds.cpp \
-	Version.cpp
+	Version.cpp \
+	VersionTuple.cpp
 
 CPPFLAGS.version.cpp=	-DSVN_REVISON=\"${CLANG_REVISION}\"
 
--- a/external/bsd/llvm/lib/libclangCodeGen/Makefile	Thu May 12 10:32:41 2011 +0000
+++ b/external/bsd/llvm/lib/libclangCodeGen/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:14:06 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2011/05/12 14:56:24 joerg Exp $
 
 LIB=	clangCodeGen
 
@@ -27,6 +27,7 @@
 	CGObjC.cpp \
 	CGObjCGNU.cpp \
 	CGObjCMac.cpp \
+	CGObjCRuntime.cpp \
 	CGRecordLayoutBuilder.cpp \
 	CGRTTI.cpp \
 	CGStmt.cpp \
--- a/external/bsd/llvm/lib/libclangFrontend/Makefile	Thu May 12 10:32:41 2011 +0000
+++ b/external/bsd/llvm/lib/libclangFrontend/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2011/03/18 23:32:04 joerg Exp $
+#	$NetBSD: Makefile,v 1.3 2011/05/12 14:56:24 joerg Exp $
 
 LIB=	clangFrontend
 
@@ -13,6 +13,7 @@
 	CacheTokens.cpp \
 	CompilerInstance.cpp \
 	CompilerInvocation.cpp \
+	CreateInvocationFromCommandLine.cpp \
 	DependencyFile.cpp \
 	DiagChecker.cpp \
 	FrontendAction.cpp \
@@ -22,6 +23,7 @@
 	InitHeaderSearch.cpp \
 	InitPreprocessor.cpp \
 	LangStandards.cpp \
+	LogDiagnosticPrinter.cpp \
 	MultiplexConsumer.cpp \
 	PrintPreprocessedOutput.cpp \
 	TextDiagnosticBuffer.cpp \
--- a/external/bsd/llvm/lib/libclangSema/Makefile	Thu May 12 10:32:41 2011 +0000
+++ b/external/bsd/llvm/lib/libclangSema/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/02/06 01:14:09 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2011/05/12 14:56:24 joerg Exp $
 
 LIB=	clangSema
 
@@ -10,8 +10,10 @@
 	AttributeList.cpp \
 	CodeCompleteConsumer.cpp \
 	DeclSpec.cpp \
+	DelayedDiagnostic.cpp \
 	IdentifierResolver.cpp \
 	JumpDiagnostics.cpp \
+	Scope.cpp \
 	Sema.cpp \
 	SemaAccess.cpp \
 	SemaAttr.cpp \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/llvm/lib/libclangTooling/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -0,0 +1,16 @@
+#	$NetBSD: Makefile,v 1.1 2011/05/12 14:56:24 joerg Exp $
+
+LIB=	clangTooling
+
+.include <bsd.init.mk>
+
+.PATH: ${CLANG_SRCDIR}/lib/Tooling
+
+SRCS+=	JsonCompileCommandLineDatabase.cpp \
+	Tooling.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/llvm-lib/libLLVMInstrumentation/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2011/05/12 14:56:24 joerg Exp $
+
+.include <bsd.init.mk>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/llvm-lib/libLLVMRuntimeDyld/Makefile	Thu May 12 14:56:22 2011 +0000
@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2011/05/12 14:56:25 joerg Exp $
+
+.include <bsd.init.mk>