Merge GDB 7.5.1

gdb/features/i386/x32-linux.c

Index: gdb/features/i386/x32-linux.c
diff --git a/gdb/features/i386/amd64-linux.c b/gdb/features/i386/x32-linux.c
similarity index 96%
copy from gdb/features/i386/amd64-linux.c
copy to gdb/features/i386/x32-linux.c
index 2eb9f96c356df681bfda5c7fc276361594ff0562..b42287dd7a68c14104edada106185274f5e00a35 100644
--- a/gdb/features/i386/amd64-linux.c
+++ b/gdb/features/i386/x32-linux.c
@@ -1,18 +1,18 @@
-/* THIS FILE IS GENERATED.  Original: amd64-linux.xml */
+/* THIS FILE IS GENERATED.  Original: x32-linux.xml */
 
 #include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
-struct target_desc *tdesc_amd64_linux;
+struct target_desc *tdesc_x32_linux;
 static void
-initialize_tdesc_amd64_linux (void)
+initialize_tdesc_x32_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 ("i386:x86-64"));
+  set_tdesc_architecture (result, bfd_scan_arch ("i386:x64-32"));
 
   set_tdesc_osabi (result, osabi_from_tdesc_string ("GNU/Linux"));
 
@@ -52,7 +52,7 @@ initialize_tdesc_amd64_linux (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, "int64");
+  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");
@@ -149,5 +149,5 @@ initialize_tdesc_amd64_linux (void)
   feature = tdesc_create_feature (result, "org.gnu.gdb.i386.linux");
   tdesc_create_reg (feature, "orig_rax", 57, 1, NULL, 64, "int");
 
-  tdesc_amd64_linux = result;
+  tdesc_x32_linux = result;
 }