Changeset 35e0963 in clfs-embedded for BOOK

Timestamp:

Nov 21, 2010, 8:05:38 AM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

master

Children:

b6327d0

Parents:

c747e18

Message:

Initial Upgrade of GCC to 4.5.1. MPC needs to be added.

Location:

BOOK

Files:

• cross-tools/common/gcc-final.xml (modified) (2 diffs)
• cross-tools/common/gcc-static.xml (modified) (3 diffs)
• introduction/common/changelog.xml (modified) (1 diff)
• materials/common/patches.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• patches.ent (modified) (1 diff)

BOOK/cross-tools/common/gcc-final.xml

@@ -25 +25 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
@@ -51 +35 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="ae"><userinput>../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \
+<screen os="ae"><userinput>AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \
+  ../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \
   --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
   --with-sysroot=${CLFS} --disable-nls --enable-shared \
   --enable-languages=c --enable-c99 --enable-long-long \
-  --with-mpfr=/cross-tools --with-gmp=/cross-tools</userinput></screen>
+  --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools</userinput></screen>
 
     <variablelist os="af">

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

@@ -28 +28 @@
     and no Threads</title>
 
-    <para os="p1">The following patch contains a number of updates to the
-    &gcc-version; branch by the GCC developers:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&gcc-branch_update-patch;</userinput></screen>
-
-    <para os="p3">To make sure that a couple of tools use the proper syntax,
-    apply the following patch:</para>
-
-<screen os="p4"><userinput>patch -Np1 -i ../&gcc-posix-patch;</userinput></screen>
-
     <para os="c">The GCC documentation recommends building GCC outside of the source
     directory in a dedicated build directory:</para>
@@ -46 +36 @@
     <para os="e">Prepare GCC for compilation:</para>
 
-<screen os="ae"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+<screen os="ae"><userinput>AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \
   ../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \
   --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
   --with-sysroot=${CLFS} --disable-nls  --disable-shared \
-  --with-mpfr=/cross-tools --with-gmp=/cross-tools \
+  --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \
   --without-headers --with-newlib --disable-decimal-float \
   --disable-libgomp --disable-libmudflap --disable-libssp \
@@ -86 +76 @@
     <para os="ag">Continue with compiling the package:</para>
 
-<screen os="ah"><userinput>make</userinput></screen>
+<screen os="ah"><userinput>make all-gcc all-target-libgcc</userinput></screen>
 
     <para os="ai">Install the package:</para>
 
-<screen os="aj"><userinput>make install</userinput></screen>
+<screen os="aj"><userinput>make install-gcc install-target-libgcc</userinput></screen>
 
   </sect2>

BOOK/introduction/common/changelog.xml

@@ -40 +40 @@
       <para>November 21, 2010</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Updated GCC to 4.5.1.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Updated Binutils to 2.20.1.</para>

BOOK/materials/common/patches.xml

@@ -29 +29 @@
 
     <varlistentry>
-      <term>GCC Branch Update Patch - <token>&gcc-branch_update-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&gcc-branch_update-patch;"/></para>
-        <para>MD5 sum: <literal>&gcc-branch_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>GCC Posix Patch - <token>&gcc-posix-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&gcc-posix-patch;"/></para>
-        <para>MD5 sum: <literal>&gcc-posix-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>uClibc Branch Update Patch - <token>&uclibc-branch_update-patch-size;</token>:</term>
       <listitem>

BOOK/packages.ent

@@ -35 +35 @@
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net">
 
-<!ENTITY gcc-version "4.3.3">
-<!ENTITY gcc-size "57,978 KB">
+<!ENTITY gcc-version "4.5.1">
+<!ENTITY gcc-size "64,576 KB">
 <!ENTITY gcc-url "ftp://gcc.gnu.org/pub/gcc/releases/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "cc3c5565fdb9ab87a05ddb106ba0bd1f ">
+<!ENTITY gcc-md5 "48231a8e33ed6e058a341c53b819de1a">
 <!ENTITY gcc-home "http://gcc.gnu.org">
 

BOOK/patches.ent

@@ -8 +8 @@
 <!ENTITY busybox-branch_update-patch-md5 "65c152520da3d998233c11de4612d667">
 <!ENTITY busybox-branch_update-patch-size "15 KB">
-
-<!ENTITY gcc-branch_update-patch "gcc-&gcc-version;-branch_update-5.patch">
-<!ENTITY gcc-branch_update-patch-md5 "d52b227655a341694809de17eba2d58d">
-<!ENTITY gcc-branch_update-patch-size "359 KB">
-
-<!ENTITY gcc-posix-patch "gcc-&gcc-version;-posix-1.patch">
-<!ENTITY gcc-posix-patch-md5 "ccc0d5f959234bf4fed2b6fa338d6117">
-<!ENTITY gcc-posix-patch-size "13 KB">
 
 <!ENTITY uclibc-branch_update-patch "uClibc-&uclibc-version;-branch_update-1.patch">