From eee8bd7b8ff15b1a1e443fad4987eec28ca386b7 Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Sun, 1 Jan 2012 02:15:02 +0100
Subject: [PATCH] Note bitness of S390/S390x
Closes: #5735
---
aclocal.m4 | 8 +++++++-
compiler/utils/Platform.hs | 4 ++++
2 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 1d5d1f7..5deb1d2 100644
|
a
|
b
|
|
| 183 | 183 | mipsel) |
| 184 | 184 | test -z "[$]2" || eval "[$]2=ArchMipsel" |
| 185 | 185 | ;; |
| 186 | | hppa|hppa1_1|ia64|m68k|rs6000|s390|s390x|sparc64|vax) |
| | 186 | s390) |
| | 187 | test -z "[$]2" || eval "[$]2=ArchS390" |
| | 188 | ;; |
| | 189 | s390x) |
| | 190 | test -z "[$]2" || eval "[$]2=ArchS390x" |
| | 191 | ;; |
| | 192 | hppa|hppa1_1|ia64|m68k|rs6000|sparc64|vax) |
| 187 | 193 | test -z "[$]2" || eval "[$]2=ArchUnknown" |
| 188 | 194 | ;; |
| 189 | 195 | *) |
diff --git a/compiler/utils/Platform.hs b/compiler/utils/Platform.hs
index 7253af1..46cbbef 100644
|
a
|
b
|
|
| 43 | 43 | | ArchARM |
| 44 | 44 | { armISA :: ArmISA |
| 45 | 45 | , armISAExt :: [ArmISAExt] } |
| | 46 | | ArchS390 |
| | 47 | | ArchS390x |
| 46 | 48 | deriving (Read, Show, Eq) |
| 47 | 49 | |
| 48 | 50 | |
| … |
… |
|
| 85 | 87 | ArchPPC_64 -> False |
| 86 | 88 | ArchSPARC -> True |
| 87 | 89 | ArchARM _ _ -> True |
| | 90 | ArchS390 -> True |
| | 91 | ArchS390x -> False |
| 88 | 92 | |
| 89 | 93 | |
| 90 | 94 | -- | This predicates tells us whether the OS supports ELF-like shared libraries. |