From 8035f937ae95955b982b7ed5b9b6b57caeddd994 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Wed, 3 Feb 2016 04:09:41 +0000
Subject: Update to binutils-2.26. Update to tzdata-2016a. Update to
 libcap-2.25. Update to linux-4.4.1.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11000 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/adjusting.xml | 8 ++++----
 chapter06/binutils.xml  | 8 ++------
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/adjusting.xml b/chapter06/adjusting.xml
index 07c155cc2..0ea4f92ef 100644
--- a/chapter06/adjusting.xml
+++ b/chapter06/adjusting.xml
@@ -16,13 +16,13 @@
 
   <para>First, backup the <filename class="directory">/tools</filename> linker,
   and replace it with the adjusted linker we made in chapter 5. We'll also create
-  a link to its counterpart in <filename class="directory">/tools/$(gcc
-  -dumpmachine)/bin</filename>:</para>
+  a link to its counterpart in
+  <filename class="directory">/tools/$(uname -m)-pc-linux-gnu/bin</filename>:</para>
 
 <screen><userinput>mv -v /tools/bin/{ld,ld-old}
-mv -v /tools/$(gcc -dumpmachine)/bin/{ld,ld-old}
+mv -v /tools/$(uname -m)-pc-linux-gnu/bin/{ld,ld-old}
 mv -v /tools/bin/{ld-new,ld}
-ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen>
+ln -sv /tools/bin/ld /tools/$(uname -m)-pc-linux-gnu/bin/ld</userinput></screen>
 
   <para>Next, amend the GCC specs file so that it points to the new
   dynamic linker. Simply deleting all instances of <quote>/tools</quote> should
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index fb9dc4b31..a33c6cf60 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -56,15 +56,11 @@
 
 <screen><computeroutput>The system has no more ptys.
 Ask your system administrator to create more.</computeroutput></screen>
-<!--
-    <para>Fix some LTO tests in the test suite:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&binutils-lto-testsuite-patch;</userinput></screen>
+    <para>Fix a problem identified upstream:</para>
 
-    <para>Enable binutils to recognize multiple plugins:</para>
+<screen><userinput remap="pre">patch -Np1 -i ../&binutils-upstream-patch;</userinput></screen>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&binutils-multiple-plugins-patch;</userinput></screen>
--->
     <para>The Binutils documentation recommends building Binutils 
     in a dedicated build directory:</para>
 
-- 
cgit v1.2.3-54-g00ecf