From 77d2cd8d437a6ba11e13ac0af109a887582e988b Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Sat, 13 Jun 2020 08:55:55 +0000
Subject: [PATCH] - fix some gcc->GCC - remove commented text in glibc (chap
 5), and fix a directory location

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross2@11934 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter05/gcc-pass1.xml          |  2 +-
 chapter05/glibc.xml              | 25 ++++---------------------
 chapter05/toolchaintechnotes.xml |  2 +-
 chapter06/gcc-pass2.xml          |  2 +-
 chapter08/libffi.xml             |  4 ++--
 chapter08/strippingagain.xml     |  2 +-
 6 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index e2a13a003..0cd852ee6 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -193,7 +193,7 @@ cd       build</userinput></screen>
     headers.  Normally one of them, <filename>limits.h</filename>, would in turn
     include the corresponding system <filename>limits.h</filename> header, in
     this case, <filename>$LFS/usr/include/limits.h</filename>. However, at the
-    time of this build of gcc <filename>$LFS/usr/include/limits.h</filename>
+    time of this build of GCC <filename>$LFS/usr/include/limits.h</filename>
     does not exist, so the internal header that has just been installed is a
     partial, self-contained file and does not include the extended features of
     the system header. This is adequate for building glibc, but the full
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 6e14f0c7d..1b72b4e20 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -99,9 +99,10 @@ cd       build</userinput></screen>
       <varlistentry>
         <term><parameter>--with-headers=$LFS/usr/include</parameter></term>
         <listitem>
-          <para>This tells Glibc to compile itself against the headers recently
-          installed to the usr/include directory, so that it knows exactly what
-          features the kernel has and can optimize itself accordingly.</para>
+          <para>This tells Glibc to compile itself against the headers
+          recently installed to the $LFS/usr/include directory, so that
+          it knows exactly what features the kernel has and can optimize
+          itself accordingly.</para>
         </listitem>
       </varlistentry>
 
@@ -112,24 +113,6 @@ cd       build</userinput></screen>
           of the default /lib64 on 64 bit machines.</para>
         </listitem>
       </varlistentry>
-<!--
-      <varlistentry>
-        <term><parameter>libc_cv_c_cleanup=yes</parameter></term>
-        <listitem>
-          <para>Similarly, we pass libc_cv_c_cleanup=yes through to the
-          <command>configure</command> script so that the test is skipped and C
-          cleanup handling support is configured.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>libc_cv_ctors_header=yes</parameter></term>
-        <listitem>
-          <para>Similarly, we pass libc_cv_ctors_header=yes through to the
-          <command>configure</command> script so that the test is skipped and
-          gcc constructor support is configured.</para>
-        </listitem>
-      </varlistentry>-->
 
     </variablelist>
 
diff --git a/chapter05/toolchaintechnotes.xml b/chapter05/toolchaintechnotes.xml
index 9e582e345..1e7086aaf 100644
--- a/chapter05/toolchaintechnotes.xml
+++ b/chapter05/toolchaintechnotes.xml
@@ -227,7 +227,7 @@
     this is the only compiler available for building the C/C++ libraries
     during stage 2! Of course, the compiler built during stage 2, cc-lfs,
     would be able to build those libraries, but (1) the build system of
-    gcc does not know that it is usable on pc, and (2) using it on pc
+    GCC does not know that it is usable on pc, and (2) using it on pc
     would be at risk of linking to the pc libraries, since cc-lfs is a native
     compiler. So we have to build libstdc++ later, in chroot.</para>
 
diff --git a/chapter06/gcc-pass2.xml b/chapter06/gcc-pass2.xml
index 532a8e8b4..c64d6f780 100644
--- a/chapter06/gcc-pass2.xml
+++ b/chapter06/gcc-pass2.xml
@@ -109,7 +109,7 @@ ln -s ../../../libgcc/gthr-posix.h $LFS_TGT/libgcc/gthr-default.h</userinput></s
         <term><parameter>-with-build-sysroot=$LFS</parameter></term>
         <listitem>
           <para>Normally, using <parameter>--host</parameter> ensures that
-          a cross-compiler is used for building gcc, and that compiler knows
+          a cross-compiler is used for building GCC, and that compiler knows
           that it has to look for headers and libraries in <filename
           class="directory">$LFS</filename>. But the build system of GCC uses
           other tools, which are not aware of this location. This switch is
diff --git a/chapter08/libffi.xml b/chapter08/libffi.xml
index 3b5347992..b6a49b122 100644
--- a/chapter08/libffi.xml
+++ b/chapter08/libffi.xml
@@ -60,14 +60,14 @@
       <varlistentry>
         <term><parameter>--with-gcc-arch=native</parameter></term>
         <listitem>
-          <para>Ensure gcc optimizes for the current system.  If this
+          <para>Ensure GCC optimizes for the current system.  If this
           is not specified, the system is guessed and the code generated
           may not be correct for some systems.  If the generated code
           will be copied from the native system to a less capable 
           system, use the less capable system as a parameter. For details 
           about alternative system types, see <ulink 
           url='https://gcc.gnu.org/onlinedocs/gcc-&gcc-version;/gcc/x86-Options.html'>
-          the x86 options in the gcc manual</ulink>.</para>
+          the x86 options in the GCC manual</ulink>.</para>
         </listitem>
       </varlistentry>
 
diff --git a/chapter08/strippingagain.xml b/chapter08/strippingagain.xml
index d436fcbda..891d2e000 100644
--- a/chapter08/strippingagain.xml
+++ b/chapter08/strippingagain.xml
@@ -30,7 +30,7 @@
   url='&blfs-book;/general/gdb.html'>gdb</ulink> later in BLFS.
   </para>
 
-<!-- also of interest are libgfortan, libgo, libgomp, and libobjc from gcc -->
+<!-- also of interest are libgfortan, libgo, libgomp, and libobjc from GCC -->
 
 <!--<screen><userinput>save_lib="ld-2.25.so libc-2.25.so libpthread-2.25.so libthread_db-1.0.so"-->
 <screen><userinput>save_lib="ld-&glibc-version;.so libc-&glibc-version;.so libpthread-&glibc-version;.so libthread_db-&libthread_db-version;.so"