Add a patch to fix building Binutils with -O3 optimization

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

7 files changed, 33 insertions, 0 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e1b031af9..d8da5f337 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
       <para>2012-03-27</para>
       <itemizedlist>
          <listitem>
+           <para>[matthew] - Add a patch to fix building of Binutils with the
+           -O3 compiler flag.  Thanks to Pierre Labastie for the report.</para>
+         </listitem>
+         <listitem>
            <para>[matthew] - Add the GCC fix patch back to Glibc instructions
            to fix a build issue on 32-bit hosts.  Thanks to Pierre Labastie for
            the report.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 212560992..c1cb214dc 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -224,6 +224,10 @@
     </listitem>
 
     <listitem>
+      <para>&binutils-build-patch;</para>
+    </listitem>
+
+    <listitem>
       <para>&gcc-startfiles-patch;</para>
     </listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index b6379105b..a76c88a0e 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -27,6 +27,14 @@
     </varlistentry>
 
     <varlistentry>
+      <term>Binutils Build Fix Patch - <token>&binutils-build-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&binutils-build-patch;"/></para>
+        <para>MD5 sum: <literal>&binutils-build-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&bzip2-docs-patch;"/></para>
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 9c9f6225f..6d596ce67 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -70,6 +70,10 @@ cd ../binutils-build</userinput></screen>
     <note><para>The approximate build SBU values and required disk space
     in Chapter 5 does not include test suite data.</para></note>
 
+    <para>Apply a patch to prevent a build failure when using compiler optimizations:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&binutils-build-patch;</userinput></screen>
+
     <para>Now prepare Binutils for compilation:</para>
 
 <screen><userinput remap="configure">../binutils-&binutils-version;/configure --target=$LFS_TGT \
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 03e55ca1e..5a0ea6900 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -48,6 +48,10 @@
 <screen><userinput remap="pre">mkdir -v ../binutils-build
 cd ../binutils-build</userinput></screen>
 
+    <para>Apply a patch to prevent a build failure when using compiler optimizations:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&binutils-build-patch;</userinput></screen>
+
     <para>Prepare Binutils for compilation:</para>
 
 <screen><userinput remap="configure">CC="$LFS_TGT-gcc -B/tools/lib/" \
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index f5ff0d27f..0b044b108 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -69,6 +69,10 @@ sed -i.bak '/^INFO/s/standards.info //' etc/Makefile.in</userinput></screen>
 <screen><userinput remap="pre">sed -i "/exception_defines.h/d" ld/testsuite/ld-elf/new.cc
 sed -i "s/-fvtable-gc //" ld/testsuite/ld-selective/selective.exp</userinput></screen>
 
+    <para>Apply a patch to prevent a build failure when using compiler optimizations:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&binutils-build-patch;</userinput></screen>
+
     <para>The Binutils documentation recommends building Binutils outside of the
     source directory in a dedicated build directory:</para>
 
diff --git a/patches.ent b/patches.ent
index 1fad4b7db..f86b36377 100644
--- a/patches.ent
+++ b/patches.ent
@@ -7,6 +7,11 @@
 <!ENTITY bash-fixes-patch-size "24 KB">
 
 
+<!ENTITY binutils-build-patch "binutils-&binutils-version;-build_fix-1.patch">
+<!ENTITY binutils-build-patch-md5 "ddc5a9a170ed6ba23b8eb7d808e609ee">
+<!ENTITY binutils-build-patch-size "1.4 KB">
+
+
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
 <!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f">
 <!ENTITY bzip2-docs-patch-size "1.6 KB">