diff options
| -rw-r--r-- | bfd/ChangeLog | 9 | ||||
| -rw-r--r-- | bfd/elf-bfd.h | 2 | ||||
| -rw-r--r-- | bfd/elf.c | 35 | ||||
| -rw-r--r-- | binutils/ChangeLog | 5 | ||||
| -rw-r--r-- | binutils/readelf.c | 2 | ||||
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/elf/common.h | 4 |
7 files changed, 62 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index d4525f1..31d0714 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,12 @@ +2021-03-05 Craig Blackmore <craig.blackmore@embecosm.com> + Andrew Burgess <andrew.burgess@embecosm.com> + + * elf-bfd.h (elfcore_write_gdb_tdesc): Declare new function. + * elf.c (elfcore_grok_gdb_tdesc): New function. + (elfcore_grok_note): Handle NT_GDB_TDESC. + (elfcore_write_gdb_tdesc): New function. + (elfcore_write_register_note): Handle NT_GDB_TDESC. + 2021-03-05 Nick Clifton <nickc@redhat.com> PR 27521 diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index dd66d98..69e1803 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -2798,6 +2798,8 @@ extern char *elfcore_write_aarch_pauth (bfd *, char *, int *, const void *, int); extern char *elfcore_write_arc_v2 (bfd *, char *, int *, const void *, int); +extern char *elfcore_write_gdb_tdesc + (bfd *, char *, int *, const void *, int); extern char *elfcore_write_lwpstatus (bfd *, char *, int *, long, int, const void *); extern char *elfcore_write_register_note @@ -9912,6 +9912,15 @@ elfcore_grok_arc_v2 (bfd *abfd, Elf_Internal_Note *note) return elfcore_make_note_pseudosection (abfd, ".reg-arc-v2", note); } +/* Convert NOTE into a bfd_section called ".gdb-tdesc". Return TRUE if + successful otherwise, return FALSE. */ + +static bfd_boolean +elfcore_grok_gdb_tdesc (bfd *abfd, Elf_Internal_Note *note) +{ + return elfcore_make_note_pseudosection (abfd, ".gdb-tdesc", note); +} + #if defined (HAVE_PRPSINFO_T) typedef prpsinfo_t elfcore_psinfo_t; #if defined (HAVE_PRPSINFO32_T) /* Sparc64 cross Sparc32 */ @@ -10570,6 +10579,13 @@ elfcore_grok_note (bfd *abfd, Elf_Internal_Note *note) else return TRUE; + case NT_GDB_TDESC: + if (note->namesz == 4 + && strcmp (note->namedata, "GDB") == 0) + return elfcore_grok_gdb_tdesc (abfd, note); + else + return TRUE; + case NT_PRPSINFO: case NT_PSINFO: if (bed->elf_backend_grok_psinfo) @@ -11951,6 +11967,23 @@ elfcore_write_arc_v2 (bfd *abfd, note_name, NT_ARC_V2, arc_v2, size); } +/* Write the target description (a string) pointed to by TDESC, length + SIZE, into the note buffer BUF, and update *BUFSIZ. ABFD is the bfd the + note is being written into. Return a pointer to the new start of the + note buffer, to replace BUF which may no longer be valid. */ + +char * +elfcore_write_gdb_tdesc (bfd *abfd, + char *buf, + int *bufsiz, + const void *tdesc, + int size) +{ + const char *note_name = "GDB"; + return elfcore_write_note (abfd, buf, bufsiz, + note_name, NT_GDB_TDESC, tdesc, size); +} + char * elfcore_write_register_note (bfd *abfd, char *buf, @@ -12035,6 +12068,8 @@ elfcore_write_register_note (bfd *abfd, return elfcore_write_aarch_pauth (abfd, buf, bufsiz, data, size); if (strcmp (section, ".reg-arc-v2") == 0) return elfcore_write_arc_v2 (abfd, buf, bufsiz, data, size); + if (strcmp (section, ".gdb-tdesc") == 0) + return elfcore_write_gdb_tdesc (abfd, buf, bufsiz, data, size); return NULL; } diff --git a/binutils/ChangeLog b/binutils/ChangeLog index da24027..80b6ea6 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2021-03-05 Craig Blackmore <craig.blackmore@embecosm.com> + Andrew Burgess <andrew.burgess@embecosm.com> + + * readelf.c (get_note_type): Handle NT_GDB_TDESC. + 2021-03-05 Nick Clifton <nickc@redhat.com> PR 27387 diff --git a/binutils/readelf.c b/binutils/readelf.c index c862839..fe58ebf 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -18499,6 +18499,8 @@ get_note_type (Filedata * filedata, unsigned e_type) return _("NT_PRPSINFO (prpsinfo structure)"); case NT_TASKSTRUCT: return _("NT_TASKSTRUCT (task structure)"); + case NT_GDB_TDESC: + return _("NT_GDB_TDESC (GDB XML target description)"); case NT_PRXFPREG: return _("NT_PRXFPREG (user_xfpregs structure)"); case NT_PPC_VMX: diff --git a/include/ChangeLog b/include/ChangeLog index 7c53c21..08c4567 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2021-03-05 Craig Blackmore <craig.blackmore@embecosm.com> + Andrew Burgess <andrew.burgess@embecosm.com> + + * elf/common.h (NT_GDB_TDESC): Define. + 2021-03-03 Alan Modra <amodra@gmail.com> * coff/internal.h: Delete obsolete relocation defines. Move used diff --git a/include/elf/common.h b/include/elf/common.h index e7d55ae..e6e9c27 100644 --- a/include/elf/common.h +++ b/include/elf/common.h @@ -677,6 +677,10 @@ #define NT_SIGINFO 0x53494749 /* Fields of siginfo_t. */ #define NT_FILE 0x46494c45 /* Description of mapped files. */ +/* The range 0xff000000 to 0xffffffff is set aside for notes that don't + originate from any particular operating system. */ +#define NT_GDB_TDESC 0xff000000 /* Contains copy of GDB's target description XML. */ + /* Note segments for core files on dir-style procfs systems. */ #define NT_PSTATUS 10 /* Has a struct pstatus */ |