[commit: ghc] wip/gc/nonmoving-nonconcurrent, wip/gc/preparation: Merge branch 'wip/gc/unglobalize-gc-state' into wip/gc/preparation (412abe8)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branches: wip/gc/nonmoving-nonconcurrent,wip/gc/preparation
Link       : http://ghc.haskell.org/trac/ghc/changeset/412abe8b6eb1b17af9c0db503ab7a4ed74064faa/ghc

>---------------------------------------------------------------

commit 412abe8b6eb1b17af9c0db503ab7a4ed74064faa
Merge: 98c9ca6 39d7a76
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Feb 20 15:32:20 2019 -0500

    Merge branch 'wip/gc/unglobalize-gc-state' into wip/gc/preparation



>---------------------------------------------------------------

412abe8b6eb1b17af9c0db503ab7a4ed74064faa
 rts/sm/Compact.c  |  2 +-
 rts/sm/Compact.h  |  4 +++-
 rts/sm/GC.c       |  9 +++++++--
 rts/sm/MarkWeak.c | 30 +++++++++++-------------------
 rts/sm/MarkWeak.h |  2 +-
 5 files changed, 23 insertions(+), 24 deletions(-)