X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=049b61fedb6e0fe7ce3c09daf1de7b1c8cd7ba84;hb=cf5905ea24904cf73a041fd7535e8723a668cb9a;hp=e03d6810ca4afd50fc67597b9cea21d281698a5d;hpb=38113ad2138652700dc4461cd2d7ab073f9716ac;p=ghc-hetmet.git

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index e03d681..049b61f 100644
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -24,7 +24,7 @@ module StaticFlags (
 	opt_PprCols,
 	opt_PprCaseAsLet,
 	opt_PprStyle_Debug, opt_TraceLevel,
-        opt_NoDebugOutput,
+        opt_NoDebugOutput, 
 
 	-- Suppressing boring aspects of core dumps
 	opt_SuppressAll,
@@ -52,6 +52,7 @@ module StaticFlags (
 	opt_CprOff,
 	opt_SimplNoPreInlining,
 	opt_SimplExcessPrecision,
+	opt_NoOptCoercion,
 	opt_MaxWorkerArgs,
 
 	-- Unfolding control
@@ -237,8 +238,17 @@ opt_PprCaseAsLet :: Bool
 opt_PprCaseAsLet		= lookUp   (fsLit "-dppr-case-as-let")
 
 -- | Set the maximum width of the dumps
+--   If GHC's command line options are bad then the options parser uses the
+--   pretty printer display the error message. In this case the staticFlags
+--   won't be initialized yet, so we must check for this case explicitly 
+--   and return the default value.
 opt_PprCols :: Int
-opt_PprCols			= lookup_def_int "-dppr-cols" 100
+opt_PprCols 
+ = unsafePerformIO
+ $ do	ready <- readIORef v_opt_C_ready
+	if (not ready)
+		then return 100
+		else return $ lookup_def_int "-dppr-cols" 100
 
 
 opt_PprStyle_Debug  :: Bool
@@ -257,7 +267,6 @@ opt_Fuel                        = lookup_def_int "-dopt-fuel" maxBound
 opt_NoDebugOutput   :: Bool
 opt_NoDebugOutput               = lookUp  (fsLit "-dno-debug-output")
 
-
 -- profiling opts
 opt_SccProfilingOn :: Bool
 opt_SccProfilingOn		= lookUp  (fsLit "-fscc-profiling")
@@ -311,6 +320,9 @@ opt_SimplNoPreInlining		= lookUp  (fsLit "-fno-pre-inlining")
 opt_SimplExcessPrecision :: Bool
 opt_SimplExcessPrecision	= lookUp  (fsLit "-fexcess-precision")
 
+opt_NoOptCoercion :: Bool
+opt_NoOptCoercion    	        = lookUp  (fsLit "-fno-opt-coercion")
+
 -- Unfolding control
 -- See Note [Discounts and thresholds] in CoreUnfold