          exposed-modules:
              GHC.Event
          other-modules:
+@@ -395,7 +396,8 @@
+             System.CPUTime.Posix.ClockGetTime
+             System.CPUTime.Posix.Times
+             System.CPUTime.Posix.RUsage
+-            System.CPUTime.Unsupported
++      other-modules:
++          System.CPUTime.Unsupported
+ 
+     -- We need to set the unit id to base (without a version number)
+     -- as it's magic.
 diff -X ../utils/updatePatches.excludes -Nru upstream/pkg/base/GHC/Conc/IO.hs boot/pkg/base/GHC/Conc/IO.hs
---- upstream/pkg/base/GHC/Conc/IO.hs	2018-12-04 07:40:08.000000000 -0800
-+++ boot/pkg/base/GHC/Conc/IO.hs	2018-12-04 07:40:08.466663374 -0800
+--- upstream/pkg/base/GHC/Conc/IO.hs	2019-05-07 22:52:33.000000000 -0700
++++ boot/pkg/base/GHC/Conc/IO.hs	2019-05-07 22:52:34.189765668 -0700
 @@ -64,19 +64,21 @@
  import GHC.Conc.Windows (asyncRead, asyncWrite, asyncDoProc, asyncReadBA,
                           asyncWriteBA, ConsoleEvent(..), win32ConsoleHandler,

+
+##endif
diff -X ../utils/updatePatches.excludes -Nru upstream/pkg/base/System/Environment/ExecutablePath.hsc boot/pkg/base/System/Environment/ExecutablePath.hsc
--- upstream/pkg/base/System/Environment/ExecutablePath.hsc	2018-12-04 07:40:08.000000000 -0800
+++ boot/pkg/base/System/Environment/ExecutablePath.hsc	2018-12-04 07:40:08.470663293 -0800
@@ -18,6 +18,13 @@
 
 module System.Environment.ExecutablePath ( getExecutablePath ) where

 -- because some iconvs (in particular GNU iconv) will brokenly UTF-8 encode
 -- lone surrogates without complaint.
diff -X ../utils/updatePatches.excludes -Nru upstream/pkg/base/GHC/IO/FD.hs boot/pkg/base/GHC/IO/FD.hs
--- upstream/pkg/base/GHC/IO/FD.hs	2019-05-07 22:52:33.000000000 -0700
+++ boot/pkg/base/GHC/IO/FD.hs	2019-05-07 22:52:34.193760861 -0700
@@ -498,6 +498,10 @@
 
 readRawBufferPtr :: String -> FD -> Ptr Word8 -> Int -> CSize -> IO Int
