diff options
| author | Tamar Christina <tamar@zhox.com> | 2016-12-05 21:27:23 +0000 |
|---|---|---|
| committer | Tamar Christina <tamar@zhox.com> | 2016-12-06 07:01:23 +0000 |
| commit | b82f71b96660400b4b9fa7f3ccef9df7532bb2d7 (patch) | |
| tree | c9dce3ffb9744f9af91bf07288442040309d0b26 /rts/sm | |
| parent | 847d229346431483b99adcff12e46c7bf6af15da (diff) | |
| download | haskell-b82f71b96660400b4b9fa7f3ccef9df7532bb2d7.tar.gz | |
Fix x86 Windows build and testsuite
Summary:
Fix issues preventing x86 GHC to build on Windows and
fix segfault in the testsuite.
Test Plan: ./validate
Reviewers: austin, erikd, simonmar, bgamari
Reviewed By: bgamari
Subscribers: #ghc_windows_task_force, thomie
Differential Revision: https://phabricator.haskell.org/D2789
Diffstat (limited to 'rts/sm')
| -rw-r--r-- | rts/sm/OSMem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rts/sm/OSMem.h b/rts/sm/OSMem.h index f6f9559c2e..4d158df40d 100644 --- a/rts/sm/OSMem.h +++ b/rts/sm/OSMem.h @@ -21,7 +21,7 @@ StgWord64 getPhysicalMemorySize (void); void setExecutable (void *p, W_ len, bool exec); bool osNumaAvailable(void); uint32_t osNumaNodes(void); -StgWord osNumaMask(void); +uint64_t osNumaMask(void); void osBindMBlocksToNode(void *addr, StgWord size, uint32_t node); INLINE_HEADER size_t |