Add gold linker to ch6 binutils build, restore chapter 5 bison.

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

5 files changed, 41 insertions, 8 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 535fe9673..93f77973d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,19 @@
     appropriate for the entry or if needed the entire day's listitem.
 -->
     <listitem>
+      <para>2017-02-08</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Restore chapter 5 build of bison for binutils.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Build gold linker with binutils. The bfd linker remains
+          default.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2017-02-07</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index e5bb196dc..fdd069a57 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -27,6 +27,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="check.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bash.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="bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="diffutils.xml"/>
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index d5d9c27f7..36d303b49 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -65,16 +65,33 @@ cd       build</userinput></screen>
 
     <para>Prepare Binutils for compilation:</para>
 
-<screen><userinput remap="configure">../configure --prefix=/usr    \
-             --enable-plugins \
-             --enable-shared  \
-             --disable-werror \
+<screen><userinput remap="configure">../configure --prefix=/usr       \
+             --enable-gold       \
+             --enable-ld=default \
+             --enable-plugins    \
+             --enable-shared     \
+             --disable-werror    \
              --with-system-zlib</userinput></screen>
-
     <variablelist>
       <title>The meaning of the configure parameters:</title>
 
       <varlistentry>
+        <term><parameter>--enable-gold</parameter></term>
+        <listitem>
+          <para>Build the gold linker and install it as ld.gold (along side the
+          default linker).</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--enable-ld=default</parameter></term>
+        <listitem>
+          <para>Build the original bdf linker and install it as both ld (the
+          default linker) and ld.bfd.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><parameter>--enable-plugins</parameter></term>
         <listitem>
           <para>Enables plugin support for the linker.</para>
diff --git a/general.ent b/general.ent
index c4856148c..26a0750df 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20170207">
+<!ENTITY version         "SVN-20170208">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20170207-systemd">
+<!ENTITY versiond        "20170208-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "February 7, 2016">
+<!ENTITY releasedate     "February 8, 2016">
 <!ENTITY copyrightdate   "1999-2017"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.0">
 
diff --git a/packages.ent b/packages.ent
index 7ecff1a66..8962da7e1 100644
--- a/packages.ent
+++ b/packages.ent
@@ -75,6 +75,8 @@
 <!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.xz">
 <!ENTITY bison-md5 "c342201de104cc9ce0a21e0ad10d4021">
 <!ENTITY bison-home "&gnu-software;bison/">
+<!ENTITY bison-ch5-du "32 MB">
+<!ENTITY bison-ch5-sbu "0.3 SBU">
 <!ENTITY bison-ch6-du "32 MB">
 <!ENTITY bison-ch6-sbu "0.3 SBU">