Index: BOOK/temp-system/64/gcc.xml
===================================================================
--- BOOK/temp-system/64/gcc.xml	(revision 3ed036937c27fe99ea5492a92b03cefb91b64fcc)
+++ BOOK/temp-system/64/gcc.xml	(revision 4dbd2763f0f82be6970f77739c7f029fa1e1336b)
@@ -25,12 +25,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/64/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
@@ -46,12 +38,4 @@
     href="../../cross-tools/64/gcc-static.xml"
     xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -77,5 +61,8 @@
     --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
     --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \
-    --enable-cloog-backend=isl</userinput></screen>
+    --enable-cloog-backend=isl --with-system-zlib \
+    --with-native-system-header-dir=/tools/include \
+    --disable-cloog-version-check --enable-checking=release \
+    --enable-libstdcxx-time</userinput></screen>
 
     <variablelist>
Index: BOOK/temp-system/common/gcc.xml
===================================================================
--- BOOK/temp-system/common/gcc.xml	(revision 3ed036937c27fe99ea5492a92b03cefb91b64fcc)
+++ BOOK/temp-system/common/gcc.xml	(revision 4dbd2763f0f82be6970f77739c7f029fa1e1336b)
@@ -25,12 +25,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
@@ -46,11 +38,4 @@
     href="../../cross-tools/common/gcc-static.xml"
     xpointer="xpointer(//*[@os='ah'])"/>
-
-    <para os="cf">Also, we need to set the directory searched by the fixincludes
-    process for system headers, so it won't look at the host's headers:</para>
-
-<screen os="cg"><userinput>cp -v gcc/Makefile.in{,.orig}
-sed -e 's@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g' \
-    gcc/Makefile.in.orig &gt; gcc/Makefile.in</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -71,8 +56,11 @@
 <screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
   --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-  --with-local-prefix=/tools --enable-long-long --enable-c99 \
-  --enable-shared --enable-threads=posix --enable-__cxa_atexit \
-  --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch \
-  --disable-multilib --enable-cloog-backend=isl</userinput></screen>
+  --libexecdir=/tools/lib --with-local-prefix=/tools --enable-long-long \
+  --enable-c99 --enable-shared --enable-threads=posix --disable-multilib \
+  --disable-nls --enable-__cxa_atexit --enable-languages=c,c++ \
+  --disable-libstdcxx-pch --enable-cloog-backend=isl --with-system-zlib \
+  --with-native-system-header-dir=/tools/include --disable-libssp \
+  --disable-install-libiberty --disable-cloog-version-check \
+  --enable-checking=release --enable-libstdcxx-time</userinput></screen>
 
     <variablelist os="cl">
@@ -94,5 +82,5 @@
 
 <screen os="ts2"><userinput>cp -v Makefile{,.orig}
-sed "/^HOST_\(GMP\|PPL\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::" \
+sed "/^HOST_\(GMP\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::" \
     Makefile.orig &gt; Makefile</userinput></screen>
 
Index: BOOK/temp-system/mips/gcc.xml
===================================================================
--- BOOK/temp-system/mips/gcc.xml	(revision 3ed036937c27fe99ea5492a92b03cefb91b64fcc)
+++ BOOK/temp-system/mips/gcc.xml	(revision 4dbd2763f0f82be6970f77739c7f029fa1e1336b)
@@ -25,12 +25,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
@@ -38,12 +30,4 @@
     href="../../cross-tools/common/gcc-static.xml"
     xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
-    xpointer="xpointer(//*[@os='f1'])"/>
-    
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
-    xpointer="xpointer(//*[@os='f2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -54,12 +38,4 @@
     href="../../cross-tools/common/gcc-static.xml"
     xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/mips64-64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64-64/gcc.xml	(revision 3ed036937c27fe99ea5492a92b03cefb91b64fcc)
+++ BOOK/temp-system/mips64-64/gcc.xml	(revision 4dbd2763f0f82be6970f77739c7f029fa1e1336b)
@@ -25,12 +25,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/64/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
@@ -38,12 +30,4 @@
     href="../../cross-tools/64/gcc-static.xml"
     xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
