fix GCC PR100017 and enable libstdc++ for pass 2

This is the issue preventing us from cross-compiling libstdc++ in
Chapter 6.  By fixing this issue we can remove a seperate pass 2 for
libstdc++ and simplify the instruction.

The upstream fix will be released in 11.3 and 12.0, so we can remove the
first sed upgrading gcc next time.

2 files changed, 0 insertions, 121 deletions

diff --git a/chapter07/chapter07.xml b/chapter07/chapter07.xml
index 8c78f230a..362980dda 100644
--- a/chapter07/chapter07.xml
+++ b/chapter07/chapter07.xml
@@ -17,7 +17,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libstdc++-pass2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
diff --git a/chapter07/libstdc++-pass2.xml b/chapter07/libstdc++-pass2.xml
deleted file mode 100644
index 35b5a8baf..000000000
--- a/chapter07/libstdc++-pass2.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-tools-libstdcpp-pass2" role="wrap">
-  <?dbhtml filename="gcc-libstdc++-pass2.html"?>
-
-  <sect1info condition="script">
-    <productname>gcc-libstdc++</productname>
-    <productnumber>&gcc-version;</productnumber>
-    <address>&gcc-url;</address>
-  </sect1info>
-
-  <title>Libstdc++ from GCC-&gcc-version;, Pass 2</title>
-
-  <indexterm zone="ch-tools-libstdcpp-pass2">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>tools, libstdc++ pass 2</secondary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>When building <xref linkend="ch-tools-gcc-pass2"/> we had to defer
-    the installation of the C++ standard library because no suitable compiler
-    was available to compile it. We could not use the compiler built in that
-    section because it is a native compiler and should not be used outside of
-    chroot and risks polluting the libraries with some host components.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>&libstdcpp-tmpp2-sbu;</seg>
-        <seg>&libstdcpp-tmpp2-du;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Target Libstdc++</title>
-
-    <note>
-      <para><application>Libstdc++</application> is part of the GCC sources.
-      You should first unpack the GCC tarball and change to the
-      <filename>gcc-&gcc-version;</filename> directory.</para>
-    </note>
-
-    <para>Create a link which exists when building libstdc++ in the gcc tree:</para>
-
-<screen><userinput remap="pre">ln -s gthr-posix.h libgcc/gthr-default.h</userinput></screen>
-
-    <para>Create a separate build directory for libstdc++ and enter it:</para>
-
-<screen><userinput remap="pre">mkdir -v build
-cd       build</userinput></screen>
-
-    <para>Prepare libstdc++ for compilation:</para>
-
-<screen><userinput remap="configure">../libstdc++-v3/configure            \
-    CXXFLAGS="-g -O2 -D_GNU_SOURCE"  \
-    --prefix=/usr                    \
-    --disable-multilib               \
-    --disable-nls                    \
-    --host=$(uname -m)-lfs-linux-gnu \
-    --disable-libstdcxx-pch</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>CXXFLAGS="-g -O2 -D_GNU_SOURCE"</parameter></term>
-        <listitem>
-          <para>These flags are passed by the top level Makefile when doing
-          a full build of GCC.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--host=$(uname -m)-lfs-linux-gnu</parameter></term>
-        <listitem>
-          <para>We have to mimic what would happen if this package were built
-          as part of a full compiler build. This switch would be passed to
-          configure by GCC's build machinery.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-libstdcxx-pch</parameter></term>
-        <listitem>
-          <para>This switch prevents the installation of precompiled
-          include files, which are not needed at this stage.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para>Compile libstdc++ by running:</para>
-
-<screen><userinput remap="make">make</userinput></screen>
-
-    <para>Install the library:</para>
-
-<screen><userinput remap="install">make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>