X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FStaticFlags.hs;h=bf0e822d111840fdfd41cfbaffadf36d940162b8;hb=8cf861ba91941412e93f70a916233223aebf686e;hp=a244544c26e967a473b14088afe15a1f5528fc14;hpb=8f47436d4941e7871569e47bf8c2f5a6180bdbd5;p=ghc-hetmet.git

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index a244544..bf0e822 100644
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -44,11 +44,11 @@ module StaticFlags (
 	opt_IrrefutableTuples,
 	opt_Parallel,
 	opt_RuntimeTypes,
-	opt_Flatten,
 
 	-- optimisation opts
 	opt_NoMethodSharing, 
 	opt_NoStateHack,
+	opt_SpecInlineJoinPoints,
 	opt_CprOff,
 	opt_SimplNoPreInlining,
 	opt_SimplExcessPrecision,
@@ -64,7 +64,6 @@ module StaticFlags (
 	-- Related to linking
 	opt_PIC,
 	opt_Static,
-	opt_HardwireLibPaths,
 
 	-- misc opts
 	opt_IgnoreDotGhci,
@@ -301,9 +300,9 @@ opt_Hpc				= lookUp FSLIT("-fhpc")
 opt_DictsStrict			= lookUp  FSLIT("-fdicts-strict")
 opt_IrrefutableTuples		= lookUp  FSLIT("-firrefutable-tuples")
 opt_Parallel			= lookUp  FSLIT("-fparallel")
-opt_Flatten			= lookUp  FSLIT("-fflatten")
 
 -- optimisation opts
+opt_SpecInlineJoinPoints	= lookUp  FSLIT("-fspec-inline-join-points")
 opt_NoStateHack			= lookUp  FSLIT("-fno-state-hack")
 opt_NoMethodSharing		= lookUp  FSLIT("-fno-method-sharing")
 opt_CprOff			= lookUp  FSLIT("-fcpr-off")
@@ -336,7 +335,6 @@ opt_PIC                         = True
 opt_PIC                         = lookUp FSLIT("-fPIC")
 #endif
 opt_Static			= lookUp  FSLIT("-static")
-opt_HardwireLibPaths		= lookUp  FSLIT("-fhardwire-lib-paths")
 opt_Unregisterised		= lookUp  FSLIT("-funregisterised")
 
 -- Derived, not a real option.  Determines whether we will be compiling
@@ -364,9 +362,9 @@ isStaticFlag f =
 	"fauto-sccs-on-individual-cafs",
 	"fscc-profiling",
 	"fdicts-strict",
+	"fspec-inline-join-points",
 	"firrefutable-tuples",
 	"fparallel",
-	"fflatten",
 	"fgransim",
 	"fno-hi-version-check",
 	"dno-black-holing",
@@ -375,7 +373,6 @@ isStaticFlag f =
 	"fruntime-types",
 	"fno-pre-inlining",
 	"fexcess-precision",
-	"funfolding-update-in-place",
 	"static",
 	"fhardwire-lib-paths",
 	"funregisterised",
@@ -492,6 +489,7 @@ allowed_combination way = and [ x `allowedWith` y
 	WayDebug `allowedWith` _		= True
 
 	WayProf `allowedWith` WayNDP		= True
+	WayThreaded `allowedWith` WayProf	= True
 	_ `allowedWith` _ 			= False
 
 
@@ -603,7 +601,7 @@ way_details =
 
     (WayNDP, Way  "ndp" False "Nested data parallelism"
 	[ "-fparr"
-	, "-fflatten"]),
+	, "-fvectorise"]),
 
     (WayUser_a,  Way  "a"  False "User way 'a'"  ["$WAY_a_REAL_OPTS"]),	
     (WayUser_b,  Way  "b"  False "User way 'b'"  ["$WAY_b_REAL_OPTS"]),