further fixes to the #5505 fix.
further fixes to the #5505 fix.

forked-upstream-packages-for-ghcjs/ghc,tjakway/ghcjvm,bitemyapp/ghc,fmthoma/ghc,holzensp/ghc,bitemyapp/ghc,nushio3/ghc,frantisekfarka/ghc-dsi,urbanslug/ghc,ekmett/ghc,mcschroeder/ghc,holzensp/ghc,tjakway/ghcjvm,ryantm/ghc,bitemyapp/ghc,ekmett/ghc,lukexi/ghc,forked-upstream-packages-for-ghcjs/ghc,mettekou/ghc,fmthoma/ghc,sgillespie/ghc,tibbe/ghc,nkaretnikov/ghc,urbanslug/ghc,mcschroeder/ghc,hferreiro/replay,acowley/ghc,nkaretnikov/ghc,vTurbine/ghc,nomeata/ghc,vikraman/ghc,bitemyapp/ghc,ezyang/ghc,TomMD/ghc,nkaretnikov/ghc,gcampax/ghc,vTurbine/ghc,tjakway/ghcjvm,sdiehl/ghc,olsner/ghc,vTurbine/ghc,snoyberg/ghc,TomMD/ghc,wxwxwwxxx/ghc,nathyong/microghc-ghc,ekmett/ghc,acowley/ghc,lukexi/ghc,acowley/ghc,ilyasergey/GHC-XAppFix,vikraman/ghc,frantisekfarka/ghc-dsi,nushio3/ghc,ryantm/ghc,nathyong/microghc-ghc,vTurbine/ghc,nathyong/microghc-ghc,GaloisInc/halvm-ghc,da-x/ghc,hferreiro/replay,anton-dessiatov/ghc,wxwxwwxxx/ghc,tibbe/ghc,ghc-android/ghc,gridaphobe/ghc,nathyong/microghc-ghc,urbanslug/ghc,ezyang/ghc,mettekou/ghc,siddhanathan/ghc,ghc-android/ghc,AlexanderPankiv/ghc,da-x/ghc,mcmaniac/ghc,mfine/ghc,frantisekfarka/ghc-dsi,christiaanb/ghc,sdiehl/ghc,snoyberg/ghc,lukexi/ghc-7.8-arm64,ezyang/ghc,olsner/ghc,tjakway/ghcjvm,christiaanb/ghc,green-haskell/ghc,gridaphobe/ghc,tibbe/ghc,da-x/ghc,gcampax/ghc,nomeata/ghc,snoyberg/ghc,jstolarek/ghc,nkaretnikov/ghc,gridaphobe/ghc,shlevy/ghc,AlexanderPankiv/ghc,tibbe/ghc,sgillespie/ghc,ezyang/ghc,nathyong/microghc-ghc,christiaanb/ghc,hferreiro/replay,nushio3/ghc,lukexi/ghc,ml9951/ghc,elieux/ghc,ml9951/ghc,gridaphobe/ghc,tjakway/ghcjvm,urbanslug/ghc,ryantm/ghc,tjakway/ghcjvm,sdiehl/ghc,ezyang/ghc,sgillespie/ghc,sgillespie/ghc,jstolarek/ghc,spacekitteh/smcghc,vikraman/ghc,vTurbine/ghc,AlexanderPankiv/ghc,mfine/ghc,green-haskell/ghc,sgillespie/ghc,TomMD/ghc,gcampax/ghc,nkaretnikov/ghc,gcampax/ghc,ml9951/ghc,GaloisInc/halvm-ghc,da-x/ghc,spacekitteh/smcghc,elieux/ghc,ml9951/ghc,ilyasergey/GHC-XAppFix,shlevy/ghc,TomMD/ghc,GaloisInc/halvm-ghc,nomeata/ghc,wxwxwwxxx/ghc,vikraman/ghc,mcschroeder/ghc,hferreiro/replay,sdiehl/ghc,lukexi/ghc-7.8-arm64,urbanslug/ghc,gridaphobe/ghc,acowley/ghc,spacekitteh/smcghc,lukexi/ghc-7.8-arm64,olsner/ghc,shlevy/ghc,green-haskell/ghc,ml9951/ghc,nomeata/ghc,vTurbine/ghc,oldmanmike/ghc,mettekou/ghc,ghc-android/ghc,GaloisInc/halvm-ghc,shlevy/ghc,gcampax/ghc,shlevy/ghc,anton-dessiatov/ghc,mettekou/ghc,mfine/ghc,shlevy/ghc,ml9951/ghc,holzensp/ghc,sgillespie/ghc,gcampax/ghc,TomMD/ghc,nathyong/microghc-ghc,fmthoma/ghc,bitemyapp/ghc,forked-upstream-packages-for-ghcjs/ghc,green-haskell/ghc,vikraman/ghc,mfine/ghc,gcampax/ghc,mcschroeder/ghc,nushio3/ghc,GaloisInc/halvm-ghc,ilyasergey/GHC-XAppFix,gridaphobe/ghc,elieux/ghc,oldmanmike/ghc,acowley/ghc,wxwxwwxxx/ghc,vikraman/ghc,forked-upstream-packages-for-ghcjs/ghc,wxwxwwxxx/ghc,wxwxwwxxx/ghc,oldmanmike/ghc,shlevy/ghc,siddhanathan/ghc,siddhanathan/ghc,frantisekfarka/ghc-dsi,ryantm/ghc,anton-dessiatov/ghc,lukexi/ghc,nushio3/ghc,snoyberg/ghc,AlexanderPankiv/ghc,TomMD/ghc,anton-dessiatov/ghc,ghc-android/ghc,da-x/ghc,olsner/ghc,GaloisInc/halvm-ghc,vTurbine/ghc,acowley/ghc,mcmaniac/ghc,tibbe/ghc,mettekou/ghc,elieux/ghc,anton-dessiatov/ghc,sdiehl/ghc,christiaanb/ghc,spacekitteh/smcghc,mcmaniac/ghc,lukexi/ghc,mfine/ghc,oldmanmike/ghc,sdiehl/ghc,nkaretnikov/ghc,siddhanathan/ghc,anton-dessiatov/ghc,siddhanathan/ghc,ghc-android/ghc,nathyong/microghc-ghc,jstolarek/ghc,hferreiro/replay,hferreiro/replay,frantisekfarka/ghc-dsi,oldmanmike/ghc,AlexanderPankiv/ghc,tjakway/ghcjvm,acowley/ghc,mettekou/ghc,mcmaniac/ghc,ml9951/ghc,wxwxwwxxx/ghc,anton-dessiatov/ghc,green-haskell/ghc,lukexi/ghc-7.8-arm64,mcschroeder/ghc,fmthoma/ghc,sgillespie/ghc,ryantm/ghc,nushio3/ghc,urbanslug/ghc,gridaphobe/ghc,AlexanderPankiv/ghc,mettekou/ghc,fmthoma/ghc,siddhanathan/ghc,nomeata/ghc,oldmanmike/ghc,ezyang/ghc,olsner/ghc,hferreiro/replay,elieux/ghc,elieux/ghc,mcschroeder/ghc,ekmett/ghc,urbanslug/ghc,sdiehl/ghc,forked-upstream-packages-for-ghcjs/ghc,spacekitteh/smcghc,vikraman/ghc,snoyberg/ghc,da-x/ghc,fmthoma/ghc,christiaanb/ghc,holzensp/ghc,ghc-android/ghc,mfine/ghc,mcmaniac/ghc,snoyberg/ghc,jstolarek/ghc,ezyang/ghc,forked-upstream-packages-for-ghcjs/ghc,mfine/ghc,lukexi/ghc-7.8-arm64,olsner/ghc,elieux/ghc,AlexanderPankiv/ghc,olsner/ghc,christiaanb/ghc,ilyasergey/GHC-XAppFix,oldmanmike/ghc,christiaanb/ghc,ml9951/ghc,ghc-android/ghc,ekmett/ghc,forked-upstream-packages-for-ghcjs/ghc,da-x/ghc,jstolarek/ghc,fmthoma/ghc,nkaretnikov/ghc,nushio3/ghc,TomMD/ghc,siddhanathan/ghc,snoyberg/ghc,holzensp/ghc,mcschroeder/ghc,GaloisInc/halvm-ghc