Tamar Christina pushed to branch wip/bump-win32-tarballs at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • rts/linker/PEi386.c
    ... ... @@ -1174,8 +1174,10 @@ bool checkAndLoadImportLibrary( pathchar* arch_name, char* member_name, FILE* f
    1174 1174
         // Because the symbol has been loaded before we actually need it, if a
    
    1175 1175
         // stronger reference wants to add a duplicate we should discard this
    
    1176 1176
         // one to preserve link order.
    
    1177
    -    if (!ghciInsertSymbolTable(dll, symhash, symbol, sym, false,
    
    1178
    -                               SYM_TYPE_CODE | SYM_TYPE_DUP_DISCARD, NULL))
    
    1177
    +    SymType symType = SYM_TYPE_DUP_DISCARD | SYM_TYPE_HIDDEN;
    
    1178
    +    symType |= hdr.Type == IMPORT_OBJECT_CODE ? SYM_TYPE_CODE : SYM_TYPE_DATA;
    
    1179
    +    
    
    1180
    +    if (!ghciInsertSymbolTable(dll, symhash, symbol, sym, false, symType, NULL))
    
    1179 1181
           return false;
    
    1180 1182
     
    
    1181 1183
         return true;