diff options
| author | Ben Gamari <bgamari.foss@gmail.com> | 2016-04-15 11:41:34 +0200 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-04-15 16:24:45 +0200 |
| commit | 9d063b690766af7d805ff015c0a0f69326ea3db7 (patch) | |
| tree | eb3c55add260728c280dc35fd33819d4a2e08c30 | |
| parent | cb0d29b21ccadde681f80f9e414f78ab42a203c7 (diff) | |
| download | haskell-9d063b690766af7d805ff015c0a0f69326ea3db7.tar.gz | |
Linker: Fix signedness mismatch
Test Plan: Validate on OS X
Reviewers: erikd, austin, Phyx
Reviewed By: austin, Phyx
Subscribers: Phyx, thomie
Differential Revision: https://phabricator.haskell.org/D2110
GHC Trac Issues: #11828
| -rw-r--r-- | rts/Linker.c | 4 | ||||
| -rw-r--r-- | rts/LinkerInternals.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/rts/Linker.c b/rts/Linker.c index 782444a45c..50f438afc2 100644 --- a/rts/Linker.c +++ b/rts/Linker.c @@ -6975,7 +6975,7 @@ ocGetNames_MachO(ObjectCode* oc) else { IF_DEBUG(linker, debugBelch("ocGetNames_MachO: inserting %s\n", nm)); - char* addr = image + void* addr = image + sections[nlist[i].n_sect - 1].offset - sections[nlist[i].n_sect - 1].addr + nlist[i].n_value; @@ -6987,7 +6987,7 @@ ocGetNames_MachO(ObjectCode* oc) , HS_BOOL_FALSE , oc); - oc->symbols[curSymbol].name = nm; + oc->symbols[curSymbol].name = nm; oc->symbols[curSymbol].addr = addr; oc->symbols[curSymbol].isWeak = HS_BOOL_FALSE; curSymbol++; diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h index 4ff6e997c9..a34e6f3334 100644 --- a/rts/LinkerInternals.h +++ b/rts/LinkerInternals.h @@ -106,7 +106,7 @@ typedef struct _SymbolInfo { char* name; /* The address of the symbol. */ - unsigned char* addr; + void* addr; /* Indicates if the symbol is weak */ HsBool isWeak; |