GCC 2.95.3 fixes and other misc. toolchain related textual adjustments.

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

chapter04/chapter04.xml

@@ -251,11 +251,12 @@ Expect Patch (&expect-patch-version;) - &expect-patch-size;:
 Gawk Patch (&gawk-patch-version;) - &gawk-patch-size;:
 <ulink url="&http;/gawk-&gawk-patch-version;.patch"/>
 
-GCC Patch (&gcc-2953-patch-version;) - &gcc-2953-patch-size;:
+GCC-2 Patch (&gcc-2953-patch-version;) - &gcc-2953-patch-size;:
 <ulink url="&http;/gcc-&gcc-2953-patch-version;.patch"/>
-
-GCC-2 Return-type Patch:
-<ulink url="&http;/gcc-2.95.3-returntype-fix.patch"/>
+GCC-2 No Fixincludes Patch (&gcc-2953-no-fixinc-patch-version;) - &gcc-2953-no-fixinc-patch-size;:
+<ulink url="&http;/gcc-&gcc-2953-no-fixinc-patch-version;-no-fixinc.patch"/>
+GCC-2 Return Type Patch (&gcc-2953-returntype-fix-patch-version;) - &gcc-2953-returntype-fix-patch-size;:
+<ulink url="&http;/gcc-&gcc-2953-returntype-fix-patch-version;-returntype-fix.patch"/>
 
 GCC No Fixincludes Patch:
 <ulink url="&http;/gcc-3.3.1-no_fixincludes-2.patch"/>

chapter05/binutils-pass1-inst.xml

@@ -18,8 +18,8 @@ you have defined any environment variables that override default
 optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting or
 modifying them when building Binutils.</para>
 
-<para>It is recommended by the Binutils installation documentation to build
-Binutils outside of the source directory in a dedicated directory:</para>
+<para>The Binutils documentation recommends building Binutils outside of the
+source directory in a dedicated build directory:</para>
 
 <para><screen><userinput>mkdir ../binutils-build
 cd ../binutils-build</userinput></screen></para>

chapter05/binutils-pass2-inst.xml

@@ -7,7 +7,7 @@
 chapter is considered not as critical as the one we run in Chapter 6.</para>
 </note>
 
-<para>First create a separate build directory again:</para>
+<para>Create a separate build directory again:</para>
 
 <para><screen><userinput>mkdir ../binutils-build
 cd ../binutils-build</userinput></screen></para>

chapter05/gcc-pass1-inst.xml

@@ -17,8 +17,8 @@ Therefore, if you have defined any environment variables that override
 default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting
 or modifying them when building GCC.</para>
 
-<para>It is recommended by the GCC installation documentation to build
-GCC outside of the source directory in a dedicated directory:</para>
+<para>The GCC documentation recommends building GCC outside of the source
+directory in a dedicated build directory:</para>
 
 <para><screen><userinput>mkdir ../gcc-build
 cd ../gcc-build</userinput></screen></para>

chapter05/glibc-inst.xml

@@ -34,8 +34,8 @@ Apply the following patch to fix this:</para>
 <para><screen><userinput>patch -Np1 -i ../glibc-2.3.2-sscanf-1.patch
 </userinput></screen></para>
 
-<para>The documentation that comes with Glibc recommends to build the package
-not in the source directory but in a separate, dedicated directory:</para>
+<para>The Glibc documentation recommends building Glibc outside of the source
+directory in a dedicated build directory:</para>
 
 <para><screen><userinput>mkdir ../glibc-build
 cd ../glibc-build</userinput></screen></para>

chapter06/binutils-inst.xml

@@ -12,8 +12,8 @@ Therefore, if you have defined any environment variables that override
 default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting
 or modifying them when building Binutils.</para>
 
-<para>It is recommended by the Binutils installation documentation to build
-Binutils outside of the source directory:</para>
+<para>The Binutils documentation recommends building Binutils outside of the
+source directory in a dedicated build directory:</para>
 
 <para><screen><userinput>mkdir ../binutils-build
 cd ../binutils-build</userinput></screen></para>

chapter06/gcc-2953-inst.xml

