Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-7.4
http://hackage.haskell.org/trac/ghc/changeset/312ee3e1dc54ace6d0155f5170ccf63674810b2f >--------------------------------------------------------------- commit 312ee3e1dc54ace6d0155f5170ccf63674810b2f Author: Paolo Capriotti <[email protected]> Date: Wed Mar 7 14:20:31 2012 +0000 Add Haiku platform (#5828) MERGED from commit 28f783f1c367784e0adcac2447682061a38f2ba3 >--------------------------------------------------------------- aclocal.m4 | 5 ++++- compiler/utils/Platform.hs | 2 ++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 1e1f30c..b572e32 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -221,7 +221,10 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS], netbsd) test -z "[$]2" || eval "[$]2=OSNetBSD" ;; - dragonfly|osf1|osf3|hpux|linuxaout|freebsd2|cygwin32|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku) + haiku) + test -z "[$]2" || eval "[$]2=OSHaiku" + ;; + dragonfly|osf1|osf3|hpux|linuxaout|freebsd2|cygwin32|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix) test -z "[$]2" || eval "[$]2=OSUnknown" ;; *) diff --git a/compiler/utils/Platform.hs b/compiler/utils/Platform.hs index 38205bb..3fbb451 100644 --- a/compiler/utils/Platform.hs +++ b/compiler/utils/Platform.hs @@ -56,6 +56,7 @@ data OS | OSOpenBSD | OSNetBSD | OSKFreeBSD + | OSHaiku deriving (Read, Show, Eq) -- | ARM Instruction Set Architecture and Extensions @@ -89,6 +90,7 @@ osElfTarget OSDarwin = False osElfTarget OSMinGW32 = False osElfTarget OSKFreeBSD = True osElfTarget OSUnknown = False +osElfTarget OSHaiku = True -- Defaulting to False is safe; it means don't rely on any -- ELF-specific functionality. It is important to have a default for -- portability, otherwise we have to answer this question for every _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
