Index: final-system/alpha-chapter.xml
===================================================================
--- final-system/alpha-chapter.xml	(revision c4e2b39d8418f5129ea481a14660875f867b8d7f)
+++ final-system/alpha-chapter.xml	(revision 109c00d410a01746d43da570a38d1ac7ac1b7b96)
@@ -17,5 +17,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/adjusting.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
Index: nal-system/alpha/adjusting.xml
===================================================================
--- final-system/alpha/adjusting.xml	(revision c4e2b39d8418f5129ea481a14660875f867b8d7f)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <caution>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
-
Index: final-system/common/adjusting.xml
===================================================================
--- final-system/common/adjusting.xml	(revision 109c00d410a01746d43da570a38d1ac7ac1b7b96)
+++ final-system/common/adjusting.xml	(revision 109c00d410a01746d43da570a38d1ac7ac1b7b96)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-adjusting">
+  <?dbhtml filename="adjusting.html"?>
+
+  <title>Adjusting the Toolchain</title>
+
+  <para os="a">Now we amend the GCC specs file so that it points to the new
+  dynamic linker. A <command>perl</command> command accomplishes this:</para>
+
+<screen os="c"><userinput>gcc -dumpspecs | \
+perl -p -e 's@/tools/lib/ld@/lib/ld@g;' \
+     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' > \
+     `dirname $(gcc --print-libgcc-file-name)`/specs</userinput></screen>
+
+  <para os="d">It is a good idea to visually inspect the specs file to verify the
+  intended change was actually made.</para>
+
+  <para os="e">Note that <filename class="directory">/lib</filename> is now
+  the prefix of our dynamic linker.</para>
+
+  <caution>
+
+    <para os="f">It is imperative at this point to stop and ensure that
+    the basic functions (compiling and linking) of the adjusted toolchain
+    are working as expected. To do this, perform a sanity
+    check:</para>
+
+<screen os="g"><userinput>echo 'main(){}' &gt; dummy.c
+cc dummy.c
+readelf -l a.out | grep ': /lib'</userinput></screen>
+
+    <para os="h">If everything is working correctly, there should be no errors,
+    and the output of the last command will be:</para>
+
+<screen os="i"><computeroutput>[Requesting program interpreter: /lib/ld-linux.so.2]</computeroutput></screen>
+
+    <para os="j">Note that <filename class="directory">/lib</filename> is now
+    the prefix of our dynamic linker.</para>
+
+    <para os="k">If the output does not appear as shown above or is not received
+    at all, then something is seriously wrong. Investigate and retrace the
+    steps to find out where the problem is and correct it. The most likely
+    reason is that something went wrong with the specs file amendment
+    above. Any issues will need to be resolved before continuing on with
+    the process.</para>
+
+    <para os="l">Once everything is working correctly, clean up the test
+    files:</para>
+
+<screen os="m"><userinput>rm dummy.c a.out</userinput></screen>
+
+  </caution>
+
+</sect1>
Index: final-system/mips/adjusting.xml
===================================================================
--- final-system/mips/adjusting.xml	(revision c4e2b39d8418f5129ea481a14660875f867b8d7f)
+++ final-system/mips/adjusting.xml	(revision 109c00d410a01746d43da570a38d1ac7ac1b7b96)
@@ -12,21 +12,17 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
+  href="../common/adjusting.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
+  href="../common/adjusting.xml"
   xpointer="xpointer(//*[@os='c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
+  href="../common/adjusting.xml"
   xpointer="xpointer(//*[@os='d'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
+  href="../common/adjusting.xml"
   xpointer="xpointer(//*[@os='e'])"/>
 
@@ -34,13 +30,13 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
@@ -48,17 +44,17 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
Index: final-system/mips64/adjusting.xml
===================================================================
--- final-system/mips64/adjusting.xml	(revision c4e2b39d8418f5129ea481a14660875f867b8d7f)
+++ final-system/mips64/adjusting.xml	(revision 109c00d410a01746d43da570a38d1ac7ac1b7b96)
@@ -15,10 +15,6 @@
   xpointer="xpointer(//*[@os='a'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/adjusting.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
 <screen os="c"><userinput>gcc -dumpspecs | \
-perl -pi -e 's@/tools/lib/ld@/lib/ld@g;' \
+perl -p -e 's@/tools/lib/ld@/lib/ld@g;' \
      -e 's@/tools/lib32/ld@/lib32/ld@g;' \
      -e 's@/tools/lib64/ld@/lib64/ld@g;' \
@@ -41,9 +37,11 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>For 32 bit ABI:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/adjusting.xml"
+    xpointer="xpointer(//*[@os='m2'])"/>
 
