From 28879d9b3afe1812810d42f14eda6dfa4aa6dc73 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Tue, 12 Oct 2010 13:47:00 +0000 Subject: [PATCH] Remove __HASKELL1__, __HASKELL98__, __CONCURRENT_HASKELL__ We used to define these CPP symbols, but nothing on hackage uses them and the first 2 are no longer correct (as we support multiple Haskell versions). --- compiler/main/DriverPipeline.hs | 9 +------ docs/users_guide/phases.xml | 51 --------------------------------------- 2 files changed, 1 insertion(+), 59 deletions(-) diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index 7c902e9..c690e84 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -1866,17 +1866,10 @@ doCpp dflags raw include_cc_opts input_fn output_fn = do , SysTools.FileOption "" output_fn ]) -cHaskell1Version :: String -cHaskell1Version = "5" -- i.e., Haskell 98 - hsSourceCppOpts :: [String] -- Default CPP defines in Haskell source hsSourceCppOpts = - [ "-D__HASKELL1__="++cHaskell1Version - , "-D__GLASGOW_HASKELL__="++cProjectVersionInt - , "-D__HASKELL98__" - , "-D__CONCURRENT_HASKELL__" - ] + [ "-D__GLASGOW_HASKELL__="++cProjectVersionInt ] -- ----------------------------------------------------------------------------- diff --git a/docs/users_guide/phases.xml b/docs/users_guide/phases.xml index 81be0a5..d1086d8 100644 --- a/docs/users_guide/phases.xml +++ b/docs/users_guide/phases.xml @@ -359,44 +359,6 @@ $ cat foo.hspp - __HASKELL98__ - __HASKELL98__ - - - If defined, this means that GHC supports the - language defined by the Haskell 98 report. - - - - - - __HASKELL__=98 - __HASKELL__=98 - - - In GHC 4.04 and later, the - __HASKELL__ - macro is defined as having the value - 98. - - - - - - __HASKELL1__ - __HASKELL1__ - - - If defined to n, that - means GHC supports the Haskell language defined in the - Haskell report version 1.n. - Currently 5. This macro is deprecated, and will probably - disappear in future versions. - - - - - __GLASGOW_HASKELL__ __GLASGOW_HASKELL__ @@ -435,19 +397,6 @@ $ cat foo.hspp - - __CONCURRENT_HASKELL__ - __CONCURRENT_HASKELL__ - - - This symbol is defined when pre-processing Haskell - (input) and pre-processing C (GHC output). Since GHC from - version 4.00 now supports concurrent haskell by default, - this symbol is always defined. - - - - __PARALLEL_HASKELL__ __PARALLEL_HASKELL__ -- 1.7.10.4