Allow osabi to be optional in target descriptors
Commit Message
Osabi is an option field in target descriptors, according to:
https://sourceware.org/gdb/current/onlinedocs/gdb/Target-Description-Format.html
However, removing the osabi field from the i386 and amd64 target descriptors
will cause gdbserver to assert. This is code I used to test (not for
committing!) :
Comments
Alan Hayward <Alan.Hayward@arm.com> writes:
Patch is good to me, some nits on commit log and code,
> Osabi is an option field in target descriptors, according to:
s/target descriptors/target descriptions/
> https://sourceware.org/gdb/current/onlinedocs/gdb/Target-Description-Format.html
>
> However, removing the osabi field from the i386 and amd64 target descriptors
Likewise.
>
> The following patch fixes this error.
>
> Tested with gdbserver on x86 and also on aarch64 with my target descriptor patch.
Likewise.
> @@ -105,9 +104,12 @@ tdesc_get_features_xml (target_desc *tdesc)
> buffer += tdesc->arch;
> buffer += "</architecture>";
>
> - buffer += "<osabi>";
> - buffer += tdesc->osabi;
> - buffer += "</osabi>";
> + if (tdesc->osabi != NULL)
As we are in C++, I prefer nullptr.
s/NULL/nullptr/
@@ -41,9 +41,6 @@ amd64_create_target_description (uint64_t xcr0, bool is_x32, bool is_linux)
#ifndef IN_PROCESS_AGENT
set_tdesc_architecture (tdesc, is_x32 ? "i386:x64-32" : "i386:x86-64");
-
- if (is_linux)
- set_tdesc_osabi (tdesc, "GNU/Linux");
#endif
long regnum = 0;
@@ -37,8 +37,6 @@ i386_create_target_description (uint64_t xcr0, bool is_linux)
#ifndef IN_PROCESS_AGENT
set_tdesc_architecture (tdesc, "i386");
- if (is_linux)
- set_tdesc_osabi (tdesc, "GNU/Linux");
#endif
long regnum = 0;
The following patch fixes this error.
Tested with gdbserver on x86 and also on aarch64 with my target descriptor patch.
Also ran make check on x86 with unix and native-gdbserver.
2017-11-16 Alan Hayward <alan.hayward@arm.com>
gdbserver
* tdesc.c (tdesc_get_features_xml): Allow null osabi.
@@ -92,8 +92,7 @@ tdesc_get_features_xml (target_desc *tdesc)
/* Either .xmltarget or .features is not NULL. */
gdb_assert (tdesc->xmltarget != NULL
|| (tdesc->features != NULL
- && tdesc->arch != NULL
- && tdesc->osabi != NULL));
+ && tdesc->arch != NULL));
if (tdesc->xmltarget == NULL)
{
@@ -105,9 +104,12 @@ tdesc_get_features_xml (target_desc *tdesc)
buffer += tdesc->arch;
buffer += "</architecture>";
- buffer += "<osabi>";
- buffer += tdesc->osabi;
- buffer += "</osabi>";
+ if (tdesc->osabi != NULL)
+ {
+ buffer += "<osabi>";
+ buffer += tdesc->osabi;
+ buffer += "</osabi>";
+ }
char *xml;