@@ -16,17 +16,31 @@ GCC have not received as much testing for Linux kernel compilation. Using a
 later version is likely to work, however, we recommend adhering to the kernel
 developer's advice and using the version here to compile your kernel.</para>
 
+<note><para>We don't install the C++ compiler or libraries here. However, there
+may be reasons why you would want to install them. More information can be found
+at <ulink url="&blfs-root;view/cvs/general/gcc2.html"/>.</para></note>
+
 <para>We'll install this older release of GCC into the non-standard prefix of
 <filename class="directory">/opt</filename> so as to avoid interfering with
 the system GCC already installed in <filename class="directory">/usr</filename>
  .</para>
 
-<para><screen><userinput>patch -Np1 -i ../gcc-2.95.3-2.patch
-patch -Np1 -i ../gcc-2.95.3-returntype-fix.patch
-echo timestamp > gcc/cstamp-h.in
-mkdir ../gcc-2-build
-cd ../gcc-2-build
-../gcc-2.95.3/configure --prefix=/opt/gcc-2.95.3 \
+<para>Apply the patches and make a small adjustment:</para>
+
+<para><screen><userinput>patch -Np1 -i ../gcc-&gcc-2953-patch-version;.patch
+patch -Np1 -i ../gcc-&gcc-2953-no-fixinc-patch-version;-no-fixinc.patch
+patch -Np1 -i ../gcc-&gcc-2953-returntype-fix-patch-version;-returntype-fix.patch
+echo timestamp > gcc/cstamp-h.in</userinput></screen></para>
+
+<para>The GCC documentation recommends building GCC outside of the source
+directory in a dedicated build directory:</para>
+
+<para><screen><userinput>mkdir ../gcc-2-build
+cd ../gcc-2-build</userinput></screen></para>
+
+<para>Compile and install gcc:</para>
+
+<para><screen><userinput>../gcc-2.95.3/configure --prefix=/opt/gcc-2.95.3 \
 &nbsp;&nbsp;&nbsp;&nbsp;--enable-shared --enable-languages=c \
 &nbsp;&nbsp;&nbsp;&nbsp;--enable-threads=posix
 make bootstrap

chapter06/gcc-inst.xml

@@ -25,9 +25,8 @@ patch -Np1 -i ../gcc-3.3.1-suppress-libiberty.patch</userinput></screen></para>
 <para>The second patch here suppresses the installation of libiberty from GCC,
 as we will use the one provided by binutils instead.</para>
 
-<para>GCC's installation documentation recommends to build the package in a
-dedicated directory separate from the source tree. Create this build
-directory and go there:</para>
+<para>The GCC documentation recommends building GCC outside of the source
+directory in a dedicated build directory:</para>
 
 <para><screen><userinput>mkdir ../gcc-build
 cd ../gcc-build</userinput></screen></para>

chapter06/glibc-inst.xml

@@ -22,8 +22,8 @@ flags.</para>
 <para><screen><userinput>patch -Np1 -i ../glibc-2.3.2-sscanf-1.patch
 </userinput></screen></para>
 
-<para>The documentation that comes with Glibc recommends to build the package
-not in the source directory but in a separate, dedicated directory:</para>
+<para>The Glibc documentation recommends building Glibc outside of the source
+directory in a dedicated build directory:</para>
 
 <para><screen><userinput>mkdir ../glibc-build
 cd ../glibc-build</userinput></screen></para>

entities/gcc-2953.ent

@@ -16,6 +16,10 @@
 <!ENTITY gcc-2953-size "2520 KB">
 <!ENTITY gcc-2953-patch-version "2.95.3-2">
 <!ENTITY gcc-2953-patch-size "4 KB">
+<!ENTITY gcc-2953-no-fixinc-patch-version "2.95.3">
+<!ENTITY gcc-2953-no-fixinc-patch-size "1 KB">
+<!ENTITY gcc-2953-returntype-fix-patch-version "2.95.3">
+<!ENTITY gcc-2953-returntype-fix-patch-size "1 KB">
 <!ENTITY gcc-2953-package "gcc-&gcc-2953-version;.tar.bz2">
 <!ENTITY gcc-2953-dir "gcc-&gcc-2953-version;">