diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
index b9f624d..801ea79 100644
--- a/gdb/amd64-linux-tdep.c
+++ b/gdb/amd64-linux-tdep.c
@@ -40,16 +40,16 @@
 #include "xml-syscall.h"
 #include "glibc-tdep.h"
 
-#include "features/i386/amd64-linux.c"
-#include "features/i386/amd64-avx-linux.c"
-#include "features/i386/amd64-mpx-linux.c"
-#include "features/i386/amd64-avx-mpx-linux.c"
-#include "features/i386/amd64-avx-avx512-linux.c"
-#include "features/i386/amd64-avx-mpx-avx512-pku-linux.c"
+#include "features/i386/64bit-avx.c"
+#include "features/i386/64bit-avx512.c"
+#include "features/i386/64bit-core.c"
+#include "features/i386/64bit-linux.c"
+#include "features/i386/64bit-mpx.c"
+#include "features/i386/64bit-pkeys.c"
+#include "features/i386/64bit-segments.c"
+#include "features/i386/64bit-sse.c"
 
-#include "features/i386/x32-linux.c"
-#include "features/i386/x32-avx-linux.c"
-#include "features/i386/x32-avx-avx512-linux.c"
+#include "features/i386/x32-core.c"
 
 /* The syscall's XML filename for i386.  */
 #define XML_SYSCALL_FILENAME_AMD64 "syscalls/amd64-linux.xml"
@@ -1578,40 +1578,72 @@ amd64_linux_record_signal (struct gdbarch *gdbarch,
 const target_desc *
 amd64_linux_read_description (uint64_t xcr0_features_bit, bool is_x32)
 {
-  switch (xcr0_features_bit)
+  static target_desc *amd64_linux_tdescs \
+    [2/*AVX*/][2/*MPX*/][2/*AVX512*/][2/*PKRU*/] = {};
+  static target_desc *x32_linux_tdescs[2/*AVX*/][2/*AVX512*/] = {};
+
+  target_desc **tdesc;
+
+  if (is_x32)
     {
-    case X86_XSTATE_AVX_MPX_AVX512_PKU_MASK:
-      if (is_x32)
-	/* No MPX, PKU on x32, fall back to AVX-AVX512.  */
-	return tdesc_x32_avx_avx512_linux;
-      else
-	return tdesc_amd64_avx_mpx_avx512_pku_linux;
-    case X86_XSTATE_AVX_AVX512_MASK:
-      if (is_x32)
-	return tdesc_x32_avx_avx512_linux;
-      else
-	return tdesc_amd64_avx_avx512_linux;
-    case X86_XSTATE_MPX_MASK:
-      if (is_x32)
-	return tdesc_x32_avx_linux; /* No MPX on x32 using AVX.  */
-      else
-	return tdesc_amd64_mpx_linux;
-    case X86_XSTATE_AVX_MPX_MASK:
-      if (is_x32)
-	return tdesc_x32_avx_linux; /* No MPX on x32 using AVX.  */
-      else
-	return tdesc_amd64_avx_mpx_linux;
-    case X86_XSTATE_AVX_MASK:
-      if (is_x32)
-	return tdesc_x32_avx_linux;
-      else
-	return tdesc_amd64_avx_linux;
-    default:
-      if (is_x32)
-	return tdesc_x32_linux;
-      else
-	return tdesc_amd64_linux;
+      tdesc = &x32_linux_tdescs[(xcr0_features_bit & X86_XSTATE_AVX) ? 1 : 0 ]
+	[(xcr0_features_bit & X86_XSTATE_AVX512) ? 1 : 0];
+
+      if (*tdesc == NULL)
+	{
+	  *tdesc = allocate_target_description ();
+	  set_tdesc_architecture (*tdesc, bfd_scan_arch ("i386:x64-32"));
+	  set_tdesc_osabi (*tdesc, osabi_from_tdesc_string ("GNU/Linux"));
+
+	  long regnum = 0;
+
+	  regnum = create_feature_i386_x32_core (*tdesc, regnum);
+	  regnum = create_feature_i386_64bit_sse (*tdesc, regnum);
+	  regnum = create_feature_i386_64bit_linux (*tdesc, regnum);
+	  regnum = create_feature_i386_64bit_segments (*tdesc, regnum);
+
+	  if (xcr0_features_bit & X86_XSTATE_AVX)
+	    regnum = create_feature_i386_64bit_avx (*tdesc, regnum);
+
+	  if (xcr0_features_bit & X86_XSTATE_AVX512)
+	    regnum = create_feature_i386_64bit_avx512 (*tdesc, regnum);
+	}
     }
+  else
+    {
+      tdesc = &amd64_linux_tdescs[(xcr0_features_bit & X86_XSTATE_AVX) ? 1 : 0]
+	[(xcr0_features_bit & X86_XSTATE_MPX) ? 1 : 0]
+	[(xcr0_features_bit & X86_XSTATE_AVX512) ? 1 : 0]
+	[(xcr0_features_bit & X86_XSTATE_PKRU) ? 1 : 0];
+
+      if (*tdesc == NULL)
+	{
+	  *tdesc = allocate_target_description ();
+	  set_tdesc_architecture (*tdesc, bfd_scan_arch ("i386:x86-64"));
+	  set_tdesc_osabi (*tdesc, osabi_from_tdesc_string ("GNU/Linux"));
+
+	  long regnum = 0;
+
+	  regnum = create_feature_i386_64bit_core (*tdesc, regnum);
+	  regnum = create_feature_i386_64bit_sse (*tdesc, regnum);
+	  regnum = create_feature_i386_64bit_linux (*tdesc, regnum);
+	  regnum = create_feature_i386_64bit_segments (*tdesc, regnum);
+
+	  if (xcr0_features_bit & X86_XSTATE_AVX)
+	    regnum = create_feature_i386_64bit_avx (*tdesc, regnum);
+
+	  if (xcr0_features_bit & X86_XSTATE_MPX)
+	    regnum = create_feature_i386_64bit_mpx (*tdesc, regnum);
+
+	  if (xcr0_features_bit & X86_XSTATE_AVX512)
+	    regnum = create_feature_i386_64bit_avx512 (*tdesc, regnum);
+
+	  if (xcr0_features_bit & X86_XSTATE_PKRU)
+	    regnum = create_feature_i386_64bit_pkeys (*tdesc, regnum);
+	}
+    }
+
+  return *tdesc;
 }
 
 /* Get Linux/x86 target description from core dump.  */
@@ -2305,15 +2337,27 @@ _initialize_amd64_linux_tdep (void)
   gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x64_32,
 			  GDB_OSABI_LINUX, amd64_x32_linux_init_abi);
 
