From 289da84381cb227be7c7189c2ba704ac4f503664 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Tue, 4 Sep 2018 09:55:41 -0600
Subject: [PATCH] Restore lldb build

commit 6c10142251 ("Update LLVM submodule") disabled the lldb build.
This patch updates the lldb and clang submodules to once again build
against the LLVM that is included in the Rust tree, and reverts the
.travis.yml changes from that patch.
---
 .gitmodules     | 4 ++--
 .travis.yml     | 6 +++---
 src/tools/clang | 2 +-
 src/tools/lldb  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 1631daac76c..5753e9ed45e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -59,8 +59,8 @@
 [submodule "src/tools/lldb"]
 	path = src/tools/lldb
 	url = https://github.com/rust-lang-nursery/lldb/
-	branch = rust-release-70
+	branch = rust-release-80-v1
 [submodule "src/tools/clang"]
 	path = src/tools/clang
 	url = https://github.com/rust-lang-nursery/clang/
-	branch = release_70
+	branch = rust-release-80-v1
diff --git a/.travis.yml b/.travis.yml
index 4a7c8f4b7cf..b1701e4a654 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ matrix:
 
     - env: >
         RUST_CHECK_TARGET=dist
-        RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler"
+        RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler --enable-lldb"
         SRC=.
         DEPLOY_ALT=1
         RUSTC_RETRY_LINKER_ON_SEGFAULT=1
@@ -87,7 +87,7 @@ matrix:
     # OSX 10.7 and `xcode7` is the latest Xcode able to compile LLVM for 10.7.
     - env: >
         RUST_CHECK_TARGET=dist
-        RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --enable-full-tools --enable-profiler"
+        RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --enable-full-tools --enable-profiler --enable-lldb"
         SRC=.
         DEPLOY=1
         RUSTC_RETRY_LINKER_ON_SEGFAULT=1
@@ -101,7 +101,7 @@ matrix:
 
     - env: >
         RUST_CHECK_TARGET=dist
-        RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler"
+        RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --enable-lldb"
         SRC=.
         DEPLOY=1
         RUSTC_RETRY_LINKER_ON_SEGFAULT=1
diff --git a/src/tools/clang b/src/tools/clang
index 2a284a70e26..d0fc1788123 160000
--- a/src/tools/clang
+++ b/src/tools/clang
@@ -1 +1 @@
-Subproject commit 2a284a70e26997273c296afe06586ffdf3a142fd
+Subproject commit d0fc1788123de9844c8088b977cd142021cea1f2
diff --git a/src/tools/lldb b/src/tools/lldb
index 3dbe998969d..3be47d264e9 160000
--- a/src/tools/lldb
+++ b/src/tools/lldb
@@ -1 +1 @@
-Subproject commit 3dbe998969d457c5cef245f61b48bdaed0f5c059
+Subproject commit 3be47d264e91844544d56078a18182b8a7418086