[Clfs-commits] commit: r4486 - in /trunk/BOOK: cross-tools/ cross-tools/64/ cross-tools/common/ cross-tools/mips64-64/ cross-tools/multilib/ cross-tools/native/ cross-tools/native64/ cross-tools/sparc64-64/ cross-tools/sparc64/ cross-tools/x86_64-64/ cross-tools/x86_64/ introduction/common/ temp-system/ temp-system/64/ temp-system/common/ temp-system/mips64-64/ temp-system/mips64/ temp-system/multilib/ temp-system/native/ temp-system/native64/ temp-system/sparc64-64/ temp-system/sparc64/ temp-system/x86_64-64/ temp-system/x86_64/

svn at cross-lfs.org svn at cross-lfs.org
Sat Jan 17 11:58:17 PST 2009


Author: jim
Date: Sat Jan 17 19:58:17 2009
New Revision: 4486

Log:
Ryan's Toolchain Update

Added:
    trunk/BOOK/cross-tools/64/gcc-final.xml
    trunk/BOOK/cross-tools/64/gcc-static.xml
    trunk/BOOK/cross-tools/multilib/gcc-final.xml   (contents, props changed)
      - copied, changed from r4484, trunk/BOOK/cross-tools/x86_64/gcc-final.xml
    trunk/BOOK/cross-tools/multilib/gcc-static.xml
    trunk/BOOK/cross-tools/native/variables.xml
    trunk/BOOK/cross-tools/sparc64/gcc-final.xml
    trunk/BOOK/temp-system/64/gcc.xml
    trunk/BOOK/temp-system/multilib/gcc.xml
Removed:
    trunk/BOOK/cross-tools/64/binutils.xml
    trunk/BOOK/cross-tools/native/binutils.xml
    trunk/BOOK/cross-tools/native/gcc-final.xml
    trunk/BOOK/cross-tools/native/gcc-static.xml
    trunk/BOOK/cross-tools/native64/binutils.xml
    trunk/BOOK/cross-tools/native64/gcc-final.xml
    trunk/BOOK/cross-tools/native64/gcc-static.xml
    trunk/BOOK/cross-tools/x86_64-64/gcc-final.xml
    trunk/BOOK/cross-tools/x86_64-64/gcc-static.xml
    trunk/BOOK/cross-tools/x86_64/gcc-final.xml
    trunk/BOOK/cross-tools/x86_64/gcc-static.xml
    trunk/BOOK/temp-system/mips64-64/gcc.xml
    trunk/BOOK/temp-system/native/binutils.xml
    trunk/BOOK/temp-system/native/gcc.xml
    trunk/BOOK/temp-system/native64/binutils.xml
    trunk/BOOK/temp-system/native64/gcc.xml
    trunk/BOOK/temp-system/sparc64-64/gcc.xml
    trunk/BOOK/temp-system/sparc64/gcc.xml
    trunk/BOOK/temp-system/x86_64-64/gcc.xml
    trunk/BOOK/temp-system/x86_64/gcc.xml
Modified:
    trunk/BOOK/cross-tools/common/binutils.xml
    trunk/BOOK/cross-tools/common/gcc-final.xml
    trunk/BOOK/cross-tools/common/gcc-static.xml
    trunk/BOOK/cross-tools/mips64-64-chapter.xml
    trunk/BOOK/cross-tools/mips64-64/gcc-final.xml
    trunk/BOOK/cross-tools/mips64-64/gcc-static.xml
    trunk/BOOK/cross-tools/mips64-chapter.xml
    trunk/BOOK/cross-tools/multilib/binutils.xml
    trunk/BOOK/cross-tools/native-chapter.xml
    trunk/BOOK/cross-tools/native64-chapter.xml
    trunk/BOOK/cross-tools/ppc64-chapter.xml
    trunk/BOOK/cross-tools/sparc64-64-chapter.xml
    trunk/BOOK/cross-tools/sparc64-64/gcc-static.xml
    trunk/BOOK/cross-tools/sparc64-chapter.xml
    trunk/BOOK/cross-tools/sparc64/gcc-static.xml
    trunk/BOOK/cross-tools/x86_64-64-chapter.xml
    trunk/BOOK/cross-tools/x86_64-chapter.xml
    trunk/BOOK/introduction/common/changelog.xml
    trunk/BOOK/temp-system/common/gcc.xml
    trunk/BOOK/temp-system/mips64-64-chapter.xml
    trunk/BOOK/temp-system/mips64/gcc.xml
    trunk/BOOK/temp-system/native-chapter.xml
    trunk/BOOK/temp-system/native64-chapter.xml
    trunk/BOOK/temp-system/ppc64-chapter.xml
    trunk/BOOK/temp-system/sparc64-64-chapter.xml
    trunk/BOOK/temp-system/sparc64-chapter.xml
    trunk/BOOK/temp-system/x86_64-64-chapter.xml
    trunk/BOOK/temp-system/x86_64-chapter.xml

