Commit d63d877c authored by simonmar's avatar simonmar
Browse files

[project @ 2001-01-16 12:41:03 by simonmar]

take account of GhcUnregisterised
parent 8865f0d0
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- $Id: DriverState.hs,v 1.23 2001/01/12 11:04:45 simonmar Exp $ -- $Id: DriverState.hs,v 1.24 2001/01/16 12:41:03 simonmar Exp $
-- --
-- Settings for the driver -- Settings for the driver
-- --
...@@ -602,11 +602,7 @@ way_details = ...@@ -602,11 +602,7 @@ way_details =
, "-fvia-C" ]), , "-fvia-C" ]),
(WayUnreg, Way "u" "Unregisterised" (WayUnreg, Way "u" "Unregisterised"
[ "-optc-DNO_REGS" unregFlags ),
, "-optc-DUSE_MINIINTERPRETER"
, "-fno-asm-mangling"
, "-funregisterised"
, "-fvia-C" ]),
(WayPar, Way "mp" "Parallel" (WayPar, Way "mp" "Parallel"
[ "-fparallel" [ "-fparallel"
...@@ -648,6 +644,13 @@ way_details = ...@@ -648,6 +644,13 @@ way_details =
(WayUser_B, Way "B" "User way 'B'" ["$WAY_B_REAL_OPTS"]) (WayUser_B, Way "B" "User way 'B'" ["$WAY_B_REAL_OPTS"])
] ]
unregFlags =
[ "-optc-DNO_REGS"
, "-optc-DUSE_MINIINTERPRETER"
, "-fno-asm-mangling"
, "-funregisterised"
, "-fvia-C" ]
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- Programs for particular phases -- Programs for particular phases
......
{-# OPTIONS -fno-warn-incomplete-patterns #-} {-# OPTIONS -fno-warn-incomplete-patterns #-}
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- $Id: Main.hs,v 1.46 2001/01/12 11:04:45 simonmar Exp $ -- $Id: Main.hs,v 1.47 2001/01/16 12:41:03 simonmar Exp $
-- --
-- GHC Driver program -- GHC Driver program
-- --
...@@ -168,9 +168,13 @@ main = ...@@ -168,9 +168,13 @@ main =
-- process all the other arguments, and get the source files -- process all the other arguments, and get the source files
non_static <- processArgs static_flags flags2 [] non_static <- processArgs static_flags flags2 []
-- find the build tag, and re-process the build-specific options -- Find the build tag, and re-process the build-specific options.
more_opts <- findBuildTag -- Also add in flags for unregisterised compilation, if
way_non_static <- processArgs static_flags more_opts [] -- GhcUnregisterised=YES.
way_opts <- findBuildTag
let unreg_opts | cGhcUnregisterised == "YES" = unregFlags
| otherwise = []
way_non_static <- processArgs static_flags (unreg_opts ++ way_opts) []
-- give the static flags to hsc -- give the static flags to hsc
static_opts <- buildStaticHscOpts static_opts <- buildStaticHscOpts
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment