From 19d80e5fec548e681c453d15b4ae5b49bc080acc Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Mon, 24 Aug 2020 15:52:53 +0100 Subject: [PATCH] bfd: Handle DW_FORM_data16 for .debug_line tables containing MD5 * dwarf2.c (read_attribute_value): Handle DW_FORM_data16. (read_formatted_entries): Likewise. And skip zero entry. --- bfd/ChangeLog | 5 +++++ bfd/dwarf2.c | 21 +++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 490aec6d9de..b068c3891ab 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2020-08-24 Mark Wielaard + + * dwarf2.c (read_attribute_value): Handle DW_FORM_data16. + (read_formatted_entries): Likewise. And skip zero entry. + 2020-08-24 Cooper Qu * bfd-in2.h (bfd_mach_ck860): New. diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c index 9ed4a4a2871..d89a64b7fba 100644 --- a/bfd/dwarf2.c +++ b/bfd/dwarf2.c @@ -1329,6 +1329,17 @@ read_attribute_value (struct attribute * attr, attr->form = DW_FORM_sdata; attr->u.sval = implicit_const; break; + case DW_FORM_data16: + /* This is really a "constant", but there is no way to store that + so pretend it is a 16 byte block instead. */ + amt = sizeof (struct dwarf_block); + blk = (struct dwarf_block *) bfd_alloc (abfd, amt); + if (blk == NULL) + return NULL; + blk->size = 16; + info_ptr = read_n_bytes (info_ptr, info_ptr_end, blk); + attr->u.blk = blk; + break; default: _bfd_error_handler (_("DWARF error: invalid or unhandled FORM value: %#x"), form); @@ -2069,11 +2080,17 @@ read_formatted_entries (struct comp_unit *unit, bfd_byte **bufp, case DW_FORM_udata: *uintp = attr.u.val; break; + + case DW_FORM_data16: + /* MD5 data is in the attr.blk, but we are ignoring those. */ + break; } } - if (!callback (table, fe.name, fe.dir, fe.time, fe.size)) - return FALSE; + /* Skip the first "zero entry", which is the compilation dir/file. */ + if (datai != 0) + if (!callback (table, fe.name, fe.dir, fe.time, fe.size)) + return FALSE; } *bufp = buf; -- 2.30.2