Fix #7661 regression.
Fix #7661 regression.

Patch from singpolyma.

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