diff options
| author | Tamar Christina <tamar@zhox.com> | 2019-06-01 10:59:04 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-07-15 16:41:01 -0400 |
| commit | 763088fc3c14c8687685fe811eac13d216971840 (patch) | |
| tree | 67f3ac4f3e25dd4c64fcf30128c2a732eb4c41bb /rts | |
| parent | 459e1c5f7c71e37ed8bb239c57bdec441d278fff (diff) | |
| download | haskell-763088fc3c14c8687685fe811eac13d216971840.tar.gz | |
winio: Small linker comment and ifdef cleanups
Diffstat (limited to 'rts')
| -rw-r--r-- | rts/Linker.c | 8 | ||||
| -rw-r--r-- | rts/linker/PEi386.c | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/rts/Linker.c b/rts/Linker.c index 443de6a356..4b551f0073 100644 --- a/rts/Linker.c +++ b/rts/Linker.c @@ -1681,12 +1681,10 @@ int ocTryLoad (ObjectCode* oc) { are to be loaded by this call. This call is intended to have no side-effects when a non-duplicate - symbol is re-inserted. A symbol is only a duplicate if the object file - it is defined in has had it's relocations resolved. A resolved object - file means the symbols inside it are required. + symbol is re-inserted. - The symbol address is not used to distinguish symbols. Duplicate symbols - are distinguished by name, oc and attributes (weak symbols etc). + We set the Address to NULL since that is not used to distinguish + symbols. Duplicate symbols are distinguished by name and oc. */ int x; Symbol_t symbol; diff --git a/rts/linker/PEi386.c b/rts/linker/PEi386.c index f494eee567..6585c36bf0 100644 --- a/rts/linker/PEi386.c +++ b/rts/linker/PEi386.c @@ -2060,7 +2060,6 @@ SymbolAddr *lookupSymbol_PEi386(SymbolName *lbl) sym = lookupSymbolInDLLs(lbl); return sym; // might be NULL if not found } else { -#if defined(mingw32_HOST_OS) // If Windows, perform initialization of uninitialized // Symbols from the C runtime which was loaded above. // We do this on lookup to prevent the hit when @@ -2093,7 +2092,6 @@ SymbolAddr *lookupSymbol_PEi386(SymbolName *lbl) clearImportSymbol (pinfo->owner, lbl); return pinfo->value; } -#endif return loadSymbol(lbl, pinfo); } } |