mirror of
https://github.com/Ed94/raddebugger.git
synced 2026-06-13 07:32:23 -07:00
fix replacement rule for weak search library vs undefined
This commit is contained in:
committed by
Ryan Fleury
parent
0ceadff525
commit
89d496c855
+1
-4
@@ -1537,9 +1537,6 @@ lnk_build_link_context(TP_Context *tp, TP_Arena *tp_arena, LNK_Config *config)
|
||||
if (symbol_ht) {
|
||||
COFF_SymbolValueInterpType interp = lnk_interp_from_symbol(symbol_ht->symbol);
|
||||
if (interp == COFF_SymbolValueInterp_Undefined) {
|
||||
// clear slot for the weak alternate name that replaces an undefined symbol
|
||||
symbol_ht->symbol = 0;
|
||||
|
||||
// make obj with alternamte name symbol
|
||||
String8 alt_name_obj;
|
||||
{
|
||||
@@ -1556,7 +1553,7 @@ lnk_build_link_context(TP_Context *tp, TP_Arena *tp_arena, LNK_Config *config)
|
||||
LNK_InputObj *input = lnk_input_obj_list_push(scratch.arena, &input_obj_list);
|
||||
input->path = alt_name_n->data.obj ? alt_name_n->data.obj->path : str8_lit("RADLINK");
|
||||
input->exclude_from_debug_info = 1;
|
||||
input->dedup_id = push_str8f(scratch.arena, "* ALTERNATE NAME FOR %S=%S *", alt_name_n->data.from, alt_name_n->data.to, obj_list.count);
|
||||
input->dedup_id = push_str8f(scratch.arena, "* ALTERNATE NAME FOR %S=%S %u *", alt_name_n->data.from, alt_name_n->data.to, obj_list.count);
|
||||
input->data = alt_name_obj;
|
||||
input->lib = alt_name_n->data.obj ? alt_name_n->data.obj->lib : 0;
|
||||
}
|
||||
|
||||
@@ -159,7 +159,7 @@ lnk_can_replace_symbol(LNK_SymbolScope scope, LNK_Symbol *dst, LNK_Symbol *src)
|
||||
|
||||
COFF_SymbolWeakExt *weak_ext = coff_parse_weak_tag(weak_parsed, weak->u.defined.obj->header.is_big_obj);
|
||||
if (weak_ext->characteristics == COFF_WeakExt_SearchLibrary) {
|
||||
can_replace = dst_interp == COFF_SymbolValueInterp_Weak;
|
||||
can_replace = lnk_symbol_defined_is_before(dst, src);
|
||||
} else if (weak_ext->characteristics == COFF_WeakExt_NoLibrary) {
|
||||
can_replace = dst_interp == COFF_SymbolValueInterp_Weak;
|
||||
} else if (weak_ext->characteristics == COFF_WeakExt_SearchAlias) {
|
||||
|
||||
Reference in New Issue
Block a user