remove the "-unreg" flag and the unregisterised way, see #1008

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index 267be56..43f630c 100644 (file)
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -159,7 +159,6 @@ static_flags = [
 
        ------- ways --------------------------------------------------------
   ,  ( "prof"          , NoArg (addWay WayProf) )
-  ,  ( "unreg"         , NoArg (addWay WayUnreg) )
   ,  ( "ticky"         , NoArg (addWay WayTicky) )
   ,  ( "parallel"      , NoArg (addWay WayPar) )
   ,  ( "gransim"       , NoArg (addWay WayGran) )
@@ -455,7 +454,6 @@ data WayName
   = WayThreaded
   | WayDebug
   | WayProf
-  | WayUnreg
   | WayTicky
   | WayPar
   | WayGran
@@ -492,7 +490,6 @@ allowed_combination way = and [ x `allowedWith` y
        _ `allowedWith` WayDebug                = True
        WayDebug `allowedWith` _                = True
 
-       WayProf `allowedWith` WayUnreg          = True
        WayProf `allowedWith` WayNDP            = True
        _ `allowedWith` _                       = False
 
@@ -562,9 +559,6 @@ way_details =
        [ "-DTICKY_TICKY"
        , "-optc-DTICKY_TICKY" ]),
 
-    (WayUnreg, Way  "u" False "Unregisterised" 
-       unregFlags ),
-
     -- optl's below to tell linker where to find the PVM library -- HWL
     (WayPar, Way  "mp" False "Parallel" 
        [ "-fparallel"

diff --git a/docs/users_guide/debugging.xml b/docs/users_guide/debugging.xml
index 4ab4379..0f1fd18 100644 (file)
--- a/docs/users_guide/debugging.xml
+++ b/docs/users_guide/debugging.xml
@@ -601,21 +601,9 @@ Main.skip2{-r1L6-} =
     of platform-specific code that needs to be written in order to get
     unregisterised compilation going is usually fairly small.</para>
 
-    <variablelist>
-      <varlistentry>
-       <term>
-          <option>-unreg</option>:
-          <indexterm><primary><option>-unreg</option></primary></indexterm>
-        </term>
-       <listitem>
-         <para>Compile via vanilla ANSI C only, turning off
-         platform-specific optimisations.  NOTE: in order to use
-         <option>-unreg</option>, you need to have a set of libraries
-         (including the RTS) built for unregisterised compilation.
-         This amounts to building GHC with way "u" enabled.</para>
-       </listitem>
-      </varlistentry>
-    </variablelist>
+   <para>Unregisterised compilation cannot be selected at
+   compile-time; you have to build GHC with the appropriate options
+   set.  Consult the GHC Building Guide for details.</para>
   </sect2>
 
 </sect1>

diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index d994220..39b6991 100644 (file)
--- a/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
@@ -2222,12 +2222,6 @@
              <entry>dynamic</entry>
              <entry>-</entry>
            </row>
-           <row>
-             <entry><option>-unreg</option></entry>
-             <entry>Enable unregisterised compilation</entry>
-             <entry>static</entry>
-             <entry>-</entry>
-           </row>
          </tbody>
        </tgroup>
       </informaltable>