From: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
Date: Mon, 23 May 2016 14:12:09 +0000 (+0000)
Subject: hurd
X-Git-Tag: archive/raspbian/8.0.2-9+rpi1~1^2^2^2^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=428f12a83ef17b5fb90567467b20305505b87f7b;p=ghc.git

hurd

Provided by “Pino” via Samuel Thibault. Not yet pushed upstream.


Gbp-Pq: Name hurd.diff
---

diff --git a/aclocal.m4 b/aclocal.m4
index 0fa038b6..1fc1ec5f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -271,12 +271,15 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
         nto-qnx)
             test -z "[$]2" || eval "[$]2=OSQNXNTO"
             ;;
-        dragonfly|osf1|hpux|linuxaout|freebsd2|cygwin32|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix)
+        dragonfly|osf1|hpux|linuxaout|freebsd2|cygwin32|nextstep2|nextstep3|sunos4|ultrix|irix|aix)
             test -z "[$]2" || eval "[$]2=OSUnknown"
             ;;
         linux-android)
             test -z "[$]2" || eval "[$]2=OSAndroid"
             ;;
+        gnu)
+            test -z "[$]2" || eval "[$]2=OSHurd"
+            ;;
         *)
             echo "Unknown OS '[$]1'"
             exit 1
diff --git a/compiler/utils/Platform.hs b/compiler/utils/Platform.hs
index 8f9a8deb..2e1ace85 100644
--- a/compiler/utils/Platform.hs
+++ b/compiler/utils/Platform.hs
@@ -83,6 +83,7 @@ data OS
         | OSOsf3
         | OSQNXNTO
         | OSAndroid
+        | OSHurd
         deriving (Read, Show, Eq)
 
 -- | ARM Instruction Set Architecture, Extensions and ABI
@@ -127,6 +128,7 @@ osElfTarget OSOsf3      = False -- I don't know if this is right, but as
                                 -- per comment below it's safe
 osElfTarget OSQNXNTO    = False
 osElfTarget OSAndroid   = True
+osElfTarget OSHurd      = True
 osElfTarget OSUnknown   = False
  -- Defaulting to False is safe; it means don't rely on any
  -- ELF-specific functionality.  It is important to have a default for