Changeset 026bb5d for BOOK/cross-tools/ppc/gcc-static.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/cross-tools/ppc/gcc-static.xml (modified) (3 diffs)

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

@@ -25 +25 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
+    href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
+    href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
 
@@ -44 +44 @@
     xpointer="xpointer(//*[@os='ag'])"/>
 
-<screen os="ah"><userinput>echo -en '#undef STANDARD_INCLUDE_DIR\n#define STANDARD_INCLUDE_DIR "/tools/include/"\n\n' >> gcc/config/rs6000/sysv4.h
-echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/rs6000/sysv4.h
+<screen os="ah"><userinput>echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/rs6000/sysv4.h
 echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' >> gcc/config/rs6000/sysv4.h</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -100 +91 @@
     xpointer="xpointer(//*[@os='aq'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ar'])"/>
+
   </sect2>