X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=docs%2Fbuilding%2Fbuilding.xml;h=1cce8b561af23351a3aab416795fe45274fee29f;hb=5b0e32406c30be1613fbf556685c77e840dff342;hp=0c80312537432c4aa60d093bf398ed7a890c4871;hpb=7465f1dd9a0d60a74b538e1894e035d732cbe30a;p=ghc-hetmet.git

diff --git a/docs/building/building.xml b/docs/building/building.xml
index 0c80312..1cce8b5 100644
--- a/docs/building/building.xml
+++ b/docs/building/building.xml
@@ -2752,8 +2752,8 @@ directive.
 	      </varlistentry>
 
 	      <varlistentry>
-		<term><literal>EXCLUDE_SRCS</literal>
-                  <indexterm><primary><literal>EXCLUDE_SRCS</literal></primary></indexterm>
+		<term><literal>EXCLUDED_SRCS</literal>
+                  <indexterm><primary><literal>EXCLUDED_SRCS</literal></primary></indexterm>
                 </term>
 		<listitem>
 		  <para>Set to a list of source files (relative to the
@@ -2771,7 +2771,7 @@ directive.
 
 	      <varlistentry>
 		<term><literal>EXTRA_SRCS</literal>
-                  <indexterm><primary><literal>EXCLUDE_SRCS</literal></primary></indexterm>
+                  <indexterm><primary><literal>EXTRA_SRCS</literal></primary></indexterm>
                 </term>
 		  <listitem>
 		  <para>Set to a list of extra source files (perhaps
@@ -2952,6 +2952,58 @@ directive.
       ones in <filename>boilerplate.mk</filename>.</para>
     </sect2>
 
+    <sect2 id="sec-platforms">
+      <title>Platform settings</title>
+      <indexterm><primary>Platform settings</primary>
+      </indexterm>
+
+      <para>There are three platforms of interest when building GHC:</para>
+      
+      <variablelist>
+	<varlistentry>
+	  <term>The <emphasis>build</emphasis> platform</term>
+	  <listitem>
+	    <para>The platform on which we are doing this build.</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term>The <emphasis>host</emphasis> platform</term>
+	  <listitem>
+	    <para>The platform on which these binaries will run.</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term>The <emphasis>target</emphasis> platform</term>
+	  <listitem>
+	    <para>The platform for which this compiler will generate code.</para>
+	  </listitem>
+	</varlistentry>
+      </variablelist>
+      
+      <para>These platforms are set when running the
+	<literal>configure</literal> script, using the
+	<option>--build</option>, <option>--host</option>, and
+	<option>--target</option> options.  The <filename>mk/config.mk</filename>
+	file defines several symbols related to the platform settings (see
+	<filename>mk/config.mk</filename> for details).</para>
+
+      <para>We don't currently support build &amp; host being different, because
+	the build process creates binaries that are both run during the build,
+	and also installed.</para>
+
+      <para>If host and target are different, then we are building a
+	cross-compiler.  For GHC, this means a compiler
+	which will generate intermediate .hc files to port to the target
+	architecture for bootstrapping.  The libraries and stage 2 compiler
+	will be built as HC files for the target system (see <xref
+	  linkend="sec-porting-ghc" /> for details.</para>
+
+      <para>More details on when to use BUILD, HOST or TARGET can be found in
+	the comments in <filename>config.mk</filename>.</para>
+    </sect2>
+
     <sect2 id="sec-suffix">
       <title>Pattern rules and options</title>
       <indexterm><primary>Pattern rules</primary></indexterm>
@@ -3540,20 +3592,19 @@ $ make install</screen>
 
       <para>Bootstrapping GHC on a system without GHC already
       installed is achieved by taking the intermediate C files (known
-      as HC files) from a GHC compilation on a supported system to the
-      target machine, and compiling them using gcc to get a working
-      GHC.</para>
+      as HC files) from another GHC compilation, compiling them using gcc to
+	get a working GHC.</para>
 
       <para><emphasis>NOTE: GHC versions 5.xx were hard to bootstrap
       from C.  We recommend using GHC 6.0.1 or
       later.</emphasis></para>
 
       <para>HC files are platform-dependent, so you have to get a set
-      that were generated on similar hardware.  There may be some
-      supplied on the GHC download page, otherwise you'll have to
-      compile some up yourself, or start from
-      <emphasis>unregisterised</emphasis> HC files - see <xref
-      linkend="unregisterised-porting"/>.</para>
+	that were generated on <emphasis>the same platform</emphasis>.  There
+	may be some supplied on the GHC download page, otherwise you'll have to
+	compile some up yourself, or start from
+	<emphasis>unregisterised</emphasis> HC files - see <xref
+	  linkend="unregisterised-porting"/>.</para>
 
       <para>The following steps should result in a working GHC build
       with full libraries:</para>
@@ -3696,7 +3747,7 @@ $ ./configure --enable-hc-boot --enable-hc-boot-unregisterised</screen>
   
 	    <listitem>
 <screen>$ cd <replaceable>T</replaceable>/ghc/includes
-$ make ghcconfig.h</screen>
+$ make</screen>
 	    </listitem>
 	  </itemizedlist>
 	  </listitem>
@@ -3722,14 +3773,15 @@ $ ./configure</screen>
 
 <programlisting>GhcUnregisterised = YES
 GhcLibHcOpts = -O -fvia-C -keep-hc-files
+GhcRtsHcOpts = -keep-hc-files
 GhcLibWays =
 SplitObjs = NO
 GhcWithNativeCodeGen = NO
 GhcWithInterpreter = NO
 GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -O -fvia-C -keep-hc-files</programlisting>
+GhcStage2HcOpts = -O -fvia-C -keep-hc-files
 SRC_HC_OPTS += -H32m
-GhcBootLibs = YES
+GhcBootLibs = YES</programlisting>
 	    </listitem>
 
 	    <listitem>
@@ -3755,7 +3807,7 @@ GhcBootLibs = YES
 
 	    <listitem>
 	      <para>Copy
-	      <filename><replaceable>T</replaceable>/ghc/includes/ghcconfig.h</filename>
+	      <filename><replaceable>T</replaceable>/ghc/includes/ghcautoconf.h</filename>
 	      to
 	      <filename><replaceable>H</replaceable>/ghc/includes</filename>.
 	      Note that we are building on the host machine, using the
@@ -3766,9 +3818,9 @@ GhcBootLibs = YES
 	    </listitem>
 
 	      <listitem>
-		<para>Touch <literal>ghcconfig.h</literal>, just to make
+		<para>Touch <literal>ghcautoconf.h</literal>, just to make
 		sure it doesn't get replaced during the build:</para>
-<screen>$ touch <replaceable>H</replaceable>/ghc/includes/ghcconfig.h</screen>
+<screen>$ touch <replaceable>H</replaceable>/ghc/includes/ghcautoconf.h</screen>
 	      </listitem>
 
 	    <listitem>
@@ -3785,15 +3837,17 @@ $ make boot &amp;&amp; make</screen>
 	    </listitem>
 
 	    <listitem>
-<screen>$ cd <replaceable>H</replaceable>/ghc
+<screen>$ cd <replaceable>H</replaceable>/ghc/compiler
 $ make boot stage=2 &amp;&amp; make stage=2</screen>
 	    </listitem>
-	    
+
 	    <listitem>
-<screen>$ cd <replaceable>H</replaceable>/ghc/utils
+<screen>$ cd <replaceable>H</replaceable>/ghc/lib
+$ make clean
+$ make -k UseStage1=YES EXTRA_HC_OPTS='-O -fvia-C -keep-hc-files'
+$ cd <replaceable>H</replaceable>/ghc/utils
 $ make clean
-$ make -k HC=<replaceable>H</replaceable>/ghc/compiler/stage1/ghc-inplace \
-		EXTRA_HC_OPTS='-O -fvia-C -keep-hc-files'</screen>
+$ make -k UseStage1=YES EXTRA_HC_OPTS='-O -fvia-C -keep-hc-files'</screen>
 	    </listitem>
 	    
 	    <listitem>