-  /* Initialize the Linux target description.  */
-  initialize_tdesc_amd64_linux ();
-  initialize_tdesc_amd64_avx_linux ();
-  initialize_tdesc_amd64_mpx_linux ();
-  initialize_tdesc_amd64_avx_mpx_linux ();
-  initialize_tdesc_amd64_avx_avx512_linux ();
-  initialize_tdesc_amd64_avx_mpx_avx512_pku_linux ();
-
-  initialize_tdesc_x32_linux ();
-  initialize_tdesc_x32_avx_linux ();
-  initialize_tdesc_x32_avx_avx512_linux ();
+#if GDB_SELF_TEST
+  std::pair<const char *, uint64_t> xml_masks[] = {
+    { "i386/amd64-linux.xml", X86_XSTATE_SSE_MASK },
+    { "i386/amd64-avx-linux.xml", X86_XSTATE_AVX_MASK },
+    { "i386/amd64-mpx-linux.xml", X86_XSTATE_MPX_MASK },
+    { "i386/amd64-avx-mpx-linux.xml", X86_XSTATE_AVX_MPX_MASK },
+    { "i386/amd64-avx-avx512-linux.xml", X86_XSTATE_AVX_AVX512_MASK },
+    { "i386/amd64-avx-mpx-avx512-pku-linux.xml",
+      X86_XSTATE_AVX_MPX_AVX512_PKU_MASK },
+    { "i386/x32-linux.xml", X86_XSTATE_SSE_MASK },
+    { "i386/x32-avx-linux.xml", X86_XSTATE_AVX_MASK },
+    { "i386/x32-avx-avx512-linux.xml", X86_XSTATE_AVX_AVX512_MASK },
+  };
+
+  for (auto &a : xml_masks)
+    {
+      auto tdesc =
+	amd64_linux_read_description (a.second,
+				      strncmp (a.first, "i386/x32", 8) == 0);
+
+      selftests::record_xml_tdesc (a.first, tdesc);
+    }
+#endif /* GDB_SELF_TEST */
 }
diff --git a/gdb/features/Makefile b/gdb/features/Makefile
index 9fdaeba..0f43565 100644
--- a/gdb/features/Makefile
+++ b/gdb/features/Makefile
@@ -251,7 +251,16 @@ FEATURE_XMLFILES = i386/32bit-core.xml \
 	i386/32bit-avx.xml \
 	i386/32bit-mpx.xml \
 	i386/32bit-avx512.xml \
