X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverState.hs;h=01b03e890afc2b380f2f6e766597e1a0b0fc9903;hb=2dbdd850a75eba264f1f362fd80aac3527ce141e;hp=16dcfcb90c1793fcbd69e4ba358d3a5939f09ced;hpb=07c1fd553eae63aa229a1aa1b62c61714636019e;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/DriverState.hs b/ghc/compiler/main/DriverState.hs
index 16dcfcb..01b03e8 100644
--- a/ghc/compiler/main/DriverState.hs
+++ b/ghc/compiler/main/DriverState.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverState.hs,v 1.70 2002/02/16 18:15:14 sof Exp $
+-- $Id: DriverState.hs,v 1.73 2002/03/29 20:14:31 krasimir Exp $
 --
 -- Settings for the driver
 --
@@ -121,12 +121,6 @@ can_split =  prefixMatch "i386"    cTARGETPLATFORM
 -----------------------------------------------------------------------------
 -- Compiler output options
 
-defaultHscLang
-  | cGhcWithNativeCodeGen == "YES" && 
-	(prefixMatch "i386" cTARGETPLATFORM ||
-	 prefixMatch "sparc" cTARGETPLATFORM)   =  HscAsm
-  | otherwise					=  HscC
-
 GLOBAL_VAR(v_Output_dir,  Nothing, Maybe String)
 GLOBAL_VAR(v_Output_file, Nothing, Maybe String)
 GLOBAL_VAR(v_Output_hi,   Nothing, Maybe String)
@@ -167,7 +161,7 @@ GLOBAL_VAR(v_MaxSimplifierIterations,   4,     Int)
 GLOBAL_VAR(v_StgStats,                  False, Bool)
 GLOBAL_VAR(v_UsageSPInf,  	     	False, Bool)  -- Off by default
 GLOBAL_VAR(v_Strictness,  		True,  Bool)
-#ifdef DEBUG
+#ifdef OLD_STRICTNESS
 GLOBAL_VAR(v_CPR,         		True,  Bool)
 #endif
 GLOBAL_VAR(v_CSE,         		True,  Bool)
@@ -209,7 +203,7 @@ buildCoreToDo = do
    max_iter   <- readIORef v_MaxSimplifierIterations
    usageSP    <- readIORef v_UsageSPInf
    strictness <- readIORef v_Strictness
-#ifdef DEBUG
+#ifdef OLD_STRICTNESS
    cpr        <- readIORef v_CPR
 #endif
    cse        <- readIORef v_CSE
@@ -287,7 +281,7 @@ buildCoreToDo = do
 	],
 	case rule_check of { Just pat -> CoreDoRuleCheck 0 pat; Nothing -> CoreDoNothing },
 
-#ifdef DEBUG
+#ifdef OLD_STRICTNESS
 	if cpr        then CoreDoCPResult   else CoreDoNothing,
 #endif
 	if strictness then CoreDoStrictness else CoreDoNothing,
@@ -503,6 +497,7 @@ getPackageLibraries = do
      -- See driver/PackageSrc.hs for the HSbase1/HSbase2 split definition.
      -- THIS IS A STRICTLY TEMPORARY HACK (famous last words ...)
      -- JRS 04 Sept 01: Same appalling hack for HSwin32[1,2]
+     -- KAA 29 Mar  02: Same appalling hack for HSobjectio[1,2,3,4]
      hACK libs
 #      ifndef mingw32_TARGET_OS
        = libs
@@ -513,6 +508,9 @@ getPackageLibraries = do
          if   "HSwin321" `elem` libs && "HSwin322" `elem` libs
          then "HSwin32" : filter (not.(isPrefixOf "HSwin32")) libs
          else 
+         if   "HSobjectio1" `elem` libs && "HSobjectio2" `elem` libs && "HSobjectio3" `elem` libs && "HSobjectio4" `elem` libs
+	 then "HSobjectio" : filter (not.(isPrefixOf "HSobjectio")) libs
+         else 
          libs
 #      endif