-1, -1, -1, -1, -1, -1, -1, -1,
ORIG_RAX * 8,
#ifdef HAVE_STRUCT_USER_REGS_STRUCT_FS_BASE
- 21 * 8, 22 * 8,
+ FS_BASE * 8, GS_BASE * 8,
#else
-1, -1,
#endif
if (*tdesc == NULL)
{
- *tdesc = i386_create_target_description (xcr0, true, false);
+#ifdef HAVE_STRUCT_USER_REGS_STRUCT_FS_BASE
+ const bool segment = true;
+#else
+ const bool segment = false;
+#endif
+
+ *tdesc = i386_create_target_description (xcr0, true, segment);
init_target_desc (*tdesc, i386_expedite_regs);
}
if (*tdesc == NULL)
{
- *tdesc = amd64_create_target_description (xcr0, is_x32, true, true);
+#ifdef HAVE_STRUCT_USER_REGS_STRUCT_FS_BASE
+ const bool segment = true;
+#else
+ const bool segment = false;
+#endif
+
+ *tdesc = amd64_create_target_description (xcr0, is_x32, true, segment);
init_target_desc (*tdesc, amd64_expedite_regs);
}