-    xpointer="xpointer(//*[@os='f1'])"/>
-    
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
-    xpointer="xpointer(//*[@os='f2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -54,12 +38,4 @@
     href="../../cross-tools/64/gcc-static.xml"
     xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -85,5 +61,7 @@
     --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
     --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \
-    --enable-cloog-backend=isl</userinput></screen>
+    --enable-cloog-backend=isl --with-system-zlib \
+    --disable-cloog-version-check --enable-checking=release \
+    --with-native-system-header-dir=/tools/include --enable-libstdcxx-time</userinput></screen>
 
     <variablelist>
Index: BOOK/temp-system/mips64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64/gcc.xml	(revision 3ed036937c27fe99ea5492a92b03cefb91b64fcc)
+++ BOOK/temp-system/mips64/gcc.xml	(revision 4dbd2763f0f82be6970f77739c7f029fa1e1336b)
@@ -25,12 +25,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
@@ -38,12 +30,4 @@
     href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
-    xpointer="xpointer(//*[@os='f1'])"/>
-    
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
-    xpointer="xpointer(//*[@os='f2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -54,12 +38,4 @@
     href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -85,5 +61,7 @@
   --enable-c99 --enable-shared --enable-threads=posix \
   --enable-__cxa_atexit --disable-nls --enable-languages=c,c++ \
-  --disable-libstdcxx-pch --with-abi=64 --enable-cloog-backend=isl</userinput></screen>
+  --disable-libstdcxx-pch --with-abi=64 --enable-cloog-backend=isl \
+  --with-system-zlib --disable-cloog-version-check --enable-checking=release \
+  --with-native-system-header-dir=/tools/include --enable-libstdcxx-time</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/multilib/gcc.xml
===================================================================
--- BOOK/temp-system/multilib/gcc.xml	(revision 3ed036937c27fe99ea5492a92b03cefb91b64fcc)
+++ BOOK/temp-system/multilib/gcc.xml	(revision 4dbd2763f0f82be6970f77739c7f029fa1e1336b)
@@ -25,12 +25,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
@@ -46,12 +38,4 @@
     href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -74,8 +58,11 @@
   ../gcc-&gcc-version;/configure --prefix=/tools \
   --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-  --target=${CLFS_TARGET} --with-local-prefix=/tools  --enable-long-long \
-  --enable-c99 --enable-shared --enable-threads=posix \
-  --enable-__cxa_atexit --disable-nls --enable-languages=c,c++ \
-  --disable-libstdcxx-pch --enable-cloog-backend=isl</userinput></screen>
+  --target=${CLFS_TARGET} --libexecdir=/tools/lib64 --with-local-prefix=/tools \
+  --enable-long-long --enable-c99 --enable-shared --enable-threads=posix \
+  --disable-nls --enable-__cxa_atexit --enable-languages=c,c++ \
+  --disable-libstdcxx-pch --enable-cloog-backend=isl --with-system-zlib \
+  --with-native-system-header-dir=/tools/include --disable-libssp \
+  --disable-install-libiberty --disable-cloog-version-check \
+  --enable-checking=release --enable-libstdcxx-time</userinput></screen>
 
     <variablelist os="dd">
Index: BOOK/temp-system/ppc/gcc.xml
===================================================================
--- BOOK/temp-system/ppc/gcc.xml	(revision 3ed036937c27fe99ea5492a92b03cefb91b64fcc)
+++ BOOK/temp-system/ppc/gcc.xml	(revision 4dbd2763f0f82be6970f77739c7f029fa1e1336b)
@@ -25,12 +25,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
@@ -46,12 +38,4 @@
     href="../../cross-tools/ppc/gcc-static.xml"
     xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/ppc64/gcc.xml
===================================================================
--- BOOK/temp-system/ppc64/gcc.xml	(revision 3ed036937c27fe99ea5492a92b03cefb91b64fcc)
+++ BOOK/temp-system/ppc64/gcc.xml	(revision 4dbd2763f0f82be6970f77739c7f029fa1e1336b)
@@ -38,12 +38,4 @@
     href="../../cross-tools/ppc64/gcc-static.xml"
     xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