Modified: trunk/BOOK/cross-tools/common/binutils.xml
==============================================================================
--- trunk/BOOK/cross-tools/common/binutils.xml (original)
+++ trunk/BOOK/cross-tools/common/binutils.xml Sat Jan 17 19:58:17 2009
@@ -52,9 +52,10 @@
     href="../../final-system/common/binutils.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-version;/configure --prefix=/cross-tools \
-    --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-lib-path=/tools/lib \
-    --disable-nls --enable-shared --disable-multilib</userinput></screen>
+<screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-version;/configure \
+  --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
+  --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls --enable-shared \
+  --enable-64-bit-bfd --disable-multilib</userinput></screen>
 
     <variablelist os="bd">
       <title>The meaning of the configure options:</title>

Modified: trunk/BOOK/cross-tools/common/gcc-final.xml
==============================================================================
--- trunk/BOOK/cross-tools/common/gcc-final.xml (original)
+++ trunk/BOOK/cross-tools/common/gcc-final.xml Sat Jan 17 19:58:17 2009
@@ -62,13 +62,6 @@
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='aj'])"/>
 
-    <para os="bd">Finally, disable <option>-B</option> in <filename>configure</filename>,
-    so it doesn't pick up the host's header files:</para>
-
-<screen os="be"><userinput>cp -v configure{,.orig}
-sed -e '/FLAGS_FOR_TARGET.*\/lib\//s at -B[^ ]*/lib/@@g' configure.orig > \
-    configure</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='f'])"/>
@@ -82,12 +75,12 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
 <screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
-    --disable-multilib --with-local-prefix=/tools --disable-nls \
-    --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-    --enable-shared --enable-languages=c,c++ --enable-__cxa_atexit \
-    --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
+  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+  --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
+  --with-sysroot=${CLFS} --with-local-prefix=/tools --disable-nls \
+  --enable-shared --enable-languages=c,c++ --enable-__cxa_atexit \
+  --with-mpfr=/cross-tools --with-gmp=/cross-tools --enable-c99 \
+  --enable-long-long --enable-threads=posix --disable-multilib</userinput></screen>
 
     <variablelist os="bg">
       <title>The meaning of the new configure options:</title>

Modified: trunk/BOOK/cross-tools/common/gcc-static.xml
==============================================================================
--- trunk/BOOK/cross-tools/common/gcc-static.xml (original)
+++ trunk/BOOK/cross-tools/common/gcc-static.xml Sat Jan 17 19:58:17 2009
@@ -44,9 +44,8 @@
     <para os="ag">Change the StartFile Spec to point to the correct library
     location:</para>
 
-<screen os="ah"><userinput>for file in $(find gcc/config  -name linux.h -o -name linux64.h ! -wholename gcc/config/linux.h)
-do echo -e '\n#undef STARTFILE_PREFIX_SPEC\n#define STARTFILE_PREFIX_SPEC "/tools/lib/"' >> ${file}
-done</userinput></screen>
+<screen os="ah"><userinput>echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/linux.h
+echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' >> gcc/config/linux.h</userinput></screen>
 
     <para os="ai">Now alter <command>gcc</command>'s c preprocessor's default
     include search path to use <filename class="directory">/tools</filename> only:</para>
@@ -73,13 +72,13 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
 <screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-    --disable-multilib --with-local-prefix=/tools --disable-nls \
-    --without-headers --with-newlib --disable-decimal-float \
-    --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-    --disable-libgomp --disable-libmudflap --disable-libssp \
-    --disable-shared --disable-threads --enable-languages=c</userinput></screen>
+  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+  --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
+  --with-sysroot=${CLFS} --with-local-prefix=/tools --disable-nls \
+  --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
+  --without-headers --with-newlib --disable-decimal-float \
+  --disable-libgomp --disable-libmudflap --disable-libssp \
+  --disable-threads --enable-languages=c --disable-multilib</userinput></screen>
 
     <variablelist os="am">
       <title>The meaning of the configure options:</title>

Modified: trunk/BOOK/cross-tools/mips64-64-chapter.xml
==============================================================================
--- trunk/BOOK/cross-tools/mips64-64-chapter.xml (original)
+++ trunk/BOOK/cross-tools/mips64-64-chapter.xml Sat Jan 17 19:58:17 2009
@@ -20,7 +20,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.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="mips64-64/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/gcc-final.xml"/>

