Index: BOOK/introduction/mips/changelog.xml
===================================================================
--- BOOK/introduction/mips/changelog.xml	(revision e3cda9ac6640fd91e7078507d03cc7a8d492be90)
+++ BOOK/introduction/mips/changelog.xml	(revision 1aebe7f371916bc4ead866daf83ca2b9d2966487)
@@ -33,4 +33,13 @@
 
 -->
+
+    <listitem>
+      <para>December 26, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Added config update patch to Expect.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: BOOK/introduction/mips64-64/changelog.xml
===================================================================
--- BOOK/introduction/mips64-64/changelog.xml	(revision e3cda9ac6640fd91e7078507d03cc7a8d492be90)
+++ BOOK/introduction/mips64-64/changelog.xml	(revision 1aebe7f371916bc4ead866daf83ca2b9d2966487)
@@ -33,4 +33,13 @@
 
 -->
+
+    <listitem>
+      <para>December 26, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Added config update patch to Expect.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: BOOK/introduction/mips64/changelog.xml
===================================================================
--- BOOK/introduction/mips64/changelog.xml	(revision e3cda9ac6640fd91e7078507d03cc7a8d492be90)
+++ BOOK/introduction/mips64/changelog.xml	(revision 1aebe7f371916bc4ead866daf83ca2b9d2966487)
@@ -33,4 +33,13 @@
 
 -->
+
+    <listitem>
+      <para>December 26, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Added config update patch to Expect.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: BOOK/materials/mips/patches.xml
===================================================================
--- BOOK/materials/mips/patches.xml	(revision e3cda9ac6640fd91e7078507d03cc7a8d492be90)
+++ BOOK/materials/mips/patches.xml	(revision 1aebe7f371916bc4ead866daf83ca2b9d2966487)
@@ -26,4 +26,12 @@
         <para><ulink
         url="&patches-root;dvhtool/&dvhtool-fixes-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry os="expect-mips_update-patch">
+      <term>Expect Config Update Patch - 51 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;expect/&expect-mips_update-patch;"/></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/mips64-64/patches.xml
===================================================================
--- BOOK/materials/mips64-64/patches.xml	(revision e3cda9ac6640fd91e7078507d03cc7a8d492be90)
+++ BOOK/materials/mips64-64/patches.xml	(revision 1aebe7f371916bc4ead866daf83ca2b9d2966487)
@@ -24,4 +24,8 @@
     href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='dvhtool-fixes-patch'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='expect-mips_update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/materials/mips64/patches.xml
===================================================================
--- BOOK/materials/mips64/patches.xml	(revision e3cda9ac6640fd91e7078507d03cc7a8d492be90)
+++ BOOK/materials/mips64/patches.xml	(revision 1aebe7f371916bc4ead866daf83ca2b9d2966487)
@@ -31,4 +31,8 @@
     href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='dvhtool-fixes-patch'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='expect-mips_update-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision e3cda9ac6640fd91e7078507d03cc7a8d492be90)
+++ BOOK/patches.ent	(revision 1aebe7f371916bc4ead866daf83ca2b9d2966487)
@@ -101,4 +101,6 @@
 <!ENTITY dvhtool-fixes-patch "dvhtool-&dvhtool-version;-fixes-1.patch">
 
+<!ENTITY expect-mips_update-patch "expect-&expect-version;-mips_config_update-1.patch">
+
 <!ENTITY flex-mips_update-patch "flex-&flex-version;-mips_config_update-1.patch">
 
