* Merged newxml into HEAD

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

1 files changed, 70 insertions, 22 deletions

diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index bb9467167..cc6b5d79e 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -1,21 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
 <sect1 id="ch-system-gcc" xreflabel="GCC">
-<title>Installing GCC-&gcc-version;</title>
-<?dbhtml filename="gcc.html" dir="chapter06"?>
+<title>GCC-&gcc-version;</title>
+<?dbhtml filename="gcc.html"?>
 
-<para>The GCC package contains the GNU compiler collection, among them
+<indexterm zone="ch-system-gcc"><primary sortas="a-GCC">GCC</primary></indexterm>
+
+<para>The GCC package contains the GNU compiler collection, which includes
 the C and C++ compilers.</para>
 
-<screen>&buildtime; &gcc-time;
-&diskspace; &gcc-compsize;</screen>
+<screen>&buildtime; 11.7 SBU
+&diskspace; 294 MB</screen>
 
-<literallayout>Official download location for GCC (&gcc-version;): 
-<ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/>
-And for the patch:
-<ulink url="&patches-root;&gcc-nofixincludes-patch;"/></literallayout>
+<para>GCC installation depends on: Bash, Binutils, Coreutils, Diffutils, Findutils,
+Gawk, Gettext, Glibc, Grep, Make, Perl, Sed, Texinfo.</para>
 
-&aa-gcc-dep;
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
 <title>Installation of GCC</title>
@@ -23,7 +26,7 @@ And for the patch:
 <para>This package is known to behave badly when you have changed its
 default optimization flags (including the -march and -mcpu options).
 Therefore, if you have defined any environment variables that override
-default optimizations, such as CFLAGS and CXXFLAGS, we recommend unsetting
+default optimizations, such as CFLAGS and CXXFLAGS, we recommend un-setting
 or modifying them when building GCC.</para>
 
 <para>Unpack the GCC-core <emphasis>and</emphasis> the GCC-g++ tarball -- they
@@ -35,7 +38,7 @@ compilers. Instructions for building these can be found at
 <para>First apply only the No-Fixincludes patch (and <emphasis>not</emphasis>
 the Specs patch) also used in the previous chapter:</para>
 
-<screen><userinput>patch -Np1 -i ../&gcc-nofixincludes-patch;</userinput></screen>
+<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-1.patch</userinput></screen>
 
 <para>Now apply a sed substitution that will suppress the installation of
 <filename>libiberty.a</filename>. We want to use the version of
@@ -51,10 +54,10 @@ cd ../gcc-build</userinput></screen>
 
 <para>Now prepare GCC for compilation:</para>
 
-<screen><userinput>../&gcc-dir;/configure --prefix=/usr \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-shared --enable-threads=posix \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-__cxa_atexit --enable-clocale=gnu \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-languages=c,c++</userinput></screen>
+<screen><userinput>../gcc-&gcc-version;/configure --prefix=/usr \
+    --enable-shared --enable-threads=posix \
+    --enable-__cxa_atexit --enable-clocale=gnu \
+    --enable-languages=c,c++</userinput></screen>
 
 <para>Compile the package:</para>
 
@@ -73,13 +76,13 @@ known ones):</para>
 much appropriate here. Be sure to refer back there should you have any
 doubts.</para>
 
-<para>And install the package:</para>
+<para>Now install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
 <para>Some packages expect the C PreProcessor to be installed in the
 <filename>/lib</filename> directory.
-To honor those packages, create this symlink:</para>
+To support those packages, create this symlink:</para>
 
 <screen><userinput>ln -s ../usr/bin/cpp /lib</userinput></screen>
 
@@ -96,8 +99,53 @@ are wrong, then most likely you erroneously applied the GCC Specs patch from
 
 </sect2>
 
-&aa-gcc-shortdesc;
-&aa-gcc-desc;
 
-</sect1>
+<sect2 id="contents-gcc"><title>Contents of GCC</title>
+
+<para><emphasis>Installed programs</emphasis>: c++, cc (link to gcc),
+cc1, cc1plus, collect2, cpp, g++, gcc, gccbug, and gcov</para>
+
+<para><emphasis>Installed libraries</emphasis>: libgcc.a, libgcc_eh.a,
+libgcc_s.so, libstdc++.[a,so] and libsupc++.a</para>
+
+</sect2>
+
+
+<sect2><title>Short descriptions</title>
+
+<indexterm zone="ch-system-gcc cpp"><primary sortas="b-cpp">cpp</primary></indexterm>
+<para id="cpp"><command>cpp</command> is the C preprocessor. It is used by the
+compiler to have the #include and #define and such statements expanded in
+the source files.</para>
+
+<indexterm zone="ch-system-gcc g"><primary sortas="b-g++">g++</primary></indexterm>
+<para id="g"><command>g++</command> is the C++ compiler.</para>
+
+<indexterm zone="ch-system-gcc gcc"><primary sortas="b-gcc">gcc</primary></indexterm>
+<para id="gcc"><command>gcc</command> is the C compiler. It is used to translate
+the source code of a program into assembly code.</para>
 
+<indexterm zone="ch-system-gcc gccbug"><primary sortas="b-gccbug">gccbug</primary></indexterm>
+<para id="gccbug"><command>gccbug</command> is a shell script used to help create
+good bug reports.</para>
+
+<indexterm zone="ch-system-gcc gcov"><primary sortas="b-gcov">gcov</primary></indexterm>
+<para id="gcov"><command>gcov</command> is a coverage testing tool. It is used to
+analyze programs to find out where optimizations will have the most effect.</para>
+
+<indexterm zone="ch-system-gcc libgcc"><primary sortas="c-libgcc*">libgcc*</primary></indexterm>
+<para id="libgcc"><command>libgcc*</command> contains run-time support for gcc.</para>
+
+<indexterm zone="ch-system-gcc libstdc"><primary sortas="c-libstdc++">libstdc++</primary></indexterm>
+<para id="libstdc"><command>libstdc++</command> is the standard C++ library. It contains
+many frequently-used functions.</para>
+
+<indexterm zone="ch-system-gcc libsupc"><primary sortas="c-libsupc++">libsupc++</primary></indexterm>
+<para id="libsupc"><command>libsupc++</command> provides supporting routines
+for the c++ programming language.</para>
+
+</sect2>
+
+
+
+</sect1>