mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-03-01 13:26:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "gdbserver/x86: move no-xml code earlier in x86_linux_read_description"

Browse Source 
This reverts commit 0a7bb97ad2.
This commit is contained in:
Andrew Burgess 2024-03-26 18:53:05 +00:00
parent f06daade43
commit 59b198a616
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gdbserver/linux-x86-low.cc
View File

@ -891,22 +891,6 @@ x86_linux_read_description (void)
#endif
}
/* If we are not allowed to send an XML target description then we need
to use the hard-wired target descriptions. This corresponds to GDB's
default machine for x86.
This check needs to occur before any returns statements that might
generate some alternative target descriptions. */
if (!use_xml)
{
#ifdef __x86_64__
if (machine == EM_X86_64)
return tdesc_amd64_linux_no_xml.get ();
else
#endif
return tdesc_i386_linux_no_xml.get ();
}
#if !defined __x86_64__ && defined HAVE_PTRACE_GETFPXREGS
if (machine == EM_386 && have_ptrace_getfpxregs == -1)
{
@ -923,6 +907,17 @@ x86_linux_read_description (void)
}
#endif
if (!use_xml)
{
/* Don't use XML. */
#ifdef __x86_64__
if (machine == EM_X86_64)
return tdesc_amd64_linux_no_xml.get ();
else
#endif
return tdesc_i386_linux_no_xml.get ();
}
if (have_ptrace_getregset == TRIBOOL_UNKNOWN)
{
uint64_t xstateregs[(X86_XSTATE_SSE_SIZE / sizeof (uint64_t))];