Changeset 6cefbfb


Ignore:
Timestamp:
Apr 16, 2011, 2:36:23 PM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
21e442f
Parents:
8c3f58f (diff), af891d2 (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:

Merge branch 'master' into systemd

Conflicts:

BOOK/introduction/common/changelog.xml
BOOK/packages.ent

Files:
2 added
3 deleted
30 edited
5 moved

Legend:

Unmodified
Added
Removed

  • BOOK/cross-tools/common/cloog-ppl.xml

    r8c3f58f r6cefbfb  
    2222  <sect2 role="installation">
    2323    <title>Installation of CLooG-PPL</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../../final-system/common/cloog-ppl.xml"
    27     xpointer="xpointer(//*[@os='p1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../../final-system/common/cloog-ppl.xml"
    31     xpointer="xpointer(//*[@os='p2'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/cross-tools/common/ppl.xml

    r8c3f58f r6cefbfb  
    2222  <sect2 role="installation">
    2323    <title>Installation of PPL</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../../final-system/common/ppl.xml"
    27     xpointer="xpointer(//*[@os='s1'])"/>
    28 
    29 <screen os="s2"><userinput>cp -v configure{,.orig}
    30 sed -e "s/__GMP_BITS_PER_MP_LIMB/GMP_LIMB_BITS/g" \
    31     configure.orig > configure</userinput></screen>
    3224
    3325    <para os="a">Prepare PPL for compilation:</para>

  • BOOK/final-system/common/cloog-ppl.xml

    r8c3f58f r6cefbfb  
    2727  <sect2 role="installation">
    2828    <title>Installation of CLooG-PPL</title>
    29 
    30     <para os="p1">When this version of CLooG-PPL was packaged it was missing
    31     a few files related to Libtool. The following patch adds them back in and
    32     regenerted Automake and Autoconf.</para>
    33 
    34 <screen os="p2"><userinput>patch -Np1 -i ../&cloog-ppl-autogen-patch;</userinput></screen>
    3529
    3630    <para os="a">Prepare CLooG-PPL for compilation:</para>

  • BOOK/final-system/common/mpc.xml

    r8c3f58f r6cefbfb  
    2929
    3030<screen os="b"><userinput>CC="gcc -isystem /usr/include" \
    31 LDFLAGS="-Wl,-rpath-link,/lib" \
     31LDFLAGS="-Wl,-rpath-link,/lib" EGREP="grep -E" \
    3232./configure --prefix=/usr</userinput></screen>
    3333

  • BOOK/final-system/common/ppl.xml

    r8c3f58f r6cefbfb  
    2626  <sect2 role="installation">
    2727    <title>Installation of PPL</title>
    28 
    29     <para os="s1">The following fixes an issue when detecting newer versions
    30     of GMP.</para>
    31 
    32 <screen os="s2"><userinput>sed -i "s/__GMP_BITS_PER_MP_LIMB/GMP_LIMB_BITS/g" configure</userinput></screen>
    3328
    3429    <para os="a">Prepare PPL for compilation:</para>

  • BOOK/final-system/mips64/ppl-64bit.xml

    r8c3f58f r6cefbfb  
    2121  <sect2 role="installation">
    2222    <title>Installation of PPL</title>
    23 
    24     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/ppl.xml"
    26     xpointer="xpointer(//*[@os='s1'])"/>
    27 
    28     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/ppl.xml"
    30     xpointer="xpointer(//*[@os='s2'])"/>
    3123
    3224    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/cloog-ppl-64bit.xml

    r8c3f58f r6cefbfb  
    2121  <sect2 role="installation">
    2222    <title>Installation of CLooG-PPL</title>
    23 
    24     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/cloog-ppl.xml"
    26     xpointer="xpointer(//*[@os='p1'])"/>
    27 
    28     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/cloog-ppl.xml"
    30     xpointer="xpointer(//*[@os='p2'])"/>
    3123
    3224    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/cloog-ppl-n32.xml

    r8c3f58f r6cefbfb  
    2222  <sect2 role="installation">
    2323    <title>Installation of CLooG-PPL</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/cloog-ppl.xml"
    27     xpointer="xpointer(//*[@os='p1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/cloog-ppl.xml"
    31     xpointer="xpointer(//*[@os='p2'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/cloog-ppl.xml

    r8c3f58f r6cefbfb  
    2222  <sect2 role="installation">
    2323    <title>Installation of CLooG-PPL</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/cloog-ppl.xml"
    27     xpointer="xpointer(//*[@os='p1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/cloog-ppl.xml"
    31     xpointer="xpointer(//*[@os='p2'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/mpc-64bit.xml

    r8c3f58f r6cefbfb  
    2727
    2828<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
    29 LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" \
     29LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" EGREP="grep -E" \
    3030./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
    3131

  • BOOK/final-system/multilib/mpc-n32.xml

    r8c3f58f r6cefbfb  
    2828
    2929<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
    30 LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" \
     30LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" EGREP="grep -E" \
    3131./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
    3232

  • BOOK/final-system/multilib/mpc.xml

    r8c3f58f r6cefbfb  
    2828
    2929<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
    30 LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" \
    31 ./configure --prefix=/usr \
    32     --host=${CLFS_TARGET32}</userinput></screen>
     30LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" EGREP="grep -E" \
     31./configure --prefix=/usr --host=${CLFS_TARGET32}</userinput></screen>
    3332
    3433    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/ppl-64bit.xml

    r8c3f58f r6cefbfb  
    2121  <sect2 role="installation">
    2222    <title>Installation of PPL</title>
    23 
    24     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/ppl.xml"
    26     xpointer="xpointer(//*[@os='s1'])"/>
    27 
    28     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/ppl.xml"
    30     xpointer="xpointer(//*[@os='s2'])"/>
    3123
    3224    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/ppl-n32.xml

    r8c3f58f r6cefbfb  
    2222  <sect2 role="installation">
    2323    <title>Installation of PPL</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/ppl.xml"
    27     xpointer="xpointer(//*[@os='s1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/ppl.xml"
    31     xpointer="xpointer(//*[@os='s2'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/multilib/ppl.xml

    r8c3f58f r6cefbfb  
    2222  <sect2 role="installation">
    2323    <title>Installation of PPL</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/ppl.xml"
    27     xpointer="xpointer(//*[@os='s1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/ppl.xml"
    31         xpointer="xpointer(//*[@os='s2'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/general.ent

    r8c3f58f r6cefbfb  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    22
    3 <!ENTITY month "02"> <!-- Use two digits -->
    4 <!ENTITY month_name "Feburary">
    5 <!ENTITY day "13"> <!-- Use two digits -->
     3<!ENTITY month "04"> <!-- Use two digits -->
     4<!ENTITY month_name "April">
     5<!ENTITY day "16"> <!-- Use two digits -->
    66<!ENTITY year "2011"> <!-- Use four digits -->
    77

  • BOOK/introduction/common/changelog.xml

    r8c3f58f r6cefbfb  
    3636    </listitem>
    3737-->
     38
     39    <listitem>
     40      <para>April 16, 2011</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[jciccone] - Updated DejaDNU to 1.5.</para>
     44        </listitem>
     45        <listitem>
     46          <para>[jciccone] - Updated Util-linux to 2.19.</para>
     47        </listitem>
     48        <listitem>
     49          <para>[jciccone] - Updated XZ Utils to 5.0.2.</para>
     50        </listitem>
     51        <listitem>
     52          <para>[jciccone] - Updated Tar to 1.26.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[jciccone] - Updated M4 to 1.4.16.</para>
     56        </listitem>
     57        <listitem>
     58          <para>[jciccone] - Updated Coreutils to 8.11.</para>
     59        </listitem>
     60        <listitem>
     61          <para>[jciccone] - Updated Bash to 4.2.</para>
     62        </listitem>
     63        <listitem>
     64          <para>[jciccone] - Updated EGLIBC to 2.13 r13356.</para>
     65        </listitem>
     66        <listitem>
     67          <para>[jciccone] - Updated GCC to 4.6.0.</para>
     68        </listitem>
     69        <listitem>
     70          <para>[jciccone] - Updated Binutils to 2.21.</para>
     71        </listitem>
     72        <listitem>
     73          <para>[jciccone] - Updated ClooG-PPL to 0.15.11.</para>
     74        </listitem>
     75        <listitem>
     76          <para>[jciccone] - Updated PPL to 0.11.2.</para>
     77        </listitem>
     78        <listitem>
     79          <para>[jciccone] - Updated MPC to 0.9.</para>
     80        </listitem>
     81        <listitem>
     82          <para>[jciccone] - Updated MPFR to 3.0.1.</para>
     83        </listitem>
     84        <listitem>
     85          <para>[jciccone] - Updated NCurses to 5.9.</para>
     86        </listitem>
     87        <listitem>
     88          <para>[jciccone] - Updated File to 5.06.</para>
     89        </listitem>
     90        <listitem>
     91          <para>[jciccone] - Updated the Kernel to 2.6.38.3.</para>
     92        </listitem>
     93      </itemizedlist>
     94    </listitem>
    3895
    3996    <listitem>

  • BOOK/packages.ent

    r8c3f58f r6cefbfb  
    3737<!ENTITY automake-home "&gnu-software;automake">
    3838
    39 <!ENTITY bash-version "4.1">
    40 <!ENTITY bash-size "6,444 KB">
     39<!ENTITY bash-version "4.2">
     40<!ENTITY bash-size "6,848 KB">
    4141<!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
    42 <!ENTITY bash-md5 "9800d8724815fd84994d9be65ab5e7b8">
     42<!ENTITY bash-md5 "3fb927c7c33022f1c327f14a81c0d4b0">
    4343<!ENTITY bash-home "&gnu-software;bash">
    4444
    45 <!ENTITY binutils-version "2.20.1">
    46 <!ENTITY binutils-size "17,092 KB">
     45<!ENTITY binutils-version "2.21">
     46<!ENTITY binutils-size "18,304 KB">
    4747<!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
    48 <!ENTITY binutils-md5 "9cdfb9d6ec0578c166d3beae5e15c4e5">
     48<!ENTITY binutils-md5 "c84c5acc9d266f1a7044b51c85a823f5">
    4949<!ENTITY binutils-home "http://sources.redhat.com/binutils">
    5050
    … …  
    6767<!ENTITY bzip2-home "http://www.bzip.org/">
    6868
    69 <!ENTITY cloog-ppl-version "0.15.10">
    70 <!ENTITY cloog-ppl-size "688 KB">
     69<!ENTITY cloog-ppl-version "0.15.11">
     70<!ENTITY cloog-ppl-size "756 KB">
    7171<!ENTITY cloog-ppl-url "ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-&cloog-ppl-version;.tar.gz">
    72 <!ENTITY cloog-ppl-md5 "04aa756179b6d850d9ffa50f61b91895">
     72<!ENTITY cloog-ppl-md5 "060ae4df6fb8176e021b4d033a6c0b9e">
    7373<!ENTITY cloog-ppl-home "http://cloog.org">
    7474
    … …  
    7979<!ENTITY colo-home "http://www.colonel-panic.org/cobalt-mips">
    8080
    81 <!ENTITY coreutils-version "8.9">
    82 <!ENTITY coreutils-size "10,998 KB">
     81<!ENTITY coreutils-version "8.11">
     82<!ENTITY coreutils-size "11,228 KB">
    8383<!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.gz">
    84 <!ENTITY coreutils-md5 "36909ae68840d73a800120cf74af794a">
     84<!ENTITY coreutils-md5 "eabaf2593f4b978dea13044d6acc2dc8">
    8585<!ENTITY coreutils-home "&gnu-software;coreutils">
    8686
    … …  
    9191<!ENTITY dbus-home "http://www.freedesktop.org/wiki/Software/dbus">
    9292
    93 <!ENTITY dejagnu-version "1.4.4">
    94 <!ENTITY dejagnu-size "1,055 KB">
     93<!ENTITY dejagnu-version "1.5">
     94<!ENTITY dejagnu-size "564 KB">
     95
    9596<!ENTITY dejagnu-url "&gnu;dejagnu/dejagnu-&dejagnu-version;.tar.gz">
    96 <!ENTITY dejagnu-md5 "053f18fd5d00873de365413cab17a666">
     97<!ENTITY dejagnu-md5 "3df1cbca885e751e22d3ebd1ac64dc3c">
    9798<!ENTITY dejagnu-home "&gnu-software;dejagnu">
    9899
    … …  
    121122<!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net">
    122123
    123 <!ENTITY eglibc-version "2.12">
    124 <!ENTITY eglibc-revision "12509">
     124<!ENTITY eglibc-version "2.13">
     125<!ENTITY eglibc-revision "13356">
    125126<!ENTITY eglibc-fversion "&eglibc-version;-r&eglibc-revision;">
    126 <!ENTITY eglibc-size "16,016 KB">
     127<!ENTITY eglibc-size "16,100 KB">
    127128<!ENTITY eglibc-url "&packages-root;eglibc-&eglibc-fversion;.tar.bz2">
    128 <!ENTITY eglibc-md5 "78d31bca19920f2de591910545dcd564">
     129<!ENTITY eglibc-md5 "689231137135771df3637e99ad169083">
    129130<!ENTITY eglibc-home "http://www.eglibc.org/home">
    130131<!ENTITY eglibc-ld-name "ld-&eglibc-version;.so">
    131132
    132133<!ENTITY eglibc-ports-version "&eglibc-version;">
    133 <!ENTITY eglibc-ports-size "632 KB">
     134<!ENTITY eglibc-ports-size "640 KB">
    134135<!ENTITY eglibc-ports-url "&packages-root;eglibc-ports-&eglibc-version;-r&eglibc-revision;.tar.bz2">
    135 <!ENTITY eglibc-ports-md5 "a90dc5cd2104d68b54a9edae46e8f82b">
     136<!ENTITY eglibc-ports-md5 "7b1241cc3e3d5c606c960d841ab692bd">
    136137<!ENTITY eglibc-ports-home " ">
    137138
    … …  
    155156<!ENTITY expect-lib-version "5.43">
    156157
    157 <!ENTITY file-version "5.04">
    158 <!ENTITY file-size "608 KB">
     158<!ENTITY file-version "5.06">
     159<!ENTITY file-size "588 KB">
    159160<!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
    160161<!--<!ENTITY file-url "&packages-root;file-&file-version;.tar.gz">-->
    161 <!ENTITY file-md5 "accade81ff1cc774904b47c72c8aeea0">
     162<!ENTITY file-md5 "deb12b0fb9d09e7681be72bad6eba4e0">
    162163<!ENTITY file-home "http://www.darwinsys.com/file">
    163164
    … …  
    180181<!ENTITY gawk-home "&gnu-software;gawk">
    181182
    182 <!ENTITY gcc-version "4.5.2">
    183 <!ENTITY gcc-size "64,776 KB">
     183<!ENTITY gcc-version "4.6.0">
     184<!ENTITY gcc-size "69,904 KB">
    184185<!ENTITY gcc-url "ftp://gcc.gnu.org/pub/gcc/releases/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
    185 <!ENTITY gcc-md5 "d6559145853fbaaa0fd7556ed93bce9a">
     186<!ENTITY gcc-md5 "93d1c436bf991564524701259b6285a2">
    186187<!ENTITY gcc-home "http://gcc.gnu.org">
    187188
    … …  
    274275<!ENTITY linux-dl-version "2.6">
    275276
    276 <!ENTITY linux-version "2.6.37">
    277 <!ENTITY linux-size "71,860 KB">
     277<!ENTITY linux-version "2.6.38.3">
     278<!ENTITY linux-size "73,048 KB">
    278279<!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2">
    279 <!ENTITY linux-md5 "c8ee37b4fdccdb651e0603d35350b434">
     280<!ENTITY linux-md5 "d3071407a33a7bd2ffb47181f200f22c">
    280281<!ENTITY linux-home "http://www.kernel.org">
    281282
    282 <!ENTITY m4-version "1.4.15">
    283 <!ENTITY m4-size "1,176 KB">
     283<!ENTITY m4-version "1.4.16">
     284<!ENTITY m4-size "1,232 KB">
    284285<!ENTITY m4-url "&gnu;m4/m4-&m4-version;.tar.bz2">
    285 <!ENTITY m4-md5 "c7c32540bc3842d5550f88d47ef551d8">
     286<!ENTITY m4-md5 "8a7cef47fecab6272eb86a6be6363b2f">
    286287<!ENTITY m4-home "&gnu-software;m4">
    287288
    … …  
    310311<!ENTITY module-init-tools-home "http://www.kerneltools.org/KernelTools.org">
    311312
    312 <!ENTITY mpc-version "0.8.2">
    313 <!ENTITY mpc-size "536 KB">
     313<!ENTITY mpc-version "0.9">
     314<!ENTITY mpc-size "556 KB">
    314315<!ENTITY mpc-url "http://www.multiprecision.org/mpc/download/mpc-&mpc-version;.tar.gz">
    315 <!ENTITY mpc-md5 "e98267ebd5648a39f881d66797122fb6">
     316<!ENTITY mpc-md5 "0d6acab8d214bd7d1fbbc593e83dd00d">
    316317<!ENTITY mpc-home "http://www.multiprecision.org/">
    317318
    318 <!ENTITY mpfr-version "3.0.0">
    319 <!ENTITY mpfr-size "1,112 KB">
    320 <!ENTITY mpfr-url "http://www.mpfr.org/mpfr-current/mpfr-3.0.0.tar.bz2">
    321 <!ENTITY mpfr-md5 "f45bac3584922c8004a10060ab1a8f9f">
     319<!ENTITY mpfr-version "3.0.1">
     320<!ENTITY mpfr-size "1,128 KB">
     321<!ENTITY mpfr-url "http://www.mpfr.org/mpfr-current/mpfr-&mpfr-version;.tar.bz2">
     322<!ENTITY mpfr-md5 "bfbecb2eacb6d48432ead5cfc3f7390a">
    322323<!ENTITY mpfr-home "http://www.mpfr.org/">
    323324
    324 <!ENTITY ncurses-version "5.7">
    325 <!ENTITY ncurses-size "2,387 KB">
     325<!ENTITY ncurses-version "5.9">
     326<!ENTITY ncurses-size "2,764 KB">
    326327<!ENTITY ncurses-url "ftp://ftp.gnu.org/pub/gnu/ncurses/ncurses-&ncurses-version;.tar.gz">
    327 <!ENTITY ncurses-md5 "cce05daf61a64501ef6cd8da1f727ec6">
     328<!ENTITY ncurses-md5 "8cb9c412e5f2d96bc6f459aa8c6282a1">
    328329<!ENTITY ncurses-home "&gnu-software;ncurses">
    329330
    … …  
    358359<!ENTITY powerpcutils-home "http://packages.qa.debian.org/p/powerpc-utils.html">
    359360
    360 <!ENTITY ppl-version "0.10.2">
    361 <!ENTITY ppl-size "9,592 KB">
     361<!ENTITY ppl-version "0.11.2">
     362<!ENTITY ppl-size "12,060 KB">
    362363<!ENTITY ppl-url "http://www.cs.unipr.it/ppl/Download/ftp/releases/&ppl-version;/ppl-&ppl-version;.tar.bz2">
    363 <!ENTITY ppl-md5 "5667111f53150618b0fa522ffc53fc3e">
     364<!ENTITY ppl-md5 "c24429e6c3bc97d45976a63f40f489a1">
    364365<!ENTITY ppl-home "http://www.cs.unipr.it/ppl">
    365366
    … …  
    419420<!ENTITY systemd-home "http://freedesktop.org/wiki/Software/systemd">
    420421
    421 <!ENTITY tar-version "1.25">
    422 <!ENTITY tar-size "2,276 KB">
     422<!ENTITY tar-version "1.26">
     423<!ENTITY tar-size "2,288 KB">
    423424<!ENTITY tar-url "&gnu;tar/tar-&tar-version;.tar.bz2">
    424 <!ENTITY tar-md5 "6e497f861c77bbba2f7da4e10270995b">
     425<!ENTITY tar-md5 "2cee42a2ff4f1cd4f9298eeeb2264519">
    425426<!ENTITY tar-home "&gnu-software;tar">
    426427
    … …  
    451452
    452453<!ENTITY util-linux-major-version "2.19">
    453 <!ENTITY util-linux-version "&util-linux-major-version;-rc3">
    454 <!ENTITY util-linux-size "4,200 KB">
     454<!ENTITY util-linux-version "&util-linux-major-version;">
     455<!ENTITY util-linux-size "4,726 KB">
    455456<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-major-version;/util-linux-&util-linux-version;.tar.bz2">
    456 <!ENTITY util-linux-md5 "89423502d34bd1e6da0ad29ac716145f">
     457<!ENTITY util-linux-md5 "590ca71aad0b254e2631d84401f28255">
    457458<!ENTITY util-linux-blkid-id "1.1.0">
    458459<!ENTITY util-linux-uuid-id "1.3.0">
    … …  
    466467<!ENTITY vim-home "http://www.vim.org">
    467468
    468 <!ENTITY xz-version "5.0.0">
    469 <!ENTITY xz-size "984 KB">
     469<!ENTITY xz-version "5.0.2">
     470<!ENTITY xz-size "1,000 KB">
    470471<!ENTITY xz-url "http://tukaani.org/xz/xz-&xz-version;.tar.bz2">
    471 <!ENTITY xz-md5 "0652c09fdbb93ae2ce78c1368ffda612">
     472<!ENTITY xz-md5 "ee05b17a4062bb55cba099ef46eca007">
    472473<!ENTITY xz-home "http://tukaani.org/xz/">
    473474

  • BOOK/patches.ent

    r8c3f58f r6cefbfb  
    55<!-- Start of Common Patches -->
    66
    7 <!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-2.patch">
    8 <!ENTITY bash-branch_update-patch-md5 "7645587a6efcefa67936dcaeb9b2bee7">
    9 <!ENTITY bash-branch_update-patch-size "8 KB">
     7<!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-1.patch">
     8<!ENTITY bash-branch_update-patch-md5 "ee7bbf5d36058487cbe23f5571a2c21c">
     9<!ENTITY bash-branch_update-patch-size "12 KB">
    1010
    1111<!ENTITY cloog-ppl-autogen-patch "cloog-ppl-&cloog-ppl-version;-autogen-1.patch">
    … …  
    2222
    2323<!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-1.patch">
    24 <!ENTITY gcc-specs-patch-md5 "15e207e152928cb307f38aa0c0924429">
     24<!ENTITY gcc-specs-patch-md5 "61d583984f9f12b6f37141e132fc7d57">
    2525<!ENTITY gcc-specs-patch-size "20 KB">
    2626
    … …  
    4343<!ENTITY ncurses-bashfix-patch "ncurses-&ncurses-version;-bash_fix-1.patch">
    4444<!ENTITY ncurses-bashfix-patch-md5 "c6f7f2ab0ebaf7721ebeb266641352db">
    45 <!ENTITY ncurses-bashfix-patch-size ".7 KB">
     45<!ENTITY ncurses-bashfix-patch-size "4 KB">
    4646
    47 <!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-22.patch">
    48 <!ENTITY ncurses-branch_update-patch-md5 "3b543b078fe0703e9277b75076209a79">
    49 <!ENTITY ncurses-branch_update-patch-size "6,280 KB">
     47<!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-1.patch">
     48<!ENTITY ncurses-branch_update-patch-md5 "5361bccf700849ba968a8886cdfaa879">
     49<!ENTITY ncurses-branch_update-patch-size "324 KB">
    5050
    5151<!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
    … …  
    6666
    6767<!ENTITY tar-man-patch "tar-&tar-version;-man-1.patch">
    68 <!ENTITY tar-man-patch-md5 "6a1a1d8bdc00fc149c28aa1f8405fc93">
     68<!ENTITY tar-man-patch-md5 "79d962bddc4871b394e5f8e3267680fe">
    6969<!ENTITY tar-man-patch-size "20 KB">
    7070
    … …  
    9090
    9191<!ENTITY gcc-pure64-patch "gcc-&gcc-version;-pure64-1.patch">
    92 <!ENTITY gcc-pure64-patch-md5 "9f230c4d6fc288405d831aaf02ef8a69">
     92<!ENTITY gcc-pure64-patch-md5 "7c41d649fe266f11e4dbdd2392f7729b">
    9393<!ENTITY gcc-pure64-patch-size "12 KB">
    9494
    9595<!ENTITY gcc-specs_pure64-patch "gcc-&gcc-version;-pure64_specs-1.patch">
    96 <!ENTITY gcc-specs_pure64-patch-md5 "bdf42c85af936319438f912a3870e3ea">
     96<!ENTITY gcc-specs_pure64-patch-md5 "24f012f5d407d48bf6191ec5aa6bed60">
    9797<!ENTITY gcc-specs_pure64-patch-size "24 KB">
    9898

  • BOOK/temp-system/64/cloog-ppl.xml

    r8c3f58f r6cefbfb  
    2222  <sect2 role="installation">
    2323    <title>Installation of CLooG-PPL</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/cloog-ppl.xml"
    27     xpointer="xpointer(//*[@os='p1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/cloog-ppl.xml"
    31     xpointer="xpointer(//*[@os='p2'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/temp-system/64/mpc.xml

    r8c3f58f r6cefbfb  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     29<screen os="b"><userinput>CC="${CC} ${BUILD64}" EGREP="grep -E" \
     30  ./configure --prefix=/tools \
    3031    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
    3132

  • BOOK/temp-system/64/ppl.xml

    r8c3f58f r6cefbfb  
    2222  <sect2 role="installation">
    2323    <title>Installation of PPL</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/ppl.xml"
    27     xpointer="xpointer(//*[@os='s1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/ppl.xml"
    31     xpointer="xpointer(//*[@os='s2'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/temp-system/common/cloog-ppl.xml

    r8c3f58f r6cefbfb  
    2222  <sect2 role="installation">
    2323    <title>Installation of CLooG-PPL</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../../final-system/common/cloog-ppl.xml"
    27     xpointer="xpointer(//*[@os='p1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../../final-system/common/cloog-ppl.xml"
    31     xpointer="xpointer(//*[@os='p2'])"/>
    3224
    3325    <para os="s1">The following prevents the configure script from setting <envar>LD_LIBRARY_PATH</envar> when it finds PPL. This will prevent any conflicts with libraries from the host system:</para>

  • BOOK/temp-system/common/mpc.xml

    r8c3f58f r6cefbfb  
    2525    <para os="a">Prepare MPC for compilation:</para>
    2626
    27 <screen os="b"><userinput>./configure --prefix=/tools \
     27<screen os="b"><userinput>EGREP="grep -E" ./configure --prefix=/tools \
    2828    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
    2929

  • BOOK/temp-system/common/ppl.xml

    r8c3f58f r6cefbfb  
    2222  <sect2 role="installation">
    2323    <title>Installation of PPL</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../../final-system/common/ppl.xml"
    27     xpointer="xpointer(//*[@os='s1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../../final-system/common/ppl.xml"
    31     xpointer="xpointer(//*[@os='s2'])"/>
    3224
    3325    <para os="a">Prepare PPL for compilation:</para>

  • BOOK/temp-system/common/vim.xml

    r8c3f58f r6cefbfb  
    9595<screen os="m"><userinput>ln -sv vim /tools/bin/vi</userinput></screen>
    9696
     97    <para os="tv1" >Create a temporary vimrc to make it function more the way you may
     98    expect it to. This is explained more in the final system:</para>
     99
     100<screen os="tv2"><userinput>cat &gt; /tools/etc/vimrc &lt;&lt; "EOF"
     101<literal>" Begin /etc/vimrc
     102
     103set nocompatible
     104set backspace=2
     105set ruler
     106syntax on
     107
     108" End /etc/vimrc</literal>
     109EOF</userinput></screen>
     110
    97111  </sect2>
    98112

  • BOOK/temp-system/multilib/cloog-ppl.xml

    r8c3f58f r6cefbfb  
    2222  <sect2 role="installation">
    2323    <title>Installation of CLooG-PPL</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/cloog-ppl.xml"
    27     xpointer="xpointer(//*[@os='p1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/cloog-ppl.xml"
    31     xpointer="xpointer(//*[@os='p2'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/temp-system/multilib/mpc.xml

    r8c3f58f r6cefbfb  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     29<screen os="b"><userinput>CC="${CC} ${BUILD64}" EGREP="grep -E" \
     30  ./configure --prefix=/tools \
    3031    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    3132    --libdir=/tools/lib64</userinput></screen>

  • BOOK/temp-system/multilib/ppl.xml

    r8c3f58f r6cefbfb  
    2222  <sect2 role="installation">
    2323    <title>Installation of PPL</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/ppl.xml"
    27     xpointer="xpointer(//*[@os='s1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/ppl.xml"
    31     xpointer="xpointer(//*[@os='s2'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/temp-system/multilib/vim.xml

    r8c3f58f r6cefbfb  
    9090    xpointer="xpointer(//*[@os='m'])"/>
    9191
     92    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     93    href="../common/vim.xml"
     94    xpointer="xpointer(//*[@os='tv1'])"/>
     95
     96    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     97    href="../common/vim.xml"
     98    xpointer="xpointer(//*[@os='tv2'])"/>
     99
    92100  </sect2>
    93101

  • patches/gcc-4.6.0-pure64-1.patch

    r8c3f58f r6cefbfb  
    11Submitted By: Joe Ciccone <jciccone@gmail.com>
    2 Date: 01-08-2011
     2Date: 04-16-2011
    33Initial Package Version: 3.4.6
    44Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
    … …  
    99
    1010    Rediffed Against 4.5.2 By Pontus Carlsson <PontusCarlsson at live dot se>
     11    Rediffed Against 4.6.0 By Joe Ciccone <jciccone@gmail.com>
    1112
    12 diff -Naur gcc-4.5.2.orig/gcc/config/i386/linux64.h gcc-4.5.2/gcc/config/i386/linux64.h
    13 --- gcc-4.5.2.orig/gcc/config/i386/linux64.h    2010-03-24 16:44:48.000000000 -0400
    14 +++ gcc-4.5.2/gcc/config/i386/linux64.h 2011-01-08 13:41:39.814665253 -0500
    15 @@ -58,8 +58,8 @@
     13diff -Naur gcc-4.6.0.orig/gcc/config/i386/linux64.h gcc-4.6.0/gcc/config/i386/linux64.h
     14--- gcc-4.6.0.orig/gcc/config/i386/linux64.h    2011-03-02 17:35:36.000000000 -0500
     15+++ gcc-4.6.0/gcc/config/i386/linux64.h 2011-04-16 15:49:02.335213604 -0400
     16@@ -62,8 +62,8 @@
    1617    When the -shared link option is used a final link is not being
    1718    done.  */
    … …  
    2425 #if TARGET_64BIT_DEFAULT
    2526 #define SPEC_32 "m32"
    26 diff -Naur gcc-4.5.2.orig/gcc/config/i386/t-linux64 gcc-4.5.2/gcc/config/i386/t-linux64
    27 --- gcc-4.5.2.orig/gcc/config/i386/t-linux64    2009-04-21 15:03:23.000000000 -0400
    28 +++ gcc-4.5.2/gcc/config/i386/t-linux64 2011-01-08 13:41:39.814665253 -0500
     27diff -Naur gcc-4.6.0.orig/gcc/config/i386/t-linux64 gcc-4.6.0/gcc/config/i386/t-linux64
     28--- gcc-4.6.0.orig/gcc/config/i386/t-linux64    2009-04-21 15:03:23.000000000 -0400
     29+++ gcc-4.6.0/gcc/config/i386/t-linux64 2011-04-16 15:49:02.335213604 -0400
    2930@@ -25,7 +25,7 @@
    3031 
    … …  
    3637 LIBGCC = stmp-multilib
    3738 INSTALL_LIBGCC = install-multilib
    38 diff -Naur gcc-4.5.2.orig/gcc/config/linux.h gcc-4.5.2/gcc/config/linux.h
    39 --- gcc-4.5.2.orig/gcc/config/linux.h   2009-04-09 11:00:19.000000000 -0400
    40 +++ gcc-4.5.2/gcc/config/linux.h        2011-01-08 13:41:39.814665253 -0500
    41 @@ -118,7 +118,7 @@
     39diff -Naur gcc-4.6.0.orig/gcc/config/linux.h gcc-4.6.0/gcc/config/linux.h
     40--- gcc-4.6.0.orig/gcc/config/linux.h   2011-01-12 09:29:14.000000000 -0500
     41+++ gcc-4.6.0/gcc/config/linux.h        2011-04-16 15:49:02.335213604 -0400
     42@@ -75,7 +75,7 @@
    4243    GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
    4344    supporting both 32-bit and 64-bit compilation.  */
    … …  
    4647+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
    4748 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
    48  #define LINUX_DYNAMIC_LINKER \
    49    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
    50 diff -Naur gcc-4.5.2.orig/gcc/config/mips/linux64.h gcc-4.5.2/gcc/config/mips/linux64.h
    51 --- gcc-4.5.2.orig/gcc/config/mips/linux64.h    2009-02-20 10:20:38.000000000 -0500
    52 +++ gcc-4.5.2/gcc/config/mips/linux64.h 2011-01-08 13:41:39.814665253 -0500
     49 #define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
     50 #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
     51diff -Naur gcc-4.6.0.orig/gcc/config/mips/linux64.h gcc-4.6.0/gcc/config/mips/linux64.h
     52--- gcc-4.6.0.orig/gcc/config/mips/linux64.h    2011-01-19 15:39:09.000000000 -0500
     53+++ gcc-4.6.0/gcc/config/mips/linux64.h 2011-04-16 15:50:00.807213626 -0400
    5354@@ -35,10 +35,10 @@
    5455 %{!shared: \
    … …  
    6364+#define GLIBC_DYNAMIC_LINKERN32 "/lib64/ld.so.1"
    6465+#define UCLIBC_DYNAMIC_LINKERN32 "/lib64/ld-uClibc.so.0"
     66 #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
    6567 #define LINUX_DYNAMIC_LINKERN32 \
    66    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
    67  
    68 diff -Naur gcc-4.5.2.orig/gcc/config/mips/t-linux64 gcc-4.5.2/gcc/config/mips/t-linux64
    69 --- gcc-4.5.2.orig/gcc/config/mips/t-linux64    2009-04-21 15:03:23.000000000 -0400
    70 +++ gcc-4.5.2/gcc/config/mips/t-linux64 2011-01-08 13:41:39.814665253 -0500
     68   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
     69diff -Naur gcc-4.6.0.orig/gcc/config/mips/t-linux64 gcc-4.6.0/gcc/config/mips/t-linux64
     70--- gcc-4.6.0.orig/gcc/config/mips/t-linux64    2009-04-21 15:03:23.000000000 -0400
     71+++ gcc-4.6.0/gcc/config/mips/t-linux64 2011-04-16 15:49:02.335213604 -0400
    7172@@ -18,7 +18,7 @@
    7273 
    … …  
    7879 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
    7980 
    80 diff -Naur gcc-4.5.2.orig/gcc/config/rs6000/linux64.h gcc-4.5.2/gcc/config/rs6000/linux64.h
    81 --- gcc-4.5.2.orig/gcc/config/rs6000/linux64.h  2010-11-17 01:09:53.000000000 -0500
    82 +++ gcc-4.5.2/gcc/config/rs6000/linux64.h       2011-01-08 13:41:39.814665253 -0500
    83 @@ -340,9 +340,9 @@
     81diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/linux64.h gcc-4.6.0/gcc/config/rs6000/linux64.h
     82--- gcc-4.6.0.orig/gcc/config/rs6000/linux64.h  2011-03-07 02:50:23.000000000 -0500
     83+++ gcc-4.6.0/gcc/config/rs6000/linux64.h       2011-04-16 15:49:02.335213604 -0400
     84@@ -372,9 +372,9 @@
    8485 #undef LINK_OS_DEFAULT_SPEC
    8586 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
    … …  
    9293+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
    9394 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
    94  #if UCLIBC_DEFAULT
    95  #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
    96 diff -Naur gcc-4.5.2.orig/gcc/config/rs6000/t-linux64 gcc-4.5.2/gcc/config/rs6000/t-linux64
    97 --- gcc-4.5.2.orig/gcc/config/rs6000/t-linux64  2009-04-21 15:03:23.000000000 -0400
    98 +++ gcc-4.5.2/gcc/config/rs6000/t-linux64       2011-01-08 13:41:39.814665253 -0500
     95 #if DEFAULT_LIBC == LIBC_UCLIBC
     96 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
     97diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/t-linux64 gcc-4.6.0/gcc/config/rs6000/t-linux64
     98--- gcc-4.6.0.orig/gcc/config/rs6000/t-linux64  2009-04-21 15:03:23.000000000 -0400
     99+++ gcc-4.6.0/gcc/config/rs6000/t-linux64       2011-04-16 15:49:02.335213604 -0400
    99100@@ -36,7 +36,7 @@
    100101 MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
    … …  
    106107 
    107108 softfp_wrap_start := '\#ifndef __powerpc64__'
    108 diff -Naur gcc-4.5.2.orig/gcc/config/s390/linux.h gcc-4.5.2/gcc/config/s390/linux.h
    109 --- gcc-4.5.2.orig/gcc/config/s390/linux.h      2007-08-02 06:49:31.000000000 -0400
    110 +++ gcc-4.5.2/gcc/config/s390/linux.h   2011-01-08 13:41:39.814665253 -0500
     109diff -Naur gcc-4.6.0.orig/gcc/config/s390/linux.h gcc-4.6.0/gcc/config/s390/linux.h
     110--- gcc-4.6.0.orig/gcc/config/s390/linux.h      2010-12-09 08:27:07.000000000 -0500
     111+++ gcc-4.6.0/gcc/config/s390/linux.h   2011-04-16 15:49:02.335213604 -0400
    111112@@ -72,7 +72,7 @@
    112113 #define MULTILIB_DEFAULTS { "m31" }
    … …  
    118119 
    119120 #undef  LINK_SPEC
    120 diff -Naur gcc-4.5.2.orig/gcc/config/s390/t-linux64 gcc-4.5.2/gcc/config/s390/t-linux64
    121 --- gcc-4.5.2.orig/gcc/config/s390/t-linux64    2010-10-04 12:54:26.000000000 -0400
    122 +++ gcc-4.5.2/gcc/config/s390/t-linux64 2011-01-08 13:41:51.762743997 -0500
     121diff -Naur gcc-4.6.0.orig/gcc/config/s390/t-linux64 gcc-4.6.0/gcc/config/s390/t-linux64
     122--- gcc-4.6.0.orig/gcc/config/s390/t-linux64    2010-10-04 12:51:59.000000000 -0400
     123+++ gcc-4.6.0/gcc/config/s390/t-linux64 2011-04-16 15:49:02.335213604 -0400
    123124@@ -7,4 +7,4 @@
    124125 
    … …  
    127128-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
    128129+MULTILIB_OSDIRNAMES = ../lib ../lib32
    129 diff -Naur gcc-4.5.2.orig/gcc/config/sparc/linux.h gcc-4.5.2/gcc/config/sparc/linux.h
    130 --- gcc-4.5.2.orig/gcc/config/sparc/linux.h     2010-09-22 17:15:37.000000000 -0400
    131 +++ gcc-4.5.2/gcc/config/sparc/linux.h  2011-01-08 13:41:39.814665253 -0500
    132 @@ -86,7 +86,7 @@
     130diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux.h gcc-4.6.0/gcc/config/sparc/linux.h
     131--- gcc-4.6.0.orig/gcc/config/sparc/linux.h     2011-01-26 15:30:12.000000000 -0500
     132+++ gcc-4.6.0/gcc/config/sparc/linux.h  2011-04-16 15:49:02.335213604 -0400
     133@@ -74,7 +74,7 @@
    133134 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
    134135 
    … …  
    138139   %{!mno-relax:%{!r:-relax}} \
    139140   %{!shared: \
    140      %{!ibcs: \
    141 diff -Naur gcc-4.5.2.orig/gcc/config/sparc/linux64.h gcc-4.5.2/gcc/config/sparc/linux64.h
    142 --- gcc-4.5.2.orig/gcc/config/sparc/linux64.h   2010-09-22 17:15:37.000000000 -0400
    143 +++ gcc-4.5.2/gcc/config/sparc/linux64.h        2011-01-08 13:41:39.814665253 -0500
    144 @@ -109,8 +109,8 @@
    145  
    146  /* If ELF is the default format, we should not use /lib/elf.  */
     141     %{!static: \
     142diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux64.h gcc-4.6.0/gcc/config/sparc/linux64.h
     143--- gcc-4.6.0.orig/gcc/config/sparc/linux64.h   2011-02-17 08:57:21.000000000 -0500
     144+++ gcc-4.6.0/gcc/config/sparc/linux64.h        2011-04-16 15:49:02.335213604 -0400
     145@@ -101,8 +101,8 @@
     146    When the -shared link option is used a final link is not being
     147    done.  */
    147148 
    148149-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
    … …  
    153154 #ifdef SPARC_BI_ARCH
    154155 
    155 @@ -121,7 +121,7 @@
     156@@ -113,7 +113,7 @@
    156157   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },       \
    157158   { "link_arch",        LINK_ARCH_SPEC },
    … …  
    160161+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/lib32 %{shared:-shared} \
    161162   %{!shared: \
    162      %{!ibcs: \
    163        %{!static: \
    164 @@ -130,7 +130,7 @@
    165          %{static:-static}}} \
     163     %{!static: \
     164       %{rdynamic:-export-dynamic} \
     165@@ -121,7 +121,7 @@
     166       %{static:-static}} \
    166167 "
    167168 
    … …  
    169170+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \
    170171   %{!shared: \
    171      %{!ibcs: \
    172        %{!static: \
    173 @@ -211,7 +211,7 @@
     172     %{!static: \
     173       %{rdynamic:-export-dynamic} \
     174@@ -193,7 +193,7 @@
    174175 #else /* !SPARC_BI_ARCH */
    175176 
    … …  
    178179+#define LINK_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \
    179180   %{!shared: \
    180      %{!ibcs: \
    181        %{!static: \
    182 diff -Naur gcc-4.5.2.orig/gcc/config/sparc/t-linux64 gcc-4.5.2/gcc/config/sparc/t-linux64
    183 --- gcc-4.5.2.orig/gcc/config/sparc/t-linux64   2010-10-04 12:54:26.000000000 -0400
    184 +++ gcc-4.5.2/gcc/config/sparc/t-linux64        2011-01-08 13:42:07.870657323 -0500
     181     %{!static: \
     182       %{rdynamic:-export-dynamic} \
     183diff -Naur gcc-4.6.0.orig/gcc/config/sparc/t-linux64 gcc-4.6.0/gcc/config/sparc/t-linux64
     184--- gcc-4.6.0.orig/gcc/config/sparc/t-linux64   2011-01-03 15:52:22.000000000 -0500
     185+++ gcc-4.6.0/gcc/config/sparc/t-linux64        2011-04-16 15:49:02.335213604 -0400
    185186@@ -26,7 +26,7 @@
    186187 

  • patches/gcc-4.6.0-pure64_specs-1.patch

    r8c3f58f r6cefbfb  
    11Submitted By: Joe Ciccone <jciccone@gmail.com>
    2 Date: 09-08-2011
     2Date: 04-16-2011
    33Initial Package Version: 3.4.6
    44Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
    … …  
    1111
    1212    Rediffed Against 4.5.2 By Pontus Carlsson <PontusCarlsson at live dot se>
     13    Rediffed Against 4.6.0 By Joe Ciccone <jciccone@gmail.com>
    1314
    14 diff -Naur gcc-4.5.2.orig/gcc/config/alpha/gnu.h gcc-4.5.2/gcc/config/alpha/gnu.h
    15 --- gcc-4.5.2.orig/gcc/config/alpha/gnu.h       2009-04-21 15:03:23.000000000 -0400
    16 +++ gcc-4.5.2/gcc/config/alpha/gnu.h    2011-01-08 13:38:44.091021377 -0500
     15diff -Naur gcc-4.6.0.orig/gcc/config/alpha/gnu.h gcc-4.6.0/gcc/config/alpha/gnu.h
     16--- gcc-4.6.0.orig/gcc/config/alpha/gnu.h       2010-10-06 03:49:52.000000000 -0400
     17+++ gcc-4.6.0/gcc/config/alpha/gnu.h    2011-04-16 15:42:48.119213462 -0400
    1718@@ -34,7 +34,7 @@
    1819     } while (0)
    … …  
    2425 #undef STARTFILE_SPEC
    2526 #define STARTFILE_SPEC \
    26 diff -Naur gcc-4.5.2.orig/gcc/config/alpha/linux-elf.h gcc-4.5.2/gcc/config/alpha/linux-elf.h
    27 --- gcc-4.5.2.orig/gcc/config/alpha/linux-elf.h 2007-08-02 06:49:31.000000000 -0400
    28 +++ gcc-4.5.2/gcc/config/alpha/linux-elf.h      2011-01-08 13:38:44.091021377 -0500
     27diff -Naur gcc-4.6.0.orig/gcc/config/alpha/linux-elf.h gcc-4.6.0/gcc/config/alpha/linux-elf.h
     28--- gcc-4.6.0.orig/gcc/config/alpha/linux-elf.h 2010-12-09 08:27:07.000000000 -0500
     29+++ gcc-4.6.0/gcc/config/alpha/linux-elf.h      2011-04-16 15:45:39.055213526 -0400
    2930@@ -27,8 +27,8 @@
    3031 #define EXTRA_SPECS \
    … …  
    3536+#define GLIBC_DYNAMIC_LINKER   "/tools/lib/ld-linux.so.2"
    3637+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
    37  #if UCLIBC_DEFAULT
    38  #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
    39  #else
    40 diff -Naur gcc-4.5.2.orig/gcc/config/arm/linux-eabi.h gcc-4.5.2/gcc/config/arm/linux-eabi.h
    41 --- gcc-4.5.2.orig/gcc/config/arm/linux-eabi.h  2009-10-30 16:03:09.000000000 -0400
    42 +++ gcc-4.5.2/gcc/config/arm/linux-eabi.h       2011-01-08 13:38:44.091021377 -0500
    43 @@ -61,7 +61,7 @@
     38 #if DEFAULT_LIBC == LIBC_UCLIBC
     39 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
     40 #elif DEFAULT_LIBC == LIBC_GLIBC
     41diff -Naur gcc-4.6.0.orig/gcc/config/arm/linux-eabi.h gcc-4.6.0/gcc/config/arm/linux-eabi.h
     42--- gcc-4.6.0.orig/gcc/config/arm/linux-eabi.h  2011-01-12 09:29:14.000000000 -0500
     43+++ gcc-4.6.0/gcc/config/arm/linux-eabi.h       2011-04-16 15:42:48.119213462 -0400
     44@@ -62,7 +62,7 @@
    4445 /* Use ld-linux.so.3 so that it will be possible to run "classic"
    4546    GNU/Linux binaries on an EABI system.  */
    … …  
    5051 /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
    5152    use the GNU/Linux version, not the generic BPABI version.  */
    52 diff -Naur gcc-4.5.2.orig/gcc/config/arm/linux-elf.h gcc-4.5.2/gcc/config/arm/linux-elf.h
    53 --- gcc-4.5.2.orig/gcc/config/arm/linux-elf.h   2009-11-05 09:47:45.000000000 -0500
    54 +++ gcc-4.5.2/gcc/config/arm/linux-elf.h        2011-01-08 13:38:44.091021377 -0500
     53diff -Naur gcc-4.6.0.orig/gcc/config/arm/linux-elf.h gcc-4.6.0/gcc/config/arm/linux-elf.h
     54--- gcc-4.6.0.orig/gcc/config/arm/linux-elf.h   2011-01-14 13:42:32.000000000 -0500
     55+++ gcc-4.6.0/gcc/config/arm/linux-elf.h        2011-04-16 15:42:48.119213462 -0400
    5556@@ -62,7 +62,7 @@
    5657 
    … …  
    6061+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
    6162 
    62  #define LINUX_TARGET_LINK_SPEC  "%{h*} %{version:-v} \
    63     %{b} \
    64 diff -Naur gcc-4.5.2.orig/gcc/config/bfin/linux.h gcc-4.5.2/gcc/config/bfin/linux.h
    65 --- gcc-4.5.2.orig/gcc/config/bfin/linux.h      2009-09-03 11:37:28.000000000 -0400
    66 +++ gcc-4.5.2/gcc/config/bfin/linux.h   2011-01-08 13:38:44.091021377 -0500
     63 #define LINUX_TARGET_LINK_SPEC  "%{h*} \
     64    %{static:-Bstatic} \
     65diff -Naur gcc-4.6.0.orig/gcc/config/bfin/linux.h gcc-4.6.0/gcc/config/bfin/linux.h
     66--- gcc-4.6.0.orig/gcc/config/bfin/linux.h      2010-12-09 08:27:07.000000000 -0500
     67+++ gcc-4.6.0/gcc/config/bfin/linux.h   2011-04-16 15:43:19.823213474 -0400
    6768@@ -45,7 +45,7 @@
    6869   %{shared:-G -Bdynamic} \
    6970   %{!shared: %{!static: \
    7071    %{rdynamic:-export-dynamic} \
    71 -   %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \
    72 +   %{!dynamic-linker:-dynamic-linker /tools/lib/ld-uClibc.so.0}} \
     72-   -dynamic-linker /lib/ld-uClibc.so.0} \
     73+   -dynamic-linker /tools/lib/ld-uClibc.so.0} \
    7374    %{static}} -init __init -fini __fini"
    7475 
    7576 #define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h"
    76 diff -Naur gcc-4.5.2.orig/gcc/config/cris/linux.h gcc-4.5.2/gcc/config/cris/linux.h
    77 --- gcc-4.5.2.orig/gcc/config/cris/linux.h      2009-03-22 11:15:04.000000000 -0400
    78 +++ gcc-4.5.2/gcc/config/cris/linux.h   2011-01-08 13:38:44.091021377 -0500
     77diff -Naur gcc-4.6.0.orig/gcc/config/cris/linux.h gcc-4.6.0/gcc/config/cris/linux.h
     78--- gcc-4.6.0.orig/gcc/config/cris/linux.h      2011-01-14 13:51:46.000000000 -0500
     79+++ gcc-4.6.0/gcc/config/cris/linux.h   2011-04-16 15:42:48.119213462 -0400
    7980@@ -103,7 +103,7 @@
    8081 #undef CRIS_DEFAULT_CPU_VERSION
    … …  
    8485+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    8586 
    86  /* We need an -rpath-link to ld.so.1, and presumably to each directory
    87     specified with -B.  */
    88 diff -Naur gcc-4.5.2.orig/gcc/config/freebsd-spec.h gcc-4.5.2/gcc/config/freebsd-spec.h
    89 --- gcc-4.5.2.orig/gcc/config/freebsd-spec.h    2009-09-22 12:28:26.000000000 -0400
    90 +++ gcc-4.5.2/gcc/config/freebsd-spec.h 2011-01-08 13:38:44.091021377 -0500
    91 @@ -146,7 +146,7 @@
     87 #undef CRIS_LINK_SUBTARGET_SPEC
     88 #define CRIS_LINK_SUBTARGET_SPEC \
     89diff -Naur gcc-4.6.0.orig/gcc/config/freebsd-spec.h gcc-4.6.0/gcc/config/freebsd-spec.h
     90--- gcc-4.6.0.orig/gcc/config/freebsd-spec.h    2011-02-13 19:40:15.000000000 -0500
     91+++ gcc-4.6.0/gcc/config/freebsd-spec.h 2011-04-16 15:42:48.119213462 -0400
     92@@ -131,7 +131,7 @@
    9293 #if FBSD_MAJOR < 6
    9394 #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
    … …  
    9899 
    99100 #if defined(HAVE_LD_EH_FRAME_HDR)
    100 diff -Naur gcc-4.5.2.orig/gcc/config/frv/linux.h gcc-4.5.2/gcc/config/frv/linux.h
    101 --- gcc-4.5.2.orig/gcc/config/frv/linux.h       2007-08-02 06:49:31.000000000 -0400
    102 +++ gcc-4.5.2/gcc/config/frv/linux.h    2011-01-08 13:38:44.091021377 -0500
     101diff -Naur gcc-4.6.0.orig/gcc/config/frv/linux.h gcc-4.6.0/gcc/config/frv/linux.h
     102--- gcc-4.6.0.orig/gcc/config/frv/linux.h       2010-12-09 08:27:07.000000000 -0500
     103+++ gcc-4.6.0/gcc/config/frv/linux.h    2011-04-16 15:42:48.119213462 -0400
    103104@@ -35,7 +35,7 @@
    104105 #define ENDFILE_SPEC \
    … …  
    110111 #undef LINK_SPEC
    111112 #define LINK_SPEC "\
    112 diff -Naur gcc-4.5.2.orig/gcc/config/i386/gnu.h gcc-4.5.2/gcc/config/i386/gnu.h
    113 --- gcc-4.5.2.orig/gcc/config/i386/gnu.h        2008-11-13 18:28:46.000000000 -0500
    114 +++ gcc-4.5.2/gcc/config/i386/gnu.h     2011-01-08 13:38:44.091021377 -0500
     113diff -Naur gcc-4.6.0.orig/gcc/config/i386/gnu.h gcc-4.6.0/gcc/config/i386/gnu.h
     114--- gcc-4.6.0.orig/gcc/config/i386/gnu.h        2011-02-08 14:14:04.000000000 -0500
     115+++ gcc-4.6.0/gcc/config/i386/gnu.h     2011-04-16 15:42:48.119213462 -0400
    115116@@ -21,7 +21,7 @@
    116117 */
    … …  
    122123 #undef TARGET_VERSION
    123124 #define TARGET_VERSION fprintf (stderr, " (i386 GNU)");
    124 diff -Naur gcc-4.5.2.orig/gcc/config/i386/linux.h gcc-4.5.2/gcc/config/i386/linux.h
    125 --- gcc-4.5.2.orig/gcc/config/i386/linux.h      2010-03-24 16:44:48.000000000 -0400
    126 +++ gcc-4.5.2/gcc/config/i386/linux.h   2011-01-08 13:38:44.091021377 -0500
    127 @@ -100,7 +100,7 @@
     125diff -Naur gcc-4.6.0.orig/gcc/config/i386/linux.h gcc-4.6.0/gcc/config/i386/linux.h
     126--- gcc-4.6.0.orig/gcc/config/i386/linux.h      2011-01-14 13:45:06.000000000 -0500
     127+++ gcc-4.6.0/gcc/config/i386/linux.h   2011-04-16 15:42:48.123213462 -0400
     128@@ -92,7 +92,7 @@
    128129 
    129130 /* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */
    … …  
    134135 #undef  ASM_SPEC
    135136 #define ASM_SPEC \
    136 diff -Naur gcc-4.5.2.orig/gcc/config/i386/linux64.h gcc-4.5.2/gcc/config/i386/linux64.h
    137 --- gcc-4.5.2.orig/gcc/config/i386/linux64.h    2010-03-24 16:44:48.000000000 -0400
    138 +++ gcc-4.5.2/gcc/config/i386/linux64.h 2011-01-08 13:38:44.091021377 -0500
    139 @@ -58,8 +58,8 @@
     137diff -Naur gcc-4.6.0.orig/gcc/config/i386/linux64.h gcc-4.6.0/gcc/config/i386/linux64.h
     138--- gcc-4.6.0.orig/gcc/config/i386/linux64.h    2011-03-02 17:35:36.000000000 -0500
     139+++ gcc-4.6.0/gcc/config/i386/linux64.h 2011-04-16 15:42:48.123213462 -0400
     140@@ -62,8 +62,8 @@
    140141    When the -shared link option is used a final link is not being
    141142    done.  */
    … …  
    148149 #if TARGET_64BIT_DEFAULT
    149150 #define SPEC_32 "m32"
    150 diff -Naur gcc-4.5.2.orig/gcc/config/i386/t-linux64 gcc-4.5.2/gcc/config/i386/t-linux64
    151 --- gcc-4.5.2.orig/gcc/config/i386/t-linux64    2009-04-21 15:03:23.000000000 -0400
    152 +++ gcc-4.5.2/gcc/config/i386/t-linux64 2011-01-08 13:38:44.091021377 -0500
     151diff -Naur gcc-4.6.0.orig/gcc/config/i386/t-linux64 gcc-4.6.0/gcc/config/i386/t-linux64
     152--- gcc-4.6.0.orig/gcc/config/i386/t-linux64    2009-04-21 15:03:23.000000000 -0400
     153+++ gcc-4.6.0/gcc/config/i386/t-linux64 2011-04-16 15:42:48.123213462 -0400
    153154@@ -25,7 +25,7 @@
    154155 
    … …  
    160161 LIBGCC = stmp-multilib
    161162 INSTALL_LIBGCC = install-multilib
    162 diff -Naur gcc-4.5.2.orig/gcc/config/ia64/linux.h gcc-4.5.2/gcc/config/ia64/linux.h
    163 --- gcc-4.5.2.orig/gcc/config/ia64/linux.h      2009-04-21 15:03:23.000000000 -0400
    164 +++ gcc-4.5.2/gcc/config/ia64/linux.h   2011-01-08 13:38:44.095033293 -0500
     163diff -Naur gcc-4.6.0.orig/gcc/config/ia64/linux.h gcc-4.6.0/gcc/config/ia64/linux.h
     164--- gcc-4.6.0.orig/gcc/config/ia64/linux.h      2010-12-09 08:27:07.000000000 -0500
     165+++ gcc-4.6.0/gcc/config/ia64/linux.h   2011-04-16 15:42:48.123213462 -0400
    165166@@ -61,7 +61,7 @@
    166167 /* Define this for shared library support because it isn't in the main
    … …  
    172173 #undef LINK_SPEC
    173174 #define LINK_SPEC "\
    174 diff -Naur gcc-4.5.2.orig/gcc/config/kfreebsd-gnu.h gcc-4.5.2/gcc/config/kfreebsd-gnu.h
    175 --- gcc-4.5.2.orig/gcc/config/kfreebsd-gnu.h    2007-08-02 06:49:31.000000000 -0400
    176 +++ gcc-4.5.2/gcc/config/kfreebsd-gnu.h 2011-01-08 13:38:44.095033293 -0500
     175diff -Naur gcc-4.6.0.orig/gcc/config/kfreebsd-gnu.h gcc-4.6.0/gcc/config/kfreebsd-gnu.h
     176--- gcc-4.6.0.orig/gcc/config/kfreebsd-gnu.h    2007-08-02 06:49:31.000000000 -0400
     177+++ gcc-4.6.0/gcc/config/kfreebsd-gnu.h 2011-04-16 15:42:48.123213462 -0400
    177178@@ -33,5 +33,5 @@
    178179 
    … …  
    182183+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    183184 #endif
    184 diff -Naur gcc-4.5.2.orig/gcc/config/knetbsd-gnu.h gcc-4.5.2/gcc/config/knetbsd-gnu.h
    185 --- gcc-4.5.2.orig/gcc/config/knetbsd-gnu.h     2007-08-02 06:49:31.000000000 -0400
    186 +++ gcc-4.5.2/gcc/config/knetbsd-gnu.h  2011-01-08 13:38:44.095033293 -0500
     185diff -Naur gcc-4.6.0.orig/gcc/config/knetbsd-gnu.h gcc-4.6.0/gcc/config/knetbsd-gnu.h
     186--- gcc-4.6.0.orig/gcc/config/knetbsd-gnu.h     2007-08-02 06:49:31.000000000 -0400
     187+++ gcc-4.6.0/gcc/config/knetbsd-gnu.h  2011-04-16 15:42:48.123213462 -0400
    187188@@ -34,5 +34,5 @@
    188189 
    … …  
    192193+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    193194 #endif
    194 diff -Naur gcc-4.5.2.orig/gcc/config/kopensolaris-gnu.h gcc-4.5.2/gcc/config/kopensolaris-gnu.h
    195 --- gcc-4.5.2.orig/gcc/config/kopensolaris-gnu.h        2009-01-29 13:48:41.000000000 -0500
    196 +++ gcc-4.5.2/gcc/config/kopensolaris-gnu.h     2011-01-08 13:38:44.095033293 -0500
     195diff -Naur gcc-4.6.0.orig/gcc/config/kopensolaris-gnu.h gcc-4.6.0/gcc/config/kopensolaris-gnu.h
     196--- gcc-4.6.0.orig/gcc/config/kopensolaris-gnu.h        2009-01-29 13:48:41.000000000 -0500
     197+++ gcc-4.6.0/gcc/config/kopensolaris-gnu.h     2011-04-16 15:42:48.123213462 -0400
    197198@@ -33,5 +33,5 @@
    198199 
    … …  
    202203+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    203204 #endif
    204 diff -Naur gcc-4.5.2.orig/gcc/config/linux.h gcc-4.5.2/gcc/config/linux.h
    205 --- gcc-4.5.2.orig/gcc/config/linux.h   2009-04-09 11:00:19.000000000 -0400
    206 +++ gcc-4.5.2/gcc/config/linux.h        2011-01-08 13:38:44.095033293 -0500
    207 @@ -117,9 +117,9 @@
     205diff -Naur gcc-4.6.0.orig/gcc/config/linux.h gcc-4.6.0/gcc/config/linux.h
     206--- gcc-4.6.0.orig/gcc/config/linux.h   2011-01-12 09:29:14.000000000 -0500
     207+++ gcc-4.6.0/gcc/config/linux.h        2011-04-16 15:43:45.695213484 -0400
     208@@ -74,9 +74,9 @@
    208209    GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
    209210    GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
    … …  
    213214-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
    214215+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
    215 +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0"
     216+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
    216217+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
    217  #define LINUX_DYNAMIC_LINKER \
    218    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
    219  #define LINUX_DYNAMIC_LINKER32 \
    220 diff -Naur gcc-4.5.2.orig/gcc/config/lm32/uclinux-elf.h gcc-4.5.2/gcc/config/lm32/uclinux-elf.h
    221 --- gcc-4.5.2.orig/gcc/config/lm32/uclinux-elf.h        2009-11-11 11:43:06.000000000 -0500
    222 +++ gcc-4.5.2/gcc/config/lm32/uclinux-elf.h     2011-01-08 13:38:44.095033293 -0500
    223 @@ -73,7 +73,7 @@
     218 #define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
     219 #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
     220 #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
     221diff -Naur gcc-4.6.0.orig/gcc/config/lm32/uclinux-elf.h gcc-4.6.0/gcc/config/lm32/uclinux-elf.h
     222--- gcc-4.6.0.orig/gcc/config/lm32/uclinux-elf.h        2011-01-14 13:42:32.000000000 -0500
     223+++ gcc-4.6.0/gcc/config/lm32/uclinux-elf.h     2011-04-16 15:46:22.543213544 -0400
     224@@ -72,7 +72,7 @@
    224225    %{shared:-shared} \
    225226    %{symbolic:-Bsymbolic} \
    226227    %{rdynamic:-export-dynamic} \
    227 -   %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}"
    228 +   %{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux.so.2}"
     228-   -dynamic-linker /lib/ld-linux.so.2"
     229+   -dynamic-linker /tools/lib/ld-linux.so.2"
    229230 
    230231 #define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS()
    231232 
    232 diff -Naur gcc-4.5.2.orig/gcc/config/m32r/linux.h gcc-4.5.2/gcc/config/m32r/linux.h
    233 --- gcc-4.5.2.orig/gcc/config/m32r/linux.h      2007-08-02 06:49:31.000000000 -0400
    234 +++ gcc-4.5.2/gcc/config/m32r/linux.h   2011-01-08 13:38:44.095033293 -0500
    235 @@ -58,7 +58,7 @@
    236  
    237  /* If ELF is the default format, we should not use /lib/elf.  */
     233diff -Naur gcc-4.6.0.orig/gcc/config/m32r/linux.h gcc-4.6.0/gcc/config/m32r/linux.h
     234--- gcc-4.6.0.orig/gcc/config/m32r/linux.h      2011-01-14 13:45:06.000000000 -0500
     235+++ gcc-4.6.0/gcc/config/m32r/linux.h   2011-04-16 15:42:48.135213462 -0400
     236@@ -47,7 +47,7 @@
     237    When the -shared link option is used a final link is not being
     238    done.  */
    238239 
    239240-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
    … …  
    242243 #undef LINK_SPEC
    243244 #if TARGET_LITTLE_ENDIAN
    244 diff -Naur gcc-4.5.2.orig/gcc/config/m68k/linux.h gcc-4.5.2/gcc/config/m68k/linux.h
    245 --- gcc-4.5.2.orig/gcc/config/m68k/linux.h      2009-12-11 10:32:08.000000000 -0500
    246 +++ gcc-4.5.2/gcc/config/m68k/linux.h   2011-01-08 13:38:44.095033293 -0500
    247 @@ -84,7 +84,7 @@
    248  
    249  /* If ELF is the default format, we should not use /lib/elf.  */
     245diff -Naur gcc-4.6.0.orig/gcc/config/m68k/linux.h gcc-4.6.0/gcc/config/m68k/linux.h
     246--- gcc-4.6.0.orig/gcc/config/m68k/linux.h      2011-01-26 15:30:12.000000000 -0500
     247+++ gcc-4.6.0/gcc/config/m68k/linux.h   2011-04-16 15:42:48.135213462 -0400
     248@@ -75,7 +75,7 @@
     249    When the -shared link option is used a final link is not being
     250    done.  */
    250251 
    251252-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
    … …  
    254255 #undef LINK_SPEC
    255256 #define LINK_SPEC "-m m68kelf %{shared} \
    256 diff -Naur gcc-4.5.2.orig/gcc/config/mips/linux.h gcc-4.5.2/gcc/config/mips/linux.h
    257 --- gcc-4.5.2.orig/gcc/config/mips/linux.h      2009-02-20 10:20:38.000000000 -0500
    258 +++ gcc-4.5.2/gcc/config/mips/linux.h   2011-01-08 13:38:44.095033293 -0500
    259 @@ -64,7 +64,7 @@
     257diff -Naur gcc-4.6.0.orig/gcc/config/microblaze/linux.h gcc-4.6.0/gcc/config/microblaze/linux.h
     258--- gcc-4.6.0.orig/gcc/config/microblaze/linux.h        2010-12-09 08:27:07.000000000 -0500
     259+++ gcc-4.6.0/gcc/config/microblaze/linux.h     2011-04-16 15:46:40.719213550 -0400
     260@@ -20,7 +20,7 @@
     261    <http://www.gnu.org/licenses/>.  */
     262 
     263 
     264-#define DYNAMIC_LINKER "/lib/ld.so.1"
     265+#define DYNAMIC_LINKER "/tools/lib/ld.so.1"
     266 #undef  SUBTARGET_EXTRA_SPECS
     267 #define SUBTARGET_EXTRA_SPECS \
     268   { "dynamic_linker", DYNAMIC_LINKER }
     269diff -Naur gcc-4.6.0.orig/gcc/config/mips/linux.h gcc-4.6.0/gcc/config/mips/linux.h
     270--- gcc-4.6.0.orig/gcc/config/mips/linux.h      2011-01-14 13:45:06.000000000 -0500
     271+++ gcc-4.6.0/gcc/config/mips/linux.h   2011-04-16 15:42:48.135213462 -0400
     272@@ -61,7 +61,7 @@
    260273 #undef MIPS_DEFAULT_GVALUE
    261274 #define MIPS_DEFAULT_GVALUE 0
    … …  
    266279 /* Borrowed from sparc/linux.h */
    267280 #undef LINK_SPEC
    268 diff -Naur gcc-4.5.2.orig/gcc/config/mips/linux64.h gcc-4.5.2/gcc/config/mips/linux64.h
    269 --- gcc-4.5.2.orig/gcc/config/mips/linux64.h    2009-02-20 10:20:38.000000000 -0500
    270 +++ gcc-4.5.2/gcc/config/mips/linux64.h 2011-01-08 13:38:44.095033293 -0500
     281diff -Naur gcc-4.6.0.orig/gcc/config/mips/linux64.h gcc-4.6.0/gcc/config/mips/linux64.h
     282--- gcc-4.6.0.orig/gcc/config/mips/linux64.h    2011-01-19 15:39:09.000000000 -0500
     283+++ gcc-4.6.0/gcc/config/mips/linux64.h 2011-04-16 15:44:23.007213498 -0400
    271284@@ -35,10 +35,10 @@
    272285 %{!shared: \
    … …  
    277290-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
    278291-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
    279 +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
    280 +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld.so.1"
    281 +#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib64/ld.so.1"
    282 +#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib64/ld-uClibc.so.0"
     292+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
     293+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld.so.1"
     294+#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld.so.1"
     295+#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld-uClibc.so.0"
     296 #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
    283297 #define LINUX_DYNAMIC_LINKERN32 \
    284    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
    285  
    286 diff -Naur gcc-4.5.2.orig/gcc/config/mips/t-linux64 gcc-4.5.2/gcc/config/mips/t-linux64
    287 --- gcc-4.5.2.orig/gcc/config/mips/t-linux64    2009-04-21 15:03:23.000000000 -0400
    288 +++ gcc-4.5.2/gcc/config/mips/t-linux64 2011-01-08 13:38:44.095033293 -0500
     298   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
     299diff -Naur gcc-4.6.0.orig/gcc/config/mips/t-linux64 gcc-4.6.0/gcc/config/mips/t-linux64
     300--- gcc-4.6.0.orig/gcc/config/mips/t-linux64    2009-04-21 15:03:23.000000000 -0400
     301+++ gcc-4.6.0/gcc/config/mips/t-linux64 2011-04-16 15:42:48.135213462 -0400
    289302@@ -18,7 +18,7 @@
    290303 
    … …  
    296309 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
    297310 
    298 diff -Naur gcc-4.5.2.orig/gcc/config/mn10300/linux.h gcc-4.5.2/gcc/config/mn10300/linux.h
    299 --- gcc-4.5.2.orig/gcc/config/mn10300/linux.h   2007-08-02 06:49:31.000000000 -0400
    300 +++ gcc-4.5.2/gcc/config/mn10300/linux.h        2011-01-08 13:38:44.095033293 -0500
     311diff -Naur gcc-4.6.0.orig/gcc/config/mn10300/linux.h gcc-4.6.0/gcc/config/mn10300/linux.h
     312--- gcc-4.6.0.orig/gcc/config/mn10300/linux.h   2010-12-31 09:34:26.000000000 -0500
     313+++ gcc-4.6.0/gcc/config/mn10300/linux.h        2011-04-16 15:42:48.135213462 -0400
    301314@@ -32,7 +32,7 @@
    302315 #undef  ASM_SPEC
    303  #define ASM_SPEC "%{Wa,*:%*}"
     316 #define ASM_SPEC ""
    304317 
    305318-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
    … …  
    308321 #undef  LINK_SPEC
    309322 #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
    310 diff -Naur gcc-4.5.2.orig/gcc/config/pa/pa-linux.h gcc-4.5.2/gcc/config/pa/pa-linux.h
    311 --- gcc-4.5.2.orig/gcc/config/pa/pa-linux.h     2009-12-04 02:47:51.000000000 -0500
    312 +++ gcc-4.5.2/gcc/config/pa/pa-linux.h  2011-01-08 13:38:44.095033293 -0500
    313 @@ -38,7 +38,7 @@
     323diff -Naur gcc-4.6.0.orig/gcc/config/pa/pa-linux.h gcc-4.6.0/gcc/config/pa/pa-linux.h
     324--- gcc-4.6.0.orig/gcc/config/pa/pa-linux.h     2011-01-26 15:27:04.000000000 -0500
     325+++ gcc-4.6.0/gcc/config/pa/pa-linux.h  2011-04-16 15:42:48.135213462 -0400
     326@@ -39,7 +39,7 @@
    314327 /* Define this for shared library support because it isn't in the main
    315328    linux.h file.  */
    … …  
    320333 #undef LINK_SPEC
    321334 #define LINK_SPEC "\
    322 diff -Naur gcc-4.5.2.orig/gcc/config/rs6000/linux64.h gcc-4.5.2/gcc/config/rs6000/linux64.h
    323 --- gcc-4.5.2.orig/gcc/config/rs6000/linux64.h  2010-11-17 01:09:53.000000000 -0500
    324 +++ gcc-4.5.2/gcc/config/rs6000/linux64.h       2011-01-08 13:38:44.095033293 -0500
    325 @@ -340,10 +340,10 @@
     335diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/linux64.h gcc-4.6.0/gcc/config/rs6000/linux64.h
     336--- gcc-4.6.0.orig/gcc/config/rs6000/linux64.h  2011-03-07 02:50:23.000000000 -0500
     337+++ gcc-4.6.0/gcc/config/rs6000/linux64.h       2011-04-16 15:44:57.343213510 -0400
     338@@ -372,10 +372,10 @@
    326339 #undef LINK_OS_DEFAULT_SPEC
    327340 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
    … …  
    331344-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
    332345-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
    333 +#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
    334 +#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
    335 +#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0"
     346+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
     347+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld64.so.1"
     348+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
    336349+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
    337  #if UCLIBC_DEFAULT
    338  #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
    339  #else
    340 diff -Naur gcc-4.5.2.orig/gcc/config/rs6000/sysv4.h gcc-4.5.2/gcc/config/rs6000/sysv4.h
    341 --- gcc-4.5.2.orig/gcc/config/rs6000/sysv4.h    2010-11-03 09:55:26.000000000 -0400
    342 +++ gcc-4.5.2/gcc/config/rs6000/sysv4.h 2011-01-08 13:38:44.095033293 -0500
    343 @@ -899,8 +899,8 @@
     350 #if DEFAULT_LIBC == LIBC_UCLIBC
     351 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
     352 #elif DEFAULT_LIBC == LIBC_GLIBC
     353diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/sysv4.h gcc-4.6.0/gcc/config/rs6000/sysv4.h
     354--- gcc-4.6.0.orig/gcc/config/rs6000/sysv4.h    2011-03-07 02:50:23.000000000 -0500
     355+++ gcc-4.6.0/gcc/config/rs6000/sysv4.h 2011-04-16 15:45:23.727213520 -0400
     356@@ -818,8 +818,8 @@
    344357 
    345358 #define LINK_START_LINUX_SPEC ""
    … …  
    349362+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    350363+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
    351  #if UCLIBC_DEFAULT
    352  #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
    353  #else
    354 @@ -942,7 +942,7 @@
     364 #if DEFAULT_LIBC == LIBC_UCLIBC
     365 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
     366 #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
     367@@ -863,7 +863,7 @@
    355368 
    356369 #define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \
    357370   %{rdynamic:-export-dynamic} \
    358 -  %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
    359 +  %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}}}"
     371-  -dynamic-linker /lib/ld.so.1}}"
     372+  -dynamic-linker /tools/lib/ld.so.1}}"
    360373 
    361374 #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__   \
    362375 %{!undef:                                                      \
    363 diff -Naur gcc-4.5.2.orig/gcc/config/rs6000/t-linux64 gcc-4.5.2/gcc/config/rs6000/t-linux64
    364 --- gcc-4.5.2.orig/gcc/config/rs6000/t-linux64  2009-04-21 15:03:23.000000000 -0400
    365 +++ gcc-4.5.2/gcc/config/rs6000/t-linux64       2011-01-08 13:38:44.095033293 -0500
     376diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/t-linux64 gcc-4.6.0/gcc/config/rs6000/t-linux64
     377--- gcc-4.6.0.orig/gcc/config/rs6000/t-linux64  2009-04-21 15:03:23.000000000 -0400
     378+++ gcc-4.6.0/gcc/config/rs6000/t-linux64       2011-04-16 15:42:48.195213462 -0400
    366379@@ -36,7 +36,7 @@
    367380 MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
    … …  
    373386 
    374387 softfp_wrap_start := '\#ifndef __powerpc64__'
    375 diff -Naur gcc-4.5.2.orig/gcc/config/s390/linux.h gcc-4.5.2/gcc/config/s390/linux.h
    376 --- gcc-4.5.2.orig/gcc/config/s390/linux.h      2007-08-02 06:49:31.000000000 -0400
    377 +++ gcc-4.5.2/gcc/config/s390/linux.h   2011-01-08 13:38:44.095033293 -0500
     388diff -Naur gcc-4.6.0.orig/gcc/config/s390/linux.h gcc-4.6.0/gcc/config/s390/linux.h
     389--- gcc-4.6.0.orig/gcc/config/s390/linux.h      2010-12-09 08:27:07.000000000 -0500
     390+++ gcc-4.6.0/gcc/config/s390/linux.h   2011-04-16 15:42:48.195213462 -0400
    378391@@ -72,8 +72,8 @@
    379392 #define MULTILIB_DEFAULTS { "m31" }
    … …  
    387400 #undef  LINK_SPEC
    388401 #define LINK_SPEC \
    389 diff -Naur gcc-4.5.2.orig/gcc/config/s390/t-linux64 gcc-4.5.2/gcc/config/s390/t-linux64
    390 --- gcc-4.5.2.orig/gcc/config/s390/t-linux64    2010-10-04 12:54:26.000000000 -0400
    391 +++ gcc-4.5.2/gcc/config/s390/t-linux64 2011-01-08 13:40:17.250656249 -0500
     402diff -Naur gcc-4.6.0.orig/gcc/config/s390/t-linux64 gcc-4.6.0/gcc/config/s390/t-linux64
     403--- gcc-4.6.0.orig/gcc/config/s390/t-linux64    2010-10-04 12:51:59.000000000 -0400
     404+++ gcc-4.6.0/gcc/config/s390/t-linux64 2011-04-16 15:42:48.195213462 -0400
    392405@@ -7,4 +7,4 @@
    393406 
    … …  
    396409-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
    397410+MULTILIB_OSDIRNAMES = ../lib ../lib32
    398 diff -Naur gcc-4.5.2.orig/gcc/config/sh/linux.h gcc-4.5.2/gcc/config/sh/linux.h
    399 --- gcc-4.5.2.orig/gcc/config/sh/linux.h        2007-08-02 06:49:31.000000000 -0400
    400 +++ gcc-4.5.2/gcc/config/sh/linux.h     2011-01-08 13:38:44.099033415 -0500
     411diff -Naur gcc-4.6.0.orig/gcc/config/sh/linux.h gcc-4.6.0/gcc/config/sh/linux.h
     412--- gcc-4.6.0.orig/gcc/config/sh/linux.h        2010-12-09 08:27:07.000000000 -0500
     413+++ gcc-4.6.0/gcc/config/sh/linux.h     2011-04-16 15:42:48.195213462 -0400
    401414@@ -47,7 +47,7 @@
    402415 
    … …  
    408421 #undef SUBTARGET_LINK_EMUL_SUFFIX
    409422 #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
    410 diff -Naur gcc-4.5.2.orig/gcc/config/sparc/linux.h gcc-4.5.2/gcc/config/sparc/linux.h
    411 --- gcc-4.5.2.orig/gcc/config/sparc/linux.h     2010-09-22 17:15:37.000000000 -0400
    412 +++ gcc-4.5.2/gcc/config/sparc/linux.h  2011-01-08 13:38:44.099033415 -0500
    413 @@ -83,10 +83,10 @@
    414  
    415  /* If ELF is the default format, we should not use /lib/elf.  */
     423diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux.h gcc-4.6.0/gcc/config/sparc/linux.h
     424--- gcc-4.6.0.orig/gcc/config/sparc/linux.h     2011-01-26 15:30:12.000000000 -0500
     425+++ gcc-4.6.0/gcc/config/sparc/linux.h  2011-04-16 15:42:48.195213462 -0400
     426@@ -71,10 +71,10 @@
     427    When the -shared link option is used a final link is not being
     428    done.  */
    416429 
    417430-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
    … …  
    423436   %{!mno-relax:%{!r:-relax}} \
    424437   %{!shared: \
    425      %{!ibcs: \
    426 diff -Naur gcc-4.5.2.orig/gcc/config/sparc/linux64.h gcc-4.5.2/gcc/config/sparc/linux64.h
    427 --- gcc-4.5.2.orig/gcc/config/sparc/linux64.h   2010-09-22 17:15:37.000000000 -0400
    428 +++ gcc-4.5.2/gcc/config/sparc/linux64.h        2011-01-08 13:38:44.099033415 -0500
    429 @@ -109,8 +109,8 @@
    430  
    431  /* If ELF is the default format, we should not use /lib/elf.  */
     438     %{!static: \
     439diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux64.h gcc-4.6.0/gcc/config/sparc/linux64.h
     440--- gcc-4.6.0.orig/gcc/config/sparc/linux64.h   2011-02-17 08:57:21.000000000 -0500
     441+++ gcc-4.6.0/gcc/config/sparc/linux64.h        2011-04-16 15:42:48.195213462 -0400
     442@@ -101,8 +101,8 @@
     443    When the -shared link option is used a final link is not being
     444    done.  */
    432445 
    433446-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
    … …  
    438451 #ifdef SPARC_BI_ARCH
    439452 
    440 @@ -121,7 +121,7 @@
     453@@ -113,7 +113,7 @@
    441454   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },       \
    442455   { "link_arch",        LINK_ARCH_SPEC },
    … …  
    445458+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/tools/lib32 %{shared:-shared} \
    446459   %{!shared: \
    447      %{!ibcs: \
    448        %{!static: \
    449 @@ -130,7 +130,7 @@
    450          %{static:-static}}} \
     460     %{!static: \
     461       %{rdynamic:-export-dynamic} \
     462@@ -121,7 +121,7 @@
     463       %{static:-static}} \
    451464 "
    452465 
    … …  
    454467+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/tools/lib %{shared:-shared} \
    455468   %{!shared: \
    456      %{!ibcs: \
    457        %{!static: \
    458 @@ -211,7 +211,7 @@
     469     %{!static: \
     470       %{rdynamic:-export-dynamic} \
     471@@ -193,7 +193,7 @@
    459472 #else /* !SPARC_BI_ARCH */
    460473 
    … …  
    463476+#define LINK_SPEC "-m elf64_sparc -Y P,%R/tools/lib %{shared:-shared} \
    464477   %{!shared: \
    465      %{!ibcs: \
    466        %{!static: \
    467 diff -Naur gcc-4.5.2.orig/gcc/config/sparc/t-linux64 gcc-4.5.2/gcc/config/sparc/t-linux64
    468 --- gcc-4.5.2.orig/gcc/config/sparc/t-linux64   2010-10-04 12:54:26.000000000 -0400
    469 +++ gcc-4.5.2/gcc/config/sparc/t-linux64        2011-01-08 13:40:26.191030611 -0500
     478     %{!static: \
     479       %{rdynamic:-export-dynamic} \
     480diff -Naur gcc-4.6.0.orig/gcc/config/sparc/t-linux64 gcc-4.6.0/gcc/config/sparc/t-linux64
     481--- gcc-4.6.0.orig/gcc/config/sparc/t-linux64   2011-01-03 15:52:22.000000000 -0500
     482+++ gcc-4.6.0/gcc/config/sparc/t-linux64        2011-04-16 15:42:48.195213462 -0400
    470483@@ -26,7 +26,7 @@
    471484 
    … …  
    477490 LIBGCC = stmp-multilib
    478491 INSTALL_LIBGCC = install-multilib
    479 diff -Naur gcc-4.5.2.orig/gcc/config/vax/linux.h gcc-4.5.2/gcc/config/vax/linux.h
    480 --- gcc-4.5.2.orig/gcc/config/vax/linux.h       2009-11-03 19:07:24.000000000 -0500
    481 +++ gcc-4.5.2/gcc/config/vax/linux.h    2011-01-08 13:38:44.099033415 -0500
    482 @@ -44,5 +44,5 @@
     492diff -Naur gcc-4.6.0.orig/gcc/config/vax/linux.h gcc-4.6.0/gcc/config/vax/linux.h
     493--- gcc-4.6.0.orig/gcc/config/vax/linux.h       2010-12-09 20:03:33.000000000 -0500
     494+++ gcc-4.6.0/gcc/config/vax/linux.h    2011-04-16 15:45:53.007213532 -0400
     495@@ -44,7 +44,7 @@
    483496   %{!shared: \
    484497     %{!static: \
    485498       %{rdynamic:-export-dynamic} \
    486 -      %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
    487 +      %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}} \
     499-      -dynamic-linker /lib/ld.so.1} \
     500+      -dynamic-linker /tools/lib/ld.so.1} \
    488501     %{static:-static}}"
    489 diff -Naur gcc-4.5.2.orig/gcc/config/xtensa/linux.h gcc-4.5.2/gcc/config/xtensa/linux.h
    490 --- gcc-4.5.2.orig/gcc/config/xtensa/linux.h    2008-01-17 20:37:53.000000000 -0500
    491 +++ gcc-4.5.2/gcc/config/xtensa/linux.h 2011-01-08 13:38:44.099033415 -0500
    492 @@ -43,7 +43,7 @@
     502 
     503 #undef  WCHAR_TYPE
     504diff -Naur gcc-4.6.0.orig/gcc/config/xtensa/linux.h gcc-4.6.0/gcc/config/xtensa/linux.h
     505--- gcc-4.6.0.orig/gcc/config/xtensa/linux.h    2011-01-14 13:45:06.000000000 -0500
     506+++ gcc-4.6.0/gcc/config/xtensa/linux.h 2011-04-16 15:42:48.195213462 -0400
     507@@ -48,7 +48,7 @@
    493508   %{mlongcalls:--longcalls} \
    494509   %{mno-longcalls:--no-longcalls}"

  • patches/gcc-4.6.0-specs-1.patch

    r8c3f58f r6cefbfb  
    11Submitted By: Joe Ciccone <jciccone@gmail.com>
    2 Date: 01-08-2011
     2Date: 04-16-2011
    33Initial Package Version: 3.4.6
    44Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
    … …  
    99
    1010    Rediffed Against 4.5.2 By Joe Ciccone <jciccone@gmail.com>
     11    Rediffed Against 4.6.0 By Joe Ciccone <jciccone@gmail.com>
    1112
    12 diff -Naur gcc-4.5.2.orig/gcc/config/alpha/gnu.h gcc-4.5.2/gcc/config/alpha/gnu.h
    13 --- gcc-4.5.2.orig/gcc/config/alpha/gnu.h       2009-04-21 15:03:23.000000000 -0400
    14 +++ gcc-4.5.2/gcc/config/alpha/gnu.h    2011-01-08 13:32:34.482662693 -0500
     13diff -Naur gcc-4.6.0.orig/gcc/config/alpha/gnu.h gcc-4.6.0/gcc/config/alpha/gnu.h
     14--- gcc-4.6.0.orig/gcc/config/alpha/gnu.h       2010-10-06 03:49:52.000000000 -0400
     15+++ gcc-4.6.0/gcc/config/alpha/gnu.h    2011-04-16 15:31:47.519213210 -0400
    1516@@ -34,7 +34,7 @@
    1617     } while (0)
    … …  
    2223 #undef STARTFILE_SPEC
    2324 #define STARTFILE_SPEC \
    24 diff -Naur gcc-4.5.2.orig/gcc/config/alpha/linux-elf.h gcc-4.5.2/gcc/config/alpha/linux-elf.h
    25 --- gcc-4.5.2.orig/gcc/config/alpha/linux-elf.h 2007-08-02 06:49:31.000000000 -0400
    26 +++ gcc-4.5.2/gcc/config/alpha/linux-elf.h      2011-01-08 13:32:34.486656575 -0500
     25diff -Naur gcc-4.6.0.orig/gcc/config/alpha/linux-elf.h gcc-4.6.0/gcc/config/alpha/linux-elf.h
     26--- gcc-4.6.0.orig/gcc/config/alpha/linux-elf.h 2010-12-09 08:27:07.000000000 -0500
     27+++ gcc-4.6.0/gcc/config/alpha/linux-elf.h      2011-04-16 15:33:20.991213246 -0400
    2728@@ -27,8 +27,8 @@
    2829 #define EXTRA_SPECS \
    … …  
    3334+#define GLIBC_DYNAMIC_LINKER   "/tools/lib/ld-linux.so.2"
    3435+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
    35  #if UCLIBC_DEFAULT
    36  #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
    37  #else
    38 diff -Naur gcc-4.5.2.orig/gcc/config/arm/linux-eabi.h gcc-4.5.2/gcc/config/arm/linux-eabi.h
    39 --- gcc-4.5.2.orig/gcc/config/arm/linux-eabi.h  2009-10-30 16:03:09.000000000 -0400
    40 +++ gcc-4.5.2/gcc/config/arm/linux-eabi.h       2011-01-08 13:32:34.486656575 -0500
    41 @@ -61,7 +61,7 @@
     36 #if DEFAULT_LIBC == LIBC_UCLIBC
     37 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
     38 #elif DEFAULT_LIBC == LIBC_GLIBC
     39diff -Naur gcc-4.6.0.orig/gcc/config/arm/linux-eabi.h gcc-4.6.0/gcc/config/arm/linux-eabi.h
     40--- gcc-4.6.0.orig/gcc/config/arm/linux-eabi.h  2011-01-12 09:29:14.000000000 -0500
     41+++ gcc-4.6.0/gcc/config/arm/linux-eabi.h       2011-04-16 15:31:47.911213210 -0400
     42@@ -62,7 +62,7 @@
    4243 /* Use ld-linux.so.3 so that it will be possible to run "classic"
    4344    GNU/Linux binaries on an EABI system.  */
    … …  
    4849 /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
    4950    use the GNU/Linux version, not the generic BPABI version.  */
    50 diff -Naur gcc-4.5.2.orig/gcc/config/arm/linux-elf.h gcc-4.5.2/gcc/config/arm/linux-elf.h
    51 --- gcc-4.5.2.orig/gcc/config/arm/linux-elf.h   2009-11-05 09:47:45.000000000 -0500
    52 +++ gcc-4.5.2/gcc/config/arm/linux-elf.h        2011-01-08 13:32:34.486656575 -0500
     51diff -Naur gcc-4.6.0.orig/gcc/config/arm/linux-elf.h gcc-4.6.0/gcc/config/arm/linux-elf.h
     52--- gcc-4.6.0.orig/gcc/config/arm/linux-elf.h   2011-01-14 13:42:32.000000000 -0500
     53+++ gcc-4.6.0/gcc/config/arm/linux-elf.h        2011-04-16 15:31:48.087213212 -0400
    5354@@ -62,7 +62,7 @@
    5455 
    … …  
    5859+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
    5960 
    60  #define LINUX_TARGET_LINK_SPEC  "%{h*} %{version:-v} \
    61     %{b} \
    62 diff -Naur gcc-4.5.2.orig/gcc/config/bfin/linux.h gcc-4.5.2/gcc/config/bfin/linux.h
    63 --- gcc-4.5.2.orig/gcc/config/bfin/linux.h      2009-09-03 11:37:28.000000000 -0400
    64 +++ gcc-4.5.2/gcc/config/bfin/linux.h   2011-01-08 13:32:34.486656575 -0500
     61 #define LINUX_TARGET_LINK_SPEC  "%{h*} \
     62    %{static:-Bstatic} \
     63diff -Naur gcc-4.6.0.orig/gcc/config/bfin/linux.h gcc-4.6.0/gcc/config/bfin/linux.h
     64--- gcc-4.6.0.orig/gcc/config/bfin/linux.h      2010-12-09 08:27:07.000000000 -0500
     65+++ gcc-4.6.0/gcc/config/bfin/linux.h   2011-04-16 15:33:51.791213258 -0400
    6566@@ -45,7 +45,7 @@
    6667   %{shared:-G -Bdynamic} \
    6768   %{!shared: %{!static: \
    6869    %{rdynamic:-export-dynamic} \
    69 -   %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \
    70 +   %{!dynamic-linker:-dynamic-linker /tools/lib/ld-uClibc.so.0}} \
     70-   -dynamic-linker /lib/ld-uClibc.so.0} \
     71+   -dynamic-linker /tools/lib/ld-uClibc.so.0} \
    7172    %{static}} -init __init -fini __fini"
    7273 
    7374 #define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h"
    74 diff -Naur gcc-4.5.2.orig/gcc/config/cris/linux.h gcc-4.5.2/gcc/config/cris/linux.h
    75 --- gcc-4.5.2.orig/gcc/config/cris/linux.h      2009-03-22 11:15:04.000000000 -0400
    76 +++ gcc-4.5.2/gcc/config/cris/linux.h   2011-01-08 13:32:34.486656575 -0500
     75diff -Naur gcc-4.6.0.orig/gcc/config/cris/linux.h gcc-4.6.0/gcc/config/cris/linux.h
     76--- gcc-4.6.0.orig/gcc/config/cris/linux.h      2011-01-14 13:51:46.000000000 -0500
     77+++ gcc-4.6.0/gcc/config/cris/linux.h   2011-04-16 15:31:48.239213212 -0400
    7778@@ -103,7 +103,7 @@
    7879 #undef CRIS_DEFAULT_CPU_VERSION
    … …  
    8283+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    8384 
    84  /* We need an -rpath-link to ld.so.1, and presumably to each directory
    85     specified with -B.  */
    86 diff -Naur gcc-4.5.2.orig/gcc/config/freebsd-spec.h gcc-4.5.2/gcc/config/freebsd-spec.h
    87 --- gcc-4.5.2.orig/gcc/config/freebsd-spec.h    2009-09-22 12:28:26.000000000 -0400
    88 +++ gcc-4.5.2/gcc/config/freebsd-spec.h 2011-01-08 13:32:34.486656575 -0500
    89 @@ -146,7 +146,7 @@
     85 #undef CRIS_LINK_SUBTARGET_SPEC
     86 #define CRIS_LINK_SUBTARGET_SPEC \
     87diff -Naur gcc-4.6.0.orig/gcc/config/freebsd-spec.h gcc-4.6.0/gcc/config/freebsd-spec.h
     88--- gcc-4.6.0.orig/gcc/config/freebsd-spec.h    2011-02-13 19:40:15.000000000 -0500
     89+++ gcc-4.6.0/gcc/config/freebsd-spec.h 2011-04-16 15:31:48.239213212 -0400
     90@@ -131,7 +131,7 @@
    9091 #if FBSD_MAJOR < 6
    9192 #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
    … …  
    9697 
    9798 #if defined(HAVE_LD_EH_FRAME_HDR)
    98 diff -Naur gcc-4.5.2.orig/gcc/config/frv/linux.h gcc-4.5.2/gcc/config/frv/linux.h
    99 --- gcc-4.5.2.orig/gcc/config/frv/linux.h       2007-08-02 06:49:31.000000000 -0400
    100 +++ gcc-4.5.2/gcc/config/frv/linux.h    2011-01-08 13:32:34.486656575 -0500
     99diff -Naur gcc-4.6.0.orig/gcc/config/frv/linux.h gcc-4.6.0/gcc/config/frv/linux.h
     100--- gcc-4.6.0.orig/gcc/config/frv/linux.h       2010-12-09 08:27:07.000000000 -0500
     101+++ gcc-4.6.0/gcc/config/frv/linux.h    2011-04-16 15:31:48.239213212 -0400
    101102@@ -35,7 +35,7 @@
    102103 #define ENDFILE_SPEC \
    … …  
    108109 #undef LINK_SPEC
    109110 #define LINK_SPEC "\
    110 diff -Naur gcc-4.5.2.orig/gcc/config/i386/gnu.h gcc-4.5.2/gcc/config/i386/gnu.h
    111 --- gcc-4.5.2.orig/gcc/config/i386/gnu.h        2008-11-13 18:28:46.000000000 -0500
    112 +++ gcc-4.5.2/gcc/config/i386/gnu.h     2011-01-08 13:32:34.486656575 -0500
     111diff -Naur gcc-4.6.0.orig/gcc/config/i386/gnu.h gcc-4.6.0/gcc/config/i386/gnu.h
     112--- gcc-4.6.0.orig/gcc/config/i386/gnu.h        2011-02-08 14:14:04.000000000 -0500
     113+++ gcc-4.6.0/gcc/config/i386/gnu.h     2011-04-16 15:31:48.239213212 -0400
    113114@@ -21,7 +21,7 @@
    114115 */
    … …  
    120121 #undef TARGET_VERSION
    121122 #define TARGET_VERSION fprintf (stderr, " (i386 GNU)");
    122 diff -Naur gcc-4.5.2.orig/gcc/config/i386/linux.h gcc-4.5.2/gcc/config/i386/linux.h
    123 --- gcc-4.5.2.orig/gcc/config/i386/linux.h      2010-03-24 16:44:48.000000000 -0400
    124 +++ gcc-4.5.2/gcc/config/i386/linux.h   2011-01-08 13:32:34.486656575 -0500
    125 @@ -100,7 +100,7 @@
     123diff -Naur gcc-4.6.0.orig/gcc/config/i386/linux.h gcc-4.6.0/gcc/config/i386/linux.h
     124--- gcc-4.6.0.orig/gcc/config/i386/linux.h      2011-01-14 13:45:06.000000000 -0500
     125+++ gcc-4.6.0/gcc/config/i386/linux.h   2011-04-16 15:31:48.239213212 -0400
     126@@ -92,7 +92,7 @@
    126127 
    127128 /* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */
    … …  
    132133 #undef  ASM_SPEC
    133134 #define ASM_SPEC \
    134 diff -Naur gcc-4.5.2.orig/gcc/config/i386/linux64.h gcc-4.5.2/gcc/config/i386/linux64.h
    135 --- gcc-4.5.2.orig/gcc/config/i386/linux64.h    2010-03-24 16:44:48.000000000 -0400
    136 +++ gcc-4.5.2/gcc/config/i386/linux64.h 2011-01-08 13:32:34.486656575 -0500
    137 @@ -58,8 +58,8 @@
     135diff -Naur gcc-4.6.0.orig/gcc/config/i386/linux64.h gcc-4.6.0/gcc/config/i386/linux64.h
     136--- gcc-4.6.0.orig/gcc/config/i386/linux64.h    2011-03-02 17:35:36.000000000 -0500
     137+++ gcc-4.6.0/gcc/config/i386/linux64.h 2011-04-16 15:31:48.239213212 -0400
     138@@ -62,8 +62,8 @@
    138139    When the -shared link option is used a final link is not being
    139140    done.  */
    … …  
    146147 #if TARGET_64BIT_DEFAULT
    147148 #define SPEC_32 "m32"
    148 diff -Naur gcc-4.5.2.orig/gcc/config/ia64/linux.h gcc-4.5.2/gcc/config/ia64/linux.h
    149 --- gcc-4.5.2.orig/gcc/config/ia64/linux.h      2009-04-21 15:03:23.000000000 -0400
    150 +++ gcc-4.5.2/gcc/config/ia64/linux.h   2011-01-08 13:32:34.486656575 -0500
     149diff -Naur gcc-4.6.0.orig/gcc/config/ia64/linux.h gcc-4.6.0/gcc/config/ia64/linux.h
     150--- gcc-4.6.0.orig/gcc/config/ia64/linux.h      2010-12-09 08:27:07.000000000 -0500
     151+++ gcc-4.6.0/gcc/config/ia64/linux.h   2011-04-16 15:31:48.239213212 -0400
    151152@@ -61,7 +61,7 @@
    152153 /* Define this for shared library support because it isn't in the main
    … …  
    158159 #undef LINK_SPEC
    159160 #define LINK_SPEC "\
    160 diff -Naur gcc-4.5.2.orig/gcc/config/kfreebsd-gnu.h gcc-4.5.2/gcc/config/kfreebsd-gnu.h
    161 --- gcc-4.5.2.orig/gcc/config/kfreebsd-gnu.h    2007-08-02 06:49:31.000000000 -0400
    162 +++ gcc-4.5.2/gcc/config/kfreebsd-gnu.h 2011-01-08 13:32:34.486656575 -0500
     161diff -Naur gcc-4.6.0.orig/gcc/config/kfreebsd-gnu.h gcc-4.6.0/gcc/config/kfreebsd-gnu.h
     162--- gcc-4.6.0.orig/gcc/config/kfreebsd-gnu.h    2007-08-02 06:49:31.000000000 -0400
     163+++ gcc-4.6.0/gcc/config/kfreebsd-gnu.h 2011-04-16 15:31:48.239213212 -0400
    163164@@ -33,5 +33,5 @@
    164165 
    … …  
    168169+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    169170 #endif
    170 diff -Naur gcc-4.5.2.orig/gcc/config/knetbsd-gnu.h gcc-4.5.2/gcc/config/knetbsd-gnu.h
    171 --- gcc-4.5.2.orig/gcc/config/knetbsd-gnu.h     2007-08-02 06:49:31.000000000 -0400
    172 +++ gcc-4.5.2/gcc/config/knetbsd-gnu.h  2011-01-08 13:32:34.486656575 -0500
     171diff -Naur gcc-4.6.0.orig/gcc/config/knetbsd-gnu.h gcc-4.6.0/gcc/config/knetbsd-gnu.h
     172--- gcc-4.6.0.orig/gcc/config/knetbsd-gnu.h     2007-08-02 06:49:31.000000000 -0400
     173+++ gcc-4.6.0/gcc/config/knetbsd-gnu.h  2011-04-16 15:31:48.239213212 -0400
    173174@@ -34,5 +34,5 @@
    174175 
    … …  
    178179+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    179180 #endif
    180 diff -Naur gcc-4.5.2.orig/gcc/config/kopensolaris-gnu.h gcc-4.5.2/gcc/config/kopensolaris-gnu.h
    181 --- gcc-4.5.2.orig/gcc/config/kopensolaris-gnu.h        2009-01-29 13:48:41.000000000 -0500
    182 +++ gcc-4.5.2/gcc/config/kopensolaris-gnu.h     2011-01-08 13:32:34.486656575 -0500
     181diff -Naur gcc-4.6.0.orig/gcc/config/kopensolaris-gnu.h gcc-4.6.0/gcc/config/kopensolaris-gnu.h
     182--- gcc-4.6.0.orig/gcc/config/kopensolaris-gnu.h        2009-01-29 13:48:41.000000000 -0500
     183+++ gcc-4.6.0/gcc/config/kopensolaris-gnu.h     2011-04-16 15:31:48.239213212 -0400
    183184@@ -33,5 +33,5 @@
    184185 
    … …  
    188189+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    189190 #endif
    190 diff -Naur gcc-4.5.2.orig/gcc/config/linux.h gcc-4.5.2/gcc/config/linux.h
    191 --- gcc-4.5.2.orig/gcc/config/linux.h   2009-04-09 11:00:19.000000000 -0400
    192 +++ gcc-4.5.2/gcc/config/linux.h        2011-01-08 13:32:34.486656575 -0500
    193 @@ -117,9 +117,9 @@
     191diff -Naur gcc-4.6.0.orig/gcc/config/linux.h gcc-4.6.0/gcc/config/linux.h
     192--- gcc-4.6.0.orig/gcc/config/linux.h   2011-01-12 09:29:14.000000000 -0500
     193+++ gcc-4.6.0/gcc/config/linux.h        2011-04-16 15:34:53.103213282 -0400
     194@@ -74,9 +74,9 @@
    194195    GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
    195196    GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
    … …  
    201202+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
    202203+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
    203  #define LINUX_DYNAMIC_LINKER \
    204    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
    205  #define LINUX_DYNAMIC_LINKER32 \
    206 diff -Naur gcc-4.5.2.orig/gcc/config/lm32/uclinux-elf.h gcc-4.5.2/gcc/config/lm32/uclinux-elf.h
    207 --- gcc-4.5.2.orig/gcc/config/lm32/uclinux-elf.h        2009-11-11 11:43:06.000000000 -0500
    208 +++ gcc-4.5.2/gcc/config/lm32/uclinux-elf.h     2011-01-08 13:32:34.486656575 -0500
    209 @@ -73,7 +73,7 @@
     204 #define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
     205 #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
     206 #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
     207diff -Naur gcc-4.6.0.orig/gcc/config/lm32/uclinux-elf.h gcc-4.6.0/gcc/config/lm32/uclinux-elf.h
     208--- gcc-4.6.0.orig/gcc/config/lm32/uclinux-elf.h        2011-01-14 13:42:32.000000000 -0500
     209+++ gcc-4.6.0/gcc/config/lm32/uclinux-elf.h     2011-04-16 15:38:23.975213362 -0400
     210@@ -72,7 +72,7 @@
    210211    %{shared:-shared} \
    211212    %{symbolic:-Bsymbolic} \
    212213    %{rdynamic:-export-dynamic} \
    213 -   %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}"
    214 +   %{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux.so.2}"
     214-   -dynamic-linker /lib/ld-linux.so.2"
     215+   -dynamic-linker /tools/lib/ld-linux.so.2"
    215216 
    216217 #define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS()
    217218 
    218 diff -Naur gcc-4.5.2.orig/gcc/config/m32r/linux.h gcc-4.5.2/gcc/config/m32r/linux.h
    219 --- gcc-4.5.2.orig/gcc/config/m32r/linux.h      2007-08-02 06:49:31.000000000 -0400
    220 +++ gcc-4.5.2/gcc/config/m32r/linux.h   2011-01-08 13:32:34.486656575 -0500
    221 @@ -58,7 +58,7 @@
    222  
    223  /* If ELF is the default format, we should not use /lib/elf.  */
     219diff -Naur gcc-4.6.0.orig/gcc/config/m32r/linux.h gcc-4.6.0/gcc/config/m32r/linux.h
     220--- gcc-4.6.0.orig/gcc/config/m32r/linux.h      2011-01-14 13:45:06.000000000 -0500
     221+++ gcc-4.6.0/gcc/config/m32r/linux.h   2011-04-16 15:31:48.395213212 -0400
     222@@ -47,7 +47,7 @@
     223    When the -shared link option is used a final link is not being
     224    done.  */
    224225 
    225226-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
    … …  
    228229 #undef LINK_SPEC
    229230 #if TARGET_LITTLE_ENDIAN
    230 diff -Naur gcc-4.5.2.orig/gcc/config/m68k/linux.h gcc-4.5.2/gcc/config/m68k/linux.h
    231 --- gcc-4.5.2.orig/gcc/config/m68k/linux.h      2009-12-11 10:32:08.000000000 -0500
    232 +++ gcc-4.5.2/gcc/config/m68k/linux.h   2011-01-08 13:32:34.486656575 -0500
    233 @@ -84,7 +84,7 @@
    234  
    235  /* If ELF is the default format, we should not use /lib/elf.  */
     231diff -Naur gcc-4.6.0.orig/gcc/config/m68k/linux.h gcc-4.6.0/gcc/config/m68k/linux.h
     232--- gcc-4.6.0.orig/gcc/config/m68k/linux.h      2011-01-26 15:30:12.000000000 -0500
     233+++ gcc-4.6.0/gcc/config/m68k/linux.h   2011-04-16 15:31:48.395213212 -0400
     234@@ -75,7 +75,7 @@
     235    When the -shared link option is used a final link is not being
     236    done.  */
    236237 
    237238-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
    … …  
    240241 #undef LINK_SPEC
    241242 #define LINK_SPEC "-m m68kelf %{shared} \
    242 diff -Naur gcc-4.5.2.orig/gcc/config/mips/linux.h gcc-4.5.2/gcc/config/mips/linux.h
    243 --- gcc-4.5.2.orig/gcc/config/mips/linux.h      2009-02-20 10:20:38.000000000 -0500
    244 +++ gcc-4.5.2/gcc/config/mips/linux.h   2011-01-08 13:32:34.486656575 -0500
    245 @@ -64,7 +64,7 @@
     243diff -Naur gcc-4.6.0.orig/gcc/config/microblaze/linux.h gcc-4.6.0/gcc/config/microblaze/linux.h
     244--- gcc-4.6.0.orig/gcc/config/microblaze/linux.h        2010-12-09 08:27:07.000000000 -0500
     245+++ gcc-4.6.0/gcc/config/microblaze/linux.h     2011-04-16 15:40:09.295213402 -0400
     246@@ -20,7 +20,7 @@
     247    <http://www.gnu.org/licenses/>.  */
     248 
     249 
     250-#define DYNAMIC_LINKER "/lib/ld.so.1"
     251+#define DYNAMIC_LINKER "/tools/lib/ld.so.1"
     252 #undef  SUBTARGET_EXTRA_SPECS
     253 #define SUBTARGET_EXTRA_SPECS \
     254   { "dynamic_linker", DYNAMIC_LINKER }
     255diff -Naur gcc-4.6.0.orig/gcc/config/mips/linux.h gcc-4.6.0/gcc/config/mips/linux.h
     256--- gcc-4.6.0.orig/gcc/config/mips/linux.h      2011-01-14 13:45:06.000000000 -0500
     257+++ gcc-4.6.0/gcc/config/mips/linux.h   2011-04-16 15:31:48.395213212 -0400
     258@@ -61,7 +61,7 @@
    246259 #undef MIPS_DEFAULT_GVALUE
    247260 #define MIPS_DEFAULT_GVALUE 0
    … …  
    252265 /* Borrowed from sparc/linux.h */
    253266 #undef LINK_SPEC
    254 diff -Naur gcc-4.5.2.orig/gcc/config/mips/linux64.h gcc-4.5.2/gcc/config/mips/linux64.h
    255 --- gcc-4.5.2.orig/gcc/config/mips/linux64.h    2009-02-20 10:20:38.000000000 -0500
    256 +++ gcc-4.5.2/gcc/config/mips/linux64.h 2011-01-08 13:32:34.490657437 -0500
     267diff -Naur gcc-4.6.0.orig/gcc/config/mips/linux64.h gcc-4.6.0/gcc/config/mips/linux64.h
     268--- gcc-4.6.0.orig/gcc/config/mips/linux64.h    2011-01-19 15:39:09.000000000 -0500
     269+++ gcc-4.6.0/gcc/config/mips/linux64.h 2011-04-16 15:35:35.847213298 -0400
    257270@@ -35,10 +35,10 @@
    258271 %{!shared: \
    … …  
    267280+#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld.so.1"
    268281+#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld-uClibc.so.0"
     282 #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
    269283 #define LINUX_DYNAMIC_LINKERN32 \
    270    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
    271  
    272 diff -Naur gcc-4.5.2.orig/gcc/config/mn10300/linux.h gcc-4.5.2/gcc/config/mn10300/linux.h
    273 --- gcc-4.5.2.orig/gcc/config/mn10300/linux.h   2007-08-02 06:49:31.000000000 -0400
    274 +++ gcc-4.5.2/gcc/config/mn10300/linux.h        2011-01-08 13:32:34.490657437 -0500
     284   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
     285diff -Naur gcc-4.6.0.orig/gcc/config/mn10300/linux.h gcc-4.6.0/gcc/config/mn10300/linux.h
     286--- gcc-4.6.0.orig/gcc/config/mn10300/linux.h   2010-12-31 09:34:26.000000000 -0500
     287+++ gcc-4.6.0/gcc/config/mn10300/linux.h        2011-04-16 15:31:48.395213212 -0400
    275288@@ -32,7 +32,7 @@
    276289 #undef  ASM_SPEC
    277  #define ASM_SPEC "%{Wa,*:%*}"
     290 #define ASM_SPEC ""
    278291 
    279292-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
    … …  
    282295 #undef  LINK_SPEC
    283296 #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
    284 diff -Naur gcc-4.5.2.orig/gcc/config/pa/pa-linux.h gcc-4.5.2/gcc/config/pa/pa-linux.h
    285 --- gcc-4.5.2.orig/gcc/config/pa/pa-linux.h     2009-12-04 02:47:51.000000000 -0500
    286 +++ gcc-4.5.2/gcc/config/pa/pa-linux.h  2011-01-08 13:32:34.490657437 -0500
    287 @@ -38,7 +38,7 @@
     297diff -Naur gcc-4.6.0.orig/gcc/config/pa/pa-linux.h gcc-4.6.0/gcc/config/pa/pa-linux.h
     298--- gcc-4.6.0.orig/gcc/config/pa/pa-linux.h     2011-01-26 15:27:04.000000000 -0500
     299+++ gcc-4.6.0/gcc/config/pa/pa-linux.h  2011-04-16 15:31:48.395213212 -0400
     300@@ -39,7 +39,7 @@
    288301 /* Define this for shared library support because it isn't in the main
    289302    linux.h file.  */
    … …  
    294307 #undef LINK_SPEC
    295308 #define LINK_SPEC "\
    296 diff -Naur gcc-4.5.2.orig/gcc/config/rs6000/linux64.h gcc-4.5.2/gcc/config/rs6000/linux64.h
    297 --- gcc-4.5.2.orig/gcc/config/rs6000/linux64.h  2010-11-17 01:09:53.000000000 -0500
    298 +++ gcc-4.5.2/gcc/config/rs6000/linux64.h       2011-01-08 13:32:34.490657437 -0500
    299 @@ -340,10 +340,10 @@
     309diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/linux64.h gcc-4.6.0/gcc/config/rs6000/linux64.h
     310--- gcc-4.6.0.orig/gcc/config/rs6000/linux64.h  2011-03-07 02:50:23.000000000 -0500
     311+++ gcc-4.6.0/gcc/config/rs6000/linux64.h       2011-04-16 15:36:11.471213312 -0400
     312@@ -372,10 +372,10 @@
    300313 #undef LINK_OS_DEFAULT_SPEC
    301314 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
    … …  
    309322+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
    310323+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
    311  #if UCLIBC_DEFAULT
    312  #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
    313  #else
    314 diff -Naur gcc-4.5.2.orig/gcc/config/rs6000/sysv4.h gcc-4.5.2/gcc/config/rs6000/sysv4.h
    315 --- gcc-4.5.2.orig/gcc/config/rs6000/sysv4.h    2010-11-03 09:55:26.000000000 -0400
    316 +++ gcc-4.5.2/gcc/config/rs6000/sysv4.h 2011-01-08 13:32:34.490657437 -0500
    317 @@ -899,8 +899,8 @@
     324 #if DEFAULT_LIBC == LIBC_UCLIBC
     325 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
     326 #elif DEFAULT_LIBC == LIBC_GLIBC
     327diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/sysv4.h gcc-4.6.0/gcc/config/rs6000/sysv4.h
     328--- gcc-4.6.0.orig/gcc/config/rs6000/sysv4.h    2011-03-07 02:50:23.000000000 -0500
     329+++ gcc-4.6.0/gcc/config/rs6000/sysv4.h 2011-04-16 15:37:33.279213342 -0400
     330@@ -818,8 +818,8 @@
    318331 
    319332 #define LINK_START_LINUX_SPEC ""
    … …  
    323336+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    324337+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
    325  #if UCLIBC_DEFAULT
    326  #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
    327  #else
    328 @@ -942,7 +942,7 @@
     338 #if DEFAULT_LIBC == LIBC_UCLIBC
     339 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
     340 #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
     341@@ -863,7 +863,7 @@
    329342 
    330343 #define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \
    331344   %{rdynamic:-export-dynamic} \
    332 -  %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
    333 +  %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}}}"
     345-  -dynamic-linker /lib/ld.so.1}}"
     346+  -dynamic-linker /tools/lib/ld.so.1}}"
    334347 
    335348 #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__   \
    336349 %{!undef:                                                      \
    337 diff -Naur gcc-4.5.2.orig/gcc/config/s390/linux.h gcc-4.5.2/gcc/config/s390/linux.h
    338 --- gcc-4.5.2.orig/gcc/config/s390/linux.h      2007-08-02 06:49:31.000000000 -0400
    339 +++ gcc-4.5.2/gcc/config/s390/linux.h   2011-01-08 13:32:34.490657437 -0500
     350diff -Naur gcc-4.6.0.orig/gcc/config/s390/linux.h gcc-4.6.0/gcc/config/s390/linux.h
     351--- gcc-4.6.0.orig/gcc/config/s390/linux.h      2010-12-09 08:27:07.000000000 -0500
     352+++ gcc-4.6.0/gcc/config/s390/linux.h   2011-04-16 15:31:48.399213212 -0400
    340353@@ -72,8 +72,8 @@
    341354 #define MULTILIB_DEFAULTS { "m31" }
    … …  
    349362 #undef  LINK_SPEC
    350363 #define LINK_SPEC \
    351 diff -Naur gcc-4.5.2.orig/gcc/config/sh/linux.h gcc-4.5.2/gcc/config/sh/linux.h
    352 --- gcc-4.5.2.orig/gcc/config/sh/linux.h        2007-08-02 06:49:31.000000000 -0400
    353 +++ gcc-4.5.2/gcc/config/sh/linux.h     2011-01-08 13:32:34.490657437 -0500
     364diff -Naur gcc-4.6.0.orig/gcc/config/sh/linux.h gcc-4.6.0/gcc/config/sh/linux.h
     365--- gcc-4.6.0.orig/gcc/config/sh/linux.h        2010-12-09 08:27:07.000000000 -0500
     366+++ gcc-4.6.0/gcc/config/sh/linux.h     2011-04-16 15:31:48.399213212 -0400
    354367@@ -47,7 +47,7 @@
    355368 
    … …  
    361374 #undef SUBTARGET_LINK_EMUL_SUFFIX
    362375 #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
    363 diff -Naur gcc-4.5.2.orig/gcc/config/sparc/linux.h gcc-4.5.2/gcc/config/sparc/linux.h
    364 --- gcc-4.5.2.orig/gcc/config/sparc/linux.h     2010-09-22 17:15:37.000000000 -0400
    365 +++ gcc-4.5.2/gcc/config/sparc/linux.h  2011-01-08 13:32:34.490657437 -0500
    366 @@ -83,10 +83,10 @@
    367  
    368  /* If ELF is the default format, we should not use /lib/elf.  */
     376diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux.h gcc-4.6.0/gcc/config/sparc/linux.h
     377--- gcc-4.6.0.orig/gcc/config/sparc/linux.h     2011-01-26 15:30:12.000000000 -0500
     378+++ gcc-4.6.0/gcc/config/sparc/linux.h  2011-04-16 15:31:48.399213212 -0400
     379@@ -71,10 +71,10 @@
     380    When the -shared link option is used a final link is not being
     381    done.  */
    369382 
    370383-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
    … …  
    376389   %{!mno-relax:%{!r:-relax}} \
    377390   %{!shared: \
    378      %{!ibcs: \
    379 diff -Naur gcc-4.5.2.orig/gcc/config/sparc/linux64.h gcc-4.5.2/gcc/config/sparc/linux64.h
    380 --- gcc-4.5.2.orig/gcc/config/sparc/linux64.h   2010-09-22 17:15:37.000000000 -0400
    381 +++ gcc-4.5.2/gcc/config/sparc/linux64.h        2011-01-08 13:32:34.490657437 -0500
    382 @@ -109,8 +109,8 @@
    383  
    384  /* If ELF is the default format, we should not use /lib/elf.  */
     391     %{!static: \
     392diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux64.h gcc-4.6.0/gcc/config/sparc/linux64.h
     393--- gcc-4.6.0.orig/gcc/config/sparc/linux64.h   2011-02-17 08:57:21.000000000 -0500
     394+++ gcc-4.6.0/gcc/config/sparc/linux64.h        2011-04-16 15:31:48.399213212 -0400
     395@@ -101,8 +101,8 @@
     396    When the -shared link option is used a final link is not being
     397    done.  */
    385398 
    386399-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
    … …  
    391404 #ifdef SPARC_BI_ARCH
    392405 
    393 @@ -121,7 +121,7 @@
     406@@ -113,7 +113,7 @@
    394407   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },       \
    395408   { "link_arch",        LINK_ARCH_SPEC },
    … …  
    398411+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/tools/lib %{shared:-shared} \
    399412   %{!shared: \
    400      %{!ibcs: \
    401        %{!static: \
    402 @@ -130,7 +130,7 @@
    403          %{static:-static}}} \
     413     %{!static: \
     414       %{rdynamic:-export-dynamic} \
     415@@ -121,7 +121,7 @@
     416       %{static:-static}} \
    404417 "
    405418 
    … …  
    407420+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/tools/lib64 %{shared:-shared} \
    408421   %{!shared: \
    409      %{!ibcs: \
    410        %{!static: \
    411 @@ -211,7 +211,7 @@
     422     %{!static: \
     423       %{rdynamic:-export-dynamic} \
     424@@ -193,7 +193,7 @@
    412425 #else /* !SPARC_BI_ARCH */
    413426 
    … …  
    416429+#define LINK_SPEC "-m elf64_sparc -Y P,%R/tools/lib64 %{shared:-shared} \
    417430   %{!shared: \
    418      %{!ibcs: \
    419        %{!static: \
    420 diff -Naur gcc-4.5.2.orig/gcc/config/vax/linux.h gcc-4.5.2/gcc/config/vax/linux.h
    421 --- gcc-4.5.2.orig/gcc/config/vax/linux.h       2009-11-03 19:07:24.000000000 -0500
    422 +++ gcc-4.5.2/gcc/config/vax/linux.h    2011-01-08 13:32:34.494657459 -0500
    423 @@ -44,5 +44,5 @@
     431     %{!static: \
     432       %{rdynamic:-export-dynamic} \
     433diff -Naur gcc-4.6.0.orig/gcc/config/vax/linux.h gcc-4.6.0/gcc/config/vax/linux.h
     434--- gcc-4.6.0.orig/gcc/config/vax/linux.h       2010-12-09 20:03:33.000000000 -0500
     435+++ gcc-4.6.0/gcc/config/vax/linux.h    2011-04-16 15:38:05.583213354 -0400
     436@@ -44,7 +44,7 @@
    424437   %{!shared: \
    425438     %{!static: \
    426439       %{rdynamic:-export-dynamic} \
    427 -      %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
    428 +      %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}} \
     440-      -dynamic-linker /lib/ld.so.1} \
     441+      -dynamic-linker /tools/lib/ld.so.1} \
    429442     %{static:-static}}"
    430 diff -Naur gcc-4.5.2.orig/gcc/config/xtensa/linux.h gcc-4.5.2/gcc/config/xtensa/linux.h
    431 --- gcc-4.5.2.orig/gcc/config/xtensa/linux.h    2008-01-17 20:37:53.000000000 -0500
    432 +++ gcc-4.5.2/gcc/config/xtensa/linux.h 2011-01-08 13:32:34.494657459 -0500
    433 @@ -43,7 +43,7 @@
     443 
     444 #undef  WCHAR_TYPE
     445diff -Naur gcc-4.6.0.orig/gcc/config/xtensa/linux.h gcc-4.6.0/gcc/config/xtensa/linux.h
     446--- gcc-4.6.0.orig/gcc/config/xtensa/linux.h    2011-01-14 13:45:06.000000000 -0500
     447+++ gcc-4.6.0/gcc/config/xtensa/linux.h 2011-04-16 15:31:48.399213212 -0400
     448@@ -48,7 +48,7 @@
    434449   %{mlongcalls:--longcalls} \
    435450   %{mno-longcalls:--no-longcalls}"
Note: See TracChangeset for help on using the changeset viewer.