summaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2016-03-28 12:24:37 +0200
committerHerbert Valerio Riedel <hvr@gnu.org>2016-03-28 12:39:49 +0200
commitf911358bd071a8ec311d3838f7f1119de196f19a (patch)
tree8a838e9f5872cc2df8af53084ef14eb4f603b5a4 /compiler
parent0bca3f3a56c606e5060be03227f0ea9ca2197acc (diff)
downloadhaskell-f911358bd071a8ec311d3838f7f1119de196f19a.tar.gz
Scrap DEC OSF/1 support
DEC OSF/1 (aka Tru64 UNIX) has been discontinued a few years ago already[1]. This removes the undoubtedly bitrotten support for `OSOsf3 :: OS` from GHC's code-base. Support for `ArchAlpha :: Arch` may be removed at some later point, as there may still be users out there running a more or less recent Linux/alpha distribution on their more-than-a-decade old Alpha hardware... [1]: https://en.wikipedia.org/wiki/Tru64_UNIX
Diffstat (limited to 'compiler')
-rw-r--r--compiler/main/DriverPipeline.hs5
-rw-r--r--compiler/utils/Platform.hs3
2 files changed, 2 insertions, 6 deletions
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index 89fbb42346..1991bd3c86 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -1834,9 +1834,8 @@ linkBinary' staticLink dflags o_files dep_packages = do
let thread_opts
| WayThreaded `elem` ways dflags =
let os = platformOS (targetPlatform dflags)
- in if os == OSOsf3 then ["-lpthread", "-lexc"]
- else if os `elem` [OSMinGW32, OSFreeBSD, OSOpenBSD,
- OSNetBSD, OSHaiku, OSQNXNTO, OSiOS, OSDarwin]
+ in if os `elem` [OSMinGW32, OSFreeBSD, OSOpenBSD,
+ OSNetBSD, OSHaiku, OSQNXNTO, OSiOS, OSDarwin]
then []
else ["-lpthread"]
| otherwise = []
diff --git a/compiler/utils/Platform.hs b/compiler/utils/Platform.hs
index cfd948e779..600ed8099d 100644
--- a/compiler/utils/Platform.hs
+++ b/compiler/utils/Platform.hs
@@ -84,7 +84,6 @@ data OS
| OSNetBSD
| OSKFreeBSD
| OSHaiku
- | OSOsf3
| OSQNXNTO
| OSAndroid
| OSAIX
@@ -136,8 +135,6 @@ osElfTarget OSiOS = False
osElfTarget OSMinGW32 = False
osElfTarget OSKFreeBSD = True
osElfTarget OSHaiku = True
-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 OSAIX = False