r5266 - in branches/cross-lfs/BOOK: cross-tools introduction materials

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sun May 8 21:12:43 PDT 2005


Author: jhuntwork
Date: 2005-05-08 22:12:42 -0600 (Sun, 08 May 2005)
New Revision: 5266

Modified:
   branches/cross-lfs/BOOK/cross-tools/linux-libc-headers-sparc64.xml
   branches/cross-lfs/BOOK/introduction/changelog.xml
   branches/cross-lfs/BOOK/materials/patches.xml
Log:
Edited Sparc64 specific instructions for linux-libc-headers in cross-tools. Added a patch.

Modified: branches/cross-lfs/BOOK/cross-tools/linux-libc-headers-sparc64.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/linux-libc-headers-sparc64.xml	2005-05-09 01:07:01 UTC (rev 5265)
+++ branches/cross-lfs/BOOK/cross-tools/linux-libc-headers-sparc64.xml	2005-05-09 04:12:42 UTC (rev 5266)
@@ -18,52 +18,19 @@
 <sect2 role="installation">
 <title>Installation of Linux-Libc-Headers</title>
 
+<para>The following patch contains header stubs which link to the proper
+header from either asm-sparc or asm-sparc64:</para>
+<screen><userinput>patch -Np1 -i ../linux-libc-headers-&linux-libc-headers-version;-sparc_biarch-1.patch
+</userinput></screen>
+
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="linux-libc-headers.xml"
   xpointer="xpointer(/sect1/sect2[@role='installation']/para[1])"/>
 
-<screen><userinput>install -d /tools/include/asm
-cp -R include/asm-sparc64 /tools/include/
+<screen><userinput>cp -R include/asm-sparc64 /tools/include/
 cp -R include/asm-sparc /tools/include/
-startdir=`pwd`
-for arch in sparc64 sparc ; do cd /tools/include/asm-${arch}; hdrs=`ls *.h`; \
-HDRS=`echo ${HDRS} ${hdrs} | sort | uniq`; done
-cd $startdir
-for hdr in ${HDRS}; do name=`basename ${hdr} | tr [a-z]. [A-Z]_` \
-cat > /tools/include/asm/${hdr} << EOF
-#ifndef __STUB__${name}__
-#define __STUB__${name}__
-EOF
-if [ -f /tools/include/asm-sparc64/${hdr} ]; then
-if [ -f /tools/include/asm-sparc/${hdr} ]; then
-cat >> /tools/include/asm/${hdr} << EOF
-#ifdef __arch64__
-#include <asm-sparc64/${hdr}>
-#else
-#include <asm-sparc/${hdr}>
-#endif
-EOF
-else
-cat >> /tools/include/asm/${hdr} << EOF
-#ifdef __arch64__
-#include <asm-sparc64/${hdr}>
-#endif
-EOF
-fi
-else
-cat >> /tools/include/asm/${hdr} << EOF
-#ifndef __arch64__
-#include <asm-sparc/${hdr}>
-#endif
-EOF
-fi
-cat >> /tools/include/asm/${hdr} << EOF
-#endif /* __STUB__${name}__ */
-EOF
-echo " - /tools/include/asm/${hdr} created"
-done
+cp -R include/asm-sparc-biarc /tools/include/asm
 cp -R include/linux /tools/include</userinput></screen>
-
 </sect2>
 
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: branches/cross-lfs/BOOK/introduction/changelog.xml
===================================================================
--- branches/cross-lfs/BOOK/introduction/changelog.xml	2005-05-09 01:07:01 UTC (rev 5265)
+++ branches/cross-lfs/BOOK/introduction/changelog.xml	2005-05-09 04:12:42 UTC (rev 5266)
@@ -115,8 +115,7 @@
 <listitem><para>Added Sparc64 specific instructions to glibc-startfiles in cross-tools (64-bit)</para></listitem>
 <listitem><para>Added Sparc64 specific instructions to gcc-shared in cross-tools</para></listitem>
 <listitem><para>Added Sparc64 specific instructions to glibc in cross-tools(32-bit)</para></listitem>
-<listitem><para>Edited sparc64 specific instructions for linux-libc-headers in cross-tools for multilib.
-This may have to be re-thought, the commands are long and awkward.</para></listitem>
+<listitem><para>Edited Sparc64 specific instructions for linux-libc-headers in cross-tools. Added a patch.</para></listitem>
 </itemizedlist>
 </listitem>
 </itemizedlist>

Modified: branches/cross-lfs/BOOK/materials/patches.xml
===================================================================
--- branches/cross-lfs/BOOK/materials/patches.xml	2005-05-09 01:07:01 UTC (rev 5265)
+++ branches/cross-lfs/BOOK/materials/patches.xml	2005-05-09 04:12:42 UTC (rev 5266)
@@ -134,6 +134,14 @@
 </listitem>
 </varlistentry>
 
+<varlistentry arch="sparc64">
+<term>Linux-libc-headers Sparc Biarch Patch - 80 KB:</term>
+<listitem>
+<para><ulink url="&patches-root;linux-libc-headers/linux-libc-headers-&linux-libc-headers-version;-sparc_biarch-1.patch"/></para>
+</listitem>
+</varlistentry>
+
+
 <varlistentry arch="raq2">
 <term>Linux RaQ2 Patch - 164 KB:</term>
 <listitem>




More information about the lfs-book mailing list