From: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
Date: Fri, 30 Nov 2018 10:11:18 +0000 (+0000)
Subject: hurd
X-Git-Tag: archive/raspbian/8.4.4+dfsg1-1+rpi1^2~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=33e3814dafa789fd10926a5626616314d8826013;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 c6df749b..f7a2136c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -272,12 +272,15 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
         nto-qnx)
             test -z "[$]2" || eval "[$]2=OSQNXNTO"
             ;;
-        dragonfly|hpux|linuxaout|freebsd2|gnu|nextstep2|nextstep3|sunos4|ultrix)
+        dragonfly|hpux|linuxaout|freebsd2|nextstep2|nextstep3|sunos4|ultrix)
             test -z "[$]2" || eval "[$]2=OSUnknown"
             ;;
         aix)
             test -z "[$]2" || eval "[$]2=OSAIX"
             ;;
+        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 c313870f..449a62a5 100644
--- a/compiler/utils/Platform.hs
+++ b/compiler/utils/Platform.hs
@@ -87,6 +87,7 @@ data OS
         | OSHaiku
         | OSQNXNTO
         | OSAIX
+        | OSHurd
         deriving (Read, Show, Eq)
 
 -- | ARM Instruction Set Architecture, Extensions and ABI
@@ -136,6 +137,7 @@ osElfTarget OSKFreeBSD  = True
 osElfTarget OSHaiku     = True
 osElfTarget OSQNXNTO    = False
 osElfTarget OSAIX       = False
+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