X-Git-Url: https://git.gag.com/?p=fw%2Fcortex-toolchain;a=blobdiff_plain;f=summon-arm-toolchain;h=fe9e58ad4049f248c2e9b743ff79f943efdd2704;hp=f1ddff04fa21a80dcc6e93ee49873c8aafe77851;hb=d1fe6940a33afa4d4dc83d1429bcb66c5740b967;hpb=97d03426e4ac528d0b30d70bc40db54f903d8194

diff --git a/summon-arm-toolchain b/summon-arm-toolchain
index f1ddff0..fe9e58a 100755
--- a/summon-arm-toolchain
+++ b/summon-arm-toolchain
@@ -19,8 +19,7 @@ set -e
 # You probably want to customize those
 ##############################################################################
 TARGET=arm-none-eabi		# Or: TARGET=arm-elf
-PREFIX=${HOME}/arm-none-eabi	# Install location of your final toolchain
-PARALLEL=			# Or: PARALLEL="-j 5" for 4 CPUs
+PREFIX=${HOME}/sat	# Install location of your final toolchain
 DARWIN_OPT_PATH=/opt/local	# Path in which MacPorts or Fink is installed
 # Set to 'sudo' if you need superuser privileges while installing
 SUDO=
@@ -62,6 +61,10 @@ LIBOPENSTM32=master
 # Flags section
 ##############################################################################
 
+CPUS=$(getconf _NPROCESSORS_ONLN)
+PARALLEL=-j$((CPUS + 1))
+echo "${CPUS} cpu's detected running make with '${PARALLEL}' flag"
+
 GDBFLAGS=
 BINUTILFLAGS=
 
@@ -69,7 +72,7 @@ if [ ${DEFAULT_TO_CORTEX_M3} == 0 ] ; then
 	GCCFLAGS=
 else
 	# To default to the Cortex-M3:
-	GCCFLAGS="--with-arch=armv7-m --with-mode=thumb"
+	GCCFLAGS="--with-arch=armv7-m --with-mode=thumb --with-float=soft"
 fi
 
 # Pull in the local configuration, if any
@@ -91,6 +94,35 @@ SUMMON_DIR=$(pwd)
 SOURCES=${SUMMON_DIR}/sources
 STAMPS=${SUMMON_DIR}/stamps
 
+
+##############################################################################
+# Tool section
+##############################################################################
+TAR=tar
+
+##############################################################################
+# OS and Tooldetection section
+# Detects which tools and flags to use
+##############################################################################
+
+case "$(uname)" in
+	Linux)
+	echo "Found Linux OS."
+	;;
+	Darwin)
+	echo "Found Darwin OS."
+	GCCFLAGS="${GCCFLAGS} \
+                  --with-gmp=${DARWIN_OPT_PATH} \
+	          --with-mpfr=${DARWIN_OPT_PATH} \
+	          --with-mpc=${DARWIN_OPT_PATH} \
+		  -with-libiconv-prefix=${DARWIN_OPT_PATH}"
+	;;
+	*)
+	echo "Found unknown OS. Aborting!"
+	exit 1
+	;;
+esac
+
 ##############################################################################
 # Building section
 # You probably don't have to touch anything after this
@@ -116,7 +148,23 @@ function log {
 function unpack {
     log Unpacking $*
     # Use 'auto' mode decompression.  Replace with a switch if tar doesn't support -a
-    tar xaf${TARFLAGS} ${SOURCES}/$1.tar.*
+    ARCHIVE=$(ls ${SOURCES}/$1.tar.*)
+    case ${ARCHIVE} in
+	*.bz2)
+	    echo "archive type bz2"
+	    TYPE=j
+	    ;;
+	*.gz)
+	    echo "archive type gz"
+	    TYPE=z
+	    ;;
+	*)
+	    echo "Unknown archive type of $1"
+	    echo ${ARCHIVE}
+	    exit 1
+	    ;;
+    esac
+    ${TAR} xf${TYPE}${TARFLAGS} ${SOURCES}/$1.tar.*
 }
 
 # Install a build
@@ -125,23 +173,6 @@ function install {
     ${SUDO} make ${MAKEFLAGS} $2 $3 $4 $5 $6 $7 $8
 }
 
-case "$(uname)" in
-	Linux)
-	echo "Found Linux OS."
-	;;
-	Darwin)
-	echo "Found Darwin OS."
-	GCCFLAGS="${GCCFLAGS} \
-                  --with-gmp=${DARWIN_OPT_PATH} \
-	          --with-mpfr=${DARWIN_OPT_PATH} \
-	          --with-mpc=${DARWIN_OPT_PATH} \
-		  -with-libiconv-prefix=${DARWIN_OPT_PATH}"
-	;;
-	*)
-	echo "Found unknown OS. Aborting!"
-	exit 1
-	;;
-esac
 
 mkdir -p ${STAMPS} ${SOURCES}
 
