Use gcc version of libiberty.a

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

2 files changed, 21 insertions, 9 deletions

diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index a82f96c5c..d54cbe45e 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -112,13 +112,12 @@ cd ../binutils-build</userinput></screen>
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make tooldir=/usr install</userinput></screen>
-
+<!--
     <para>Install the <filename class="headerfile">libiberty</filename> header
     file that is needed by some packages:</para>
 
-<!-- <screen><userinput remap="install">cp -v ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen> -->
 <screen><userinput remap="install">cp -v ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen>
-
+-->
   </sect2>
 
 
@@ -133,7 +132,7 @@ cd ../binutils-build</userinput></screen>
       <seglistitem>
         <seg>addr2line, ar, as, c++filt, elfedit, gprof, ld, ld.bfd, nm,
         objcopy, objdump, ranlib, readelf, size, strings, and strip</seg>
-        <seg>libiberty.a, libbfd.{a,so}, and libopcodes.{a,so}</seg>
+        <seg><!--libiberty.a,--> libbfd.{a,so}, and libopcodes.{a,so}</seg>
         <seg>/usr/lib/ldscripts</seg>
       </seglistitem>
     </segmentedlist>
@@ -319,7 +318,7 @@ cd ../binutils-build</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="libiberty">
         <term><filename class="libraryfile">libiberty</filename></term>
         <listitem>
@@ -332,7 +331,7 @@ cd ../binutils-build</userinput></screen>
           </indexterm>
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="libbfd">
         <term><filename class="libraryfile">libbfd</filename></term>
         <listitem>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 34cff2785..cbc292c1e 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -49,13 +49,13 @@
 <screen><userinput remap="pre">case `uname -m` in
   i?86) sed -i 's/^T_CFLAGS =$/&amp; -fomit-frame-pointer/' gcc/Makefile.in ;;
 esac</userinput></screen>
-
+<!--
     <para>Workaround a bug so that GCC doesn't install
     <filename class="libraryfile">libiberty.a</filename>, which is already
     provided by Binutils:</para>
 
 <screen><userinput remap="pre">sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in</userinput></screen>
-
+-->
     <para>Also fix an error in one of the check Makefiles and disable one test in
     the g++ libmudflap test suite:</para>
 
@@ -315,7 +315,7 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
         gcc-ar, gcc-nm, gcc-ranlib, and gcov</seg>
 
         <seg>libasan.{a,so}, libatomic.{a,so}, libgcc.a, libgcc_eh.a, 
-        libgcc_s.so, libgcov.a, libgomp.{a,so}, libitm.{a,so},
+        libgcc_s.so, libgcov.a, libgomp.{a,so}, libiberty.a, libitm.{a,so},
         liblto_plugin.so, libmudflap.{a,so}, libmudflapth.{a,so},
         libquadmath.{a,so}, libssp.{a,so},
         libssp_nonshared.a, libstdc++.{a,so}, libsupc++.a and libtsan.{a,so}</seg>
@@ -472,6 +472,19 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="libiberty">
+        <term><filename class="libraryfile">libiberty</filename></term>
+        <listitem>
+          <para>Contains routines used by various GNU programs, including
+          <command>getopt</command>, <command>obstack</command>,
+          <command>strerror</command>, <command>strtol</command>, and
+          <command>strtoul</command></para>
+          <indexterm zone="ch-system-gcc libiberty">
+            <primary sortas="c-libiberty">libiberty</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="liblto_plugin">
         <term><filename class="libraryfile">liblto_plugin</filename></term>
         <listitem>