Merge GDB 7.5.1

gdb/features/i386/x32-avx-linux.c

Index: gdb/features/i386/x32-avx-linux.c
diff --git a/gdb/features/i386/amd64-avx-linux.c b/gdb/features/i386/x32-avx-linux.c
similarity index 94%
copy from gdb/features/i386/amd64-avx-linux.c
copy to gdb/features/i386/x32-avx-linux.c
index 73392d3d8113aab4b409d73cbc73f3a647458541..d2e5ce96a4e04258b6740e9f80771de603396f7a 100644
--- a/gdb/features/i386/amd64-avx-linux.c
+++ b/gdb/features/i386/x32-avx-linux.c
@@ -1,18 +1,18 @@
-/* THIS FILE IS GENERATED.  Original: amd64-avx-linux.xml */
+/* THIS FILE IS GENERATED.  Original: x32-avx-linux.xml */
 
 #include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
-struct target_desc *tdesc_amd64_avx_linux;
+struct target_desc *tdesc_x32_avx_linux;
 static void
-initialize_tdesc_amd64_avx_linux (void)
+initialize_tdesc_x32_avx_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"));
 
@@ -42,8 +42,8 @@ initialize_tdesc_amd64_avx_linux (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");
@@ -52,7 +52,7 @@ initialize_tdesc_amd64_avx_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, "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");
@@ -167,5 +167,5 @@ initialize_tdesc_amd64_avx_linux (void)
   tdesc_create_reg (feature, "ymm14h", 72, 1, NULL, 128, "uint128");
   tdesc_create_reg (feature, "ymm15h", 73, 1, NULL, 128, "uint128");
 
-  tdesc_amd64_avx_linux = result;
+  tdesc_x32_avx_linux = result;
 }