From 84da03a24f7bb570c6642aefc22e5bd4d0867631 Mon Sep 17 00:00:00 2001 From: sof Date: Wed, 3 Jul 2002 15:15:25 +0000 Subject: [PATCH] [project @ 2002-07-03 15:15:24 by sof] Remove -fcore option, a NOP. (The Core frontend is enabled by feeding GHC .hcr files.) --- ghc/compiler/main/CmdLineOpts.lhs | 1 - ghc/compiler/main/DriverFlags.hs | 8 ++++---- ghc/compiler/main/DriverPipeline.hs | 5 ----- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/ghc/compiler/main/CmdLineOpts.lhs b/ghc/compiler/main/CmdLineOpts.lhs index 2f6c6a6..fd17c53 100644 --- a/ghc/compiler/main/CmdLineOpts.lhs +++ b/ghc/compiler/main/CmdLineOpts.lhs @@ -335,7 +335,6 @@ data HscLang | HscAsm | HscJava | HscILX - | HscCore | HscInterpreted | HscNothing deriving (Eq, Show) diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs index e0196f2..0e2763b 100644 --- a/ghc/compiler/main/DriverFlags.hs +++ b/ghc/compiler/main/DriverFlags.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: DriverFlags.hs,v 1.97 2002/06/12 22:04:26 wolfgang Exp $ +-- $Id: DriverFlags.hs,v 1.98 2002/07/03 15:15:24 sof Exp $ -- -- Driver flags -- @@ -433,7 +433,6 @@ dynamic_flags = [ , ( "fvia-c", NoArg (setLang HscC) ) , ( "fvia-C", NoArg (setLang HscC) ) , ( "filx", NoArg (setLang HscILX) ) - , ( "fcore", NoArg (setLang HscCore) ) -- "active negatives" , ( "fno-implicit-prelude", NoArg (setDynFlag Opt_NoImplicitPrelude) ) @@ -565,8 +564,9 @@ machdepCCOpts -- the fp (%ebp) for our register maps. = do n_regs <- dynFlag stolen_x86_regs sta <- readIORef v_Static - return ( [ if sta then "-DDONT_WANT_WIN32_DLL_SUPPORT" else "", - if suffixMatch "mingw32" cTARGETPLATFORM then "-mno-cygwin" else "" ], + return ( [ if sta then "-DDONT_WANT_WIN32_DLL_SUPPORT" else "" +-- , if suffixMatch "mingw32" cTARGETPLATFORM then "-mno-cygwin" else "" + ], [ "-fno-defer-pop", "-fomit-frame-pointer", "-DSTOLEN_X86_REGS="++show n_regs ] ) diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs index 0cb43c3..c2d4235 100644 --- a/ghc/compiler/main/DriverPipeline.hs +++ b/ghc/compiler/main/DriverPipeline.hs @@ -155,11 +155,6 @@ genPipeline todo stop_flag persistent_output lang (filename,suffix) | split -> not_valid | otherwise -> [ Hsc, HCc, As ] - HscCore | split && mangle -> [ Hsc, HCc, Mangle, SplitMangle, SplitAs ] - | mangle -> [ Hsc, HCc, Mangle, As ] - | split -> not_valid - | otherwise -> [ Hsc, HCc, As ] - HscAsm | split -> [ Hsc, SplitMangle, SplitAs ] | otherwise -> [ Hsc, As ] -- 1.7.10.4