From 7997799121230085c3c882e65ad275674d03d990 Mon Sep 17 00:00:00 2001
From: joerg <joerg@NetBSD.org>
Date: Sun, 20 Oct 2013 14:53:22 +0000
Subject: [PATCH] Update to LLVM/Clang r193040 for a bug fix in the phi
 splitting around landing pads.

---
 external/bsd/llvm/Makefile.inc                    |  4 ++--
 external/bsd/llvm/bin/lldb/Makefile               |  8 ++++++--
 external/bsd/llvm/lib/Makefile                    |  3 ++-
 external/bsd/llvm/lib/libLLVMCodeGen/Makefile     |  5 +++--
 external/bsd/llvm/lib/libLLVMMC/Makefile          |  3 ++-
 .../lib/liblldbPluginPlatformWindows/Makefile     | 15 +++++++++++++++
 6 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 external/bsd/llvm/lib/liblldbPluginPlatformWindows/Makefile

diff --git a/external/bsd/llvm/Makefile.inc b/external/bsd/llvm/Makefile.inc
index 463ad7c19887..0c39d86937db 100644
--- a/external/bsd/llvm/Makefile.inc
+++ b/external/bsd/llvm/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.58 2013/10/14 21:19:16 joerg Exp $
+#	$NetBSD: Makefile.inc,v 1.59 2013/10/20 14:53:22 joerg Exp $
 
 .if !defined(LLVM_TOPLEVEL_MK)
 LLVM_TOPLEVEL_MK=
@@ -7,7 +7,7 @@ LLVM_TOPLEVEL_MK=
 
 SVN_ROOT=		http://llvm.org/svn/llvm-project
 
-COMMON_REVISION=	192615
+COMMON_REVISION=	193040
 CLANG_REVISION=		${COMMON_REVISION}
 COMPILER_RT_REVISION=	${COMMON_REVISION}
 LLD_REVISION=		${COMMON_REVISION}
diff --git a/external/bsd/llvm/bin/lldb/Makefile b/external/bsd/llvm/bin/lldb/Makefile
index 0aaddb08cc37..02d35cc45d15 100644
--- a/external/bsd/llvm/bin/lldb/Makefile
+++ b/external/bsd/llvm/bin/lldb/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2013/09/29 12:11:59 joerg Exp $
+#	$NetBSD: Makefile,v 1.2 2013/10/20 14:53:22 joerg Exp $
 
 PROG_CXX=	lldb
 NOMAN=		yes
@@ -8,7 +8,10 @@ NOMAN=		yes
 .PATH: ${LLDB_SRCDIR}/tools/driver
 
 SRCS=	Driver.cpp \
-	IOChannel.cpp
+	ELWrapper.cpp \
+	GetOptWrapper.cpp \
+	IOChannel.cpp \
+	Platform.cpp
 
 CPPFLAGS.Driver.cpp+=	-Dgetopt_long_only=getopt_long
 
@@ -55,6 +58,7 @@ LLDB_LIBS+= \
 	PluginPlatformLinux \
 	PluginPlatformMacOSX \
 	PluginPlatformPOSIX \
+	PluginPlatformWindows \
 	PluginProcessElfCore \
 	PluginProcessNetBSD \
 	PluginProcessPOSIX \
diff --git a/external/bsd/llvm/lib/Makefile b/external/bsd/llvm/lib/Makefile
index 4928ef846fe1..a665f3e9b1a3 100644
--- a/external/bsd/llvm/lib/Makefile
+++ b/external/bsd/llvm/lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2013/09/29 12:11:59 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2013/10/20 14:53:22 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -197,6 +197,7 @@ SUBDIR+= \
 	liblldbPluginPlatformLinux \
 	liblldbPluginPlatformMacOSX \
 	liblldbPluginPlatformPOSIX \
+	liblldbPluginPlatformWindows \
 	liblldbPluginProcessElfCore \
 	liblldbPluginProcessNetBSD \
 	liblldbPluginProcessGDBRemote \
diff --git a/external/bsd/llvm/lib/libLLVMCodeGen/Makefile b/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
index 02a78a712ea6..4c45885450b2 100644
--- a/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
+++ b/external/bsd/llvm/lib/libLLVMCodeGen/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2013/10/14 21:19:16 joerg Exp $
+#	$NetBSD: Makefile,v 1.24 2013/10/20 14:53:22 joerg Exp $
 
 LIB=	LLVMCodeGen
 
@@ -40,10 +40,11 @@ SRCS+=	AggressiveAntiDepBreaker.cpp \
 	LiveIntervalAnalysis.cpp \
 	LiveIntervalUnion.cpp \
 	LiveRangeCalc.cpp \
+	LiveRangeEdit.cpp \
 	LiveRegMatrix.cpp \
+	LiveRegUnits.cpp \
 	LiveStackAnalysis.cpp \
 	LiveVariables.cpp \
-	LiveRangeEdit.cpp \
 	LocalStackSlotAllocation.cpp \
 	MachineBasicBlock.cpp \
 	MachineBranchProbabilityInfo.cpp \
diff --git a/external/bsd/llvm/lib/libLLVMMC/Makefile b/external/bsd/llvm/lib/libLLVMMC/Makefile
index bd6dec2d9342..5cfc4959fae5 100644
--- a/external/bsd/llvm/lib/libLLVMMC/Makefile
+++ b/external/bsd/llvm/lib/libLLVMMC/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2013/09/02 14:34:56 joerg Exp $
+#	$NetBSD: Makefile,v 1.14 2013/10/20 14:53:23 joerg Exp $
 
 LIB=	LLVMMC
 
@@ -11,6 +11,7 @@ SRCS+=	ELFObjectWriter.cpp \
 	MCAsmInfo.cpp \
 	MCAsmInfoCOFF.cpp \
 	MCAsmInfoDarwin.cpp \
+	MCAsmInfoELF.cpp \
 	MCAsmStreamer.cpp \
 	MCAssembler.cpp \
 	MCAtom.cpp \
diff --git a/external/bsd/llvm/lib/liblldbPluginPlatformWindows/Makefile b/external/bsd/llvm/lib/liblldbPluginPlatformWindows/Makefile
new file mode 100644
index 000000000000..73130c300b4a
--- /dev/null
+++ b/external/bsd/llvm/lib/liblldbPluginPlatformWindows/Makefile
@@ -0,0 +1,15 @@
+#	$NetBSD: Makefile,v 1.1 2013/10/20 14:53:23 joerg Exp $
+
+LIB=	lldbPluginPlatformWindows
+
+.include <bsd.init.mk>
+
+.PATH: ${LLDB_SRCDIR}/source/Plugins/Platform/Windows
+
+SRCS+=	PlatformWindows.cpp
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif