Changeset 026bb5d for BOOK/final-system/64

Timestamp:

Dec 18, 2013, 1:04:00 AM (12 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

Location:

BOOK/final-system/64

Files:

• binutils.xml (modified) (2 diffs)
• gcc.xml (modified) (4 diffs)

BOOK/final-system/64/binutils.xml

@@ -42 +42 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
+<!-- Branch update patch area
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+-->
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/binutils.xml"
@@ -56 +65 @@
 <screen os="ca"><userinput>CC="gcc -isystem /usr/include" \
 LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
-  ../binutils-&binutils-version;/configure --prefix=/usr \
+  ../binutils-&binutils-dir;/configure --prefix=/usr \
     --libdir=/usr/lib --enable-shared \
     --disable-multilib --enable-64-bit-bfd</userinput></screen>

BOOK/final-system/64/gcc.xml

@@ -30 +30 @@
     xpointer="xpointer(//*[@os='p2'])"/>
 
-
     <para os="p5">Apply the following patch so that GCC links to
     <filename class="directory">/lib</filename> instead of
@@ -36 +35 @@
 
 <screen os="p6"><userinput>patch -Np1 -i ../&gcc-pure64-patch;</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='fix1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='fix2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -72 +79 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -121 +136 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='y'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='z'])"/>
+
   </sect2>