Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset fbcfc4da in mainline for contrib/toolchain.sh


Ignore:
Timestamp:
2009-12-03T19:25:17Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
9510be2
Parents:
cb3d641a (diff), 22e6802 (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 mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • contrib/toolchain.sh

    rcb3d641a rfbcfc4da  
    9292}
    9393
     94patch_binutils() {
     95        PLATFORM="$1"
     96       
     97        if [ "${PLATFORM}" == "arm32" ] ; then
     98                patch -p1 <<EOF
     99diff -Naur binutils-2.20.orig/gas/config/tc-arm.c binutils-2.20/gas/config/tc-arm.c
     100--- binutils-2.20.orig/gas/config/tc-arm.c      2009-08-30 00:10:59.000000000 +0200
     101+++ binutils-2.20/gas/config/tc-arm.c   2009-11-02 14:25:11.000000000 +0100
     102@@ -2485,8 +2485,9 @@
     103       know (frag->tc_frag_data.first_map == NULL);
     104       frag->tc_frag_data.first_map = symbolP;
     105     }
     106-  if (frag->tc_frag_data.last_map != NULL)
     107+  if (frag->tc_frag_data.last_map != NULL) {
     108     know (S_GET_VALUE (frag->tc_frag_data.last_map) < S_GET_VALUE (symbolP));
     109+  }
     110   frag->tc_frag_data.last_map = symbolP;
     111 }
     112EOF
     113                check_error $? "Error patching binutils"
     114        fi
     115}
     116
    94117build_target() {
    95118        PLATFORM="$1"
    96119        TARGET="$2"
    97120       
    98         BINUTILS_VERSION="2.19.1"
    99         GCC_VERSION="4.4.1"
     121        BINUTILS_VERSION="2.20"
     122        GCC_VERSION="4.4.2"
    100123       
    101124        BINUTILS="binutils-${BINUTILS_VERSION}.tar.bz2"
     
    119142       
    120143        echo ">>> Downloading tarballs"
    121         download_check "${BINUTILS_SOURCE}" "${BINUTILS}" "09a8c5821a2dfdbb20665bc0bd680791"
    122         download_check "${GCC_SOURCE}" "${GCC_CORE}" "d19693308aa6b2052e14c071111df59f"
    123         download_check "${GCC_SOURCE}" "${GCC_OBJC}" "f7b2a606394036e81433b2f4c3251cba"
    124         download_check "${GCC_SOURCE}" "${GCC_CPP}" "d449047b5761348ceec23739f5553e0b"
     144        download_check "${BINUTILS_SOURCE}" "${BINUTILS}" "ee2d3e996e9a2d669808713360fa96f8"
     145        download_check "${GCC_SOURCE}" "${GCC_CORE}" "d50ec5af20508974411d0c83c5f4e396"
     146        download_check "${GCC_SOURCE}" "${GCC_OBJC}" "d8d26187d386a0591222a580b5a5b3d3"
     147        download_check "${GCC_SOURCE}" "${GCC_CPP}" "43b1e4879eb282dc4b05e4c016d356d7"
    125148       
    126149        echo ">>> Removing previous content"
     
    142165        cd "${BINUTILSDIR}"
    143166        check_error $? "Change directory failed."
     167        patch_binutils "${PLATFORM}"
    144168        ./configure "--target=${TARGET}" "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" "--disable-nls"
    145169        check_error $? "Error configuring binutils."
Note: See TracChangeset for help on using the changeset viewer.