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

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index 3e9737f..9378c0a 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,
@@ -56,7 +55,6 @@ module StaticFlags (
 	-- misc opts
 	opt_IgnoreDotGhci,
 	opt_ErrorSpans,
-	opt_EmitCExternDecls,
 	opt_GranMacros,
 	opt_HiVersion,
 	opt_HistorySize,
@@ -66,25 +64,23 @@ module StaticFlags (
 	opt_EmitExternalCore,
 	opt_PIC,
 	v_Ld_inputs,
+	tablesNextToCode
   ) where
 
 #include "HsVersions.h"
 
-import Util		( consIORef )
 import CmdLineParser
-import Config		( cProjectVersionInt, cProjectPatchLevel,
-			  cGhcUnregisterised )
+import Config
 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
-import UNSAFE_IO	( unsafePerformIO )
-import Monad		( when )
-import Char		( isDigit )
+import Control.Exception ( throwDyn )
+import Data.IORef
+import System.IO.Unsafe	( unsafePerformIO )
+import Control.Monad	( when )
+import Data.Char	( isDigit )
 import Data.List	( sort, intersperse, nub )
 
 -----------------------------------------------------------------------------
@@ -104,8 +100,16 @@ parseStaticFlags args = do
 		  | otherwise = []
 
   (more_leftover, errs) <- processArgs static_flags (unreg_flags ++ way_flags)
+
+    -- TABLES_NEXT_TO_CODE affects the info table layout.
+    -- Be careful to do this *after* all processArgs,
+    -- because evaluating tablesNextToCode involves looking at the global
+    -- static flags.  Those pesky global variables...
+  let cg_flags | tablesNextToCode = ["-optc-DTABLES_NEXT_TO_CODE"]
+	       | otherwise	  = []
+
   when (not (null errs)) $ ghcError (UsageError (unlines errs))
-  return (more_leftover++leftover)
+  return (cg_flags++more_leftover++leftover)
 
 
 -- note that ordering is important in the following list: any flag which
@@ -253,7 +257,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")
 
@@ -266,7 +269,6 @@ opt_RulesOff			= lookUp  FSLIT("-frules-off")
 opt_LiberateCaseThreshold	= lookup_def_int "-fliberate-case-threshold" (10::Int)
 opt_MaxWorkerArgs		= lookup_def_int "-fmax-worker-args" (10::Int)
 
-opt_EmitCExternDecls	        = lookUp  FSLIT("-femit-extern-decls")
 opt_GranMacros			= lookUp  FSLIT("-fgransim")
 opt_HiVersion			= read (cProjectVersionInt ++ cProjectPatchLevel) :: Int
 opt_HistorySize			= lookup_def_int "-fhistory-size" 20
@@ -290,6 +292,14 @@ opt_UF_DearOp   = ( 4 :: Int)
 			
 opt_Static			= lookUp  FSLIT("-static")
 opt_Unregisterised		= lookUp  FSLIT("-funregisterised")
+
+-- Derived, not a real option.  Determines whether we will be compiling
+-- info tables that reside just before the entry code, or with an
+-- indirection to the entry code.  See TABLES_NEXT_TO_CODE in 
+-- includes/InfoTables.h.
+tablesNextToCode 		= not opt_Unregisterised
+		 		  && cGhcEnableTablesNextToCode == "YES"
+
 opt_EmitExternalCore		= lookUp  FSLIT("-fext-core")
 
 -- Include full span info in error messages, instead of just the start position.
@@ -309,15 +319,10 @@ isStaticFlag f =
 	"fauto-sccs-on-individual-cafs",
 	"fscc-profiling",
 	"fticky-ticky",
-	"fall-strict",
 	"fdicts-strict",
 	"firrefutable-tuples",
 	"fparallel",
 	"fflatten",
-	"fsemi-tagging",
-	"flet-no-escape",
-	"femit-extern-decls",
-	"fglobalise-toplev-names",
 	"fgransim",
 	"fno-hi-version-check",
 	"dno-black-holing",
@@ -330,14 +335,12 @@ isStaticFlag f =
 	"static",
 	"funregisterised",
 	"fext-core",
-	"frule-check",
 	"frules-off",
 	"fcpr-off",
 	"ferror-spans",
 	"fPIC"
 	]
   || any (flip prefixMatch f) [
-	"fcontext-stack",
 	"fliberate-case-threshold",
 	"fmax-worker-args",
 	"fhistory-size",
@@ -449,7 +452,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
@@ -492,8 +494,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