X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=039051b8b9490af824c396f765a42c715c236bae;hb=5d536b42c88dbe9523c4b0c799a0e46c2d984aa6;hp=e71c5c7f985a99d5d32d4c2640a30b70b5e1976c;hpb=08f3834baf68671f1b9e61def2e4d5511fbe2c8d;p=ghc-hetmet.git

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index e71c5c7..039051b 100644
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -1,3 +1,10 @@
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 -----------------------------------------------------------------------------
 --
 -- Static flags
@@ -19,6 +26,7 @@ module StaticFlags (
 
 	-- Output style options
 	opt_PprUserLength,
+	opt_SuppressUniques,
 	opt_PprStyle_Debug,
 
 	-- profiling opts
@@ -57,6 +65,7 @@ module StaticFlags (
 	-- Related to linking
 	opt_PIC,
 	opt_Static,
+	opt_HardwireLibPaths,
 
 	-- misc opts
 	opt_IgnoreDotGhci,
@@ -151,7 +160,6 @@ static_flags = [
 
 	------- ways --------------------------------------------------------
   ,  ( "prof"		, NoArg (addWay WayProf) )
-  ,  ( "unreg"		, NoArg (addWay WayUnreg) )
   ,  ( "ticky"		, NoArg (addWay WayTicky) )
   ,  ( "parallel"	, NoArg (addWay WayPar) )
   ,  ( "gransim"	, NoArg (addWay WayGran) )
@@ -162,8 +170,9 @@ static_flags = [
  	-- ToDo: user ways
 
 	------ Debugging ----------------------------------------------------
-  ,  ( "dppr-debug",       PassFlag addOpt )
-  ,  ( "dppr-user-length", AnySuffix addOpt )
+  ,  ( "dppr-debug",        PassFlag addOpt )
+  ,  ( "dsuppress-uniques", PassFlag addOpt )
+  ,  ( "dppr-user-length",  AnySuffix addOpt )
       -- rest of the debugging flags are dynamic
 
 	--------- Profiling --------------------------------------------------
@@ -275,6 +284,7 @@ unpacked_opts =
 opt_IgnoreDotGhci		= lookUp FSLIT("-ignore-dot-ghci")
 
 -- debugging opts
+opt_SuppressUniques		= lookUp  FSLIT("-dsuppress-uniques")
 opt_PprStyle_Debug		= lookUp  FSLIT("-dppr-debug")
 opt_PprUserLength	        = lookup_def_int "-dppr-user-length" 5 --ToDo: give this a name
 
@@ -328,6 +338,7 @@ opt_PIC                         = True
 opt_PIC                         = lookUp FSLIT("-fPIC")
 #endif
 opt_Static			= lookUp  FSLIT("-static")
+opt_HardwireLibPaths		= lookUp  FSLIT("-fhardwire-lib-paths")
 opt_Unregisterised		= lookUp  FSLIT("-funregisterised")
 
 -- Derived, not a real option.  Determines whether we will be compiling
@@ -368,6 +379,7 @@ isStaticFlag f =
 	"fexcess-precision",
 	"funfolding-update-in-place",
 	"static",
+	"fhardwire-lib-paths",
 	"funregisterised",
 	"fext-core",
 	"fcpr-off",
@@ -409,7 +421,7 @@ decodeSize str
   | c == "G" || c == "g" = truncate (n * 1000 * 1000 * 1000)
   | otherwise            = throwDyn (CmdLineError ("can't decode size: " ++ str))
   where (m, c) = span pred str
-        n      = read m  :: Double
+        n      = readRational m
 	pred c = isDigit c || c == '.'
 
 
@@ -445,7 +457,6 @@ data WayName
   = WayThreaded
   | WayDebug
   | WayProf
-  | WayUnreg
   | WayTicky
   | WayPar
   | WayGran
@@ -482,7 +493,6 @@ allowed_combination way = and [ x `allowedWith` y
 	_ `allowedWith` WayDebug		= True
 	WayDebug `allowedWith` _		= True
 
-	WayProf `allowedWith` WayUnreg		= True
 	WayProf `allowedWith` WayNDP		= True
 	_ `allowedWith` _ 			= False
 
@@ -552,9 +562,6 @@ way_details =
 	[ "-DTICKY_TICKY"
 	, "-optc-DTICKY_TICKY" ]),
 
-    (WayUnreg, Way  "u" False "Unregisterised" 
-	unregFlags ),
-
     -- optl's below to tell linker where to find the PVM library -- HWL
     (WayPar, Way  "mp" False "Parallel" 
 	[ "-fparallel"