projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid making Either String an instance of Monad in the Haddock parser
[ghc-hetmet.git]
/
compiler
/
main
/
StaticFlags.hs
diff --git
a/compiler/main/StaticFlags.hs
b/compiler/main/StaticFlags.hs
index
46f3416
..
43f630c
100644
(file)
--- 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
-----------------------------------------------------------------------------
--
-- Static flags
@@
-9,13
+16,6
@@
--
-----------------------------------------------------------------------------
--
-----------------------------------------------------------------------------
-{-# 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
-
module StaticFlags (
parseStaticFlags,
staticFlags,
module StaticFlags (
parseStaticFlags,
staticFlags,
@@
-159,7
+159,6
@@
static_flags = [
------- ways --------------------------------------------------------
, ( "prof" , NoArg (addWay WayProf) )
------- ways --------------------------------------------------------
, ( "prof" , NoArg (addWay WayProf) )
- , ( "unreg" , NoArg (addWay WayUnreg) )
, ( "ticky" , NoArg (addWay WayTicky) )
, ( "parallel" , NoArg (addWay WayPar) )
, ( "gransim" , NoArg (addWay WayGran) )
, ( "ticky" , NoArg (addWay WayTicky) )
, ( "parallel" , NoArg (addWay WayPar) )
, ( "gransim" , NoArg (addWay WayGran) )
@@
-455,7
+454,6
@@
data WayName
= WayThreaded
| WayDebug
| WayProf
= WayThreaded
| WayDebug
| WayProf
- | WayUnreg
| WayTicky
| WayPar
| WayGran
| WayTicky
| WayPar
| WayGran
@@
-492,7
+490,6
@@
allowed_combination way = and [ x `allowedWith` y
_ `allowedWith` WayDebug = True
WayDebug `allowedWith` _ = True
_ `allowedWith` WayDebug = True
WayDebug `allowedWith` _ = True
- WayProf `allowedWith` WayUnreg = True
WayProf `allowedWith` WayNDP = True
_ `allowedWith` _ = False
WayProf `allowedWith` WayNDP = True
_ `allowedWith` _ = False
@@
-562,9
+559,6
@@
way_details =
[ "-DTICKY_TICKY"
, "-optc-DTICKY_TICKY" ]),
[ "-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"
-- optl's below to tell linker where to find the PVM library -- HWL
(WayPar, Way "mp" False "Parallel"
[ "-fparallel"