binutils: Handle DWARF5 DW_FORM_ref_addr and DW_UT_partial.

dwz in DWARF5 mode might produce DW_UT_partial unit types, which are
the same as DW_UT_compile unit types (but start with a DW_TAG_partial_unit)
and it might produce DW_FORM_ref_addr to create a reference between
units. Accept both constructs.

binutils/ChangeLog:

	* dwarf.c (read_and_display_attr_value): Handle DW_FORM_ref_addr
	for dwarf_version 5 just as version 3 and 4 (only 2 is different).
	(process_debug_info): Allow DW_UT_partial.

(cherry picked from commit ec47b32a85294af959457ad19bd98dd13f6389fd)

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 76ba6d9840a2dde5ef028d0c8779f9b16f36ae0d..255fe9510a59dfc0628a48119495802e06b5aa92 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,13 @@
+2020-11-15  Mark Wielaard  <mark@klomp.org>
+
+       Backport from the mainline:
+       2020-09-23  Mark Wielaard  <mark@klomp.org>
+
+       * dwarf.c (read_and_display_attr_value): Handle DW_FORM_ref_addr
+       for dwarf_version 5 just as version 3 and 4 (only 2 is
+       different).
+       (process_debug_info): Allow DW_UT_partial.
+
 2020-09-19  Nick Clifton  <nickc@redhat.com>
 
        This is the 2.35.1 point release.

diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index cc13fe067f0fbc16125d59b5a15ef15df31e623c..ca6758cd0db9380d68fba1e050a4b187effd85ef 100644 (file)
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -2202,10 +2202,10 @@ read_and_display_attr_value (unsigned long           attribute,
     case DW_FORM_ref_addr:
       if (dwarf_version == 2)
        SAFE_BYTE_GET_AND_INC (uvalue, data, pointer_size, end);
-      else if (dwarf_version == 3 || dwarf_version == 4)
+      else if (dwarf_version > 2)
        SAFE_BYTE_GET_AND_INC (uvalue, data, offset_size, end);
       else
-       error (_("Internal error: DWARF version is not 2, 3 or 4.\n"));
+       error (_("Internal error: DW_FORM_ref_addr is not supported in DWARF version 1.\n"));
 
       break;
 
@@ -3419,6 +3419,7 @@ process_debug_info (struct dwarf_section *           section,
        }
 
       if (compunit.cu_unit_type != DW_UT_compile
+         && compunit.cu_unit_type != DW_UT_partial
          && compunit.cu_unit_type != DW_UT_type)
        {
          warn (_("CU at offset %s contains corrupt or "