Skip to content

Commit 0c9e552

Browse files
committed
Combine sections when generating report
1 parent 3db0727 commit 0c9e552

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

objdiff-cli/src/cmd/report.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ pub fn run(args: Args) -> Result<()> {
8585
fn generate(args: GenerateArgs) -> Result<()> {
8686
let mut diff_config = diff::DiffObjConfig {
8787
function_reloc_diffs: diff::FunctionRelocDiffs::None,
88+
combine_data_sections: true,
89+
combine_text_sections: true,
90+
ppc_calculate_pool_relocations: false,
8891
..Default::default()
8992
};
9093
apply_config_args(&mut diff_config, &args.config)?;
@@ -241,14 +244,12 @@ fn report_object(
241244
for (symbol, symbol_diff) in obj.symbols.iter().zip(&obj_diff.symbols) {
242245
if symbol.section != Some(section_idx)
243246
|| symbol.size == 0
244-
|| symbol.flags.contains(SymbolFlag::Hidden)
245-
|| symbol.flags.contains(SymbolFlag::Ignored)
247+
|| symbol.flags.contains(SymbolFlag::Hidden | SymbolFlag::Ignored)
246248
{
247249
continue;
248250
}
249251
if let Some(existing_functions) = &mut existing_functions {
250-
if (symbol.flags.contains(SymbolFlag::Global)
251-
|| symbol.flags.contains(SymbolFlag::Weak))
252+
if symbol.flags.contains(SymbolFlag::Global | SymbolFlag::Weak)
252253
&& !existing_functions.insert(symbol.name.clone())
253254
{
254255
continue;

0 commit comments

Comments
 (0)