Merge branch 'master' of http://darcs.haskell.org/ghc

2 files changed, 1 insertions, 22 deletions

diff --git a/compiler/utils/IOEnv.hs b/compiler/utils/IOEnv.hs
index 35d7973c04..583e875903 100644
--- a/compiler/utils/IOEnv.hs
+++ b/compiler/utils/IOEnv.hs
@@ -208,23 +208,3 @@ updEnv :: (env -> env') -> IOEnv env' a -> IOEnv env a
 {-# INLINE updEnv #-}
 updEnv upd (IOEnv m) = IOEnv (\ env -> m (upd env))
 
-
-----------------------------------------------------------------------
--- Standard combinators, but specialised for this monad
--- (for efficiency)
-----------------------------------------------------------------------
-
--- {-# SPECIALIZE mapM          :: (a -> IOEnv env b) -> [a] -> IOEnv env [b] #-}
--- {-# SPECIALIZE mapM_         :: (a -> IOEnv env b) -> [a] -> IOEnv env () #-}
--- {-# SPECIALIZE mapSndM       :: (b -> IOEnv env c) -> [(a,b)] -> IOEnv env [(a,c)] #-}
--- {-# SPECIALIZE sequence      :: [IOEnv env a] -> IOEnv env [a] #-}
--- {-# SPECIALIZE sequence_     :: [IOEnv env a] -> IOEnv env () #-}
--- {-# SPECIALIZE foldlM        :: (a -> b -> IOEnv env a)  -> a -> [b] -> IOEnv env a #-}
--- {-# SPECIALIZE foldrM        :: (b -> a -> IOEnv env a)  -> a -> [b] -> IOEnv env a #-}
--- {-# SPECIALIZE mapAndUnzipM  :: (a -> IOEnv env (b,c))   -> [a] -> IOEnv env ([b],[c]) #-}
--- {-# SPECIALIZE mapAndUnzip3M :: (a -> IOEnv env (b,c,d)) -> [a] -> IOEnv env ([b],[c],[d]) #-}
--- {-# SPECIALIZE zipWithM      :: (a -> b -> IOEnv env c) -> [a] -> [b] -> IOEnv env [c] #-}
--- {-# SPECIALIZE zipWithM_     :: (a -> b -> IOEnv env c) -> [a] -> [b] -> IOEnv env () #-}
--- {-# SPECIALIZE anyM          :: (a -> IOEnv env Bool) -> [a] -> IOEnv env Bool #-}
--- {-# SPECIALIZE when          :: Bool -> IOEnv env a -> IOEnv env () #-}
--- {-# SPECIALIZE unless        :: Bool -> IOEnv env a -> IOEnv env () #-}
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 1fa6c947e3..7409e40fe8 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -124,8 +124,7 @@ endif
 # cabal-install's that are in the wild don't handle it properly.
 DYNAMIC_BY_DEFAULT = NO
 
-# For now, we unconditionally disable building with -dynamic-too
-DYNAMIC_TOO = NO
+DYNAMIC_TOO = YES
 
 # Build a compiler that will build *unregisterised* libraries and
 # binaries by default.  Unregisterised code is supposed to compile and