Modified: trunk/BOOK/cross-tools/mips64-64/gcc-final.xml
==============================================================================
--- trunk/BOOK/cross-tools/mips64-64/gcc-final.xml (original)
+++ trunk/BOOK/cross-tools/mips64-64/gcc-final.xml Sat Jan 17 19:58:17 2009
@@ -74,14 +74,13 @@
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="bf" ><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib \
-   ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST}
-    --with-local-prefix=/tools --disable-nls --enable-shared \
-    --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-    --enable-languages=c,c++ --enable-__cxa_atexit --disable-multilib \
-    --enable-c99 --enable-long-long --enable-threads=posix \
-    --with-abi=64</userinput></screen>
+<screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+  --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
+  --with-sysroot=${CLFS} --with-local-prefix=/tools --disable-nls \
+  --enable-shared --enable-languages=c,c++ --enable-__cxa_atexit \
+  --with-mpfr=/cross-tools --with-gmp=/cross-tools --enable-c99 \
+  --enable-long-long --enable-threads=posix --with-abi=64</userinput></screen>
 
     <variablelist os="bg">
       <title>The meaning of the new configure options:</title>

Modified: trunk/BOOK/cross-tools/mips64-64/gcc-static.xml
==============================================================================
--- trunk/BOOK/cross-tools/mips64-64/gcc-static.xml (original)
+++ trunk/BOOK/cross-tools/mips64-64/gcc-static.xml Sat Jan 17 19:58:17 2009
@@ -28,7 +28,7 @@
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc-static.xml"
+    href="../64/gcc-static.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -36,7 +36,7 @@
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc-static.xml"
+    href="../64/gcc-static.xml"
     xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -84,14 +84,13 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
 <screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-    --disable-multilib --with-local-prefix=/tools --disable-nls \
-    --without-headers --with-newlib --disable-decimal-float \
-    --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-    --disable-libgomp --disable-libmudflap --disable-libssp \
-    --disable-shared  --disable-threads --enable-languages=c \
-    --with-abi=64</userinput></screen>
+  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+  --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
+  --with-sysroot=${CLFS} --with-local-prefix=/tools --disable-nls \
+  --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
+  --without-headers --with-newlib --disable-decimal-float \
+  --disable-libgomp --disable-libmudflap --disable-libssp \
+  --disable-threads --enable-languages=c --with-abi=64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc-static.xml"

Modified: trunk/BOOK/cross-tools/mips64-chapter.xml
==============================================================================
--- trunk/BOOK/cross-tools/mips64-chapter.xml (original)
+++ trunk/BOOK/cross-tools/mips64-chapter.xml Sat Jan 17 19:58:17 2009
@@ -21,10 +21,10 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mpfr.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="x86_64/gcc-static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/glibc-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc-final.xml"/>
 
 </chapter>

Modified: trunk/BOOK/cross-tools/multilib/binutils.xml
==============================================================================
--- trunk/BOOK/cross-tools/multilib/binutils.xml (original)
+++ trunk/BOOK/cross-tools/multilib/binutils.xml Sat Jan 17 19:58:17 2009
@@ -62,9 +62,10 @@
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-version;/configure --prefix=/cross-tools \
-   --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-lib-path=/tools/lib \
-   --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
+<screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-version;/configure \
+  --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
+  --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls --enable-shared \
+  --enable-64-bit-bfd</userinput></screen>
 
     <variablelist os="bd">
       <title>The meaning of the configure options:</title>

Modified: trunk/BOOK/cross-tools/native-chapter.xml
==============================================================================
--- trunk/BOOK/cross-tools/native-chapter.xml (original)
+++ trunk/BOOK/cross-tools/native-chapter.xml Sat Jan 17 19:58:17 2009
@@ -13,13 +13,14 @@
 
   <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/cflags.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/gcc-static.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-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc-final.xml"/>
 
 </chapter>

Modified: trunk/BOOK/cross-tools/native64-chapter.xml
==============================================================================
--- trunk/BOOK/cross-tools/native64-chapter.xml (original)
+++ trunk/BOOK/cross-tools/native64-chapter.xml Sat Jan 17 19:58:17 2009
@@ -13,17 +13,17 @@
 
   <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/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/gcc-static.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-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/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="native64/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc-final.xml"/>
 
 </chapter>

