Merge branch 'ghc-generics' of http://darcs.haskell.org/ghc into ghc-generics

[ghc-hetmet.git] / compiler / nativeGen / Platform.hs

diff --git a/compiler/nativeGen/Platform.hs b/compiler/nativeGen/Platform.hs
index 6c6b124..7b2502d 100644 (file)
--- a/compiler/nativeGen/Platform.hs
+++ b/compiler/nativeGen/Platform.hs
@@ -31,8 +31,7 @@ data Platform
 --     about what instruction set extensions an architecture might support.
 --
 data Arch
-       = ArchAlpha
-       | ArchX86
+       = ArchX86
        | ArchX86_64
        | ArchPPC
        | ArchPPC_64
@@ -46,7 +45,7 @@ data OS
        = OSUnknown
        | OSLinux
        | OSDarwin
-       | OSSolaris
+       | OSSolaris2
        | OSMinGW32
        | OSFreeBSD
        | OSOpenBSD
@@ -58,6 +57,7 @@ osElfTarget :: OS -> Bool
 osElfTarget OSLinux   = True
 osElfTarget OSFreeBSD = True
 osElfTarget OSOpenBSD = True
+osElfTarget OSSolaris2 = True
 osElfTarget _         = False
 
 -- | This is the target platform as far as the #ifdefs are concerned.
@@ -69,9 +69,7 @@ defaultTargetPlatform
 
 -- | Move the evil TARGET_ARCH #ifdefs into Haskell land.
 defaultTargetArch :: Arch
-#if   alpha_TARGET_ARCH
-defaultTargetArch      = ArchAlpha
-#elif i386_TARGET_ARCH
+#if i386_TARGET_ARCH
 defaultTargetArch      = ArchX86
 #elif x86_64_TARGET_ARCH
 defaultTargetArch      = ArchX86_64
@@ -92,8 +90,8 @@ defaultTargetOS :: OS
 defaultTargetOS        = OSLinux
 #elif darwin_TARGET_OS
 defaultTargetOS        = OSDarwin
-#elif solaris_TARGET_OS
-defaultTargetOS        = OSSolaris
+#elif solaris2_TARGET_OS
+defaultTargetOS        = OSSolaris2
 #elif mingw32_TARGET_OS
 defaultTargetOS        = OSMinGW32
 #elif freebsd_TARGET_OS