[commit: ghc] master: ghc & docs: kill unused flags (a383139)
git at git.haskell.org
git at git.haskell.org
Tue Apr 22 03:12:22 UTC 2014
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/a3831391e1defdf69214dc258eebcf37d92991f2/ghc
>---------------------------------------------------------------
commit a3831391e1defdf69214dc258eebcf37d92991f2
Author: Austin Seipp <austin at well-typed.com>
Date: Mon Apr 21 22:10:05 2014 -0500
ghc & docs: kill unused flags
This removes the following, now defunct flags, which will not be
recognized by GHC 7.10:
-fwarn-lazy-unlifted-bindings
-pgmm and -optm (used for the Mangler, long dead)
-keep-raw-s-file & -keep-raw-s-files
-monly[432]-reg-only
Signed-off-by: Austin Seipp <austin at well-typed.com>
>---------------------------------------------------------------
a3831391e1defdf69214dc258eebcf37d92991f2
compiler/main/DynFlags.hs | 10 ----------
docs/users_guide/flags.xml | 14 --------------
docs/users_guide/phases.xml | 9 ---------
3 files changed, 33 deletions(-)
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index ee4f8a7..72ebb38 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -457,7 +457,6 @@ data WarningFlag =
| Opt_WarnTabs
| Opt_WarnUnrecognisedPragmas
| Opt_WarnDodgyForeignImports
- | Opt_WarnLazyUnliftedBindings
| Opt_WarnUnusedDoBind
| Opt_WarnWrongDoBind
| Opt_WarnAlternativeLayoutRuleTransitional
@@ -2163,7 +2162,6 @@ dynamic_flags = [
, Flag "pgmP" (hasArg setPgmP)
, Flag "pgmF" (hasArg (\f -> alterSettings (\s -> s { sPgm_F = f})))
, Flag "pgmc" (hasArg (\f -> alterSettings (\s -> s { sPgm_c = (f,[])})))
- , Flag "pgmm" (HasArg (\_ -> addWarn "The -pgmm flag does nothing; it will be removed in a future GHC release"))
, Flag "pgms" (hasArg (\f -> alterSettings (\s -> s { sPgm_s = (f,[])})))
, Flag "pgma" (hasArg (\f -> alterSettings (\s -> s { sPgm_a = (f,[])})))
, Flag "pgml" (hasArg (\f -> alterSettings (\s -> s { sPgm_l = (f,[])})))
@@ -2178,7 +2176,6 @@ dynamic_flags = [
, Flag "optP" (hasArg addOptP)
, Flag "optF" (hasArg (\f -> alterSettings (\s -> s { sOpt_F = f : sOpt_F s})))
, Flag "optc" (hasArg addOptc)
- , Flag "optm" (HasArg (\_ -> addWarn "The -optm flag does nothing; it will be removed in a future GHC release"))
, Flag "opta" (hasArg (\f -> alterSettings (\s -> s { sOpt_a = f : sOpt_a s})))
, Flag "optl" (hasArg addOptl)
, Flag "optwindres" (hasArg (\f -> alterSettings (\s -> s { sOpt_windres = f : sOpt_windres s})))
@@ -2244,8 +2241,6 @@ dynamic_flags = [
, Flag "keep-hc-files" (NoArg (setGeneralFlag Opt_KeepHcFiles))
, Flag "keep-s-file" (NoArg (setGeneralFlag Opt_KeepSFiles))
, Flag "keep-s-files" (NoArg (setGeneralFlag Opt_KeepSFiles))
- , Flag "keep-raw-s-file" (NoArg (addWarn "The -keep-raw-s-file flag does nothing; it will be removed in a future GHC release"))
- , Flag "keep-raw-s-files" (NoArg (addWarn "The -keep-raw-s-files flag does nothing; it will be removed in a future GHC release"))
, Flag "keep-llvm-file" (NoArg (do setObjTarget HscLlvm
setGeneralFlag Opt_KeepLlvmFiles))
, Flag "keep-llvm-files" (NoArg (do setObjTarget HscLlvm
@@ -2385,9 +2380,6 @@ dynamic_flags = [
------ Machine dependant (-m<blah>) stuff ---------------------------
- , Flag "monly-2-regs" (NoArg (addWarn "The -monly-2-regs flag does nothing; it will be removed in a future GHC release"))
- , Flag "monly-3-regs" (NoArg (addWarn "The -monly-3-regs flag does nothing; it will be removed in a future GHC release"))
- , Flag "monly-4-regs" (NoArg (addWarn "The -monly-4-regs flag does nothing; it will be removed in a future GHC release"))
, Flag "msse" (versionSuffix (\maj min d -> d{ sseVersion = Just (maj, min) }))
, Flag "mavx" (noArg (\d -> d{ avx = True }))
, Flag "mavx2" (noArg (\d -> d{ avx2 = True }))
@@ -2612,8 +2604,6 @@ fWarningFlags = [
( "warn-tabs", Opt_WarnTabs, nop ),
( "warn-typed-holes", Opt_WarnTypedHoles, nop ),
( "warn-unrecognised-pragmas", Opt_WarnUnrecognisedPragmas, nop ),
- ( "warn-lazy-unlifted-bindings", Opt_WarnLazyUnliftedBindings,
- \_ -> deprecate "it has no effect, and will be removed in GHC 7.10" ),
( "warn-unused-do-bind", Opt_WarnUnusedDoBind, nop ),
( "warn-wrong-do-bind", Opt_WarnWrongDoBind, nop ),
( "warn-alternative-layout-rule-transitional", Opt_WarnAlternativeLayoutRuleTransitional, nop ),
diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index 43af1d7..593bf4b 100644
--- a/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
@@ -2550,12 +2550,6 @@
<entry>-</entry>
</row>
<row>
- <entry><option>-optm</option> <replaceable>option</replaceable></entry>
- <entry>pass <replaceable>option</replaceable> to the mangler</entry>
- <entry>dynamic</entry>
- <entry>-</entry>
- </row>
- <row>
<entry><option>-opta</option> <replaceable>option</replaceable></entry>
<entry>pass <replaceable>option</replaceable> to the assembler</entry>
<entry>dynamic</entry>
@@ -2607,14 +2601,6 @@
<entry>-</entry>
</row>
</tbody>
- <tbody>
- <row>
- <entry><option>-monly-[432]-regs</option></entry>
- <entry>(x86 only) give some registers back to the C compiler</entry>
- <entry>dynamic</entry>
- <entry>-</entry>
- </row>
- </tbody>
</tgroup>
</informaltable>
</sect2>
diff --git a/docs/users_guide/phases.xml b/docs/users_guide/phases.xml
index acb53a7..db32f38 100644
--- a/docs/users_guide/phases.xml
+++ b/docs/users_guide/phases.xml
@@ -218,15 +218,6 @@
</varlistentry>
<varlistentry>
<term>
- <option>-optm</option> <replaceable>option</replaceable>
- <indexterm><primary><option>-optm</option></primary></indexterm>
- </term>
- <listitem>
- <para>Pass <replaceable>option</replaceable> to the mangler.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>
<option>-opta</option> <replaceable>option</replaceable>
<indexterm><primary><option>-opta</option></primary></indexterm>
</term>
More information about the ghc-commits
mailing list