Index: BOOK/cross-tools/common/gcc-final.xml
===================================================================
--- BOOK/cross-tools/common/gcc-final.xml	(revision 011586235fc7fc1450bbea36457fa2bd65064fd7)
+++ BOOK/cross-tools/common/gcc-final.xml	(revision 5e6856493bd0c291867288b7b07af45d8f625dec)
@@ -64,7 +64,6 @@
     --with-sysroot=${CLFS} --with-local-prefix=/tools \
     --with-native-system-header-dir=/tools/include --disable-nls \
-    --enable-shared --disable-static --enable-languages=c,c++ \
-    --enable-__cxa_atexit --enable-c99 \
-    --enable-long-long --enable-threads=posix --disable-multilib \
+    --disable-static --enable-languages=c,c++ --enable-__cxa_atexit \
+    --enable-threads=posix --disable-multilib \
     --with-mpc=/cross-tools --with-mpfr=/cross-tools --with-gmp=/cross-tools \
     --with-cloog=/cross-tools --with-isl=/cross-tools --with-system-zlib \
@@ -93,18 +92,4 @@
 
       <varlistentry os="bg3">
-        <term><parameter>--enable-c99</parameter></term>
-        <listitem>
-          <para>Enable C99 support for C programs.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bg4">
-        <term><parameter>--enable-long-long</parameter></term>
-        <listitem>
-          <para>Enables long long support in the compiler.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bg5">
         <term><parameter>--enable-threads=posix</parameter></term>
         <listitem>
@@ -113,5 +98,5 @@
       </varlistentry>
 
-      <varlistentry os="bg6">
+      <varlistentry os="bg4">
         <term><parameter>--enable-libstdcxx-time</parameter></term>
         <listitem>
Index: BOOK/cross-tools/mips64-64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips64-64/gcc-final.xml	(revision 011586235fc7fc1450bbea36457fa2bd65064fd7)
+++ BOOK/cross-tools/mips64-64/gcc-final.xml	(revision 5e6856493bd0c291867288b7b07af45d8f625dec)
@@ -64,6 +64,6 @@
     --with-sysroot=${CLFS} --with-local-prefix=/tools \
     --with-native-system-header-dir=/tools/include --disable-nls \
-    --enable-shared --disable-static --enable-languages=c,c++ \
-    --enable-__cxa_atexit --enable-c99 --enable-long-long --enable-threads=posix \
+    --disable-static --enable-languages=c,c++ \
+    --enable-__cxa_atexit --enable-threads=posix \
     --disable-multilib --with-mpc=/cross-tools --with-mpfr=/cross-tools \
     --with-gmp=/cross-tools --with-cloog=/cross-tools \
@@ -98,12 +98,4 @@
       xpointer="xpointer(//*[@os='bg4'])"/>
 
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/gcc-final.xml"
-      xpointer="xpointer(//*[@os='bg5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/gcc-final.xml"
-      xpointer="xpointer(//*[@os='bg6'])"/>
-
     </variablelist>
 
Index: BOOK/cross-tools/multilib/gcc-final.xml
===================================================================
--- BOOK/cross-tools/multilib/gcc-final.xml	(revision 011586235fc7fc1450bbea36457fa2bd65064fd7)
+++ BOOK/cross-tools/multilib/gcc-final.xml	(revision 5e6856493bd0c291867288b7b07af45d8f625dec)
@@ -64,7 +64,6 @@
     --with-sysroot=${CLFS} --with-local-prefix=/tools \
     --with-native-system-header-dir=/tools/include \
-    --disable-nls --enable-shared --disable-static \
-    --enable-languages=c,c++ --enable-__cxa_atexit --enable-c99 \
-    --enable-long-long --enable-threads=posix --with-mpc=/cross-tools \
+    --disable-nls --disable-static --enable-languages=c,c++ \
+    --enable-__cxa_atexit --enable-threads=posix --with-mpc=/cross-tools \
     --with-mpfr=/cross-tools --with-gmp=/cross-tools --with-cloog=/cross-tools \
     --with-isl=/cross-tools --with-system-zlib --enable-checking=release \
