From d53d543682d9add652a82d267681cf6426aded42 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Sat, 1 Sep 2018 10:30:18 -0600
Subject: [PATCH] Remove --enable-multi-ice

gdb's configure script accepts --enable-multi-ice, but the code this
refers to is long gone.  This patch removes the option entirely.

gdb/ChangeLog
2018-09-04  Tom Tromey  <tom@tromey.com>

	* configure: Rebuild.
	* configure.ac: Remove multi-ice code.
---
 gdb/ChangeLog    |  5 +++++
 gdb/configure    | 18 ------------------
 gdb/configure.ac | 12 ------------
 3 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8e6e3617848..f5db91e1143 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-09-04  Tom Tromey  <tom@tromey.com>
+
+	* configure: Rebuild.
+	* configure.ac: Remove multi-ice code.
+
 2018-09-04  Tom Tromey  <tom@tromey.com>
 
 	* Makefile.in (GDB_WARN_CFLAGS_NO_DEFS): Remove.
diff --git a/gdb/configure b/gdb/configure
index d207c2baf1b..270657103b6 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -892,7 +892,6 @@ with_tcl
 with_tk
 with_x
 enable_sim
-enable_multi_ice
 enable_gdbserver
 with_babeltrace
 with_libbabeltrace_prefix
@@ -916,7 +915,6 @@ YFLAGS
 XMKMF'
 ac_subdirs_all='testsuite
 gdbtk
-multi-ice
 gdbserver'
 
 # Initialize some variables set by options.
@@ -1559,7 +1557,6 @@ Optional Features:
                           enable GDB specific build-time compiler warnings if
                           gcc is used
   --enable-sim            link gdb with simulator
-  --enable-multi-ice      build the multi-ice-gdb-server
   --enable-gdbserver      automatically build gdbserver (yes/no/auto, default
                           is auto)
 
@@ -17089,21 +17086,6 @@ _ACEOF
 
 fi
 
-# Enable multi-ice-gdb-server.
-# Check whether --enable-multi-ice was given.
-if test "${enable_multi_ice+set}" = set; then :
-  enableval=$enable_multi_ice; case $enableval in
-    yes | no)
-      ;;
-    *) as_fn_error $? "bad value $enableval for --enable-multi-ice" "$LINENO" 5 ;;
-  esac
-fi
-
-if test "x$enable_multi_ice" = xyes; then
-   subdirs="$subdirs multi-ice"
-
-fi
-
 # Check whether --enable-gdbserver was given.
 if test "${enable_gdbserver+set}" = set; then :
   enableval=$enable_gdbserver; case "${enableval}" in
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 13bc5f9a8f2..e38604cb656 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -2160,18 +2160,6 @@ if test x"${gdb_osabi}" != x ; then
 		       [Define to the default OS ABI for this configuration.])
 fi
 
-# Enable multi-ice-gdb-server.
-AC_ARG_ENABLE(multi-ice,
-AS_HELP_STRING([--enable-multi-ice], [build the multi-ice-gdb-server]),
-  [case $enableval in
-    yes | no)
-      ;;
-    *) AC_MSG_ERROR([bad value $enableval for --enable-multi-ice]) ;;
-  esac])
-if test "x$enable_multi_ice" = xyes; then
-   AC_CONFIG_SUBDIRS(multi-ice)
-fi
-
 AC_ARG_ENABLE(gdbserver,
 AS_HELP_STRING([--enable-gdbserver],
                [automatically build gdbserver (yes/no/auto, default is auto)]),
-- 
2.30.2