Removed linkonce and no_fixinclude patches for gcc4. Also removed the command to remove the pthread.h and sigthread.h files.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/gcc4/BOOK@6543 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

4 files changed, 10 insertions, 41 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 19e65fd58..202de0650 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -112,6 +112,9 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>July  16th, 2005 [jhuntwork]: Removed no_fixincludes and linkonce
+patches for gcc4. Also removed the command to remove the fixed pthread.h.</para></listitem>
+
 <listitem><para>July  16th, 2005 [jhuntwork]: Fixed adjusting toolchain sed for both
 chapters 5 and 6.</para></listitem>
 
diff --git a/chapter05/adjusting.xml b/chapter05/adjusting.xml
index 38800714a..46ec36ebf 100644
--- a/chapter05/adjusting.xml
+++ b/chapter05/adjusting.xml
@@ -60,15 +60,6 @@ dynamic linker in the above commands. Refer back to <xref
 linkend="ch-tools-toolchaintechnotes" role=","/> if
 necessary.</para></important>
 
-<para>There is a possibility that some include files from the host
-system have found their way into GCC's private include dir. This can
-happen as a result of GCC's <quote>fixincludes</quote> process, which runs as part
-of the GCC build. This is explained in more detail later in this
-chapter. Run the following command to eliminate this
-possibility:</para>
-
-<screen><userinput>rm -f /tools/lib/gcc/*/*/include/{pthread.h,bits/sigthread.h}</userinput></screen>
-
 <caution><para>At this point, it is imperative to stop and ensure that
 the basic functions (compiling and linking) of the new toolchain are
 working as expected. To perform a sanity check, run the following
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 78118cc60..451f42fdd 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -58,25 +58,11 @@ Binutils until this issue is resolved. Please consult the LFS FAQ at <ulink
 url="&lfs-root;/lfs/faq.html#no-ptys"/> for more information on how to get PTYs
 working.</para>
 
-<para>First correct a known problem and make an essential adjustment:</para>
-
-<screen><userinput>patch -Np1 -i ../&gcc-no_fixincludes-patch;
-patch -Np1 -i ../&gcc-specs-patch;</userinput></screen>
-
-<para>The first patch disables the GCC <command>fixincludes</command>
-script. This was briefly mentioned earlier, but a more in-depth
-explanation of the fixincludes process is warranted here. Under normal
-circumstances, the GCC <command>fixincludes</command> script scans the
-system for header files that need to be fixed. It might find that some
-Glibc header files on the host system need to be fixed, and will fix
-them and put them in the GCC private include directory. In <xref
-linkend="chapter-building-system"/>, after the newer Glibc has been
-installed, this private include directory will be searched before the
-system include directory.  This may result in GCC finding the fixed
-headers from the host system, which most likely will not match the
-Glibc version used for the LFS system.</para>
-
-<para>The second patch changes GCC's default location of the dynamic
+<para>Make an essential adjustment:</para>
+
+<screen><userinput>patch -Np1 -i ../&gcc-specs-patch;</userinput></screen>
+
+<para>The above patch changes GCC's default location of the dynamic
 linker (typically <filename class="libraryfile">ld-linux.so.2</filename>). It also removes
 <filename class="directory">/usr/include</filename> from GCC's include
 search path. Patching now rather than adjusting the specs file after
@@ -85,9 +71,9 @@ actual build of GCC. That is, all of the final (and temporary)
 binaries created during the build will link against the new
 Glibc.</para>
 
-<important><para>The above patches are critical in ensuring a
+<important><para>The above patch is critical in ensuring a
 successful overall build. Do not forget to apply
-them.</para></important>
+it.</para></important>
 
 <para>Create a separate build directory again:</para>
 
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 4c13eed95..6865b4510 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -38,17 +38,6 @@ variables that override default optimizations have been defined, such
 as <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>,
 unset them when building GCC.</para>
 
-<para>Apply only the No-Fixincludes patch (not the Specs patch) also
-used in the previous chapter:</para>
-
-<screen><userinput>patch -Np1 -i ../&gcc-no_fixincludes-patch;</userinput></screen>
-
-<para>GCC fails to compile some packages outside of a base Linux From Scratch
-install (e.g., Mozilla and kdegraphics) when used in conjunction with newer
-versions of Binutils.  Apply the following patch to fix this issue:</para>
-
-<screen><userinput>patch -Np1 -i ../&gcc-linkonce-patch;</userinput></screen>
-
 <para>Apply a <command>sed</command> substitution that will suppress the
 installation of <filename class="libraryfile">libiberty.a</filename>. The
 version of <filename class="libraryfile">libiberty.a</filename> provided by