X-Git-Url: https://git.gag.com/?p=fw%2Fcortex-toolchain;a=blobdiff_plain;f=summon-arm-toolchain;h=a607a8850a14d44232866efcf9e7a0f16b629b00;hp=2dfbd7c0acf0561dbb52db09d6eb4d129efeaf54;hb=78c5171a90fa0b4570722a466efb0453f46c0a6f;hpb=5789834245c6e9b6294453d4912d5f52fe406f35

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index 2dfbd7c..a607a88 100755
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -26,13 +26,13 @@ SUDO=
 # Set to 1 to be quieter while running
 QUIET=0
 # Set to 1 to use linaro gcc instead of the FSF gcc
-USE_LINARO=0
+USE_LINARO=1
 # Set to 1 to enable building of OpenOCD
 OOCD_EN=1
 # Set to 1 to build libstm32 provided by ST
 LIBSTM32_EN=0
 # Set to 1 to build libopenstm32 an open source library for stm32
-LIBOPENSTM32_EN=0
+LIBOPENSTM32_EN=1
 # Make the gcc default to Cortex-M3
 DEFAULT_TO_CORTEX_M3=0
 
@@ -41,19 +41,19 @@ DEFAULT_TO_CORTEX_M3=0
 ##############################################################################
 if [ ${USE_LINARO} == 0 ] ; then
 	# For FSF GCC:
-	GCCVERSION=4.5.1
+	GCCVERSION=4.5.2
 	GCC=gcc-${GCCVERSION}
 	GCCURL=http://ftp.gnu.org/gnu/gcc/${GCC}/${GCC}.tar.gz
 else
 	# For the Linaro GCC:
-	GCCRELEASE=4.5-2010.11-0
-	GCCVERSION=4.5-2010.11-1
+	GCCRELEASE=4.5-2011.01-1
+	GCCVERSION=4.5-2011.01-1
 	GCC=gcc-linaro-${GCCVERSION}
 	GCCURL=http://launchpad.net/gcc-linaro/4.5/${GCCRELEASE}/+download/${GCC}.tar.bz2
 fi
 
-BINUTILS=binutils-2.20
-NEWLIB=newlib-1.18.0
+BINUTILS=binutils-2.21
+NEWLIB=newlib-1.19.0
 GDB=gdb-7.2
 OOCD=master
 LIBCMSIS=v1.10-2
@@ -123,7 +123,7 @@ case "$(uname)" in
                   --with-gmp=${DARWIN_OPT_PATH} \
 	          --with-mpfr=${DARWIN_OPT_PATH} \
 	          --with-mpc=${DARWIN_OPT_PATH} \
-		  -with-libiconv-prefix=${DARWIN_OPT_PATH}"
+		  --with-libiconv-prefix=${DARWIN_OPT_PATH}"
 	OOCD_CFLAGS="-m32 -I/opt/mine/include -I/opt/local/include"
 	OOCD_LDFLAGS="-L/opt/mine/lib -L/opt/local/lib"
 	;;
@@ -383,8 +383,8 @@ if [ ! -e ${STAMPS}/openocd-${OOCD}.build ]; then
     unpack openocd-${OOCD}
     cd build
     log "Configuring openocd-${OOCD}"
-    export CFLAGS="${OOCD_CFLAGS}"
-    export LDFLAGS="${OOCD_LDFLAGS}"
+    CFLAGS="${CFLAGS} ${OOCD_CFLAGS}" \
+    LDFLAGS="${LDFLAGS} ${OOCD_LDFLAGS}" \
     ../openocd-${OOCD}/configure --enable-maintainer-mode \
                       --prefix=${PREFIX} \
                       --enable-dummy \