@@ -240,6 +271,7 @@ if [ ! -e ${STAMPS}/${GCC}-boot.build ]; then
                       --with-gnu-ld \
                       --disable-nls \
                       --disable-werror \
+		      --with-system-zlib \
 		      ${GCCFLAGS}
     log "Building ${GCC}-boot"
     make ${MAKEFLAGS} all-gcc
@@ -262,9 +294,10 @@ if [ ! -e ${STAMPS}/${NEWLIB}.build ]; then
                          --with-gnu-ld \
                          --disable-nls \
                          --disable-werror \
-                         --disable-newlib-supplied-syscalls
+                         --disable-newlib-supplied-syscalls \
+			 --with-float=soft
     log "Building ${NEWLIB}"
-    make ${MAKEFLAGS}
+    make ${MAKEFLAGS} CFLAGS_FOR_TARGET="-msoft-float" CCASFLAGS="-msoft-float"
     install ${NEWLIB} install
     cd ..
     log "Cleaning up ${NEWLIB}"
@@ -288,6 +321,7 @@ if [ ! -e ${STAMPS}/${GCC}.build ]; then
                       --with-gnu-ld \
 		      --disable-nls \
                       --disable-werror \
+                      --with-system-zlib \
 	 	     ${GCCFLAGS}
     log "Building ${GCC}"
     make ${MAKEFLAGS}
@@ -318,7 +352,7 @@ if [ ! -e ${STAMPS}/${GDB}.build ]; then
 fi
 
 if [ ${LIBSTM32_EN} != 0 ]; then
-if [ ! -e .libcmsis-${LIBCMSIS}.build ]; then
+if [ ! -e ${STAMPS}/libcmsis-${LIBCMSIS}.build ]; then
     unpack libcmsis-${LIBCMSIS}
     cd libcmsis-${LIBCMSIS}
     log "Building libcmsis-${LIBCMSIS}"
@@ -326,11 +360,11 @@ if [ ! -e .libcmsis-${LIBCMSIS}.build ]; then
     install libcmsis-${LIBCMSIS} arch_prefix=${TARGET} prefix=${PREFIX} install
     cd ..
     log "Cleaning up libcmsis-${LIBCMSIS}"
-    touch .libcmsis-${LIBCMSIS}.build
+    touch ${STAMPS}/libcmsis-${LIBCMSIS}.build
     rm -rf libcmsis-${LIBCMSIS}
 fi
 
-if [ ! -e .libstm32-${LIBSTM32}.build ]; then
+if [ ! -e ${STAMPS}/libstm32-${LIBSTM32}.build ]; then
     unpack libstm32-${LIBSTM32}
     cd libstm32-${LIBSTM32}
     log "Building libstm32-${LIBSTM32}"
@@ -338,11 +372,11 @@ if [ ! -e .libstm32-${LIBSTM32}.build ]; then
     install libstm32-${LIBSTM32} arch_prefix=${TARGET} prefix=${PREFIX} install
     cd ..
     log "Cleaning up libstm32-${LIBSTM32}"
-    touch .libstm32-${LIBSTM32}.build
+    touch ${STAMPS}/libstm32-${LIBSTM32}.build
     rm -rf libstm32-${LIBSTM32}
 fi
 
-if [ ! -e .libstm32usb-${LIBSTM32USB}.build ]; then
+if [ ! -e ${STAMPS}/libstm32usb-${LIBSTM32USB}.build ]; then
     unpack libstm32usb-${LIBSTM32USB}
     cd libstm32usb-${LIBSTM32USB}
     log "Building libstm32usb-${LIBSTM32USB}"
@@ -350,12 +384,13 @@ if [ ! -e .libstm32usb-${LIBSTM32USB}.build ]; then
     install libstm32usb-${LIBSTM32USB} arch_prefix=${TARGET} prefix=${PREFIX} install
     cd ..
     log "Cleaning up libstm32usb-${LIBSTM32USB}"
-    touch .libstm32usb-${LIBSTM32USB}.build
+    touch ${STAMPS}/libstm32usb-${LIBSTM32USB}.build
     rm -rf libstm32usb-${LIBSTM32USB}
 fi
 fi
 
 if [ $LIBOPENSTM32_EN != 0 ]; then
+if [ ! -e ${STAMPS}/libopenstm32-${LIBOPENSTM32}.build ]; then
     unpack libopenstm32-${LIBOPENSTM32}
     cd libopenstm32-${LIBOPENSTM32}
     log "Building libopenstm32-${LIBOPENSTM32}"
@@ -363,6 +398,7 @@ if [ $LIBOPENSTM32_EN != 0 ]; then
     install libopenstm32-${LIBOPENSTM32} PREFIX=${TARGET} DESTDIR=${PREFIX} install
     cd ..
     log "Cleaning up libopenstm32-${LIBOPENSTM32}"
-    touch .libopenstm32-${LIBOPENSTM32}.build
+    touch ${STAMPS}/libopenstm32-${LIBOPENSTM32}.build
     rm -rf libopenstm32-${LIBOPENSTM32}
 fi
+fi