diff options
| -rw-r--r-- | aclocal.m4 | 8 | ||||
| -rw-r--r-- | compiler/main/DriverPipeline.hs | 5 | ||||
| -rw-r--r-- | compiler/utils/Platform.hs | 3 | ||||
| -rw-r--r-- | rts/RtsFlags.c | 11 |
4 files changed, 4 insertions, 23 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 7616cf4598..14b848143f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -271,13 +271,10 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS], haiku) test -z "[$]2" || eval "[$]2=OSHaiku" ;; - osf3) - test -z "[$]2" || eval "[$]2=OSOsf3" - ;; nto-qnx) test -z "[$]2" || eval "[$]2=OSQNXNTO" ;; - dragonfly|osf1|hpux|linuxaout|freebsd2|gnu|nextstep2|nextstep3|sunos4|ultrix) + dragonfly|hpux|linuxaout|freebsd2|gnu|nextstep2|nextstep3|sunos4|ultrix) test -z "[$]2" || eval "[$]2=OSUnknown" ;; aix) @@ -814,7 +811,6 @@ case $HostPlatform in i386-*2\.@<:@0-9@:>@ | i386-*3\.@<:@0-3@:>@ ) fptools_cv_leading_underscore=yes ;; *) fptools_cv_leading_underscore=no ;; esac ;; -alpha-dec-osf*) fptools_cv_leading_underscore=no;; i386-unknown-mingw32) fptools_cv_leading_underscore=yes;; x86_64-unknown-mingw32) fptools_cv_leading_underscore=no;; @@ -1884,7 +1880,7 @@ case "$1-$2" in $3="linux" ;; # As far as I'm aware, none of these have relevant variants - freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|haiku) + freebsd|netbsd|openbsd|dragonfly|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|haiku) $3="$1" ;; aix*) # e.g. powerpc-ibm-aix7.1.3.0 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 diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c index cce799e139..3387355bfd 100644 --- a/rts/RtsFlags.c +++ b/rts/RtsFlags.c @@ -154,18 +154,7 @@ void initRtsFlagsDefaults(void) #else RtsFlags.GcFlags.doIdleGC = rtsFalse; #endif - -#if osf3_HOST_OS -/* ToDo: Perhaps by adjusting this value we can make linking without - * -static work (i.e., not generate a core-dumping executable)? */ -# if SIZEOF_VOID_P == 8 - RtsFlags.GcFlags.heapBase = 0x180000000L; -# else -# error I have no idea where to begin the heap on a non-64-bit osf3 machine. -# endif -#else RtsFlags.GcFlags.heapBase = 0; /* means don't care */ -#endif RtsFlags.GcFlags.allocLimitGrace = (100*1024) / BLOCK_SIZE; #ifdef DEBUG |