-<screen><userinput>echo 'main(){}' &gt; dummy.c
-cc ${BUILD32} dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/adjusting.xml"
+    xpointer="xpointer(//*[@os='m3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -67,9 +65,11 @@
 <screen><computeroutput>[Requesting program interpreter: /lib32/ld.so.1]</computeroutput></screen>
 
-    <para>For 64 bit ABI:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/adjusting.xml"
+    xpointer="xpointer(//*[@os='m4'])"/>
 
-<screen><userinput>echo 'main(){}' &gt; dummy.c
-cc ${BUILD64} dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/adjusting.xml"
+    xpointer="xpointer(//*[@os='m5'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/multilib/adjusting.xml
===================================================================
--- final-system/multilib/adjusting.xml	(revision 109c00d410a01746d43da570a38d1ac7ac1b7b96)
+++ final-system/multilib/adjusting.xml	(revision 109c00d410a01746d43da570a38d1ac7ac1b7b96)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-adjusting">
+  <?dbhtml filename="adjusting.html"?>
+
+  <title>Adjusting the Toolchain</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/adjusting.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="c"><userinput>gcc -dumpspecs | \
+perl -p -e 's@/tools/lib/ld@/lib/ld@g;' \
+     -e 's@/tools/lib64/ld@/lib64/ld@g;' \
+     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' > \
+     `dirname $(gcc --print-libgcc-file-name)`/specs</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/adjusting.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
+
+  <para os="m1">Note that <filename class="directory">/lib</filename> or
+  <filename class="directory">/lib64</filename> is now the prefix
+  of our dynamic linker.</para>
+
+  <caution>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <para os="m2">For 32 bit ABI:</para>
+
+<screen os="m3"><userinput>echo 'main(){}' &gt; dummy.c
+cc ${BUILD32} dummy.c
+readelf -l a.out | grep ': /lib'</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <para os="m4">For 64 bit ABI:</para>
+
+<screen os="m5"><userinput>echo 'main(){}' &gt; dummy.c
+cc ${BUILD64} dummy.c
+readelf -l a.out | grep ': /lib'</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+<screen os="m6"><computeroutput>[Requesting program interpreter: /lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
+
+    <para os="m7">Note that <filename class="directory">/lib</filename> or
+    <filename class="directory">/lib64</filename> is now the prefix
+    of our dynamic linker.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+  </caution>
+
+</sect1>
Index: final-system/ppc/adjusting.xml
===================================================================
--- final-system/ppc/adjusting.xml	(revision c4e2b39d8418f5129ea481a14660875f867b8d7f)
+++ final-system/ppc/adjusting.xml	(revision 109c00d410a01746d43da570a38d1ac7ac1b7b96)
@@ -11,21 +11,21 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
+  href="../common/adjusting.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
+  href="../common/adjusting.xml"
   xpointer="xpointer(//*[@os='b'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
+  href="../common/adjusting.xml"
   xpointer="xpointer(//*[@os='c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
+  href="../common/adjusting.xml"
   xpointer="xpointer(//*[@os='d'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
+  href="../common/adjusting.xml"
   xpointer="xpointer(//*[@os='e'])"/>
 
@@ -33,13 +33,13 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
@@ -47,17 +47,17 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
Index: final-system/sparc-chapter.xml
===================================================================
--- final-system/sparc-chapter.xml	(revision c4e2b39d8418f5129ea481a14660875f867b8d7f)
+++ final-system/sparc-chapter.xml	(revision 109c00d410a01746d43da570a38d1ac7ac1b7b96)
@@ -17,5 +17,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/adjusting.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
Index: nal-system/sparc/adjusting.xml
===================================================================
--- final-system/sparc/adjusting.xml	(revision c4e2b39d8418f5129ea481a14660875f867b8d7f)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <caution>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
-
Index: final-system/sparc64-64-chapter.xml
===================================================================
--- final-system/sparc64-64-chapter.xml	(revision c4e2b39d8418f5129ea481a14660875f867b8d7f)
+++ final-system/sparc64-64-chapter.xml	(revision 109c00d410a01746d43da570a38d1ac7ac1b7b96)
@@ -17,5 +17,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="adjusting/adjusting.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc.xml"/>
Index: nal-system/sparc64-64/adjusting.xml
===================================================================
--- final-system/sparc64-64/adjusting.xml	(revision c4e2b39d8418f5129ea481a14660875f867b8d7f)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/adjusting.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86_64-64/adjusting.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <para>Note that <filename class="directory">/lib</filename> or
-  <filename class="directory">/lib32</filename> is now the prefix
-  of our dynamic linker.</para>
-
-  <caution>
-
-    <para>It is imperative at this point to stop and ensure that
-    the basic functions (compiling and linking) of the adjusted toolchain
-    are working as expected. Since we are doing a 64 bit only build, we
-    will only test the 64 bit ABI. To do this, perform a sanity
-    check:</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/adjusting.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen><computeroutput>[Requesting program interpreter: /lib/ld-linux-sparc-64.so.2]</computeroutput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/adjusting.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
Index: final-system/sparc64-chapter.xml
===================================================================
--- final-system/sparc64-chapter.xml	(revision c4e2b39d8418f5129ea481a14660875f867b8d7f)
+++ final-system/sparc64-chapter.xml	(revision 109c00d410a01746d43da570a38d1ac7ac1b7b96)
@@ -18,5 +18,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/adjusting.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc.xml"/>
Index: final-system/sparc64/adjusting.xml
===================================================================
--- final-system/sparc64/adjusting.xml	(revision c4e2b39d8418f5129ea481a14660875f867b8d7f)
+++ final-system/sparc64/adjusting.xml	(revision 109c00d410a01746d43da570a38d1ac7ac1b7b96)
@@ -12,69 +12,71 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/adjusting.xml"
+  href="../common/adjusting.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/adjusting.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86_64/adjusting.xml"
+  href="../common/adjusting.xml"
   xpointer="xpointer(//*[@os='c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/adjusting.xml"
+  href="../common/adjusting.xml"
   xpointer="xpointer(//*[@os='d'])"/>
 
-  <para>Note that <filename class="directory">/lib</filename> or
-  <filename class="directory">/lib64</filename> is now the prefix
-  of our dynamic linker.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../multilib/adjusting.xml"
+  xpointer="xpointer(//*[@os='m1'])"/>
 
   <caution>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>For 32 bit ABI:</para>
-
-<screen><userinput>echo 'main(){}' &gt; dummy.c
-cc ${BUILD32} dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/adjusting.xml"
+    xpointer="xpointer(//*[@os='m2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/adjusting.xml"
+    href="../multilib/adjusting.xml"
+    xpointer="xpointer(//*[@os='m3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <para>For 64 bit ABI:</para>
-
-<screen><userinput>echo 'main(){}' &gt; dummy.c
-cc ${BUILD64} dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/adjusting.xml"
+    xpointer="xpointer(//*[@os='m4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/adjusting.xml"
+    href="../multilib/adjusting.xml"
+    xpointer="xpointer(//*[@os='m5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><computeroutput>[Requesting program interpreter: /lib64/ld-linux-sparc-64.so.2]</computeroutput></screen>
-
-    <para>Note that <filename class="directory">/lib</filename> or
-    <filename class="directory">/lib64</filename> is now the prefix
-    of our dynamic linker.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/adjusting.xml"
+    href="../multilib/adjusting.xml"
+    xpointer="xpointer(//*[@os='m7'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
Index: final-system/sparcv8-chapter.xml
===================================================================
--- final-system/sparcv8-chapter.xml	(revision c4e2b39d8418f5129ea481a14660875f867b8d7f)
+++ final-system/sparcv8-chapter.xml	(revision 109c00d410a01746d43da570a38d1ac7ac1b7b96)
@@ -17,5 +17,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/adjusting.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
Index: final-system/x86-chapter.xml
===================================================================
--- final-system/x86-chapter.xml	(revision c4e2b39d8418f5129ea481a14660875f867b8d7f)
+++ final-system/x86-chapter.xml	(revision 109c00d410a01746d43da570a38d1ac7ac1b7b96)
@@ -17,5 +17,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/adjusting.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
Index: nal-system/x86/adjusting.xml
===================================================================
--- final-system/x86/adjusting.xml	(revision c4e2b39d8418f5129ea481a14660875f867b8d7f)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <para os="a">Now we amend the GCC specs file so that it points to the new
-  dynamic linker. A <command>perl</command> command accomplishes this:</para>
-
-  <warning os="b">
-    <para><emphasis>Do not</emphasis> run the following command more than
-    once, it will adversely affect the outcome of software built after
-    this step.</para>
-  </warning>
-
-<screen os="c"><userinput>gcc -dumpspecs | \
-perl -pi -e 's@/tools/lib/ld@/lib/ld@g;' \
-     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' > \
-     `dirname $(gcc --print-libgcc-file-name)`/specs</userinput></screen>
-
-  <para os="d">It is a good idea to visually inspect the specs file to verify the
-  intended change was actually made.</para>
-
-  <para os="e">Note that <filename class="directory">/lib</filename> is now
-  the prefix of our dynamic linker.</para>
-
-  <caution>
-
-    <para os="f">It is imperative at this point to stop and ensure that
-    the basic functions (compiling and linking) of the adjusted toolchain
-    are working as expected. To do this, perform a sanity
-    check:</para>
-
-<screen os="g"><userinput>echo 'main(){}' &gt; dummy.c
-cc dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
-
-    <para os="h">If everything is working correctly, there should be no errors,
-    and the output of the last command will be:</para>
-
-<screen os="i"><computeroutput>[Requesting program interpreter: /lib/ld-linux.so.2]</computeroutput></screen>
-
-    <para os="j">Note that <filename class="directory">/lib</filename> is now
-    the prefix of our dynamic linker.</para>
-
-    <para os="k">If the output does not appear as shown above or is not received
-    at all, then something is seriously wrong. Investigate and retrace the
-    steps to find out where the problem is and correct it. The most likely
-    reason is that something went wrong with the specs file amendment
-    above. Any issues will need to be resolved before continuing on with
-    the process.</para>
-
-    <para os="l">Once everything is working correctly, clean up the test
-    files:</para>
-
-<screen os="m"><userinput>rm dummy.c a.out</userinput></screen>
-
-  </caution>
-
-</sect1>
Index: final-system/x86_64-64/adjusting.xml
===================================================================
--- final-system/x86_64-64/adjusting.xml	(revision c4e2b39d8418f5129ea481a14660875f867b8d7f)
+++ final-system/x86_64-64/adjusting.xml	(revision 109c00d410a01746d43da570a38d1ac7ac1b7b96)
@@ -12,39 +12,31 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
+  href="../common/adjusting.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>gcc -dumpspecs | \
-perl -pi -e 's@/tools/lib/ld@/lib/ld@g;' \
-     -e 's@/tools/lib32/ld@/lib32/ld@g;' \
-     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' > \
-     `dirname $(gcc --print-libgcc-file-name)`/specs</userinput></screen>
+  href="../common/adjusting.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
+  href="../common/adjusting.xml"
   xpointer="xpointer(//*[@os='d'])"/>
 
-  <para>Note that <filename class="directory">/lib</filename> or
-  <filename class="directory">/lib32</filename> is now the prefix
-  of our dynamic linker.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/adjusting.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
 
   <caution>
 
-    <para>It is imperative at this point to stop and ensure that
-    the basic functions (compiling and linking) of the adjusted toolchain
-    are working as expected. Since we are doing a 64 bit only build, we
-    will only test the 64 bit ABI. To do this, perform a sanity
-    check:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
@@ -52,17 +44,17 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
+    href="../common/adjusting.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
Index: final-system/x86_64-chapter.xml
===================================================================
--- final-system/x86_64-chapter.xml	(revision c4e2b39d8418f5129ea481a14660875f867b8d7f)
+++ final-system/x86_64-chapter.xml	(revision 109c00d410a01746d43da570a38d1ac7ac1b7b96)
@@ -18,5 +18,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/adjusting.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc.xml"/>
Index: nal-system/x86_64/adjusting.xml
===================================================================
--- final-system/x86_64/adjusting.xml	(revision c4e2b39d8418f5129ea481a14660875f867b8d7f)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>gcc -dumpspecs | \
-perl -pi -e 's@/tools/lib/ld@/lib/ld@g;' \
-     -e 's@/tools/lib64/ld@/lib64/ld@g;' \
-     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' > \
-     `dirname $(gcc --print-libgcc-file-name)`/specs</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <para>Note that <filename class="directory">/lib</filename> or
-  <filename class="directory">/lib64</filename> is now the prefix
-  of our dynamic linker.</para>
-
-  <caution>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para>For 32 bit ABI:</para>
-
-<screen><userinput>echo 'main(){}' &gt; dummy.c
-cc ${BUILD32} dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <para>For 64 bit ABI:</para>
-
-<screen><userinput>echo 'main(){}' &gt; dummy.c
-cc ${BUILD64} dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen><computeroutput>[Requesting program interpreter: /lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
-
-    <para>Note that <filename class="directory">/lib</filename> or
-    <filename class="directory">/lib64</filename> is now the prefix
-    of our dynamic linker.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
Index: introduction/common/changelog.xml
===================================================================
--- introduction/common/changelog.xml	(revision c4e2b39d8418f5129ea481a14660875f867b8d7f)
+++ introduction/common/changelog.xml	(revision 109c00d410a01746d43da570a38d1ac7ac1b7b96)
@@ -38,4 +38,13 @@
 
     <listitem>
+      <para>January 29, 2006</para> 
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Updated Toolchain adjustment in final-system. Thank you Dan Nicholson.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>January 24, 2006</para> 
       <itemizedlist>
