Changeset a186108 in clfs-sysroot for BOOK

Timestamp:

Nov 23, 2006, 1:02:00 PM (18 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

master

Children:

32edd3a

Parents:

b1ad6cc

Message:

Update the libgcc_eh patch to -2.

Location:

BOOK

Files:

• cross-tools/arm/glibc.xml (modified) (1 diff)
• cross-tools/common/glibc.xml (modified) (1 diff)
• introduction/common/changelog.xml (modified) (1 diff)
• patches.ent (modified) (1 diff)

BOOK/cross-tools/arm/glibc.xml

@@ -33 +33 @@
 <screen os="u2"><userinput>tar -jxvf ../glibc-ports-&glibc-ports-version;.tar.bz2
 mv -v glibc-ports-&glibc-version; ports</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='pa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/cross-tools/common/glibc.xml

@@ -40 +40 @@
     </note>
 
-    <note os="pa">
-      <para>If you need to recompile glibc after the GCC Final Cross-Compiler
-      is installed do not apply the libgcc_eh patch. This patch is applied when
-      building glibc with a static GCC because when gcc is built static, libgcc
-      contains the symbols that would normaly exist in libgcc_eh.</para>
-    </note>
-
-    <para os="p1">Disable linking to <filename>libgcc_eh</filename>:</para>
+    <para os="p1">The following patch will check for the existance of
+    <filename>libgcc_eh</filename>. When GCC is built static the contents of
+    <filename>libgcc_eh</filename> will be in <filename>libgcc</filename>
+    instead. If <filename>libgcc_eh</filename> exists the link to it:</para>
 
 <screen os="p2"><userinput>patch -Np1 -i ../&glibc-libgcc_eh-patch;</userinput></screen>

BOOK/introduction/common/changelog.xml

@@ -40 +40 @@
       <para>November 23, 2006</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Update the Glibc libgcc_eh patch to -2. The new
+          version checks to see if libgcc_eh exists and if it does Glibc will
+          link against it.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Updated Man to 1.6e.</para>

BOOK/patches.ent

@@ -57 +57 @@
 <!ENTITY glibc-minor-patch-size "4 KB">
 
-<!ENTITY glibc-libgcc_eh-patch "glibc-&glibc-version;-libgcc_eh-1.patch">
-<!ENTITY glibc-libgcc_eh-patch-md5 "e5122ea7b89a5f22615eaadf8e46b334">
-<!ENTITY glibc-libgcc_eh-patch-size "1 KB">
+<!ENTITY glibc-libgcc_eh-patch "glibc-&glibc-version;-libgcc_eh-2.patch">
+<!ENTITY glibc-libgcc_eh-patch-md5 "0b7a671fd5f3cd4ce434cf534866b06a">
+<!ENTITY glibc-libgcc_eh-patch-size "8 KB">
 
 <!ENTITY glibc-localedef_segfault-patch "glibc-&glibc-version;-localedef_segfault-1.patch">