-	i386/32bit-pkeys.xml
+	i386/32bit-pkeys.xml \
+	i386/64bit-avx512.xml \
+	i386/64bit-core.xml \
+	i386/64bit-mpx.xml \
+	i386/64bit-segments.xml \
+	i386/64bit-avx.xml \
+	i386/64bit-linux.xml \
+	i386/64bit-pkeys.xml \
+	i386/64bit-sse.xml \
+	i386/x32-core.xml
 
 FEATURE_CFILES = $(patsubst %.xml,%.c,$(FEATURE_XMLFILES))
 
@@ -273,7 +282,10 @@ $(FEATURE_CFILES): %.c: %.xml.tmp
 	echo "<!DOCTYPE target SYSTEM \"gdb-target.dtd\">" >> $@
 	echo "<target>" >> $@
 	echo "  <architecture>" >> $@
-	if test $(findstring i386/32bit-,$@); then echo "i386" >> $@ ; fi;
+	if test $(findstring i386/32bit-,$@); then echo "i386" >> $@ ; \
+	elif test $(findstring i386/64bit-,$@); then echo "i386:x86-64" >> $@; \
+	elif test $(findstring i386/x32-,$@); then echo "i386:x64-32" >> $@; \
+	fi;
 	echo "  </architecture>" >> $@
 	echo "  <xi:include href=\"$(notdir $<)\"/>" >> $@
 	echo "</target>" >> $@
