This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[gold commit] Fix dwp to accept intermediate .dwp files with no .debug_types sections
- From: Cary Coutant <ccoutant at google dot com>
- To: Binutils <binutils at sourceware dot org>
- Date: Tue, 24 Jun 2014 12:15:35 -0700
- Subject: [gold commit] Fix dwp to accept intermediate .dwp files with no .debug_types sections
- Authentication-results: sourceware.org; auth=none
I'm committing this patch to fix a bug in the dwp utility, where if it
reads an intermediate .dwp file that has no .debug_types sections, it
will complain.
-cary
2014-06-24 Cary Coutant <ccoutant@google.com>
* gold/dwp.cc (Dwo_file::read): Allow files with no .debug_types
sections.
(Dwo_file::sized_read_unit_index): Likewise.
diff --git a/gold/dwp.cc b/gold/dwp.cc
index 6fe5c79..359d4b7 100644
--- a/gold/dwp.cc
+++ b/gold/dwp.cc
@@ -970,10 +970,13 @@ Dwo_file::read(Dwp_output_file* output_file)
this->read_unit_index(debug_cu_index, debug_shndx, output_file, false);
if (debug_tu_index > 0)
{
- if (debug_types.size() != 1)
- gold_fatal(_("%s: .dwp file must have exactly one "
+ if (debug_types.size() > 1)
+ gold_fatal(_("%s: .dwp file must have no more than one "
".debug_types.dwo section"), this->name_);
- debug_shndx[elfcpp::DW_SECT_TYPES] = debug_types[0];
+ if (debug_types.size() == 1)
+ debug_shndx[elfcpp::DW_SECT_TYPES] = debug_types[0];
+ else
+ debug_shndx[elfcpp::DW_SECT_TYPES] = 0;
this->read_unit_index(debug_tu_index, debug_shndx, output_file, true);
}
return;
@@ -1154,7 +1157,7 @@ Dwo_file::sized_read_unit_index(unsigned int shndx,
: elfcpp::DW_SECT_INFO);
unsigned int info_shndx = debug_shndx[info_sect];
- gold_assert(shndx > 0 && info_shndx > 0);
+ gold_assert(shndx > 0);
section_size_type index_len;
bool index_is_new;
@@ -1180,6 +1183,8 @@ Dwo_file::sized_read_unit_index(unsigned int shndx,
if (ncols == 0 || nused == 0)
return;
+ gold_assert(info_shndx > 0);
+
unsigned int nslots =
elfcpp::Swap_unaligned<32, big_endian>::readval(contents
+ 3 * sizeof(uint32_t));