Rename vr4100 (vr4xxx) config files to vr4100.

Rename vr4xxx (vr4300) config files to vr4xxx.
Enable GDB_MULTI_ARCH in tm-vr4xxx.h

5 files changed, 44 insertions, 9 deletions

diff --git a/gdb/config/mips/.Sanitize b/gdb/config/mips/.Sanitize
index 4b512fa..f225e3d 100644
--- a/gdb/config/mips/.Sanitize
+++ b/gdb/config/mips/.Sanitize
@@ -61,6 +61,12 @@ else
 	lose_these_too="tm-vr4320.h vr4320.mt ${lose_these_too}"
 fi
 
+if ( echo $* | grep keep\-vr4xxx > /dev/null ) ; then
+	keep_these_too="tm-vr4xxx.h vr4xxx.mt ${keep_these_too}"
+else
+	lose_these_too="tm-vr4xxx.h vr4xxx.mt ${lose_these_too}"
+fi
+
 # All files listed between the "Things-to-keep:" line and the
 # "Files-to-sed:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
@@ -110,7 +116,7 @@ tm-mipsm3.h
 tm-mipsv4.h
 tm-tx39.h
 tm-tx39l.h
-tm-vr4xxx.h
+tm-vr4100.h
 tm-vr4300.h
 tm-vr4300el.h
 tm-vr5000.h
@@ -118,7 +124,7 @@ tm-vr5000el.h
 tm-vxmips.h
 tx39.mt
 tx39l.mt
-vr4xxx.mt
+vr4100.mt
 vr4300.mt
 vr4300el.mt
 vr5000.mt
diff --git a/gdb/config/mips/tm-vr4100.h b/gdb/config/mips/tm-vr4100.h
new file mode 100644
index 0000000..843f49c
--- /dev/null
+++ b/gdb/config/mips/tm-vr4100.h
@@ -0,0 +1,25 @@
+/* Copyright (C) 1998 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#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-vr4xxx.h b/gdb/config/mips/tm-vr4xxx.h
index ec5fa44..dc2e1c2 100644
--- a/gdb/config/mips/tm-vr4xxx.h
+++ b/gdb/config/mips/tm-vr4xxx.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1998 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -16,10 +16,9 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#define GDB_MULTI_ARCH 1
+#define MIPS_DEFAULT_FPU_TYPE MIPS_FPU_DOUBLE
 #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/vr4100.mt b/gdb/config/mips/vr4100.mt
new file mode 100644
index 0000000..c5ae4f9
--- /dev/null
+++ b/gdb/config/mips/vr4100.mt
@@ -0,0 +1,5 @@
+# Target: Big-endian SIM monitor board.
+TDEPFILES= mips-tdep.o remote-mips.o
+TM_FILE= tm-vr4100.h
+SIM_OBS = remote-sim.o
+SIM = ../sim/mips/libsim.a
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index d8169f9..513544a 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -170,8 +170,8 @@ mips*-dec-*)		gdb_target=decstation ;;
 mips64*el-*-ecoff*)	gdb_target=embedl64 ;;
 mips64*-*-ecoff*)	gdb_target=embed64 ;;
 # start-sanitize-vr4xxx
-mips64*vr4xxx*el-*-elf*)gdb_target=vr4300el ;;
-mips64*vr4xxx*-*-elf*)	gdb_target=vr4300 ;;
+#mips64*vr4xxx*el-*-elf*)gdb_target=vr4xxxel ;;
+mips64*vr4xxx*-*-elf*)	gdb_target=vr4xxx ;;
 # end-sanitize-vr4xxx
 # start-sanitize-vr4320
 mips64*vr4320*el-*-elf*)gdb_target=vr4300el ;;
@@ -180,7 +180,7 @@ mips64*vr4320*-*-elf*)	gdb_target=vr4320 ;;
 mips64*vr4300*el-*-elf*)	gdb_target=vr4300el ;;
 mips64*vr4300*-*-elf*)	gdb_target=vr4300 ;;
 mips64*vr4100*el-*-elf*)	gdb_target=vr4300el ;;
-mips64*vr4100*-*-elf*)	gdb_target=vr4xxx ;;
+mips64*vr4100*-*-elf*)	gdb_target=vr4100 ;;
 mips64*vr5000*el-*-elf*)	gdb_target=vr5000el ;;
 mips64*vr5000*-*-elf*)	gdb_target=vr5000
 		configdirs="${configdirs} gdbserver" ;;