[Clfs-commits] commit: r4538 - in /branches/clfs-embedded/BOOK/cross-tools: arm/abi.xml arm/variables.xml mips/abi.xml mips/variables.xml x86/linux-headers.xml x86/variables.xml
svn at cross-lfs.org
svn at cross-lfs.org
Sat Jan 24 13:26:07 PST 2009
Author: jim
Date: Sat Jan 24 21:26:07 2009
New Revision: 4538
Log:
Working an x86 and x86_64 integreation
Modified:
branches/clfs-embedded/BOOK/cross-tools/arm/abi.xml
branches/clfs-embedded/BOOK/cross-tools/arm/variables.xml
branches/clfs-embedded/BOOK/cross-tools/mips/abi.xml
branches/clfs-embedded/BOOK/cross-tools/mips/variables.xml
branches/clfs-embedded/BOOK/cross-tools/x86/linux-headers.xml
branches/clfs-embedded/BOOK/cross-tools/x86/variables.xml
Modified: branches/clfs-embedded/BOOK/cross-tools/arm/abi.xml
==============================================================================
--- branches/clfs-embedded/BOOK/cross-tools/arm/abi.xml (original)
+++ branches/clfs-embedded/BOOK/cross-tools/arm/abi.xml Sat Jan 24 21:26:07 2009
@@ -11,15 +11,15 @@
<title>ABI Variables</title>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../mips/abi.xml"
+ href="../x86/abi.xml"
xpointer="xpointer(//*[@os='a'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../mips/abi.xml"
+ href="../x86/abi.xml"
xpointer="xpointer(//*[@os='b'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../mips/abi.xml"
+ href="../x86/abi.xml"
xpointer="xpointer(//*[@os='c'])"/>
<table>
Modified: branches/clfs-embedded/BOOK/cross-tools/arm/variables.xml
==============================================================================
--- branches/clfs-embedded/BOOK/cross-tools/arm/variables.xml (original)
+++ branches/clfs-embedded/BOOK/cross-tools/arm/variables.xml Sat Jan 24 21:26:07 2009
@@ -18,15 +18,17 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='d'])"/>
+ xpointer="xpointer(//*[@os='b'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ xpointer="xpointer(//*[@os='c'])"/>
-<screen os="f"><userinput>echo export CLFS_TARGET=\""${CLFS_TARGET}\"" >> ~/.bashrc</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../x86/variables.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
- <table os="g">
+ <table os="e">
<title>Processor Type and Target Triplets</title>
<?dbfo table-width="5in" ?>
Modified: branches/clfs-embedded/BOOK/cross-tools/mips/abi.xml
==============================================================================
--- branches/clfs-embedded/BOOK/cross-tools/mips/abi.xml (original)
+++ branches/clfs-embedded/BOOK/cross-tools/mips/abi.xml Sat Jan 24 21:26:07 2009
@@ -11,15 +11,15 @@
<title>ABI Variables</title>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../mips/abi.xml"
+ href="../x86/abi.xml"
xpointer="xpointer(//*[@os='a'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../mips/abi.xml"
+ href="../x86/abi.xml"
xpointer="xpointer(//*[@os='b'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../mips/abi.xml"
+ href="../x86/abi.xml"
xpointer="xpointer(//*[@os='c'])"/>
<table>
Modified: branches/clfs-embedded/BOOK/cross-tools/mips/variables.xml
==============================================================================
--- branches/clfs-embedded/BOOK/cross-tools/mips/variables.xml (original)
+++ branches/clfs-embedded/BOOK/cross-tools/mips/variables.xml Sat Jan 24 21:26:07 2009
@@ -18,23 +18,23 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='d'])"/>
+ xpointer="xpointer(//*[@os='b'])"/>
- <para os="d1">Now you will need to set the MIPS LEVEL. This determines how your
+ <para os="m1">Now you will need to set the MIPS LEVEL. This determines how your
uClibc is built. There are currently 5 MIPS ISA Levels. To keep things simple
we are only using 2. For more information, go to
<ulink url="http://www.linux-mips.org/wiki/Instruction_Set_Architecture"/></para>
-<screen os="d2"><userinput>export CLFS_MIPS_LEVEL="{mips level}"</userinput></screen>
+<screen os="m2"><userinput>export CLFS_MIPS_LEVEL="{mips level}"</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ xpointer="xpointer(//*[@os='c'])"/>
-<screen os="f"><userinput>echo export CLFS_TARGET=\""${CLFS_TARGET}\"" >> ~/.bashrc
+<screen os="d"><userinput>echo export CLFS_TARGET=\""${CLFS_TARGET}\"" >> ~/.bashrc
echo export CLFS_MIPS_LEVEL=\""${CLFS_MIPS_LEVEL}\"" >> ~/.bashrc</userinput></screen>
- <table os="g">
+ <table os="e">
<title>Processor Type and Target Triplets</title>
<?dbfo table-width="5.5in" ?>
Modified: branches/clfs-embedded/BOOK/cross-tools/x86/linux-headers.xml
==============================================================================
--- branches/clfs-embedded/BOOK/cross-tools/x86/linux-headers.xml (original)
+++ branches/clfs-embedded/BOOK/cross-tools/x86/linux-headers.xml Sat Jan 24 21:26:07 2009
@@ -36,8 +36,8 @@
<screen os="c"><userinput>install -dv ${CLFS}/usr/include
make mrproper
-make ARCH=i386 headers_check
-make ARCH=i386 INSTALL_HDR_PATH=dest headers_install
+make ARCH=$(echo ${CLFS_TARGET} | sed 's/i.86/i386/' | cut -f1 -d-) headers_check
+make ARCH=$(echo ${CLFS_TARGET} | sed 's/i.86/i386/' | cut -f1 -d-) INSTALL_HDR_PATH=dest headers_install
cp -rv dest/include/* ${CLFS}/usr/include</userinput></screen>
</sect2>
Modified: branches/clfs-embedded/BOOK/cross-tools/x86/variables.xml
==============================================================================
--- branches/clfs-embedded/BOOK/cross-tools/x86/variables.xml (original)
+++ branches/clfs-embedded/BOOK/cross-tools/x86/variables.xml Sat Jan 24 21:26:07 2009
@@ -20,14 +20,14 @@
target machine, you can use the table at the bottom of this page. Set
the command using the method listed below:</para>
-<screen os="d"><userinput>export CLFS_TARGET="{target triplet}"</userinput></screen>
+<screen os="b"><userinput>export CLFS_TARGET="{target triplet}"</userinput></screen>
- <para os="e">Now we will add this to <filename>~/.bashrc</filename>, just in
+ <para os="c">Now we will add this to <filename>~/.bashrc</filename>, just in
case you have to exit and restart building later:</para>
-<screen os="f"><userinput>echo export CLFS_TARGET=\""${CLFS_TARGET}\"" >> ~/.bashrc</userinput></screen>
+<screen os="d"><userinput>echo export CLFS_TARGET=\""${CLFS_TARGET}\"" >> ~/.bashrc</userinput></screen>
- <table os="g">
+ <table os="e">
<title>Processor Type and Target Triplets</title>
<?dbfo table-width="4.5in" ?>
More information about the Clfs-commits
mailing list