Changeset 026bb5d for BOOK/final-system/mips64-64/eglibc.xml

Timestamp:

Dec 18, 2013, 1:04:00 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

f975b3a

Parents:

1c9985f (diff), 8abef998 (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:

Updated simp branch to match main book

File:

• BOOK/final-system/mips64-64/eglibc.xml (modified) (4 diffs)

BOOK/final-system/mips64-64/eglibc.xml

@@ -44 +44 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/eglibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/eglibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -72 +56 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
@@ -80 +72 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
+    xpointer="xpointer(//*[@os='l5'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64-64/eglibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
+    xpointer="xpointer(//*[@os='l6'])"/>
 
     <para>Now we will force EGLIBC to build as 64-bit instead of the default
@@ -148 +140 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/eglibc.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/eglibc.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
+
   </sect2>