X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=docs%2Fusers_guide%2Fphases.xml;h=2f74a6bbaa47cb16a40ab4f92a7893e2b37e12bf;hb=3e4ee05cb301bd9f10d6a64b610c21c1f890f50b;hp=40663456939a7aa2f8a70af47c6591b1507e49de;hpb=501281032723cfb1e6e324921c6c3e47b03730ab;p=ghc-hetmet.git

diff --git a/docs/users_guide/phases.xml b/docs/users_guide/phases.xml
index 4066345..2f74a6b 100644
--- a/docs/users_guide/phases.xml
+++ b/docs/users_guide/phases.xml
@@ -49,6 +49,28 @@
 
       <varlistentry>
         <term>
+          <option>-pgmm</option> <replaceable>cmd</replaceable>
+          <indexterm><primary><option>-pgmm</option></primary></indexterm>
+        </term>
+        <listitem>
+          <para>Use <replaceable>cmd</replaceable> as the
+          mangler.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
+          <option>-pgms</option> <replaceable>cmd</replaceable>
+          <indexterm><primary><option>-pgms</option></primary></indexterm>
+        </term>
+        <listitem>
+          <para>Use <replaceable>cmd</replaceable> as the
+          splitter.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
           <option>-pgma</option> <replaceable>cmd</replaceable>
           <indexterm><primary><option>-pgma</option></primary></indexterm>
         </term>
@@ -82,17 +104,6 @@
 
       <varlistentry>
         <term>
-          <option>-pgmdep</option> <replaceable>cmd</replaceable>
-          <indexterm><primary><option>-pgmdep</option></primary></indexterm>
-        </term>
-        <listitem>
-          <para>Use <replaceable>cmd</replaceable> as the dependency
-          generator.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>
           <option>-pgmF</option> <replaceable>cmd</replaceable>
           <indexterm><primary><option>-pgmF</option></primary></indexterm>
         </term>
@@ -155,6 +166,15 @@
       </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>
@@ -486,6 +506,24 @@ $ cat foo.hspp</screen>
           are fed to <replaceable>cmd</replaceable> on the command
           line after the three standard input and output
           arguments.</para>
+
+          <para>
+          An example of a pre-processor is to convert your source files to the
+          input encoding that GHC expects, i.e. create a script
+          <literal>convert.sh</literal> containing the lines:
+          </para>
+
+<screen>#!/bin/sh
+( echo "{-# LINE 1 \"$2\" #-}" ; iconv -f l1 -t utf-8 $2 ) > $3</screen>
+
+          <para>and pass <literal>-F -pgmF convert.sh</literal> to GHC.
+          The <literal>-f l1</literal> option tells iconv to convert your
+          Latin-1 file, supplied in argument <literal>$2</literal>, while
+          the "-t utf-8" options tell iconv to return a UTF-8 encoded file.
+          The result is redirected into argument <literal>$3</literal>.
+          The <literal>echo "{-# LINE 1 \"$2\" #-}"</literal>
+          just makes sure that your error positions are reported as
+          in the original source file.</para>
         </listitem>
       </varlistentry>
     </variablelist>
@@ -529,9 +567,7 @@ $ cat foo.hspp</screen>
           <para>Use GHC's native code generator rather than
           compiling via C.  This will compile faster (up to twice as
           fast), but may produce code that is slightly slower than
-          compiling via C.  <option>-fasm</option> is the default
-          when optimisation is off (see <xref
-          linkend="options-optimise"/>).</para>
+          compiling via C.  <option>-fasm</option> is the default.</para>
         </listitem>
       </varlistentry>
 
@@ -542,9 +578,8 @@ $ cat foo.hspp</screen>
         </term>
         <listitem>
           <para>Compile via C instead of using the native code
-          generator.  This is default for optimised compilations,
-          and on architectures for which GHC doesn't have a native
-          code generator.</para>
+          generator.  This is the default on architectures for which GHC
+          doesn't have a native code generator.</para>
         </listitem>
       </varlistentry>