Changeset ade6ab2

Timestamp:

Feb 21, 2006, 1:30:12 AM (18 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f87f99c

Parents:

0ae794b

Message:

r809@server (orig r807): jim | 2005-12-02 22:08:12 -0800

r892@server: jim | 2005-12-02 22:06:06 -0800
Text Updates

Location:

BOOK

Files:

• cross-tools/sparcv8/glibc.xml (modified) (3 diffs)
• final-system/sparcv8/glibc.xml (modified) (1 diff)
• materials/sparcv8/patches.xml (modified) (1 diff)
• patches.ent (modified) (1 diff)
• temp-system/sparc/binutils.xml (modified) (1 diff)
• temp-system/sparcv8/binutils.xml (modified) (1 diff)

BOOK/cross-tools/sparcv8/glibc.xml

@@ -35 +35 @@
     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>
@@ -50 +49 @@
     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='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparcv8/glibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/sparcv8/glibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -61 +74 @@
     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='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/final-system/sparcv8/glibc.xml

@@ -52 +52 @@
 
 <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.

BOOK/materials/sparcv8/patches.xml

@@ -21 +21 @@
     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"

BOOK/patches.ent

@@ -85 +85 @@
 
 <!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">

BOOK/temp-system/sparc/binutils.xml

@@ -65 +65 @@
 
     <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"

BOOK/temp-system/sparcv8/binutils.xml

@@ -57 +57 @@
 
     <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"