Delete TARGET_MONITOR_PROMPT.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6b51c40aa624934b0fa262b23dc876587c131cbe..cf28e528486a30122e2c38cced395a94d91f76dc 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,17 @@
+Tue Jun  6 15:07:08 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+       * remote-mips.c (mips_open): Select the default monitor prompt
+       based on the target ISA.
+
+       * config/mips/tm-vr4100.h (TARGET_MONITOR_PROMPT),
+       config/mips/tm-vr4300el.h (TARGET_MONITOR_PROMPT),
+       config/mips/tm-vr4300.h (TARGET_MONITOR_PROMPT),
+       config/mips/tm-vr4xxx.h (TARGET_MONITOR_PROMPT),
+       config/mips/tm-vr4xxxel.h (TARGET_MONITOR_PROMPT),
+       config/mips/tm-vr5000el.h (TARGET_MONITOR_PROMPT),
+       config/mips/tm-vr5000.h (TARGET_MONITOR_PROMPT),
+       config/mips/tm-mips.h (TARGET_MONITOR_PROMPT): Delete macro.
+
 2000-06-05  Daniel Berlin  <dan@cgsoftware.com>
 
        * c-exp.y (yylex): template handling fixes.

diff --git a/gdb/config/mips/tm-mips.h b/gdb/config/mips/tm-mips.h
index 9d07e87de595067d7088872279c959cc4734bb5a..30d00aef7297c7e04fb7c0c0b6c4393dfcecc153 100644 (file)
--- a/gdb/config/mips/tm-mips.h
+++ b/gdb/config/mips/tm-mips.h
@@ -45,10 +45,6 @@ struct value;
 #define MIPS_EABI 0
 #endif
 
-#if !defined (TARGET_MONITOR_PROMPT)
-#define TARGET_MONITOR_PROMPT "<IDT>"
-#endif
-
 /* PC should be masked to remove possible MIPS16 flag */
 #if !defined (GDB_TARGET_MASK_DISAS_PC)
 #define GDB_TARGET_MASK_DISAS_PC(addr) UNMAKE_MIPS16_ADDR(addr)

diff --git a/gdb/config/mips/tm-vr4100.h b/gdb/config/mips/tm-vr4100.h
index c139f9743f1bef08e8a637e0e8ff587f219b6ec1..e28e28ed07c8715cf6314dae0b5e6511d0f8e974 100644 (file)
--- a/gdb/config/mips/tm-vr4100.h
+++ b/gdb/config/mips/tm-vr4100.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -20,7 +20,6 @@
 #define TARGET_BYTE_ORDER_SELECTABLE_P 1
 #define MIPS_EABI 1
 #define MIPS_DEFAULT_FPU_TYPE MIPS_FPU_NONE
-#define TARGET_MONITOR_PROMPT "<RISQ> "
 #define TARGET_PTR_BIT 64
 
 #include "mips/tm-bigmips64.h"

diff --git a/gdb/config/mips/tm-vr4300.h b/gdb/config/mips/tm-vr4300.h
index 273161ecc3049b08069576992e0df0b66aaea596..3f85dd05784e2eb8d53d5f6d58ab67ef4c65b5fd 100644 (file)
--- a/gdb/config/mips/tm-vr4300.h
+++ b/gdb/config/mips/tm-vr4300.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1996, 2000 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -18,6 +18,5 @@
    Boston, MA 02111-1307, USA.  */
 
 #define TARGET_BYTE_ORDER_SELECTABLE_P 1
-#define TARGET_MONITOR_PROMPT "<RISQ> "
 
 #include "mips/tm-bigmips64.h"

diff --git a/gdb/config/mips/tm-vr4300el.h b/gdb/config/mips/tm-vr4300el.h
index 1a938f3e6e75ccbd42f953cd04d2a74a8eea66a1..d45ab84c9bf4bbd92877ec8e7a8bb39236ae3be2 100644 (file)
--- a/gdb/config/mips/tm-vr4300el.h
+++ b/gdb/config/mips/tm-vr4300el.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1996, 2000 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -18,6 +18,5 @@
    Boston, MA 02111-1307, USA.  */
 
 #define TARGET_BYTE_ORDER_SELECTABLE_P 1
-#define TARGET_MONITOR_PROMPT "<RISQ> "
 
 #include "mips/tm-mips64.h"

