X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDynFlags.hs;h=2218f1729b75ba450feb908eee683bbc7cc0dc20;hb=fe7bff18c56a8adb6f7044bf4926402b8fc747e2;hp=5b26155b60d446e07ebbb2ee721eb91fd71858e6;hpb=475940d68ab79a5f352ccaca485baa17a2df0765;p=ghc-hetmet.git

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 5b26155..2218f17 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -54,7 +54,7 @@ module DynFlags (
 
 #include "HsVersions.h"
 
-import Module		( Module, mkModuleName, mkModule )
+import Module		( Module, mkModuleName, mkModule, ModLocation )
 import PackageConfig
 import PrelNames	( mAIN )
 #ifdef i386_TARGET_ARCH
@@ -102,7 +102,7 @@ data DynFlag
    | Opt_D_dump_asm_regalloc
    | Opt_D_dump_asm_regalloc_stages
    | Opt_D_dump_asm_conflicts
-   | Opt_D_drop_asm_stats
+   | Opt_D_dump_asm_stats
    | Opt_D_dump_cpranal
    | Opt_D_dump_deriv
    | Opt_D_dump_ds
@@ -142,11 +142,12 @@ data DynFlag
    | Opt_D_dump_minimal_imports
    | Opt_D_dump_mod_cycles
    | Opt_D_faststring_stats
+   | Opt_DumpToFile			-- ^ Append dump output to files instead of stdout.
    | Opt_DoCoreLinting
    | Opt_DoStgLinting
    | Opt_DoCmmLinting
 
-   | Opt_WarnIsError		-- -Werror; makes warnings fatal
+   | Opt_WarnIsError			-- -Werror; makes warnings fatal
    | Opt_WarnDuplicateExports
    | Opt_WarnHiShadows
    | Opt_WarnImplicitPrelude
@@ -264,7 +265,7 @@ data DynFlag
    | Opt_KeepRawSFiles
    | Opt_KeepTmpFiles
 
-   deriving (Eq)
+   deriving (Eq, Show)
  
 data DynFlags = DynFlags {
   ghcMode		:: GhcMode,
@@ -307,6 +308,14 @@ data DynFlags = DynFlags {
   outputFile		:: Maybe String,
   outputHi		:: Maybe String,
 
+  -- | This is set by DriverPipeline.runPipeline based on where
+  --	its output is going.
+  dumpPrefix		:: Maybe FilePath,
+
+  -- | Override the dumpPrefix set by runPipeline.
+  --	Set by -ddump-file-prefix
+  dumpPrefixForce	:: Maybe FilePath,
+
   includePaths		:: [String],
   libraryPaths		:: [String],
   frameworkPaths	:: [String],  	-- used on darwin only
@@ -466,6 +475,8 @@ defaultDynFlags =
 
 	outputFile		= Nothing,
 	outputHi		= Nothing,
+	dumpPrefix		= Nothing,
+	dumpPrefixForce		= Nothing,
 	includePaths		= [],
 	libraryPaths		= [],
 	frameworkPaths		= [],
@@ -558,6 +569,8 @@ setHcSuf      f d = d{ hcSuf      = f}
 setOutputFile f d = d{ outputFile = f}
 setOutputHi   f d = d{ outputHi   = f}
 
+setDumpPrefixForce f d = d { dumpPrefixForce = f}
+
 -- XXX HACK: Prelude> words "'does not' work" ===> ["'does","not'","work"]
 -- Config.hs should really use Option.
 setPgmP   f d = let (pgm:args) = words f in d{ pgm_P   = (pgm, map Option args)}
@@ -961,6 +974,7 @@ dynamic_flags = [
   ,  ( "hidir"		, HasArg (upd . setHiDir . Just))
   ,  ( "tmpdir"		, HasArg (upd . setTmpDir))
   ,  ( "stubdir"	, HasArg (upd . setStubDir . Just))
+  ,  ( "ddump-file-prefix", HasArg (upd . setDumpPrefixForce . Just))
 
 	------- Keeping temporary files -------------------------------------
      -- These can be singular (think ghc -c) or plural (think ghc --make)
@@ -1014,7 +1028,7 @@ dynamic_flags = [
   ,  ( "ddump-asm-conflicts",    setDumpFlag Opt_D_dump_asm_conflicts)
   ,  ( "ddump-asm-regalloc-stages",
                                  setDumpFlag Opt_D_dump_asm_regalloc_stages)
-  ,  ( "ddrop-asm-stats",        setDumpFlag Opt_D_drop_asm_stats)
+  ,  ( "ddump-asm-stats",        setDumpFlag Opt_D_dump_asm_stats)
   ,  ( "ddump-cpranal",      	 setDumpFlag Opt_D_dump_cpranal)
   ,  ( "ddump-deriv",        	 setDumpFlag Opt_D_dump_deriv)
   ,  ( "ddump-ds",           	 setDumpFlag Opt_D_dump_ds)
@@ -1052,7 +1066,7 @@ dynamic_flags = [
   ,  ( "ddump-vect",         	 setDumpFlag Opt_D_dump_vect)
   ,  ( "ddump-hpc",         	 setDumpFlag Opt_D_dump_hpc)
   ,  ( "ddump-mod-cycles",     	 setDumpFlag Opt_D_dump_mod_cycles)
-  
+  ,  ( "ddump-to-file",          setDumpFlag Opt_DumpToFile)
   ,  ( "ddump-hi-diffs",         NoArg (setDynFlag Opt_D_dump_hi_diffs))
   ,  ( "dcore-lint",       	 NoArg (setDynFlag Opt_DoCoreLinting))
   ,  ( "dstg-lint",        	 NoArg (setDynFlag Opt_DoStgLinting))
@@ -1668,6 +1682,7 @@ compilerInfo = [("Project name",                cProjectName),
                 ("Booter version",              cBooterVersion),
                 ("Stage",                       cStage),
                 ("Interface file version",      cHscIfaceFileVersion),
+                ("Have interpreter",            cGhcWithInterpreter),
                 ("Object splitting",            cSplitObjs),
                 ("Have native code generator",  cGhcWithNativeCodeGen),
                 ("Unregisterised",              cGhcUnregisterised),