Index: OK/testsuite-tools/64/tcl.xml
===================================================================
--- BOOK/testsuite-tools/64/tcl.xml	(revision e3cda9ac6640fd91e7078507d03cc7a8d492be90)
+++ 	(revision )
@@ -1,80 +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-testsuite-tools-tcl" role="wrap">
-  <?dbhtml filename="tcl.html"?>
-
-  <title>Tcl-&tcl-version;</title>
-
-  <indexterm zone="ch-testsuite-tools-tcl">
-    <primary sortas="a-Tcl">Tcl</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/tcl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Tcl</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='c2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/tcl.xml"
-  xpointer="xpointer(id('contents-tcl'))"/>
-
-</sect1>
Index: BOOK/testsuite-tools/mips-chapter.xml
===================================================================
--- BOOK/testsuite-tools/mips-chapter.xml	(revision e3cda9ac6640fd91e7078507d03cc7a8d492be90)
+++ BOOK/testsuite-tools/mips-chapter.xml	(revision 1aebe7f371916bc4ead866daf83ca2b9d2966487)
@@ -14,5 +14,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/expect.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
Index: BOOK/testsuite-tools/mips/expect.xml
===================================================================
--- BOOK/testsuite-tools/mips/expect.xml	(revision 1aebe7f371916bc4ead866daf83ca2b9d2966487)
+++ BOOK/testsuite-tools/mips/expect.xml	(revision 1aebe7f371916bc4ead866daf83ca2b9d2966487)
@@ -0,0 +1,87 @@
+<?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-testsuite-tools-expect" role="wrap">
+  <?dbhtml filename="expect.html"?>
+
+  <title>Expect-&expect-version;</title>
+
+  <indexterm zone="ch-testsuite-tools-expect">
+    <primary sortas="a-Expect">Expect</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Expect package contains a program for carrying out scripted
+    dialogues with other interactive programs.</para>
+
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
+
+      <seglistitem>
+        <seg>Bash, Binutils, Coreutils, Diffutils,
+        GCC, Glibc, Grep, Make, Sed, and Tcl</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Expect</title>
+
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <para os="p1">This patch updates config.guess and config.sub for MIPS processors.</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&expect-mips_update-patch;</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/expect.xml"
+  xpointer="xpointer(id('contents-expect'))"/>
+
+</sect1>
Index: BOOK/testsuite-tools/mips64-64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/mips64-64-chapter.xml	(revision e3cda9ac6640fd91e7078507d03cc7a8d492be90)
+++ BOOK/testsuite-tools/mips64-64-chapter.xml	(revision 1aebe7f371916bc4ead866daf83ca2b9d2966487)
@@ -13,6 +13,6 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/expect.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
Index: BOOK/testsuite-tools/mips64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/mips64-chapter.xml	(revision e3cda9ac6640fd91e7078507d03cc7a8d492be90)
+++ BOOK/testsuite-tools/mips64-chapter.xml	(revision 1aebe7f371916bc4ead866daf83ca2b9d2966487)
@@ -14,5 +14,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tcl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expect-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/expect-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
Index: BOOK/testsuite-tools/mips64/expect-64bit.xml
===================================================================
--- BOOK/testsuite-tools/mips64/expect-64bit.xml	(revision 1aebe7f371916bc4ead866daf83ca2b9d2966487)
+++ BOOK/testsuite-tools/mips64/expect-64bit.xml	(revision 1aebe7f371916bc4ead866daf83ca2b9d2966487)
@@ -0,0 +1,91 @@
+<?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-testsuite-tools-expect" role="wrap">
+  <?dbhtml filename="expect64.html"?>
+
+  <title>Expect-&expect-version;</title>
+
+  <indexterm zone="ch-testsuite-tools-expect">
+    <primary sortas="a-Expect">Expect</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/expect.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Expect</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/expect.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/expect.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools \
+   --with-tcl=/tools/lib64 --with-tclinclude=/tools/include  \
+   --libdir=/tools/lib64 --with-x=no</userinput></screen>
+
+    <variablelist os="e">
+      <title>The meaning of the configure options:</title>
+
+      <varlistentry os="e1">
+        <term><parameter>--with-tcl=/tools/lib64</parameter></term>
+        <listitem>
+          <para>This ensures that the configure script finds the Tcl
+          installation in the temporary tools location.</para>
+        </listitem>
+      </varlistentry>
+
+       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+        href="../common/expect.xml"
+        xpointer="xpointer(//*[@os='e2'])"/>
+
+       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+        href="../common/expect.xml"
+        xpointer="xpointer(//*[@os='e3'])"/>
+
+    </variablelist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/expect.xml"
+  xpointer="xpointer(id('contents-expect'))"/>
+
+</sect1>