Modified: trunk/BOOK/cross-tools/ppc64-chapter.xml
==============================================================================
--- trunk/BOOK/cross-tools/ppc64-chapter.xml (original)
+++ trunk/BOOK/cross-tools/ppc64-chapter.xml Sat Jan 17 19:58:17 2009
@@ -21,9 +21,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mpfr.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="x86_64/gcc-static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc-final.xml"/>
 
 </chapter>

Modified: trunk/BOOK/cross-tools/sparc64-64-chapter.xml
==============================================================================
--- trunk/BOOK/cross-tools/sparc64-64-chapter.xml (original)
+++ trunk/BOOK/cross-tools/sparc64-64-chapter.xml Sat Jan 17 19:58:17 2009
@@ -20,9 +20,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/gcc-static.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="64/gcc-static.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="common/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc-final.xml"/>
 
 </chapter>

Modified: trunk/BOOK/cross-tools/sparc64-64/gcc-static.xml
==============================================================================
--- trunk/BOOK/cross-tools/sparc64-64/gcc-static.xml (original)
+++ trunk/BOOK/cross-tools/sparc64-64/gcc-static.xml Sat Jan 17 19:58:17 2009
@@ -28,7 +28,7 @@
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc-static.xml"
+    href="../64/gcc-static.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -36,7 +36,7 @@
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc-static.xml"
+    href="../64/gcc-static.xml"
     xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -95,7 +95,9 @@
     href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='an'])"/>
 
-<screen><userinput>make CFLAGS_FOR_TARGET="${GCCTARGET}"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc-static.xml"

Modified: trunk/BOOK/cross-tools/sparc64-chapter.xml
==============================================================================
--- trunk/BOOK/cross-tools/sparc64-chapter.xml (original)
+++ trunk/BOOK/cross-tools/sparc64-chapter.xml Sat Jan 17 19:58:17 2009
@@ -24,6 +24,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/gcc-static.xml"/>
   <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="x86_64/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/gcc-final.xml"/>
 
 </chapter>

Modified: trunk/BOOK/cross-tools/sparc64/gcc-static.xml
==============================================================================
--- trunk/BOOK/cross-tools/sparc64/gcc-static.xml (original)
+++ trunk/BOOK/cross-tools/sparc64/gcc-static.xml Sat Jan 17 19:58:17 2009
@@ -84,7 +84,7 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc-static.xml"
+    href="../multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='al'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -95,7 +95,7 @@
     href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='an'])"/>
 
-<screen><userinput>make CFLAGS_FOR_TARGET="${GCCTARGET}"</userinput></screen>
+<screen os="s1"><userinput>make CFLAGS_FOR_TARGET="${GCCTARGET}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc-static.xml"

Modified: trunk/BOOK/cross-tools/x86_64-64-chapter.xml
==============================================================================
--- trunk/BOOK/cross-tools/x86_64-64-chapter.xml (original)
+++ trunk/BOOK/cross-tools/x86_64-64-chapter.xml Sat Jan 17 19:58:17 2009
@@ -20,9 +20,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/gcc-static.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="64/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc-final.xml"/>
 
 </chapter>

Modified: trunk/BOOK/cross-tools/x86_64-chapter.xml
==============================================================================
--- trunk/BOOK/cross-tools/x86_64-chapter.xml (original)
+++ trunk/BOOK/cross-tools/x86_64-chapter.xml Sat Jan 17 19:58:17 2009
@@ -21,9 +21,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mpfr.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="x86_64/gcc-static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/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/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc-final.xml"/>
 
 </chapter>

Modified: trunk/BOOK/introduction/common/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/common/changelog.xml (original)
+++ trunk/BOOK/introduction/common/changelog.xml Sat Jan 17 19:58:17 2009
@@ -35,6 +35,15 @@
       </itemizedlist>
     </listitem>
 -->
+
+    <listitem>
+      <para>January 17, 2009</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Jim] - Toolchain Updates from Ryan.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>January 16, 2009</para>

Modified: trunk/BOOK/temp-system/common/gcc.xml
==============================================================================
--- trunk/BOOK/temp-system/common/gcc.xml (original)
+++ trunk/BOOK/temp-system/common/gcc.xml Sat Jan 17 19:58:17 2009
@@ -46,13 +46,6 @@
     href="../../cross-tools/common/gcc-static.xml"
     xpointer="xpointer(//*[@os='ad'])"/>
 
-    <para os="cd">Now we will change <command>cpp</command>'s search path so it
-     won't look in <filename class="directory">/usr/include</filename>:</para>
-
-<screen os="ce"><userinput>cp -v gcc/cppdefault.c{,.orig}
-sed -e '/#define STANDARD_INCLUDE_DIR/s@"/usr/include"@0 at g' \
-    gcc/cppdefault.c.orig > gcc/cppdefault.c</userinput></screen>
-
     <para os="cf">Also, we need to set the directory searched by the fixincludes
     process for system headers, so it won't look at the host's headers:</para>
 