Index: BOOK/final-system/common/gcc.xml
===================================================================
--- BOOK/final-system/common/gcc.xml	(revision 011586235fc7fc1450bbea36457fa2bd65064fd7)
+++ BOOK/final-system/common/gcc.xml	(revision 5e6856493bd0c291867288b7b07af45d8f625dec)
@@ -48,7 +48,6 @@
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
   ../gcc-&gcc-version;/configure --prefix=/usr \
-    --libexecdir=/usr/lib --enable-shared --enable-threads=posix \
-    --enable-__cxa_atexit --enable-c99 --enable-long-long \
-    --enable-clocale=gnu --enable-languages=c,c++ \
+    --libexecdir=/usr/lib --enable-threads=posix \
+    --enable-__cxa_atexit --enable-clocale=gnu --enable-languages=c,c++ \
     --disable-multilib --disable-libstdcxx-pch \
     --with-system-zlib --enable-checking=release --enable-libstdcxx-time</userinput></screen>
Index: BOOK/final-system/mips64/gcc.xml
===================================================================
--- BOOK/final-system/mips64/gcc.xml	(revision 011586235fc7fc1450bbea36457fa2bd65064fd7)
+++ BOOK/final-system/mips64/gcc.xml	(revision 5e6856493bd0c291867288b7b07af45d8f625dec)
@@ -54,8 +54,8 @@
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib32:/lib32:/usr/lib:/lib" \
   ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
-    --libexecdir=/usr/lib64 --enable-shared --enable-threads=posix \
-    --enable-__cxa_atexit --enable-c99 --enable-long-long --with-abi=64 \
-    --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch \
-    --with-system-zlib --enable-checking=release --enable-libstdcxx-time</userinput></screen>
+    --libexecdir=/usr/lib64 --enable-threads=posix --enable-__cxa_atexit \
+    --with-abi=64 --enable-clocale=gnu --enable-languages=c,c++ \
+    --disable-libstdcxx-pch --with-system-zlib --enable-checking=release \
+    --enable-libstdcxx-time</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 011586235fc7fc1450bbea36457fa2bd65064fd7)
+++ BOOK/final-system/multilib/gcc.xml	(revision 5e6856493bd0c291867288b7b07af45d8f625dec)
@@ -54,6 +54,5 @@
 LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib:/lib" \
   ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
-    --libexecdir=/usr/lib64 --enable-shared --enable-threads=posix \
-    --enable-__cxa_atexit --enable-c99 --enable-long-long \
+    --libexecdir=/usr/lib64 --enable-threads=posix --enable-__cxa_atexit 
     --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch \
     --with-system-zlib --enable-checking=release --enable-libstdcxx-time</userinput></screen>
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent	(revision 011586235fc7fc1450bbea36457fa2bd65064fd7)
+++ BOOK/general.ent	(revision 5e6856493bd0c291867288b7b07af45d8f625dec)
@@ -3,5 +3,5 @@
 <!ENTITY month "08"> <!-- Use two digits -->
 <!ENTITY month_name "August">
-<!ENTITY day "09"> <!-- Use two digits -->
+<!ENTITY day "10"> <!-- Use two digits -->
 <!ENTITY year "2014"> <!-- Use four digits -->
 
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 011586235fc7fc1450bbea36457fa2bd65064fd7)
+++ BOOK/introduction/common/changelog.xml	(revision 5e6856493bd0c291867288b7b07af45d8f625dec)
@@ -38,4 +38,14 @@
 
     <listitem>
+      <para>10 August 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Removed several switches from GCC builds for options
+          that are enabled by default.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>09 August 2014</para>
       <itemizedlist>
Index: BOOK/temp-system/64/gcc.xml
===================================================================
--- BOOK/temp-system/64/gcc.xml	(revision 011586235fc7fc1450bbea36457fa2bd65064fd7)
+++ BOOK/temp-system/64/gcc.xml	(revision 5e6856493bd0c291867288b7b07af45d8f625dec)
@@ -73,9 +73,8 @@
 <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 --disable-multilib --disable-nls \
