Put the target platform in the settings file

1 files changed, 5 insertions, 77 deletions

diff --git a/compiler/utils/Platform.hs b/compiler/utils/Platform.hs
index 362d7822d0..373c7bec33 100644
--- a/compiler/utils/Platform.hs
+++ b/compiler/utils/Platform.hs
@@ -1,7 +1,5 @@
 
 -- | A description of the platform we're compiling for.
---      In the future, this module should be the only one that references
---      the evil #defines for each TARGET_ARCH and TARGET_OS
 --
 module Platform (
         Platform(..),
@@ -10,7 +8,6 @@ module Platform (
         ArmISA(..),
         ArmISAExt(..),
 
-        defaultTargetPlatform,
         target32Bit,
         osElfTarget
 )
@@ -19,16 +16,13 @@ where
 
 import Panic
 
-#include "HsVersions.h"
-
-
 -- | Contains enough information for the native code generator to emit
 --      code for this platform.
 data Platform
         = Platform
         { platformArch  :: Arch
         , platformOS    :: OS }
-        deriving (Show, Eq)
+        deriving (Read, Show, Eq)
 
 
 -- | Architectures that the native code generator knows about.
@@ -45,7 +39,7 @@ data Arch
         | ArchARM
           { armISA    :: ArmISA
           , armISAExt :: [ArmISAExt] }
-        deriving (Show, Eq)
+        deriving (Read, Show, Eq)
 
 
 -- | Operating systems that the native code generator knows about.
@@ -58,7 +52,7 @@ data OS
         | OSMinGW32
         | OSFreeBSD
         | OSOpenBSD
-        deriving (Show, Eq)
+        deriving (Read, Show, Eq)
 
 -- | ARM Instruction Set Architecture and Extensions
 --
@@ -66,7 +60,7 @@ data ArmISA
     = ARMv5
     | ARMv6
     | ARMv7
-    deriving (Show, Eq)
+    deriving (Read, Show, Eq)
 
 data ArmISAExt
     = VFPv2
@@ -74,7 +68,7 @@ data ArmISAExt
     | VFPv3D16
     | NEON
     | IWMMX2
-    deriving (Show, Eq)
+    deriving (Read, Show, Eq)
 
 
 target32Bit :: Platform -> Bool
@@ -98,69 +92,3 @@ osElfTarget OSDarwin   = False
 osElfTarget OSMinGW32  = False
 osElfTarget OSUnknown  = panic "Don't know if OSUnknown is elf"
 
-
--- | This is the target platform as far as the #ifdefs are concerned.
---      These are set in includes/ghcplatform.h by the autoconf scripts
-defaultTargetPlatform :: Platform
-defaultTargetPlatform
-        = Platform defaultTargetArch defaultTargetOS
-
-
--- | Move the evil TARGET_ARCH #ifdefs into Haskell land.
-defaultTargetArch :: Arch
-#if i386_TARGET_ARCH
-defaultTargetArch       = ArchX86
-#elif x86_64_TARGET_ARCH
-defaultTargetArch       = ArchX86_64
-#elif powerpc_TARGET_ARCH
-defaultTargetArch       = ArchPPC
-#elif powerpc64_TARGET_ARCH
-defaultTargetArch       = ArchPPC_64
-#elif sparc_TARGET_ARCH
-defaultTargetArch       = ArchSPARC
-#elif arm_TARGET_ARCH
-defaultTargetArch       = ArchARM defaultTargetArmISA defaultTargetArmISAExt
-#else
-defaultTargetArch       = ArchUnknown
-#endif
-
-
--- | Move the evil TARGET_OS #ifdefs into Haskell land.
-defaultTargetOS :: OS
-#if   linux_TARGET_OS
-defaultTargetOS = OSLinux
-#elif darwin_TARGET_OS
-defaultTargetOS = OSDarwin
-#elif solaris2_TARGET_OS
-defaultTargetOS = OSSolaris2
-#elif mingw32_TARGET_OS
-defaultTargetOS = OSMinGW32
-#elif freebsd_TARGET_OS
-defaultTargetOS = OSFreeBSD
-#elif kfreebsdgnu_TARGET_OS
-defaultTargetOS = OSFreeBSD
-#elif openbsd_TARGET_OS
-defaultTargetOS = OSOpenBSD
-#else
-defaultTargetOS = OSUnknown
-#endif
-
-#if arm_TARGET_ARCH
-defaultTargetArmISA :: ArmISA
-#if defined(arm_HOST_ARCH_PRE_ARMv6)
-defaultTargetArmISA = ARMv5
-#elif defined(arm_HOST_ARCH_PRE_ARMv7)
-defaultTargetArmISA = ARMv6
-#else
-defaultTargetArmISA = ARMv7
-#endif
-
-defaultTargetArmISAExt :: [ArmISAExt]
-#if defined(arm_TARGET_ARCH) && !defined(arm_HOST_ARCH_PRE_ARMv7)
-/* wild guess really, in case of ARMv7 we assume both VFPv3 and NEON presented
-   however this is not true for SoCs like NVidia Tegra2 and Marvell Dove */
-defaultTargetArmISAExt = [VFPv3, NEON]
-#else
-defaultTargetArmISAExt = []
-#endif
-#endif /* arm_TARGET_ARCH */