Changeset 30a199c for BOOK/cross-tools

Timestamp:

May 18, 2011, 4:53:46 PM (15 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

1718e20

Parents:

bd31da6b (diff), 279277d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into systemd

Location:

BOOK/cross-tools

Files:

• 64/gcc-final.xml (modified) (1 diff)
• 64/gcc-static.xml (modified) (1 diff)
• common/gcc-final.xml (modified) (1 diff)
• common/gcc-static.xml (modified) (1 diff)
• mips64-64/gcc-final.xml (modified) (1 diff)
• mips64-64/gcc-static.xml (modified) (1 diff)
• multilib/gcc-final.xml (modified) (1 diff)
• multilib/gcc-static.xml (modified) (1 diff)
• ppc/gcc-final.xml (modified) (1 diff)
• ppc/gcc-static.xml (modified) (1 diff)
• ppc64/gcc-final.xml (modified) (1 diff)
• ppc64/gcc-static.xml (modified) (1 diff)

BOOK/cross-tools/64/gcc-final.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/cross-tools/64/gcc-static.xml

@@ -23 +23 @@
     <title>Installation of Cross GCC Compiler with Static libgcc
     and no Threads</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/cross-tools/common/gcc-final.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/cross-tools/common/gcc-static.xml

@@ -23 +23 @@
     <title>Installation of Cross GCC Compiler with Static libgcc
     and no Threads</title>
+
+    <para os="p1">The following patch contains a number of updates to the
+    &gcc-version; branch by the GCC developers:</para>
+
+    <screen os="p2"><userinput>patch -Np1 -i ../&gcc-branch_update-patch;</userinput></screen>
 
     <para os="aa">Make a couple of essential adjustments to the

BOOK/cross-tools/mips64-64/gcc-final.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/cross-tools/mips64-64/gcc-static.xml

@@ -23 +23 @@
     <title>Installation of Cross GCC Compiler with Static libgcc
     and no Threads</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/cross-tools/multilib/gcc-final.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/cross-tools/multilib/gcc-static.xml

@@ -23 +23 @@
     <title>Installation of Cross GCC Compiler with Static libgcc
     and no Threads</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/cross-tools/ppc/gcc-final.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/cross-tools/ppc/gcc-static.xml

@@ -23 +23 @@
     <title>Installation of Cross GCC Compiler with Static libgcc
     and no Threads</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/cross-tools/ppc64/gcc-final.xml

@@ -22 +22 @@
   <sect2 role="installation">
     <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/cross-tools/ppc64/gcc-static.xml

@@ -23 +23 @@
     <title>Installation of Cross GCC Compiler with Static libgcc
     and no Threads</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"