Delete TARGET_MONITOR_PROMPT.

10 files changed, 40 insertions, 20 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6b51c40..cf28e52 100644
--- 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 9d07e87..30d00ae 100644
--- 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 c139f97..e28e28e 100644
--- 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 273161e..3f85dd0 100644
--- 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 1a938f3..d45ab84 100644
--- 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 1f2a131..b8f99df 100644
--- 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 ae5227b..aaa2a24 100644
--- 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 e3f66f0..a00a6a8 100644
--- 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 9fa4700..78c3d58 100644
--- 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 883ee9e..0b75e4c 100644
--- 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