diff --git a/gdb/config/mips/tm-vr4xxx.h b/gdb/config/mips/tm-vr4xxx.h
index 1f2a13133890d6843b4134c1709fdb428d9de81c..b8f99df81375ae5e68715873d0ff6139494c047f 100644 (file)
--- a/gdb/config/mips/tm-vr4xxx.h
+++ b/gdb/config/mips/tm-vr4xxx.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -20,6 +20,5 @@
 #define GDB_MULTI_ARCH 1
 #define MIPS_DEFAULT_FPU_TYPE MIPS_FPU_DOUBLE
 #define TARGET_BYTE_ORDER_SELECTABLE_P 1
-#define TARGET_MONITOR_PROMPT "<RISQ> "
 
 #include "mips/tm-bigmips64.h"

diff --git a/gdb/config/mips/tm-vr4xxxel.h b/gdb/config/mips/tm-vr4xxxel.h
index ae5227b518087b952022a25c36f6059a26a3a5d2..aaa2a249a6c69c277b76cdcd1b01a4c639a0aee2 100644 (file)
--- a/gdb/config/mips/tm-vr4xxxel.h
+++ b/gdb/config/mips/tm-vr4xxxel.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -20,6 +20,5 @@
 #define GDB_MULTI_ARCH 1
 #define MIPS_DEFAULT_FPU_TYPE MIPS_FPU_DOUBLE
 #define TARGET_BYTE_ORDER_SELECTABLE_P 1
-#define TARGET_MONITOR_PROMPT "<RISQ> "
 
 #include "mips/tm-mips64.h"

diff --git a/gdb/config/mips/tm-vr5000.h b/gdb/config/mips/tm-vr5000.h
index e3f66f01e0c5d84b9d93e126ac6cc67a4c37f362..a00a6a804c5b11d741246cb2f1449a66c6fdce1c 100644 (file)
--- a/gdb/config/mips/tm-vr5000.h
+++ b/gdb/config/mips/tm-vr5000.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 2000 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -19,7 +19,6 @@
 
 #define GDB_MULTI_ARCH 1
 #define TARGET_BYTE_ORDER_SELECTABLE_P 1
-#define TARGET_MONITOR_PROMPT "<RISQ> "
 #define MIPS_EABI 1
 
 #include "mips/tm-bigmips64.h"

diff --git a/gdb/config/mips/tm-vr5000el.h b/gdb/config/mips/tm-vr5000el.h
index 9fa47002c0ba23b76150457fff2fb692dc21e78e..78c3d5862b3266c6802927e3891e377e39f5a230 100644 (file)
--- a/gdb/config/mips/tm-vr5000el.h
+++ b/gdb/config/mips/tm-vr5000el.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 2000 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -19,7 +19,6 @@
 
 #define GDB_MULTI_ARCH 1
 #define TARGET_BYTE_ORDER_SELECTABLE_P 1
-#define TARGET_MONITOR_PROMPT "<RISQ> "
 #define MIPS_EABI 1
 
 #include "mips/tm-mips64.h"

diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c
index 883ee9e8617ef606220b05ba73a8806edd2e818c..0b75e4cbf7a4f544f21ae8c2422215df9447a120 100644 (file)
--- a/gdb/remote-mips.c
+++ b/gdb/remote-mips.c
@@ -1,5 +1,5 @@
 /* Remote debugging interface for MIPS remote debugging protocol.
-   Copyright 1993-1995, 2000 Free Software Foundation, Inc.
+   Copyright 1993, 1994, 1995, 2000 Free Software Foundation, Inc.
    Contributed by Cygnus Support.  Written by Ian Lance Taylor
    <ian@cygnus.com>.
 
@@ -1654,7 +1654,24 @@ mips_open (name, from_tty)
      char *name;
      int from_tty;
 {
-  common_open (&mips_ops, name, from_tty, MON_IDT, TARGET_MONITOR_PROMPT);
+  const char *monitor_prompt = NULL;
+  if (TARGET_ARCHITECTURE != NULL
+      && TARGET_ARCHITECTURE->arch == bfd_arch_mips)
+    {
+    switch (TARGET_ARCHITECTURE->mach)
+      {
+      case bfd_mach_mips4100:
+      case bfd_mach_mips4300:
+      case bfd_mach_mips4600:
+      case bfd_mach_mips4650:
+      case bfd_mach_mips5000:
+       monitor_prompt = "<RISQ> ";
+       break;
+      }
+    }
+  if (monitor_prompt == NULL)
+    monitor_prompt = "<IDT>";
+  common_open (&mips_ops, name, from_tty, MON_IDT, monitor_prompt);
 }
 
 static void