projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove -fhardwire-lib-paths in favour of -dynload sysdep
[ghc-hetmet.git]
/
compiler
/
main
/
StaticFlags.hs
diff --git
a/compiler/main/StaticFlags.hs
b/compiler/main/StaticFlags.hs
index
43f630c
..
59e125c
100644
(file)
--- a/
compiler/main/StaticFlags.hs
+++ b/
compiler/main/StaticFlags.hs
@@
-26,6
+26,7
@@
module StaticFlags (
-- Output style options
opt_PprUserLength,
-- Output style options
opt_PprUserLength,
+ opt_SuppressUniques,
opt_PprStyle_Debug,
-- profiling opts
opt_PprStyle_Debug,
-- profiling opts
@@
-58,13
+59,11
@@
module StaticFlags (
opt_UF_UseThreshold,
opt_UF_FunAppDiscount,
opt_UF_KeenessFactor,
opt_UF_UseThreshold,
opt_UF_FunAppDiscount,
opt_UF_KeenessFactor,
- opt_UF_UpdateInPlace,
opt_UF_DearOp,
-- Related to linking
opt_PIC,
opt_Static,
opt_UF_DearOp,
-- Related to linking
opt_PIC,
opt_Static,
- opt_HardwireLibPaths,
-- misc opts
opt_IgnoreDotGhci,
-- misc opts
opt_IgnoreDotGhci,
@@
-169,8
+168,9
@@
static_flags = [
-- ToDo: user ways
------ Debugging ----------------------------------------------------
-- ToDo: user ways
------ Debugging ----------------------------------------------------
- , ( "dppr-debug", PassFlag addOpt )
- , ( "dppr-user-length", AnySuffix addOpt )
+ , ( "dppr-debug", PassFlag addOpt )
+ , ( "dsuppress-uniques", PassFlag addOpt )
+ , ( "dppr-user-length", AnySuffix addOpt )
-- rest of the debugging flags are dynamic
--------- Profiling --------------------------------------------------
-- rest of the debugging flags are dynamic
--------- Profiling --------------------------------------------------
@@
-224,7
+224,7
@@
GLOBAL_VAR(v_opt_C_ready, False, Bool)
staticFlags = unsafePerformIO $ do
ready <- readIORef v_opt_C_ready
if (not ready)
staticFlags = unsafePerformIO $ do
ready <- readIORef v_opt_C_ready
if (not ready)
- then panic "a static opt was looked at too early!"
+ then panic "Static flags have not been initialised!\n Please call GHC.newSession or GHC.parseStaticFlags early enough."
else readIORef v_opt_C
-- -static is the default
else readIORef v_opt_C
-- -static is the default
@@
-282,6
+282,7
@@
unpacked_opts =
opt_IgnoreDotGhci = lookUp FSLIT("-ignore-dot-ghci")
-- debugging opts
opt_IgnoreDotGhci = lookUp FSLIT("-ignore-dot-ghci")
-- debugging opts
+opt_SuppressUniques = lookUp FSLIT("-dsuppress-uniques")
opt_PprStyle_Debug = lookUp FSLIT("-dppr-debug")
opt_PprUserLength = lookup_def_int "-dppr-user-length" 5 --ToDo: give this a name
opt_PprStyle_Debug = lookUp FSLIT("-dppr-debug")
opt_PprUserLength = lookup_def_int "-dppr-user-length" 5 --ToDo: give this a name
@@
-325,7
+326,6
@@
opt_UF_CreationThreshold = lookup_def_int "-funfolding-creation-threshold" (45:
opt_UF_UseThreshold = lookup_def_int "-funfolding-use-threshold" (8::Int) -- Discounts can be big
opt_UF_FunAppDiscount = lookup_def_int "-funfolding-fun-discount" (6::Int) -- It's great to inline a fn
opt_UF_KeenessFactor = lookup_def_float "-funfolding-keeness-factor" (1.5::Float)
opt_UF_UseThreshold = lookup_def_int "-funfolding-use-threshold" (8::Int) -- Discounts can be big
opt_UF_FunAppDiscount = lookup_def_int "-funfolding-fun-discount" (6::Int) -- It's great to inline a fn
opt_UF_KeenessFactor = lookup_def_float "-funfolding-keeness-factor" (1.5::Float)
-opt_UF_UpdateInPlace = lookUp FSLIT("-funfolding-update-in-place")
opt_UF_DearOp = ( 4 :: Int)
opt_UF_DearOp = ( 4 :: Int)
@@
-335,7
+335,6
@@
opt_PIC = True
opt_PIC = lookUp FSLIT("-fPIC")
#endif
opt_Static = lookUp FSLIT("-static")
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
opt_Unregisterised = lookUp FSLIT("-funregisterised")
-- Derived, not a real option. Determines whether we will be compiling
@@
-374,7
+373,6
@@
isStaticFlag f =
"fruntime-types",
"fno-pre-inlining",
"fexcess-precision",
"fruntime-types",
"fno-pre-inlining",
"fexcess-precision",
- "funfolding-update-in-place",
"static",
"fhardwire-lib-paths",
"funregisterised",
"static",
"fhardwire-lib-paths",
"funregisterised",