diff --git a/gdb/features/i386/64bit-avx.c b/gdb/features/i386/64bit-avx.c
new file mode 100644
index 0000000..3edb3e8
--- /dev/null
+++ b/gdb/features/i386/64bit-avx.c
@@ -0,0 +1,35 @@
+/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
+  Original: 64bit-avx.xml.tmp */
+
+#ifdef GDBSERVER
+#include "tdesc.h"
+#else
+#include "defs.h"
+#include "osabi.h"
+#include "target-descriptions.h"
+#endif
+
+static int
+create_feature_i386_64bit_avx (struct target_desc *result, long regnum)
+{
+  struct tdesc_feature *feature;
+
+  feature = tdesc_create_feature (result, "org.gnu.gdb.i386.avx", "64bit-avx.xml");
+  tdesc_create_reg (feature, "ymm0h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm1h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm2h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm3h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm4h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm5h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm6h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm7h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm8h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm9h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm10h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm11h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm12h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm13h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm14h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm15h", regnum++, 1, NULL, 128, "uint128");
+  return regnum;
+}
diff --git a/gdb/features/i386/64bit-avx512.c b/gdb/features/i386/64bit-avx512.c
new file mode 100644
index 0000000..57c9a2a
--- /dev/null
+++ b/gdb/features/i386/64bit-avx512.c
@@ -0,0 +1,130 @@
+/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
+  Original: 64bit-avx512.xml.tmp */
+
+#ifdef GDBSERVER
+#include "tdesc.h"
+#else
+#include "defs.h"
+#include "osabi.h"
+#include "target-descriptions.h"
+#endif
+
+static int
+create_feature_i386_64bit_avx512 (struct target_desc *result, long regnum)
+{
+  struct tdesc_feature *feature;
+
+  feature = tdesc_create_feature (result, "org.gnu.gdb.i386.avx512", "64bit-avx512.xml");
+  struct tdesc_type *field_type;
+  field_type = tdesc_named_type (feature, "ieee_single");
+  tdesc_create_vector (feature, "v4f", field_type, 4);
+
+  field_type = tdesc_named_type (feature, "ieee_double");
+  tdesc_create_vector (feature, "v2d", field_type, 2);
+
+  field_type = tdesc_named_type (feature, "int8");
+  tdesc_create_vector (feature, "v16i8", field_type, 16);
+
+  field_type = tdesc_named_type (feature, "int16");
+  tdesc_create_vector (feature, "v8i16", field_type, 8);
+
+  field_type = tdesc_named_type (feature, "int32");
+  tdesc_create_vector (feature, "v4i32", field_type, 4);
+
+  field_type = tdesc_named_type (feature, "int64");
+  tdesc_create_vector (feature, "v2i64", field_type, 2);
+
+  struct tdesc_type *type;
+  type = tdesc_create_union (feature, "vec128");
+  field_type = tdesc_named_type (feature, "v4f");
+  tdesc_add_field (type, "v4_float", field_type);
+  field_type = tdesc_named_type (feature, "v2d");
+  tdesc_add_field (type, "v2_double", field_type);
+  field_type = tdesc_named_type (feature, "v16i8");
+  tdesc_add_field (type, "v16_int8", field_type);
+  field_type = tdesc_named_type (feature, "v8i16");
+  tdesc_add_field (type, "v8_int16", field_type);
+  field_type = tdesc_named_type (feature, "v4i32");
+  tdesc_add_field (type, "v4_int32", field_type);
+  field_type = tdesc_named_type (feature, "v2i64");
+  tdesc_add_field (type, "v2_int64", field_type);
+  field_type = tdesc_named_type (feature, "uint128");
+  tdesc_add_field (type, "uint128", field_type);
+
+  field_type = tdesc_named_type (feature, "uint128");
+  tdesc_create_vector (feature, "v2ui128", field_type, 2);
+
+  tdesc_create_reg (feature, "xmm16", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm17", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm18", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm19", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm20", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm21", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm22", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm23", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm24", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm25", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm26", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm27", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm28", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm29", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm30", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm31", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "ymm16h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm17h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm18h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm19h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm20h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm21h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm22h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm23h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm24h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm25h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm26h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm27h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm28h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm29h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm30h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "ymm31h", regnum++, 1, NULL, 128, "uint128");
+  tdesc_create_reg (feature, "k0", regnum++, 1, NULL, 64, "uint64");
+  tdesc_create_reg (feature, "k1", regnum++, 1, NULL, 64, "uint64");
+  tdesc_create_reg (feature, "k2", regnum++, 1, NULL, 64, "uint64");
+  tdesc_create_reg (feature, "k3", regnum++, 1, NULL, 64, "uint64");
+  tdesc_create_reg (feature, "k4", regnum++, 1, NULL, 64, "uint64");
+  tdesc_create_reg (feature, "k5", regnum++, 1, NULL, 64, "uint64");
+  tdesc_create_reg (feature, "k6", regnum++, 1, NULL, 64, "uint64");
+  tdesc_create_reg (feature, "k7", regnum++, 1, NULL, 64, "uint64");
+  tdesc_create_reg (feature, "zmm0h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm1h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm2h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm3h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm4h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm5h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm6h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm7h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm8h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm9h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm10h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm11h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm12h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm13h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm14h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm15h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm16h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm17h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm18h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm19h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm20h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm21h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm22h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm23h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm24h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm25h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm26h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm27h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm28h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm29h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm30h", regnum++, 1, NULL, 256, "v2ui128");
+  tdesc_create_reg (feature, "zmm31h", regnum++, 1, NULL, 256, "v2ui128");
+  return regnum;
+}
diff --git a/gdb/features/i386/64bit-core.c b/gdb/features/i386/64bit-core.c
new file mode 100644
index 0000000..4b7fae0
--- /dev/null
+++ b/gdb/features/i386/64bit-core.c
@@ -0,0 +1,80 @@
+/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
+  Original: 64bit-core.xml.tmp */
+
+#ifdef GDBSERVER
+#include "tdesc.h"
+#else
+#include "defs.h"
+#include "osabi.h"
+#include "target-descriptions.h"
+#endif
+
+static int
+create_feature_i386_64bit_core (struct target_desc *result, long regnum)
+{
+  struct tdesc_feature *feature;
+
+  feature = tdesc_create_feature (result, "org.gnu.gdb.i386.core", "64bit-core.xml");
+  struct tdesc_type *field_type;
+  struct tdesc_type *type;
+  type = tdesc_create_flags (feature, "i386_eflags", 4);
+  tdesc_add_flag (type, 0, "CF");
+  tdesc_add_flag (type, 1, "");
+  tdesc_add_flag (type, 2, "PF");
+  tdesc_add_flag (type, 4, "AF");
+  tdesc_add_flag (type, 6, "ZF");
+  tdesc_add_flag (type, 7, "SF");
+  tdesc_add_flag (type, 8, "TF");
+  tdesc_add_flag (type, 9, "IF");
+  tdesc_add_flag (type, 10, "DF");
+  tdesc_add_flag (type, 11, "OF");
+  tdesc_add_flag (type, 14, "NT");
+  tdesc_add_flag (type, 16, "RF");
+  tdesc_add_flag (type, 17, "VM");
+  tdesc_add_flag (type, 18, "AC");
+  tdesc_add_flag (type, 19, "VIF");
+  tdesc_add_flag (type, 20, "VIP");
+  tdesc_add_flag (type, 21, "ID");
+
+  tdesc_create_reg (feature, "rax", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "rbx", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "rcx", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "rdx", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "rsi", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "rdi", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "rbp", regnum++, 1, NULL, 64, "data_ptr");
+  tdesc_create_reg (feature, "rsp", regnum++, 1, NULL, 64, "data_ptr");
+  tdesc_create_reg (feature, "r8", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "r9", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "r10", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "r11", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "r12", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "r13", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "r14", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "r15", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "rip", regnum++, 1, NULL, 64, "code_ptr");
+  tdesc_create_reg (feature, "eflags", regnum++, 1, NULL, 32, "i386_eflags");
+  tdesc_create_reg (feature, "cs", regnum++, 1, NULL, 32, "int32");
+  tdesc_create_reg (feature, "ss", regnum++, 1, NULL, 32, "int32");
+  tdesc_create_reg (feature, "ds", regnum++, 1, NULL, 32, "int32");
+  tdesc_create_reg (feature, "es", regnum++, 1, NULL, 32, "int32");
+  tdesc_create_reg (feature, "fs", regnum++, 1, NULL, 32, "int32");
+  tdesc_create_reg (feature, "gs", regnum++, 1, NULL, 32, "int32");
+  tdesc_create_reg (feature, "st0", regnum++, 1, NULL, 80, "i387_ext");
+  tdesc_create_reg (feature, "st1", regnum++, 1, NULL, 80, "i387_ext");
+  tdesc_create_reg (feature, "st2", regnum++, 1, NULL, 80, "i387_ext");
+  tdesc_create_reg (feature, "st3", regnum++, 1, NULL, 80, "i387_ext");
+  tdesc_create_reg (feature, "st4", regnum++, 1, NULL, 80, "i387_ext");
+  tdesc_create_reg (feature, "st5", regnum++, 1, NULL, 80, "i387_ext");
+  tdesc_create_reg (feature, "st6", regnum++, 1, NULL, 80, "i387_ext");
+  tdesc_create_reg (feature, "st7", regnum++, 1, NULL, 80, "i387_ext");
+  tdesc_create_reg (feature, "fctrl", regnum++, 1, "float", 32, "int");
+  tdesc_create_reg (feature, "fstat", regnum++, 1, "float", 32, "int");
+  tdesc_create_reg (feature, "ftag", regnum++, 1, "float", 32, "int");
+  tdesc_create_reg (feature, "fiseg", regnum++, 1, "float", 32, "int");
+  tdesc_create_reg (feature, "fioff", regnum++, 1, "float", 32, "int");
+  tdesc_create_reg (feature, "foseg", regnum++, 1, "float", 32, "int");
+  tdesc_create_reg (feature, "fooff", regnum++, 1, "float", 32, "int");
+  tdesc_create_reg (feature, "fop", regnum++, 1, "float", 32, "int");
+  return regnum;
+}
diff --git a/gdb/features/i386/64bit-linux.c b/gdb/features/i386/64bit-linux.c
new file mode 100644
index 0000000..1e0b595
--- /dev/null
+++ b/gdb/features/i386/64bit-linux.c
@@ -0,0 +1,21 @@
+/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
+  Original: 64bit-linux.xml.tmp */
+
+#ifdef GDBSERVER
+#include "tdesc.h"
+#else
+#include "defs.h"
+#include "osabi.h"
+#include "target-descriptions.h"
+#endif
+
+static int
+create_feature_i386_64bit_linux (struct target_desc *result, long regnum)
+{
+  struct tdesc_feature *feature;
+
+  feature = tdesc_create_feature (result, "org.gnu.gdb.i386.linux", "64bit-linux.xml");
+  regnum = 57;
+  tdesc_create_reg (feature, "orig_rax", regnum++, 1, NULL, 64, "int");
+  return regnum;
+}
diff --git a/gdb/features/i386/64bit-mpx.c b/gdb/features/i386/64bit-mpx.c
new file mode 100644
index 0000000..c7415f6
--- /dev/null
+++ b/gdb/features/i386/64bit-mpx.c
@@ -0,0 +1,57 @@
+/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
+  Original: 64bit-mpx.xml.tmp */
+
+#ifdef GDBSERVER
+#include "tdesc.h"
+#else
+#include "defs.h"
+#include "osabi.h"
+#include "target-descriptions.h"
+#endif
+
+static int
+create_feature_i386_64bit_mpx (struct target_desc *result, long regnum)
+{
+  struct tdesc_feature *feature;
+
+  feature = tdesc_create_feature (result, "org.gnu.gdb.i386.mpx", "64bit-mpx.xml");
+  struct tdesc_type *field_type;
+  struct tdesc_type *type;
+  type = tdesc_create_struct (feature, "br128");
+  field_type = tdesc_named_type (feature, "uint64");
+  tdesc_add_field (type, "lbound", field_type);
+  field_type = tdesc_named_type (feature, "uint64");
+  tdesc_add_field (type, "ubound_raw", field_type);
+
+  type = tdesc_create_struct (feature, "_bndstatus");
+  tdesc_set_struct_size (type, 8);
+  tdesc_add_bitfield (type, "bde", 2, 63);
+  tdesc_add_bitfield (type, "error", 0, 1);
+
+  type = tdesc_create_union (feature, "status");
+  field_type = tdesc_named_type (feature, "data_ptr");
+  tdesc_add_field (type, "raw", field_type);
+  field_type = tdesc_named_type (feature, "_bndstatus");
+  tdesc_add_field (type, "status", field_type);
+
+  type = tdesc_create_struct (feature, "_bndcfgu");
+  tdesc_set_struct_size (type, 8);
+  tdesc_add_bitfield (type, "base", 12, 63);
+  tdesc_add_bitfield (type, "reserved", 2, 11);
+  tdesc_add_bitfield (type, "preserved", 1, 1);
+  tdesc_add_bitfield (type, "enabled", 0, 0);
+
+  type = tdesc_create_union (feature, "cfgu");
+  field_type = tdesc_named_type (feature, "data_ptr");
+  tdesc_add_field (type, "raw", field_type);
+  field_type = tdesc_named_type (feature, "_bndcfgu");
+  tdesc_add_field (type, "config", field_type);
+
+  tdesc_create_reg (feature, "bnd0raw", regnum++, 1, NULL, 128, "br128");
+  tdesc_create_reg (feature, "bnd1raw", regnum++, 1, NULL, 128, "br128");
+  tdesc_create_reg (feature, "bnd2raw", regnum++, 1, NULL, 128, "br128");
+  tdesc_create_reg (feature, "bnd3raw", regnum++, 1, NULL, 128, "br128");
+  tdesc_create_reg (feature, "bndcfgu", regnum++, 1, NULL, 64, "cfgu");
+  tdesc_create_reg (feature, "bndstatus", regnum++, 1, NULL, 64, "status");
+  return regnum;
+}
diff --git a/gdb/features/i386/64bit-pkeys.c b/gdb/features/i386/64bit-pkeys.c
new file mode 100644
index 0000000..66d3903
--- /dev/null
+++ b/gdb/features/i386/64bit-pkeys.c
@@ -0,0 +1,20 @@
+/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
+  Original: 64bit-pkeys.xml.tmp */
+
+#ifdef GDBSERVER
+#include "tdesc.h"
+#else
+#include "defs.h"
+#include "osabi.h"
+#include "target-descriptions.h"
+#endif
+
+static int
+create_feature_i386_64bit_pkeys (struct target_desc *result, long regnum)
+{
+  struct tdesc_feature *feature;
+
+  feature = tdesc_create_feature (result, "org.gnu.gdb.i386.pkeys", "64bit-pkeys.xml");
+  tdesc_create_reg (feature, "pkru", regnum++, 1, NULL, 32, "uint32");
+  return regnum;
+}
diff --git a/gdb/features/i386/64bit-segments.c b/gdb/features/i386/64bit-segments.c
new file mode 100644
index 0000000..13f5a52
--- /dev/null
+++ b/gdb/features/i386/64bit-segments.c
@@ -0,0 +1,21 @@
+/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
+  Original: 64bit-segments.xml.tmp */
+
+#ifdef GDBSERVER
+#include "tdesc.h"
+#else
+#include "defs.h"
+#include "osabi.h"
+#include "target-descriptions.h"
+#endif
+
+static int
+create_feature_i386_64bit_segments (struct target_desc *result, long regnum)
+{
+  struct tdesc_feature *feature;
+
+  feature = tdesc_create_feature (result, "org.gnu.gdb.i386.segments", "64bit-segments.xml");
+  tdesc_create_reg (feature, "fs_base", regnum++, 1, NULL, 64, "int");
+  tdesc_create_reg (feature, "gs_base", regnum++, 1, NULL, 64, "int");
+  return regnum;
+}
diff --git a/gdb/features/i386/64bit-sse.c b/gdb/features/i386/64bit-sse.c
new file mode 100644
index 0000000..d7eadd2
--- /dev/null
+++ b/gdb/features/i386/64bit-sse.c
@@ -0,0 +1,89 @@
+/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
+  Original: 64bit-sse.xml.tmp */
+
+#ifdef GDBSERVER
+#include "tdesc.h"
+#else
+#include "defs.h"
+#include "osabi.h"
+#include "target-descriptions.h"
+#endif
+
+static int
+create_feature_i386_64bit_sse (struct target_desc *result, long regnum)
+{
+  struct tdesc_feature *feature;
+
+  feature = tdesc_create_feature (result, "org.gnu.gdb.i386.sse", "64bit-sse.xml");
+  struct tdesc_type *field_type;
+  field_type = tdesc_named_type (feature, "ieee_single");
+  tdesc_create_vector (feature, "v4f", field_type, 4);
+
+  field_type = tdesc_named_type (feature, "ieee_double");
+  tdesc_create_vector (feature, "v2d", field_type, 2);
+
+  field_type = tdesc_named_type (feature, "int8");
+  tdesc_create_vector (feature, "v16i8", field_type, 16);
+
+  field_type = tdesc_named_type (feature, "int16");
+  tdesc_create_vector (feature, "v8i16", field_type, 8);
+
+  field_type = tdesc_named_type (feature, "int32");
+  tdesc_create_vector (feature, "v4i32", field_type, 4);
+
+  field_type = tdesc_named_type (feature, "int64");
+  tdesc_create_vector (feature, "v2i64", field_type, 2);
+
+  struct tdesc_type *type;
+  type = tdesc_create_union (feature, "vec128");
+  field_type = tdesc_named_type (feature, "v4f");
+  tdesc_add_field (type, "v4_float", field_type);
+  field_type = tdesc_named_type (feature, "v2d");
+  tdesc_add_field (type, "v2_double", field_type);
+  field_type = tdesc_named_type (feature, "v16i8");
+  tdesc_add_field (type, "v16_int8", field_type);
+  field_type = tdesc_named_type (feature, "v8i16");
+  tdesc_add_field (type, "v8_int16", field_type);
+  field_type = tdesc_named_type (feature, "v4i32");
+  tdesc_add_field (type, "v4_int32", field_type);
+  field_type = tdesc_named_type (feature, "v2i64");
+  tdesc_add_field (type, "v2_int64", field_type);
+  field_type = tdesc_named_type (feature, "uint128");
+  tdesc_add_field (type, "uint128", field_type);
+
+  type = tdesc_create_flags (feature, "i386_mxcsr", 4);
+  tdesc_add_flag (type, 0, "IE");
+  tdesc_add_flag (type, 1, "DE");
+  tdesc_add_flag (type, 2, "ZE");
+  tdesc_add_flag (type, 3, "OE");
+  tdesc_add_flag (type, 4, "UE");
+  tdesc_add_flag (type, 5, "PE");
+  tdesc_add_flag (type, 6, "DAZ");
+  tdesc_add_flag (type, 7, "IM");
+  tdesc_add_flag (type, 8, "DM");
+  tdesc_add_flag (type, 9, "ZM");
+  tdesc_add_flag (type, 10, "OM");
+  tdesc_add_flag (type, 11, "UM");
+  tdesc_add_flag (type, 12, "PM");
+  tdesc_add_flag (type, 15, "FZ");
+
+  regnum = 40;
+  tdesc_create_reg (feature, "xmm0", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm1", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm2", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm3", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm4", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm5", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm6", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm7", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm8", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm9", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm10", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm11", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm12", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm13", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm14", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "xmm15", regnum++, 1, NULL, 128, "vec128");
+  tdesc_create_reg (feature, "mxcsr", regnum++, 1, "vector", 32, "i386_mxcsr");
+  return regnum;
+}
diff --git a/gdb/features/i386/x32-core.c b/gdb/features/i386/x32-core.c
new file mode 100644
index 0000000..dc74313
--- /dev/null
+++ b/gdb/features/i386/x32-core.c
@@ -0,0 +1,80 @@
+/* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
+  Original: x32-core.xml.tmp */
+
+#ifdef GDBSERVER
+#include "tdesc.h"
+#else
+#include "defs.h"
+#include "osabi.h"
+#include "target-descriptions.h"
+#endif
+
+static int
+create_feature_i386_x32_core (struct target_desc *result, long regnum)
+{
+  struct tdesc_feature *feature;
+
+  feature = tdesc_create_feature (result, "org.gnu.gdb.i386.core", "x32-core.xml");
+  struct tdesc_type *field_type;
+  struct tdesc_type *type;
+  type = tdesc_create_flags (feature, "i386_eflags", 4);
+  tdesc_add_flag (type, 0, "CF");
+  tdesc_add_flag (type, 1, "");
+  tdesc_add_flag (type, 2, "PF");
+  tdesc_add_flag (type, 4, "AF");
+  tdesc_add_flag (type, 6, "ZF");
+  tdesc_add_flag (type, 7, "SF");
+  tdesc_add_flag (type, 8, "TF");
+  tdesc_add_flag (type, 9, "IF");
+  tdesc_add_flag (type, 10, "DF");
+  tdesc_add_flag (type, 11, "OF");
+  tdesc_add_flag (type, 14, "NT");
+  tdesc_add_flag (type, 16, "RF");
+  tdesc_add_flag (type, 17, "VM");
+  tdesc_add_flag (type, 18, "AC");
+  tdesc_add_flag (type, 19, "VIF");
+  tdesc_add_flag (type, 20, "VIP");
+  tdesc_add_flag (type, 21, "ID");
+
+  tdesc_create_reg (feature, "rax", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "rbx", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "rcx", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "rdx", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "rsi", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "rdi", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "rbp", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "rsp", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "r8", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "r9", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "r10", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "r11", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "r12", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "r13", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "r14", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "r15", regnum++, 1, NULL, 64, "int64");
+  tdesc_create_reg (feature, "rip", regnum++, 1, NULL, 64, "uint64");
+  tdesc_create_reg (feature, "eflags", regnum++, 1, NULL, 32, "i386_eflags");
+  tdesc_create_reg (feature, "cs", regnum++, 1, NULL, 32, "int32");
+  tdesc_create_reg (feature, "ss", regnum++, 1, NULL, 32, "int32");
+  tdesc_create_reg (feature, "ds", regnum++, 1, NULL, 32, "int32");
+  tdesc_create_reg (feature, "es", regnum++, 1, NULL, 32, "int32");
+  tdesc_create_reg (feature, "fs", regnum++, 1, NULL, 32, "int32");
+  tdesc_create_reg (feature, "gs", regnum++, 1, NULL, 32, "int32");
+  tdesc_create_reg (feature, "st0", regnum++, 1, NULL, 80, "i387_ext");
+  tdesc_create_reg (feature, "st1", regnum++, 1, NULL, 80, "i387_ext");
+  tdesc_create_reg (feature, "st2", regnum++, 1, NULL, 80, "i387_ext");
+  tdesc_create_reg (feature, "st3", regnum++, 1, NULL, 80, "i387_ext");
+  tdesc_create_reg (feature, "st4", regnum++, 1, NULL, 80, "i387_ext");
+  tdesc_create_reg (feature, "st5", regnum++, 1, NULL, 80, "i387_ext");
+  tdesc_create_reg (feature, "st6", regnum++, 1, NULL, 80, "i387_ext");
+  tdesc_create_reg (feature, "st7", regnum++, 1, NULL, 80, "i387_ext");
+  tdesc_create_reg (feature, "fctrl", regnum++, 1, "float", 32, "int");
+  tdesc_create_reg (feature, "fstat", regnum++, 1, "float", 32, "int");
+  tdesc_create_reg (feature, "ftag", regnum++, 1, "float", 32, "int");
+  tdesc_create_reg (feature, "fiseg", regnum++, 1, "float", 32, "int");
+  tdesc_create_reg (feature, "fioff", regnum++, 1, "float", 32, "int");
+  tdesc_create_reg (feature, "foseg", regnum++, 1, "float", 32, "int");
+  tdesc_create_reg (feature, "fooff", regnum++, 1, "float", 32, "int");
+  tdesc_create_reg (feature, "fop", regnum++, 1, "float", 32, "int");
+  return regnum;
+}
diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index a12fd7e..d9fb374 100644
--- a/gdb/target-descriptions.c
+++ b/gdb/target-descriptions.c
@@ -2266,7 +2266,9 @@ maint_print_c_tdesc_cmd (char *args, int from_tty)
   if (loc != std::string::npos)
     filename_after_features = filename_after_features.substr (loc + 10);
 
-  if (strncmp (filename_after_features.c_str(), "i386/32bit-", 11) == 0)
+  if (strncmp (filename_after_features.c_str(), "i386/32bit-", 11) == 0
+      || strncmp (filename_after_features.c_str(), "i386/64bit-", 11) == 0
+      || strncmp (filename_after_features.c_str(), "i386/x32-core.xml", 17) == 0)
     {
       print_c_feature v (filename_after_features);
 
