SafeHaskell: Fix imports of base when base unsafe

compiler/utils/FastString.lhs

@@ -96,7 +96,6 @@ import FastFunctions
 import Panic
 import Util
 
-import Foreign
 import Foreign.C
 import GHC.Exts
 import System.IO
@@ -109,8 +108,10 @@ import Data.Char        ( ord )
 import GhcIO ( IO(..) )
 
 #if __GLASGOW_HASKELL__ >= 701
+import Foreign.Safe
 import GHC.Ptr.Unsafe   ( Ptr(..) )
 #else
+import Foreign hiding ( unsafePerformIO )
 import GHC.Ptr          ( Ptr(..) )
 #endif
 

compiler/utils/GhcIO.hs

@@ -7,14 +7,18 @@
 --
 module GhcIO (
 #if __GLASGOW_HASKELL__ >= 701
-        module GHC.IO.Unsafe,
-#endif
+        module GHC.IO.Safe,
+        module GHC.IO.Unsafe
+#else
         module GHC.IO
+#endif
     ) where
 
 #if __GLASGOW_HASKELL__ >= 701
+import GHC.IO.Safe
 import GHC.IO.Unsafe
+#else
+import GHC.IO
 #endif
 
-import GHC.IO