Module Name:    src
Committed By:   joerg
Date:           Thu Feb  9 17:58:57 UTC 2017

Modified Files:
        src/external/bsd/llvm: Makefile.inc
        src/external/bsd/llvm/lib/libLLVMAnalysis: Makefile
        src/external/bsd/llvm/lib/libLLVMDebugInfoCodeView: Makefile
        src/external/bsd/llvm/lib/libLLVMObject: Makefile
        src/external/bsd/llvm/lib/libLLVMScalarOpts: Makefile
Added Files:
        src/external/bsd/llvm/bin/llvm-xray: Makefile
        src/external/bsd/llvm/lib/libLLVMXRay: Makefile

Log Message:
Switch to the 4.0 release branch and update build glue for r294123.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/bin/llvm-xray/Makefile
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile
cvs rdiff -u -r1.2 -r1.3 \
    src/external/bsd/llvm/lib/libLLVMDebugInfoCodeView/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/llvm/lib/libLLVMObject/Makefile
cvs rdiff -u -r1.21 -r1.22 \
    src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/lib/libLLVMXRay/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.82 src/external/bsd/llvm/Makefile.inc:1.83
--- src/external/bsd/llvm/Makefile.inc:1.82	Wed Jan 11 12:02:24 2017
+++ src/external/bsd/llvm/Makefile.inc	Thu Feb  9 17:58:57 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.82 2017/01/11 12:02:24 joerg Exp $
+#	$NetBSD: Makefile.inc,v 1.83 2017/02/09 17:58:57 joerg Exp $
 
 .if !defined(LLVM_TOPLEVEL_MK)
 LLVM_TOPLEVEL_MK=
@@ -6,9 +6,9 @@ LLVM_TOPLEVEL_MK=
 .include <bsd.own.mk>
 
 SVN_ROOT=		http://llvm.org/svn/llvm-project
-SVN_BRANCH=		trunk
+SVN_BRANCH=		branches/release_40
 
-COMMON_REVISION=	r291444
+COMMON_REVISION=	r294123
 CLANG_REVISION=		${COMMON_REVISION}
 LLD_REVISION=		${COMMON_REVISION}
 LLDB_REVISION=		${COMMON_REVISION}

Index: src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile:1.22 src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile:1.23
--- src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile:1.22	Wed Jan 11 12:02:28 2017
+++ src/external/bsd/llvm/lib/libLLVMAnalysis/Makefile	Thu Feb  9 17:58:57 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.22 2017/01/11 12:02:28 joerg Exp $
+#	$NetBSD: Makefile,v 1.23 2017/02/09 17:58:57 joerg Exp $
 
 LIB=	LLVMAnalysis
 
@@ -51,9 +51,9 @@ SRCS+=	AliasAnalysis.cpp \
 	Lint.cpp \
 	Loads.cpp \
 	LoopAccessAnalysis.cpp \
+	LoopAnalysisManager.cpp \
 	LoopInfo.cpp \
 	LoopPass.cpp \
-	LoopPassManager.cpp \
 	LoopUnrollAnalyzer.cpp \
 	MemDepPrinter.cpp \
 	MemDerefPrinter.cpp \

Index: src/external/bsd/llvm/lib/libLLVMDebugInfoCodeView/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMDebugInfoCodeView/Makefile:1.2 src/external/bsd/llvm/lib/libLLVMDebugInfoCodeView/Makefile:1.3
--- src/external/bsd/llvm/lib/libLLVMDebugInfoCodeView/Makefile:1.2	Wed Jan 11 12:02:29 2017
+++ src/external/bsd/llvm/lib/libLLVMDebugInfoCodeView/Makefile	Thu Feb  9 17:58:57 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2017/01/11 12:02:29 joerg Exp $
+#	$NetBSD: Makefile,v 1.3 2017/02/09 17:58:57 joerg Exp $
 
 LIB=	LLVMDebugInfoCodeView
 
@@ -7,6 +7,7 @@ LIB=	LLVMDebugInfoCodeView
 .PATH: ${LLVM_SRCDIR}/lib/DebugInfo/CodeView
 
 SRCS+=	CVSymbolVisitor.cpp \
+	CVTypeDumper.cpp \
 	CVTypeVisitor.cpp \
 	CodeViewError.cpp \
 	CodeViewRecordIO.cpp \
