Ticket #5735: 0001-Note-bitness-of-S390-S390x.patch

File 0001-Note-bitness-of-S390-S390x.patch, 1.6 KB (added by nomeata, 4 years ago)

The change as a git patch

  • aclocal.m4

    From eee8bd7b8ff15b1a1e443fad4987eec28ca386b7 Mon Sep 17 00:00:00 2001
    From: Joachim Breitner <[email protected]>
    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 AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS], 
    183183        mipsel) 
    184184            test -z "[$]2" || eval "[$]2=ArchMipsel" 
    185185            ;; 
    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) 
    187193            test -z "[$]2" || eval "[$]2=ArchUnknown" 
    188194            ;; 
    189195        *) 
  • compiler/utils/Platform.hs

    diff --git a/compiler/utils/Platform.hs b/compiler/utils/Platform.hs
    index 7253af1..46cbbef 100644
    a b data Arch 
    4343        | ArchARM 
    4444          { armISA    :: ArmISA 
    4545          , armISAExt :: [ArmISAExt] } 
     46        | ArchS390 
     47        | ArchS390x 
    4648        deriving (Read, Show, Eq) 
    4749 
    4850 
    target32Bit p = case platformArch p of 
    8587                ArchPPC_64  -> False 
    8688                ArchSPARC   -> True 
    8789                ArchARM _ _ -> True 
     90                ArchS390    -> True 
     91                ArchS390x   -> False 
    8892 
    8993 
    9094-- | This predicates tells us whether the OS supports ELF-like shared libraries.