X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FnativeGen%2FPlatform.hs;h=7b2502d96e104662a3bbe04662a90f51f9f40168;hb=858cdd2f2725c75d35dabf7411dbafa932d84095;hp=6c6b124a1560dff4ca5cf5848f1b84db3dba3723;hpb=190b2d90f92f61eb802275729106b5d9fb9a7a7c;p=ghc-hetmet.git

diff --git a/compiler/nativeGen/Platform.hs b/compiler/nativeGen/Platform.hs
index 6c6b124..7b2502d 100644
--- 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