diff options
| -rw-r--r-- | compiler/cmm/PprC.hs | 12 | ||||
| -rw-r--r-- | compiler/main/DriverPipeline.hs | 5 | ||||
| -rw-r--r-- | includes/Stg.h | 14 |
3 files changed, 4 insertions, 27 deletions
diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs index aa21174109..56de94079f 100644 --- a/compiler/cmm/PprC.hs +++ b/compiler/cmm/PprC.hs @@ -62,17 +62,13 @@ import Data.Array.ST -- -------------------------------------------------------------------------- -- Top level -pprCs :: DynFlags -> [RawCmmGroup] -> SDoc -pprCs dflags cmms - = pprCode CStyle (vcat $ map (\c -> split_marker $$ pprC c) cmms) - where - split_marker - | gopt Opt_SplitObjs dflags = text "__STG_SPLIT_MARKER" - | otherwise = empty +pprCs :: [RawCmmGroup] -> SDoc +pprCs cmms + = pprCode CStyle (vcat $ map pprC cmms) writeCs :: DynFlags -> Handle -> [RawCmmGroup] -> IO () writeCs dflags handle cmms - = printForC dflags handle (pprCs dflags cmms) + = printForC dflags handle (pprCs cmms) -- -------------------------------------------------------------------------- -- Now do some real work diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index 8e21b092e9..474fd8c344 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -1148,10 +1148,6 @@ runPhase (RealPhase cc_phase) input_fn dflags (cmdlineFrameworkPaths ++ pkgFrameworkPaths) else return [] - let split_objs = gopt Opt_SplitObjs dflags - split_opt | hcc && split_objs = [ "-DUSE_SPLIT_MARKERS" ] - | otherwise = [ ] - let cc_opt | optLevel dflags >= 2 = [ "-O2" ] | optLevel dflags >= 1 = [ "-O" ] | otherwise = [] @@ -1230,7 +1226,6 @@ runPhase (RealPhase cc_phase) input_fn dflags ++ cc_opt ++ [ "-include", ghcVersionH ] ++ framework_paths - ++ split_opt ++ include_paths ++ pkg_extra_cc_opts )) diff --git a/includes/Stg.h b/includes/Stg.h index 939bed6444..619984d8e5 100644 --- a/includes/Stg.h +++ b/includes/Stg.h @@ -493,20 +493,6 @@ INLINE_HEADER StgInt64 PK_Int64(W_ p_src[]) #endif /* SIZEOF_HSWORD == 4 */ /* ----------------------------------------------------------------------------- - Split markers - -------------------------------------------------------------------------- */ - -#if defined(USE_SPLIT_MARKERS) -#if defined(LEADING_UNDERSCORE) -#define __STG_SPLIT_MARKER __asm__("\n___stg_split_marker:"); -#else -#define __STG_SPLIT_MARKER __asm__("\n__stg_split_marker:"); -#endif -#else -#define __STG_SPLIT_MARKER /* nothing */ -#endif - -/* ----------------------------------------------------------------------------- Integer multiply with overflow -------------------------------------------------------------------------- */ |