@@ -17,7 +18,9 @@ SRCS+=	CVSymbolVisitor.cpp \
 	RecordSerialization.cpp \
 	SymbolDumper.cpp \
 	SymbolRecordMapping.cpp \
-	TypeDumper.cpp \
+	TypeDatabase.cpp \
+	TypeDatabaseVisitor.cpp \
+	TypeDumpVisitor.cpp \
 	TypeRecord.cpp \
 	TypeRecordMapping.cpp \
 	TypeSerializer.cpp \

Index: src/external/bsd/llvm/lib/libLLVMObject/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMObject/Makefile:1.13 src/external/bsd/llvm/lib/libLLVMObject/Makefile:1.14
--- src/external/bsd/llvm/lib/libLLVMObject/Makefile:1.13	Wed Jan 11 12:02:30 2017
+++ src/external/bsd/llvm/lib/libLLVMObject/Makefile	Thu Feb  9 17:58:57 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2017/01/11 12:02:30 joerg Exp $
+#	$NetBSD: Makefile,v 1.14 2017/02/09 17:58:57 joerg Exp $
 
 LIB=	LLVMObject
 
@@ -10,6 +10,7 @@ SRCS+=	Archive.cpp \
 	ArchiveWriter.cpp \
 	Binary.cpp \
 	COFFObjectFile.cpp \
+	Decompressor.cpp \
 	ELF.cpp \
 	ELFObjectFile.cpp \
 	Error.cpp \

Index: src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile:1.21 src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile:1.22
--- src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile:1.21	Wed Jan 11 12:02:31 2017
+++ src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile	Thu Feb  9 17:58:57 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.21 2017/01/11 12:02:31 joerg Exp $
+#	$NetBSD: Makefile,v 1.22 2017/02/09 17:58:57 joerg Exp $
 
 LIB=	LLVMScalarOpts
 
@@ -20,11 +20,13 @@ SRCS+=	ADCE.cpp \
 	GVN.cpp \
 	GVNHoist.cpp \
 	GuardWidening.cpp \
+	IVUsersPrinter.cpp \
 	IndVarSimplify.cpp \
 	InductiveRangeCheckElimination.cpp \
 	JumpThreading.cpp \
 	LICM.cpp \
 	LoadCombine.cpp \
+	LoopAccessAnalysisPrinter.cpp \
 	LoopDataPrefetch.cpp \
 	LoopDistribute.cpp \
 	LoopDeletion.cpp \
@@ -32,6 +34,7 @@ SRCS+=	ADCE.cpp \
 	LoopInstSimplify.cpp \
 	LoopInterchange.cpp \
 	LoopLoadElimination.cpp \
+	LoopPassManager.cpp \
 	LoopRerollPass.cpp \
 	LoopRotation.cpp \
 	LoopSimplifyCFG.cpp \

Added files:

Index: src/external/bsd/llvm/bin/llvm-xray/Makefile
diff -u /dev/null src/external/bsd/llvm/bin/llvm-xray/Makefile:1.1
--- /dev/null	Thu Feb  9 17:58:57 2017
+++ src/external/bsd/llvm/bin/llvm-xray/Makefile	Thu Feb  9 17:58:57 2017
@@ -0,0 +1,20 @@
+#	$NetBSD: Makefile,v 1.1 2017/02/09 17:58:57 joerg Exp $
+
+PROG_CXX=	llvm-xray
+NOMAN=		yes
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/tools/llvm-xray
+
+SRCS=	func-id-helper.cc \
+	xray-account.cc \
+	xray-converter.cc
+
+LLVM_LIBS+= \
+	Support \
+	Demangle
+
+.include "${.PARSEDIR}/../../link.mk"
+
+.include <bsd.prog.mk>

Index: src/external/bsd/llvm/lib/libLLVMXRay/Makefile
diff -u /dev/null src/external/bsd/llvm/lib/libLLVMXRay/Makefile:1.1
--- /dev/null	Thu Feb  9 17:58:57 2017
+++ src/external/bsd/llvm/lib/libLLVMXRay/Makefile	Thu Feb  9 17:58:57 2017
@@ -0,0 +1,11 @@
+#	$NetBSD: Makefile,v 1.1 2017/02/09 17:58:57 joerg Exp $
+
+LIB=	LLVMXRay
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/lib/XRay
+
+SRCS+=	Trace.cpp
+
+.include <bsd.lib.mk>

Reply via email to