@@ -76,10 +69,11 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
 <screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools --enable-long-long --enable-c99 \
-    --enable-shared --enable-threads=posix --enable-__cxa_atexit \
-    --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
+  --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
+  --with-sysroot=${CLFS} --with-local-prefix=/tools --enable-long-long \
+  --enable-c99 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
+  --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch \
+  --disable-multilib</userinput></screen>
 
     <variablelist os="cl">
       <title>The meaning of the new configure options:</title>

Modified: trunk/BOOK/temp-system/mips64-64-chapter.xml
==============================================================================
--- trunk/BOOK/temp-system/mips64-64-chapter.xml (original)
+++ trunk/BOOK/temp-system/mips64-64-chapter.xml Sat Jan 17 19:58:17 2009
@@ -17,7 +17,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/bzip2.xml"/>

Modified: trunk/BOOK/temp-system/mips64/gcc.xml
==============================================================================
--- trunk/BOOK/temp-system/mips64/gcc.xml (original)
+++ trunk/BOOK/temp-system/mips64/gcc.xml Sat Jan 17 19:58:17 2009
@@ -23,36 +23,28 @@
     <title>Installation of GCC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
+    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
+    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
+    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
+    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
+    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='ac'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
+    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc.xml"
@@ -61,14 +53,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/gcc.xml"
@@ -86,15 +70,16 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/tools --libdir=/tools/lib64 \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --with-abi=64 --with-local-prefix=/tools --enable-long-long \
-    --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
-    --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
+<screen os="dc"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+  ../gcc-&gcc-version;/configure --prefix=/tools \
+  --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+  --target=${CLFS_TARGET} --with-sysroot=${CLFS} --with-local-prefix=/tools \
+  --enable-long-long --enable-c99 --enable-shared --enable-threads=posix \
+  --enable-__cxa_atexit --disable-nls --enable-languages=c,c++ \
+  --disable-libstdcxx-pch --with-abi=64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
+    href="../multilib/gcc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-system/native-chapter.xml
==============================================================================
--- trunk/BOOK/temp-system/native-chapter.xml (original)
+++ trunk/BOOK/temp-system/native-chapter.xml Sat Jan 17 19:58:17 2009
@@ -15,8 +15,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/gcc.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"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/bzip2.xml"/>

Modified: trunk/BOOK/temp-system/native64-chapter.xml
==============================================================================
--- trunk/BOOK/temp-system/native64-chapter.xml (original)
+++ trunk/BOOK/temp-system/native64-chapter.xml Sat Jan 17 19:58:17 2009
@@ -15,8 +15,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/gcc.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"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/bzip2.xml"/>

Modified: trunk/BOOK/temp-system/ppc64-chapter.xml
==============================================================================
--- trunk/BOOK/temp-system/ppc64-chapter.xml (original)
+++ trunk/BOOK/temp-system/ppc64-chapter.xml Sat Jan 17 19:58:17 2009
@@ -16,7 +16,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib.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="x86_64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>

Modified: trunk/BOOK/temp-system/sparc64-64-chapter.xml
==============================================================================
--- trunk/BOOK/temp-system/sparc64-64-chapter.xml (original)
+++ trunk/BOOK/temp-system/sparc64-64-chapter.xml Sat Jan 17 19:58:17 2009
@@ -17,7 +17,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/bzip2.xml"/>

Modified: trunk/BOOK/temp-system/sparc64-chapter.xml
==============================================================================
--- trunk/BOOK/temp-system/sparc64-chapter.xml (original)
+++ trunk/BOOK/temp-system/sparc64-chapter.xml Sat Jan 17 19:58:17 2009
@@ -17,7 +17,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib.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="sparc64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>

Modified: trunk/BOOK/temp-system/x86_64-64-chapter.xml
==============================================================================
--- trunk/BOOK/temp-system/x86_64-64-chapter.xml (original)
+++ trunk/BOOK/temp-system/x86_64-64-chapter.xml Sat Jan 17 19:58:17 2009
@@ -17,7 +17,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/bzip2.xml"/>

Modified: trunk/BOOK/temp-system/x86_64-chapter.xml
==============================================================================
--- trunk/BOOK/temp-system/x86_64-chapter.xml (original)
+++ trunk/BOOK/temp-system/x86_64-chapter.xml Sat Jan 17 19:58:17 2009
@@ -17,7 +17,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib.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="x86_64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>




More information about the Clfs-commits mailing list