mirror of
https://github.com/encounter/objdiff.git
synced 2025-10-05 01:19:49 +00:00
Ignore extern differences in relocations (#258)
This commit is contained in:
parent
fbdaa89cc0
commit
a06d3455ae
@ -14,7 +14,7 @@ use super::{
|
||||
};
|
||||
use crate::obj::{
|
||||
InstructionArg, InstructionArgValue, InstructionRef, Object, ResolvedInstructionRef,
|
||||
ResolvedRelocation, ResolvedSymbol, SymbolFlag, SymbolKind,
|
||||
ResolvedRelocation, ResolvedSymbol, SymbolKind,
|
||||
};
|
||||
|
||||
pub fn no_diff_code(
|
||||
@ -333,11 +333,7 @@ fn reloc_eq(
|
||||
|| display_ins_data_literals(left_obj, left_ins)
|
||||
== display_ins_data_literals(right_obj, right_ins))
|
||||
}
|
||||
(None, Some(_)) => {
|
||||
// Match if possibly stripped weak symbol
|
||||
symbol_name_addend_matches && right_reloc.symbol.flags.contains(SymbolFlag::Weak)
|
||||
}
|
||||
(Some(_), None) | (None, None) => symbol_name_addend_matches,
|
||||
(Some(_), None) | (None, Some(_)) | (None, None) => symbol_name_addend_matches,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -67,11 +67,7 @@ fn reloc_eq(
|
||||
section_name_eq(left_obj, right_obj, sl, sr)
|
||||
&& (symbol_name_addend_matches || address_eq(left, right))
|
||||
}
|
||||
(None, Some(_)) => {
|
||||
// Match if possibly stripped weak symbol
|
||||
symbol_name_addend_matches && right.symbol.flags.contains(SymbolFlag::Weak)
|
||||
}
|
||||
(Some(_), None) | (None, None) => symbol_name_addend_matches,
|
||||
(Some(_), None) | (None, Some(_)) | (None, None) => symbol_name_addend_matches,
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user