Index: BOOK/cross-tools/common/gcc-final.xml
===================================================================
--- BOOK/cross-tools/common/gcc-final.xml	(revision 2214750ba1c0321180264da466dd2a5c39f74c2d)
+++ BOOK/cross-tools/common/gcc-final.xml	(revision 3c54c0a773e1d0a68bef052f24db1c74a4751d1c)
@@ -60,7 +60,7 @@
   --disable-multilib --with-mpc=/cross-tools --with-mpfr=/cross-tools \
   --with-gmp=/cross-tools  --with-cloog=/cross-tools \
-  --enable-cloog-backend=isl --disable-cloog-version-check \
-  --with-isl=/cross-tools --disable-isl-version-check --with-system-zlib \
-  --enable-checking=release --enable-libstdcxx-time</userinput></screen>
+  --enable-cloog-backend=isl --with-isl=/cross-tools \
+  --disable-isl-version-check --with-system-zlib --enable-checking=release \
+  --enable-libstdcxx-time</userinput></screen>
 
     <variablelist os="bg">
Index: BOOK/cross-tools/common/gcc-static.xml
===================================================================
--- BOOK/cross-tools/common/gcc-static.xml	(revision 2214750ba1c0321180264da466dd2a5c39f74c2d)
+++ BOOK/cross-tools/common/gcc-static.xml	(revision 3c54c0a773e1d0a68bef052f24db1c74a4751d1c)
@@ -64,6 +64,6 @@
   --disable-libatomic --disable-libitm --disable-libsanitizer \
   --disable-libquadmath --disable-target-libiberty --disable-target-zlib \
-  --with-system-zlib --enable-cloog-backend=isl --disable-cloog-version-check \
-  --disable-isl-version-check --enable-languages=c --enable-checking=release</userinput></screen>
+  --with-system-zlib --enable-cloog-backend=isl --disable-isl-version-check \
+  --enable-languages=c --enable-checking=release</userinput></screen>
 
     <variablelist os="am">
Index: BOOK/cross-tools/multilib/gcc-final.xml
===================================================================
--- BOOK/cross-tools/multilib/gcc-final.xml	(revision 2214750ba1c0321180264da466dd2a5c39f74c2d)
+++ BOOK/cross-tools/multilib/gcc-final.xml	(revision 3c54c0a773e1d0a68bef052f24db1c74a4751d1c)
@@ -60,7 +60,7 @@
   --enable-long-long --enable-threads=posix --with-mpc=/cross-tools \
   --with-mpfr=/cross-tools --with-gmp=/cross-tools --with-cloog=/cross-tools \
-  --enable-cloog-backend=isl --disable-cloog-version-check \
-  --with-isl=/cross-tools --disable-isl-version-check --with-system-zlib \
-  --enable-checking=release --enable-libstdcxx-time</userinput></screen>
+  --enable-cloog-backend=isl --with-isl=/cross-tools \
+  --disable-isl-version-check --with-system-zlib --enable-checking=release \
+  --enable-libstdcxx-time</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/multilib/gcc-static.xml
===================================================================
--- BOOK/cross-tools/multilib/gcc-static.xml	(revision 2214750ba1c0321180264da466dd2a5c39f74c2d)
+++ BOOK/cross-tools/multilib/gcc-static.xml	(revision 3c54c0a773e1d0a68bef052f24db1c74a4751d1c)
@@ -71,6 +71,6 @@
   --disable-libsanitizer --disable-libquadmath --disable-target-libiberty \
   --disable-target-zlib --with-system-zlib --enable-cloog-backend=isl \
-  --disable-cloog-version-check --with-isl=/cross-tools \
-  --disable-isl-version-check --enable-languages=c --enable-checking=release</userinput></screen>
+  --with-isl=/cross-tools --disable-isl-version-check --enable-languages=c \
+  --enable-checking=release</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/common/gcc.xml
===================================================================
--- BOOK/final-system/common/gcc.xml	(revision 2214750ba1c0321180264da466dd2a5c39f74c2d)
+++ BOOK/final-system/common/gcc.xml	(revision 3c54c0a773e1d0a68bef052f24db1c74a4751d1c)
@@ -50,6 +50,6 @@
     --disable-multilib --disable-libstdcxx-pch \
     --enable-cloog-backend=isl --with-system-zlib \
