Merge GDB 7.5.1

gdb/features/i386/x32.c

Index: gdb/features/i386/x32.c
diff --git a/gdb/features/i386/amd64.c b/gdb/features/i386/x32.c
similarity index 94%
copy from gdb/features/i386/amd64.c
copy to gdb/features/i386/x32.c
index 154e8df1290c45f22697698a6b2c2190c2f1fbca..6342ddd2fece2b938c8dcd13b97b66985d2581f9 100644
--- a/gdb/features/i386/amd64.c
+++ b/gdb/features/i386/x32.c
@@ -1,18 +1,18 @@
-/* THIS FILE IS GENERATED.  Original: amd64.xml */
+/* THIS FILE IS GENERATED.  Original: x32.xml */
 
 #include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
-struct target_desc *tdesc_amd64;
+struct target_desc *tdesc_x32;
 static void
-initialize_tdesc_amd64 (void)
+initialize_tdesc_x32 (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 ("i386:x86-64"));
+  set_tdesc_architecture (result, bfd_scan_arch ("i386:x64-32"));
 
   feature = tdesc_create_feature (result, "org.gnu.gdb.i386.core");
   field_type = tdesc_create_flags (feature, "i386_eflags", 4);
@@ -40,8 +40,8 @@ initialize_tdesc_amd64 (void)
   tdesc_create_reg (feature, "rdx", 3, 1, NULL, 64, "int64");
   tdesc_create_reg (feature, "rsi", 4, 1, NULL, 64, "int64");
   tdesc_create_reg (feature, "rdi", 5, 1, NULL, 64, "int64");
-  tdesc_create_reg (feature, "rbp", 6, 1, NULL, 64, "data_ptr");
-  tdesc_create_reg (feature, "rsp", 7, 1, NULL, 64, "data_ptr");
+  tdesc_create_reg (feature, "rbp", 6, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "rsp", 7, 1, NULL, 64, "int64");
   tdesc_create_reg (feature, "r8", 8, 1, NULL, 64, "int64");
   tdesc_create_reg (feature, "r9", 9, 1, NULL, 64, "int64");
   tdesc_create_reg (feature, "r10", 10, 1, NULL, 64, "int64");
@@ -50,7 +50,7 @@ initialize_tdesc_amd64 (void)
   tdesc_create_reg (feature, "r13", 13, 1, NULL, 64, "int64");
   tdesc_create_reg (feature, "r14", 14, 1, NULL, 64, "int64");
   tdesc_create_reg (feature, "r15", 15, 1, NULL, 64, "int64");
-  tdesc_create_reg (feature, "rip", 16, 1, NULL, 64, "code_ptr");
+  tdesc_create_reg (feature, "rip", 16, 1, NULL, 64, "uint64");
   tdesc_create_reg (feature, "eflags", 17, 1, NULL, 32, "i386_eflags");
   tdesc_create_reg (feature, "cs", 18, 1, NULL, 32, "int32");
   tdesc_create_reg (feature, "ss", 19, 1, NULL, 32, "int32");
@@ -144,5 +144,5 @@ initialize_tdesc_amd64 (void)
   tdesc_create_reg (feature, "xmm15", 55, 1, NULL, 128, "vec128");
   tdesc_create_reg (feature, "mxcsr", 56, 1, "vector", 32, "i386_mxcsr");
 
-  tdesc_amd64 = result;
+  tdesc_x32 = result;
 }