X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=b708ad0f8cf7c929f57bbe8607956b04cb964fe0;hp=b49323b27a19d0b85461087341c0384df7269e68;hb=9da4639011348fb6c318e3cba4b08622f811d9c4;hpb=bec18cb3a1dcbc70b0257a367091c9a5948da6f6

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index b49323b..b708ad0 100644
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -314,7 +314,6 @@ isStaticFlag f =
 	"fsemi-tagging",
 	"flet-no-escape",
 	"femit-extern-decls",
-	"fglobalise-toplev-names",
 	"fgransim",
 	"fno-hi-version-check",
 	"dno-black-holing",
@@ -445,7 +444,6 @@ allowed_combination way = and [ x `allowedWith` y
 	_ `allowedWith` WayDebug		= True
 	WayDebug `allowedWith` _		= True
 
-	WayThreaded `allowedWith` WayProf	= True
 	WayProf `allowedWith` WayUnreg		= True
 	WayProf `allowedWith` WayNDP		= True
 	_ `allowedWith` _ 			= False
@@ -488,8 +486,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