-    --disable-cloog-version-check --enable-checking=release \
-    --enable-libstdcxx-time --disable-install-libiberty</userinput></screen>
+    --enable-checking=release --enable-libstdcxx-time \
+    --disable-install-libiberty</userinput></screen>
 
     <para os="j">Compile the package:</para>
Index: BOOK/final-system/mips64/gcc.xml
===================================================================
--- BOOK/final-system/mips64/gcc.xml	(revision 2214750ba1c0321180264da466dd2a5c39f74c2d)
+++ BOOK/final-system/mips64/gcc.xml	(revision 3c54c0a773e1d0a68bef052f24db1c74a4751d1c)
@@ -50,6 +50,6 @@
     --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch \
     --enable-cloog-backend=isl --with-system-zlib \
-    --disable-cloog-version-check --enable-checking=release \
-    --enable-libstdcxx-time --disable-install-libiberty</userinput></screen>
+    --enable-checking=release --enable-libstdcxx-time \
+    --disable-install-libiberty</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/gcc.xml
===================================================================
--- BOOK/final-system/multilib/gcc.xml	(revision 2214750ba1c0321180264da466dd2a5c39f74c2d)
+++ BOOK/final-system/multilib/gcc.xml	(revision 3c54c0a773e1d0a68bef052f24db1c74a4751d1c)
@@ -50,6 +50,6 @@
     --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch \
     --enable-cloog-backend=isl --with-system-zlib \
-    --disable-cloog-version-check --enable-checking=release \
-    --enable-libstdcxx-time --disable-install-libiberty</userinput></screen>
+    --enable-checking=release --enable-libstdcxx-time \
+    --disable-install-libiberty</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/64/gcc.xml
===================================================================
--- BOOK/temp-system/64/gcc.xml	(revision 2214750ba1c0321180264da466dd2a5c39f74c2d)
+++ BOOK/temp-system/64/gcc.xml	(revision 3c54c0a773e1d0a68bef052f24db1c74a4751d1c)
@@ -63,6 +63,5 @@
     --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>
+    --enable-checking=release --enable-libstdcxx-time</userinput></screen>
 
     <variablelist>
Index: BOOK/temp-system/common/gcc.xml
===================================================================
--- BOOK/temp-system/common/gcc.xml	(revision 2214750ba1c0321180264da466dd2a5c39f74c2d)
+++ BOOK/temp-system/common/gcc.xml	(revision 3c54c0a773e1d0a68bef052f24db1c74a4751d1c)
@@ -61,6 +61,6 @@
   --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>
+  --disable-install-libiberty --enable-checking=release \
+  --enable-libstdcxx-time</userinput></screen>
 
     <variablelist os="cl">
Index: BOOK/temp-system/mips64-64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64-64/gcc.xml	(revision 2214750ba1c0321180264da466dd2a5c39f74c2d)
+++ BOOK/temp-system/mips64-64/gcc.xml	(revision 3c54c0a773e1d0a68bef052f24db1c74a4751d1c)
@@ -62,6 +62,6 @@
     --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \
     --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>
+    --enable-checking=release --enable-libstdcxx-time \
+    --with-native-system-header-dir=/tools/include </userinput></screen>
 
     <variablelist>
Index: BOOK/temp-system/mips64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64/gcc.xml	(revision 2214750ba1c0321180264da466dd2a5c39f74c2d)
+++ BOOK/temp-system/mips64/gcc.xml	(revision 3c54c0a773e1d0a68bef052f24db1c74a4751d1c)
@@ -62,6 +62,6 @@
   --enable-__cxa_atexit --disable-nls --enable-languages=c,c++ \
   --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>
+  --with-system-zlib --enable-checking=release --enable-libstdcxx-time \
+  --with-native-system-header-dir=/tools/include</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 2214750ba1c0321180264da466dd2a5c39f74c2d)
+++ BOOK/temp-system/multilib/gcc.xml	(revision 3c54c0a773e1d0a68bef052f24db1c74a4751d1c)
@@ -63,6 +63,6 @@
   --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>
+  --disable-install-libiberty  --enable-libstdcxx-time \
+  --enable-checking=release</userinput></screen>
 
     <variablelist os="dd">
