Merge GDB 7.5.1

gdb/features/mips64-dsp-linux.c

Index: gdb/features/mips64-dsp-linux.c
diff --git a/gdb/features/mips64-linux.c b/gdb/features/mips64-dsp-linux.c
similarity index 87%
copy from gdb/features/mips64-linux.c
copy to gdb/features/mips64-dsp-linux.c
index 73dce6d06c121f8245c88a036aedc1e9817154f8..3e67990b54ef6636fe7d21e2a6e8618453152de2 100644
--- a/gdb/features/mips64-linux.c
+++ b/gdb/features/mips64-dsp-linux.c
@@ -1,15 +1,15 @@
-/* THIS FILE IS GENERATED.  Original: mips64-linux.xml */
+/* THIS FILE IS GENERATED.  Original: mips64-dsp-linux.xml */
 
 #include "defs.h"
+#include "osabi.h"
 #include "target-descriptions.h"
 
-struct target_desc *tdesc_mips64_linux;
+struct target_desc *tdesc_mips64_dsp_linux;
 static void
-initialize_tdesc_mips64_linux (void)
+initialize_tdesc_mips64_dsp_linux (void)
 {
   struct target_desc *result = allocate_target_description ();
   struct tdesc_feature *feature;
-  struct tdesc_type *field_type, *type;
 
   set_tdesc_architecture (result, bfd_scan_arch ("mips"));
 
@@ -91,8 +91,17 @@ initialize_tdesc_mips64_linux (void)
   tdesc_create_reg (feature, "fcsr", 70, 1, "float", 64, "int");
   tdesc_create_reg (feature, "fir", 71, 1, "float", 64, "int");
 
+  feature = tdesc_create_feature (result, "org.gnu.gdb.mips.dsp");
+  tdesc_create_reg (feature, "hi1", 72, 1, NULL, 64, "int");
+  tdesc_create_reg (feature, "lo1", 73, 1, NULL, 64, "int");
+  tdesc_create_reg (feature, "hi2", 74, 1, NULL, 64, "int");
+  tdesc_create_reg (feature, "lo2", 75, 1, NULL, 64, "int");
+  tdesc_create_reg (feature, "hi3", 76, 1, NULL, 64, "int");
+  tdesc_create_reg (feature, "lo3", 77, 1, NULL, 64, "int");
+  tdesc_create_reg (feature, "dspctl", 78, 1, NULL, 32, "int");
+
   feature = tdesc_create_feature (result, "org.gnu.gdb.mips.linux");
-  tdesc_create_reg (feature, "restart", 72, 1, "system", 64, "int");
+  tdesc_create_reg (feature, "restart", 79, 1, "system", 64, "int");
 
-  tdesc_mips64_linux = result;
+  tdesc_mips64_dsp_linux = result;
 }