Changeset 85f2064 in mainline for tools/toolchain.sh

Timestamp:

2012-04-12T14:21:46Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bb8f69d

Parents:

751cabc (diff), d11a181 (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:

• tools/toolchain.sh (modified) (7 diffs)

tools/toolchain.sh

@@ -55 +55 @@
 BINUTILS_VERSION="2.22"
 BINUTILS_RELEASE=""
-GCC_VERSION="4.6.3"
+GCC_VERSION="4.7.0"
 GDB_VERSION="7.4"
 
 BASEDIR="`pwd`"
 BINUTILS="binutils-${BINUTILS_VERSION}${BINUTILS_RELEASE}.tar.bz2"
-GCC_CORE="gcc-core-${GCC_VERSION}.tar.bz2"
-GCC_OBJC="gcc-objc-${GCC_VERSION}.tar.bz2"
-GCC_CPP="gcc-g++-${GCC_VERSION}.tar.bz2"
+GCC="gcc-${GCC_VERSION}.tar.bz2"
 GDB="gdb-${GDB_VERSION}.tar.bz2"
 
@@ -275 +273 @@
         
         download_fetch "${BINUTILS_SOURCE}" "${BINUTILS}" "ee0f10756c84979622b992a4a61ea3f5"
-        download_fetch "${GCC_SOURCE}" "${GCC_CORE}" "766091220c6a14fcaa2c06dd573e3758"
-        download_fetch "${GCC_SOURCE}" "${GCC_OBJC}" "48ba23770c34b1cb468f72618b4452c5"
-        download_fetch "${GCC_SOURCE}" "${GCC_CPP}" "37515158a0fb3d0800ec41a08c05e69e"
+        download_fetch "${GCC_SOURCE}" "${GCC}" "2a0f1d99fda235c29d40b561f81d9a77"
         download_fetch "${GDB_SOURCE}" "${GDB}" "95a9a8305fed4d30a30a6dc28ff9d060"
 }
@@ -299 +295 @@
         echo ">>> Downloading tarballs"
         source_check "${BASEDIR}/${BINUTILS}"
-        source_check "${BASEDIR}/${GCC_CORE}"
-        source_check "${BASEDIR}/${GCC_OBJC}"
-        source_check "${BASEDIR}/${GCC_CPP}"
+        source_check "${BASEDIR}/${GCC}"
         source_check "${BASEDIR}/${GDB}"
         
@@ -316 +310 @@
         
         unpack_tarball "${BASEDIR}/${BINUTILS}" "binutils"
-        unpack_tarball "${BASEDIR}/${GCC_CORE}" "GCC Core"
-        unpack_tarball "${BASEDIR}/${GCC_OBJC}" "Objective C"
-        unpack_tarball "${BASEDIR}/${GCC_CPP}" "C++"
+        unpack_tarball "${BASEDIR}/${GCC}" "GCC"
         unpack_tarball "${BASEDIR}/${GDB}" "GDB"
         
@@ -378 +370 @@
         "arm32")
                 prepare
-                build_target "arm32" "arm-linux-gnu"
+                build_target "arm32" "arm-linux-gnueabi"
                 ;;
         "ia32")
@@ -415 +407 @@
                 prepare
                 build_target "amd64" "amd64-linux-gnu"
-                build_target "arm32" "arm-linux-gnu"
+                build_target "arm32" "arm-linux-gnueabi"
                 build_target "ia32" "i686-pc-linux-gnu"
                 build_target "ia64" "ia64-pc-linux-gnu"
@@ -428 +420 @@
                 prepare
                 build_target "amd64" "amd64-linux-gnu" &
-                build_target "arm32" "arm-linux-gnu" &
+                build_target "arm32" "arm-linux-gnueabi" &
                 build_target "ia32" "i686-pc-linux-gnu" &
                 build_target "ia64" "ia64-pc-linux-gnu" &