X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=4c9c5e826a2dcb0389e056ccb8e9a7fb5defb7c1;hb=2bad3deb28991726ecff922887f39e51c39e0293;hp=3e9737fe5bfb325852e9ac99f52a96566417c847;hpb=135a717c69397ab2f575191254f71faf805042de;p=ghc-hetmet.git

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index 3e9737f..4c9c5e8 100644
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -29,7 +29,6 @@ module StaticFlags (
 
 	-- language opts
 	opt_DictsStrict,
-        opt_MaxContextReductionDepth,
 	opt_IrrefutableTuples,
 	opt_Parallel,
 	opt_RuntimeTypes,
@@ -78,7 +77,6 @@ import FastString	( FastString, mkFastString )
 import Util
 import Maybes		( firstJust )
 import Panic		( GhcException(..), ghcError )
-import Constants	( mAX_CONTEXT_REDUCTION_DEPTH )
 
 import EXCEPTION	( throwDyn )
 import DATA_IOREF
@@ -253,7 +251,6 @@ opt_DoTickyProfiling		= lookUp  FSLIT("-fticky-ticky")
 -- language opts
 opt_DictsStrict			= lookUp  FSLIT("-fdicts-strict")
 opt_IrrefutableTuples		= lookUp  FSLIT("-firrefutable-tuples")
-opt_MaxContextReductionDepth	= lookup_def_int "-fcontext-stack" mAX_CONTEXT_REDUCTION_DEPTH
 opt_Parallel			= lookUp  FSLIT("-fparallel")
 opt_Flatten			= lookUp  FSLIT("-fflatten")
 
@@ -337,7 +334,6 @@ isStaticFlag f =
 	"fPIC"
 	]
   || any (flip prefixMatch f) [
-	"fcontext-stack",
 	"fliberate-case-threshold",
 	"fmax-worker-args",
 	"fhistory-size",
@@ -492,8 +488,13 @@ way_details :: [ (WayName, Way) ]
 way_details =
   [ (WayThreaded, Way "thr" True "Threaded" [
 #if defined(freebsd_TARGET_OS)
-	  "-optc-pthread"
-        , "-optl-pthread"
+--	  "-optc-pthread"
+--      , "-optl-pthread"
+	-- FreeBSD's default threading library is the KSE-based M:N libpthread,
+	-- which GHC has some problems with.  It's currently not clear whether
+	-- the problems are our fault or theirs, but it seems that using the
+	-- alternative 1:1 threading library libthr works around it:
+	  "-optl-lthr"
 #elif defined(solaris2_TARGET_OS)
           "-optl-lrt"
 #endif