Index: final-system/64/gcc.xml
===================================================================
--- final-system/64/gcc.xml	(revision de4f4d9b04aceb70fa2e0cb151188991b464a566)
+++ final-system/64/gcc.xml	(revision 9be8160708c816a412a024a6123c60dd13d0b215)
@@ -34,4 +34,12 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='e1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/common/gcc.xml
===================================================================
--- final-system/common/gcc.xml	(revision de4f4d9b04aceb70fa2e0cb151188991b464a566)
+++ final-system/common/gcc.xml	(revision 9be8160708c816a412a024a6123c60dd13d0b215)
@@ -41,4 +41,12 @@
 
 <screen os="e"><userinput>sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in</userinput></screen>
+
+    <para os="e1">GCC provides a <command>gccbug</command> script which detects at
+    compile time whether mktemp is present, and hardcodes the result in a test.
+    This will cause the script to fall back to using less random names for
+    temporary files.  We will be installing mktemp later, so the following sed
+    will simulate its presence.</para>
+
+<screen os="e2">sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in</screen>
 
     <para os="f">The GCC documentation recommends building GCC outside of the source
Index: final-system/mips/gcc.xml
===================================================================
--- final-system/mips/gcc.xml	(revision de4f4d9b04aceb70fa2e0cb151188991b464a566)
+++ final-system/mips/gcc.xml	(revision 9be8160708c816a412a024a6123c60dd13d0b215)
@@ -34,4 +34,12 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='e1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/mips64-64/gcc.xml
===================================================================
--- final-system/mips64-64/gcc.xml	(revision de4f4d9b04aceb70fa2e0cb151188991b464a566)
+++ final-system/mips64-64/gcc.xml	(revision 9be8160708c816a412a024a6123c60dd13d0b215)
@@ -45,4 +45,12 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='e1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/mips64/gcc.xml
===================================================================
--- final-system/mips64/gcc.xml	(revision de4f4d9b04aceb70fa2e0cb151188991b464a566)
+++ final-system/mips64/gcc.xml	(revision 9be8160708c816a412a024a6123c60dd13d0b215)
@@ -37,4 +37,12 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='e1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/multilib/gcc.xml
===================================================================
--- final-system/multilib/gcc.xml	(revision de4f4d9b04aceb70fa2e0cb151188991b464a566)
+++ final-system/multilib/gcc.xml	(revision 9be8160708c816a412a024a6123c60dd13d0b215)
@@ -29,4 +29,12 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='e1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: introduction/common/changelog.xml
===================================================================
--- introduction/common/changelog.xml	(revision de4f4d9b04aceb70fa2e0cb151188991b464a566)
+++ introduction/common/changelog.xml	(revision 9be8160708c816a412a024a6123c60dd13d0b215)
@@ -47,4 +47,7 @@
 	  <para>[ken] - Alter bison to build repeatably, from LFS.</para> 
 	</listitem>
+        <listitem>
+	  <para>[ken] - Alter gccbug to use mktemp, from LFS.</para> 
+	</listitem>
       </itemizedlist>
     </listitem>
