diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:50 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:50 +0000 |
| commit | 9835e2ae736235810b4ea1c162ca5e65c547e770 (patch) | |
| tree | 3fcebf40ed70e581d776a8a4c65923e8ec20e026 /vendor/gimli/examples | |
| parent | Releasing progress-linux version 1.70.0+dfsg2-1~progress7.99u1. (diff) | |
| download | rustc-9835e2ae736235810b4ea1c162ca5e65c547e770.tar.xz rustc-9835e2ae736235810b4ea1c162ca5e65c547e770.zip | |
Merging upstream version 1.71.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/gimli/examples')
| -rw-r--r-- | vendor/gimli/examples/dwarfdump.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vendor/gimli/examples/dwarfdump.rs b/vendor/gimli/examples/dwarfdump.rs index 22458fa8f..a11f298f8 100644 --- a/vendor/gimli/examples/dwarfdump.rs +++ b/vendor/gimli/examples/dwarfdump.rs @@ -585,6 +585,8 @@ fn load_file_section<'input, 'arena, Endian: gimli::Endianity>( let mut relocations = RelocationMap::default(); let name = if is_dwo { id.dwo_name() + } else if file.format() == object::BinaryFormat::Xcoff { + id.xcoff_name() } else { Some(id.name()) }; @@ -677,12 +679,10 @@ where let mut dwarf = gimli::Dwarf::load(&mut load_section)?; if flags.dwo { - dwarf.file_type = gimli::DwarfFileType::Dwo; if let Some(dwo_parent) = dwo_parent { - dwarf.debug_addr = dwo_parent.debug_addr.clone(); - dwarf - .ranges - .set_debug_ranges(dwo_parent.ranges.debug_ranges().clone()); + dwarf.make_dwo(&dwo_parent); + } else { + dwarf.file_type = gimli::DwarfFileType::Dwo; } } |