Changeset 97c7682 in mainline for tools/toolchain.sh

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

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

tools/toolchain.sh

@@ -55 +55 @@
 BINUTILS_VERSION="2.22"
 BINUTILS_RELEASE=""
-GCC_VERSION="4.7.0"
+GCC_VERSION="4.7.1"
 GDB_VERSION="7.4"
 
@@ -149 +149 @@
         echo " sparc64    SPARC V9"
         echo " all        build all targets"
-        echo " parallel   same as 'all', but in parallel"
+        echo " parallel   same as 'all', but all in parallel"
+        echo " 2-way      same as 'all', but 2-way parallel"
         echo
         echo "The toolchain will be installed to the directory specified by"
@@ -273 +274 @@
         
         download_fetch "${BINUTILS_SOURCE}" "${BINUTILS}" "ee0f10756c84979622b992a4a61ea3f5"
-        download_fetch "${GCC_SOURCE}" "${GCC}" "2a0f1d99fda235c29d40b561f81d9a77"
+        download_fetch "${GCC_SOURCE}" "${GCC}" "933e6f15f51c031060af64a9e14149ff"
         download_fetch "${GDB_SOURCE}" "${GDB}" "95a9a8305fed4d30a30a6dc28ff9d060"
 }
@@ -318 +319 @@
         
         change_title "binutils: configure (${PLATFORM})"
-        CFLAGS=-Wno-error ./configure "--target=${TARGET}" "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" --disable-nls
+        CFLAGS=-Wno-error ./configure "--target=${TARGET}" "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" --disable-nls --disable-werror
         check_error $? "Error configuring binutils."
         
@@ -330 +331 @@
         
         change_title "GCC: configure (${PLATFORM})"
-        "${GCCDIR}/configure" "--target=${TARGET}" "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" --with-gnu-as --with-gnu-ld --disable-nls --disable-threads --enable-languages=c,objc,c++,obj-c++ --disable-multilib --disable-libgcj --without-headers --disable-shared --enable-lto
+        "${GCCDIR}/configure" "--target=${TARGET}" "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" --with-gnu-as --with-gnu-ld --disable-nls --disable-threads --enable-languages=c,objc,c++,obj-c++ --disable-multilib --disable-libgcj --without-headers --disable-shared --enable-lto --disable-werror
         check_error $? "Error configuring GCC."
         
@@ -431 +432 @@
                 wait
                 ;;
+        "2-way")
+                prepare
+                build_target "amd64" "amd64-linux-gnu" &
+                build_target "arm32" "arm-linux-gnueabi" &
+                wait
+                
+                build_target "ia32" "i686-pc-linux-gnu" &
+                build_target "ia64" "ia64-pc-linux-gnu" &
+                wait
+                
+                build_target "mips32" "mipsel-linux-gnu" &
+                build_target "mips32eb" "mips-linux-gnu" &
+                wait
+                
+                build_target "mips64" "mips64el-linux-gnu" &
+                build_target "ppc32" "ppc-linux-gnu" &
+                wait
+                
+                build_target "ppc64" "ppc64-linux-gnu" &
+                build_target "sparc64" "sparc64-linux-gnu" &
+                wait
+                ;;
         *)
                 show_usage