Index: BOOK/final-system/64/gcc.xml
===================================================================
--- BOOK/final-system/64/gcc.xml	(revision 399722062530a59ec3f9f04eff63364fd573e647)
+++ BOOK/final-system/64/gcc.xml	(revision d8a6c152192cd65068aa6d704916e50227825319)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <para os="p3">Apply the following patch so that GCC links to /lib
Index: BOOK/final-system/common/gcc.xml
===================================================================
--- BOOK/final-system/common/gcc.xml	(revision 399722062530a59ec3f9f04eff63364fd573e647)
+++ BOOK/final-system/common/gcc.xml	(revision d8a6c152192cd65068aa6d704916e50227825319)
@@ -25,4 +25,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <para os="p1">The following patch fixes the searching of multilib dirs
+    for specs file. The patch standardizes the gcc drivers path iteration
+    functions, ensuring multilib directories are searched in the correct
+    order. This fixes various issues, most noticably with libtool on
+    multilib systems:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&gcc-PR20425-patch;</userinput></screen>
 
     <para os="d">Apply a <command>sed</command> substitution that will suppress the
Index: BOOK/final-system/mips64-64/gcc.xml
===================================================================
--- BOOK/final-system/mips64-64/gcc.xml	(revision 399722062530a59ec3f9f04eff63364fd573e647)
+++ BOOK/final-system/mips64-64/gcc.xml	(revision d8a6c152192cd65068aa6d704916e50227825319)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/gcc.xml
===================================================================
--- BOOK/final-system/mips64/gcc.xml	(revision 399722062530a59ec3f9f04eff63364fd573e647)
+++ BOOK/final-system/mips64/gcc.xml	(revision d8a6c152192cd65068aa6d704916e50227825319)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/gcc.xml
===================================================================
--- BOOK/final-system/multilib/gcc.xml	(revision 399722062530a59ec3f9f04eff63364fd573e647)
+++ BOOK/final-system/multilib/gcc.xml	(revision d8a6c152192cd65068aa6d704916e50227825319)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/ppc64/gcc.xml
===================================================================
--- BOOK/final-system/ppc64/gcc.xml	(revision 399722062530a59ec3f9f04eff63364fd573e647)
+++ BOOK/final-system/ppc64/gcc.xml	(revision d8a6c152192cd65068aa6d704916e50227825319)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <para>GCC includes a <filename class="directory">nof</filename> directory
Index: BOOK/final-system/sparc/gcc.xml
===================================================================
--- BOOK/final-system/sparc/gcc.xml	(revision 399722062530a59ec3f9f04eff63364fd573e647)
+++ BOOK/final-system/sparc/gcc.xml	(revision d8a6c152192cd65068aa6d704916e50227825319)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <para os="sp1">The following patch fixes a TLS build issue. For more details
Index: BOOK/final-system/sparc64-64/gcc.xml
===================================================================
--- BOOK/final-system/sparc64-64/gcc.xml	(revision 399722062530a59ec3f9f04eff63364fd573e647)
+++ BOOK/final-system/sparc64-64/gcc.xml	(revision d8a6c152192cd65068aa6d704916e50227825319)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64/gcc.xml
===================================================================
--- BOOK/final-system/sparc64/gcc.xml	(revision 399722062530a59ec3f9f04eff63364fd573e647)
+++ BOOK/final-system/sparc64/gcc.xml	(revision d8a6c152192cd65068aa6d704916e50227825319)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision 399722062530a59ec3f9f04eff63364fd573e647)
+++ BOOK/materials/common/patches.xml	(revision d8a6c152192cd65068aa6d704916e50227825319)
@@ -101,4 +101,13 @@
 
     <varlistentry>
+      <term>GCC PR20425 Patch - <token>&gcc-PR20425-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&gcc-PR20425-patch;"/></para>
+        <para>MD5 sum: <literal>&gcc-PR20425-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Glibc Branch Update - <token>&glibc-branch_update-patch-size;</token>:</term>
       <listitem>
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision 399722062530a59ec3f9f04eff63364fd573e647)
+++ BOOK/patches.ent	(revision d8a6c152192cd65068aa6d704916e50227825319)
@@ -45,4 +45,8 @@
 <!ENTITY gcc-specs-patch-size "16 KB">
 
+<!ENTITY gcc-PR20425-patch "gcc-&gcc-version;-PR20425-1.patch">
+<!ENTITY gcc-PR20425-patch-md5 "95535bda8e4d37d30251db0b121b5374">
+<!ENTITY gcc-PR20425-patch-size "36 KB">
+
 <!ENTITY glibc-branch_update-patch "glibc-&glibc-version;-branch_update-3.patch">
 <!ENTITY glibc-branch_update-patch-md5 "0cb4331328ecfadc4fc81288fdbdb864">
