Merge GDB 7.5.1

gdb/features/arm-with-m-vfp-d16.c

Index: gdb/features/arm-with-m-vfp-d16.c
diff --git a/gdb/features/arm-with-vfpv2.c b/gdb/features/arm-with-m-vfp-d16.c
similarity index 58%
copy from gdb/features/arm-with-vfpv2.c
copy to gdb/features/arm-with-m-vfp-d16.c
index ad872f8469d6daf898f630edb74634e141e129f0..cadeaf1a528d1e49235ad9c15ac4475b9ac6fdfa 100644
--- a/gdb/features/arm-with-vfpv2.c
+++ b/gdb/features/arm-with-m-vfp-d16.c
@@ -1,35 +1,34 @@
-/* THIS FILE IS GENERATED.  Original: arm-with-vfpv2.xml */
+/* THIS FILE IS GENERATED.  Original: arm-with-m-vfp-d16.xml */
 
 #include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
-struct target_desc *tdesc_arm_with_vfpv2;
+struct target_desc *tdesc_arm_with_m_vfp_d16;
 static void
-initialize_tdesc_arm_with_vfpv2 (void)
+initialize_tdesc_arm_with_m_vfp_d16 (void)
 {
   struct target_desc *result = allocate_target_description ();
   struct tdesc_feature *feature;
-  struct tdesc_type *field_type, *type;
 
-  feature = tdesc_create_feature (result, "org.gnu.gdb.arm.core");
-  tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "r1", 1, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "r2", 2, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "r3", 3, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "r4", 4, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "r5", 5, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "r6", 6, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "r7", 7, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "r8", 8, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "r9", 9, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "r10", 10, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "r11", 11, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "r12", 12, 1, NULL, 32, "uint32");
+  feature = tdesc_create_feature (result, "org.gnu.gdb.arm.m-profile");
+  tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "r1", 1, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "r2", 2, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "r3", 3, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "r4", 4, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "r5", 5, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "r6", 6, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "r7", 7, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "r8", 8, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "r9", 9, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "r10", 10, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "r11", 11, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "r12", 12, 1, NULL, 32, "int");
   tdesc_create_reg (feature, "sp", 13, 1, NULL, 32, "data_ptr");
   tdesc_create_reg (feature, "lr", 14, 1, NULL, 32, "int");
   tdesc_create_reg (feature, "pc", 15, 1, NULL, 32, "code_ptr");
-  tdesc_create_reg (feature, "cpsr", 25, 1, NULL, 32, "int");
+  tdesc_create_reg (feature, "xpsr", 25, 1, NULL, 32, "int");
 
   feature = tdesc_create_feature (result, "org.gnu.gdb.arm.vfp");
   tdesc_create_reg (feature, "d0", 26, 1, NULL, 64, "ieee_double");
@@ -50,5 +49,5 @@ initialize_tdesc_arm_with_vfpv2 (void)
   tdesc_create_reg (feature, "d15", 41, 1, NULL, 64, "ieee_double");
   tdesc_create_reg (feature, "fpscr", 42, 1, "float", 32, "int");
 
-  tdesc_arm_with_vfpv2 = result;
+  tdesc_arm_with_m_vfp_d16 = result;
 }