-    --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \
-    --with-system-zlib --with-native-system-header-dir=/tools/include \
-    --disable-libssp --enable-checking=release --enable-libstdcxx-time</userinput></screen>
+    --with-local-prefix=/tools --disable-multilib --disable-nls \
+    --enable-languages=c,c++ --disable-libstdcxx-pch --with-system-zlib \
+    --with-native-system-header-dir=/tools/include --disable-libssp \
+    --enable-checking=release --enable-libstdcxx-time</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/common/gcc.xml
===================================================================
--- BOOK/temp-system/common/gcc.xml	(revision 011586235fc7fc1450bbea36457fa2bd65064fd7)
+++ BOOK/temp-system/common/gcc.xml	(revision 5e6856493bd0c291867288b7b07af45d8f625dec)
@@ -71,7 +71,6 @@
 <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 --disable-multilib --disable-nls \
-    --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \
+    --with-local-prefix=/tools --disable-multilib --disable-nls \
+    --enable-languages=c,c++ --disable-libstdcxx-pch \
     --with-system-zlib --with-native-system-header-dir=/tools/include \
     --disable-libssp --enable-checking=release --enable-libstdcxx-time</userinput></screen>
Index: BOOK/temp-system/mips64-64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64-64/gcc.xml	(revision 011586235fc7fc1450bbea36457fa2bd65064fd7)
+++ BOOK/temp-system/mips64-64/gcc.xml	(revision 5e6856493bd0c291867288b7b07af45d8f625dec)
@@ -73,7 +73,6 @@
 <screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --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 --with-system-zlib \
+    --with-local-prefix=/tools --disable-nls --enable-languages=c,c++ \
+    --disable-libstdcxx-pch --with-system-zlib \
     --enable-checking=release --enable-libstdcxx-time \
     --with-native-system-header-dir=/tools/include</userinput></screen>
Index: BOOK/temp-system/mips64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64/gcc.xml	(revision 011586235fc7fc1450bbea36457fa2bd65064fd7)
+++ BOOK/temp-system/mips64/gcc.xml	(revision 5e6856493bd0c291867288b7b07af45d8f625dec)
@@ -73,9 +73,7 @@
 <screen os="dc"><userinput>../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 --with-abi=64 --with-system-zlib \
-    --enable-checking=release --enable-libstdcxx-time \
+    --target=${CLFS_TARGET} --with-local-prefix=/tools --disable-nls \
+    --enable-languages=c,c++ --disable-libstdcxx-pch --with-abi=64 \
+    --with-system-zlib --enable-checking=release --enable-libstdcxx-time \
     --with-native-system-header-dir=/tools/include</userinput></screen>
 
Index: BOOK/temp-system/multilib/gcc.xml
===================================================================
--- BOOK/temp-system/multilib/gcc.xml	(revision 011586235fc7fc1450bbea36457fa2bd65064fd7)
+++ BOOK/temp-system/multilib/gcc.xml	(revision 5e6856493bd0c291867288b7b07af45d8f625dec)
@@ -73,7 +73,6 @@
 <screen os="dc"><userinput>../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 --disable-nls \
-    --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \
+    --target=${CLFS_TARGET} --with-local-prefix=/tools --disable-nls \
+    --enable-languages=c,c++ --disable-libstdcxx-pch \
     --with-system-zlib --with-native-system-header-dir=/tools/include \
     --disable-libssp --enable-libstdcxx-time --enable-checking=release</userinput></screen>
Index: BOOK/temp-system/ppc64-64/gcc.xml
===================================================================
--- BOOK/temp-system/ppc64-64/gcc.xml	(revision 011586235fc7fc1450bbea36457fa2bd65064fd7)
+++ BOOK/temp-system/ppc64-64/gcc.xml	(revision 5e6856493bd0c291867288b7b07af45d8f625dec)
@@ -73,7 +73,6 @@
 <screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --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 --with-system-zlib \
+    --with-local-prefix=/tools --disable-nls --enable-languages=c,c++ \
+    --disable-libstdcxx-pch --with-system-zlib \
     --with-native-system-header-dir=/tools/include --enable-checking=release \
     --enable-libstdcxx-time</userinput></screen>
