r807 - in trunk/BOOK: . cross-tools/sparcv8 final-system/sparcv8 materials/sparcv8 temp-system/sparc temp-system/sparcv8

jim at linuxfromscratch.org jim at linuxfromscratch.org
Fri Dec 2 22:08:14 PST 2005


Author: jim
Date: 2005-12-02 23:08:12 -0700 (Fri, 02 Dec 2005)
New Revision: 807

Modified:
   trunk/BOOK/
   trunk/BOOK/cross-tools/sparcv8/glibc.xml
   trunk/BOOK/final-system/sparcv8/glibc.xml
   trunk/BOOK/materials/sparcv8/patches.xml
   trunk/BOOK/patches.ent
   trunk/BOOK/temp-system/sparc/binutils.xml
   trunk/BOOK/temp-system/sparcv8/binutils.xml
Log:
 r892 at server:  jim | 2005-12-02 22:06:06 -0800
 Text Updates



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:891
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:892
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/cross-tools/sparcv8/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/sparcv8/glibc.xml	2005-12-03 06:08:03 UTC (rev 806)
+++ trunk/BOOK/cross-tools/sparcv8/glibc.xml	2005-12-03 06:08:12 UTC (rev 807)
@@ -34,7 +34,6 @@
     href="../../final-system/sparcv8/glibc.xml"
     xpointer="xpointer(//*[@os='l2'])"/>
 
-
     <para os="l3">If you require libidn support, you can add it
     by unpacking <filename>glibc-libidn-&glibc-linuxthreads-version;</filename>
     tarball from within the <filename class="directory">glibc-&glibc-linuxthreads-version;</filename>
@@ -49,27 +48,33 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='db'])"/>
 
+<screen os="dc"><userinput>patch -Np1 -i ../&glibc-linuxthreads-libgcc_eh-patch;</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparcv8/glibc.xml"
-    xpointer="xpointer(//*[@os='l5'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparcv8/glibc.xml"
-    xpointer="xpointer(//*[@os='l6'])"/>
+    xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    href="../../final-system/sparcv8/glibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    href="../../final-system/sparcv8/glibc.xml"
+    xpointer="xpointer(//*[@os='l5'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparcv8/glibc.xml"
+    xpointer="xpointer(//*[@os='l6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 

Modified: trunk/BOOK/final-system/sparcv8/glibc.xml
===================================================================
--- trunk/BOOK/final-system/sparcv8/glibc.xml	2005-12-03 06:08:03 UTC (rev 806)
+++ trunk/BOOK/final-system/sparcv8/glibc.xml	2005-12-03 06:08:12 UTC (rev 807)
@@ -52,6 +52,11 @@
 
 <screen os="d"><userinput>patch -Np1 -i ../&glibc-linuxthreads-localedef_segfault-patch;</userinput></screen>
 
+   <para os="s1">This patch will fix an obsolete gcc option that was removed in
+   GCC 4.x:</para>
+
+<screen os="s2"><userinput>patch -Np1 -i ../&glibc-sparc_gcc4_fixes-patch;</userinput></screen>
+
     <para os="l5">NPTL is not supported on Sparc v8 and below, so we need to remove the NPTL from our build.
     We do this by removing the NPTL directories:</para>
 

Modified: trunk/BOOK/materials/sparcv8/patches.xml
===================================================================
--- trunk/BOOK/materials/sparcv8/patches.xml	2005-12-03 06:08:03 UTC (rev 806)
+++ trunk/BOOK/materials/sparcv8/patches.xml	2005-12-03 06:08:12 UTC (rev 807)
@@ -20,6 +20,14 @@
     href="../x86/patches.xml"
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
+    <varlistentry os="glibc-sparc_gcc4_fixes-patch">
+      <term>Glibc GCC4 Patch - 1 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;glibc/&glibc-sparc_gcc4_fixes-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../sparc/patches.xml"
     xpointer="xpointer(//*[@os='kbd-sparc_kbdrate-patch'])"/>

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2005-12-03 06:08:03 UTC (rev 806)
+++ trunk/BOOK/patches.ent	2005-12-03 06:08:12 UTC (rev 807)
@@ -84,6 +84,7 @@
 <!ENTITY binutils-sparc_aout-patch "binutils-&binutils-version;-sparc_aout-1.patch">
 
 <!ENTITY glibc-sparc_tls-patch "glibc-&glibc-version;-sparc_tls-1.patch">
+<!ENTITY glibc-sparc_gcc4_fixes-patch "glibc-&glibc-version;-sparc_gcc4_fixes-1.patch">
 
 <!ENTITY linux-libc-headers-sparc_biarch-patch "linux-libc-headers-&linux-libc-headers-version;-sparc_biarch-1.patch">
 <!ENTITY linux-libc-headers-sparc_conflicts-patch "linux-libc-headers-&linux-libc-headers-version;-sparc_conflicts-1.patch">

Modified: trunk/BOOK/temp-system/sparc/binutils.xml
===================================================================
--- trunk/BOOK/temp-system/sparc/binutils.xml	2005-12-03 06:08:03 UTC (rev 806)
+++ trunk/BOOK/temp-system/sparc/binutils.xml	2005-12-03 06:08:12 UTC (rev 807)
@@ -64,15 +64,15 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/common/binutils.xml"
+    xpointer="xpointer(//*[@os='bc'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/binutils.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/binutils.xml"
     xpointer="xpointer(//*[@os='bf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/temp-system/sparcv8/binutils.xml
===================================================================
--- trunk/BOOK/temp-system/sparcv8/binutils.xml	2005-12-03 06:08:03 UTC (rev 806)
+++ trunk/BOOK/temp-system/sparcv8/binutils.xml	2005-12-03 06:08:12 UTC (rev 807)
@@ -56,15 +56,15 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/common/binutils.xml"
+    xpointer="xpointer(//*[@os='bc'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/binutils.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/binutils.xml"
     xpointer="xpointer(//*[@os='bf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"




More information about the cross-lfs mailing list