X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=util%2Fcrossgcc%2Fbuildgcc;h=891819137dc9eaba8396e5cd3da00407d04e56ba;hb=1200ec5a532220b3349d97de1b91f860ae2d2de2;hp=d33c6e94f9ecf1d49261dbdd0ce0e330a1807091;hpb=5f1ad890203748e8440101edbd72ab12ff44a9b8;p=coreboot.git

diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index d33c6e94f..891819137 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -1,9 +1,11 @@
-#!/bin/bash
+#!/bin/sh
 #
 # Copyright (C) 2008-2010 by coresystems GmbH
 # written by Patrick Georgi <patrick.georgi@coresystems.de> and
 #            Stefan Reinauer <stefan.reinauer@coresystems.de>
 #
+# Copyright (C) 2011 by Sage Electronic Engineering
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License.
@@ -15,11 +17,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA
 #
 
-CROSSGCC_DATE="March 29th, 2010"
-CROSSGCC_VERSION="1.0"
+CROSSGCC_DATE="November 1st, 2011"
+CROSSGCC_VERSION="1.07"
 
 # default settings
 TARGETDIR=`pwd`/xgcc
@@ -27,26 +29,34 @@ TARGETARCH=i386-elf
 DESTDIR=
 
 # version numbers
-GMP_VERSION=5.0.1
-MPFR_VERSION=2.4.2
-MPC_VERSION=0.8.2
+GMP_VERSION=5.0.2
+MPFR_VERSION=3.1.0
+MPC_VERSION=0.9
 LIBELF_VERSION=0.8.13
-GCC_VERSION=4.5.0 # enable for Link Time Optimization & Co
-BINUTILS_VERSION=2.20.1
-GDB_VERSION=7.1
-W32API_VERSION=3.14
+GCC_VERSION=4.6.2
+GCC_AUTOCONF_VERSION=2.64
+BINUTILS_VERSION=2.21.1
+GDB_VERSION=7.3.1
+W32API_VERSION=3.17-2
+W32API_VERSION_SHORT=3.17
 MINGWRT_VERSION=3.18
+IASL_VERSION=20110922
+PYTHON_VERSION=2.7.2
+EXPAT_VERSION=2.0.1
 
 # archive locations
 GMP_ARCHIVE="ftp://ftp.gmplib.org/pub/gmp-${GMP_VERSION}/gmp-${GMP_VERSION}.tar.bz2"
 MPFR_ARCHIVE="http://www.mpfr.org/mpfr-${MPFR_VERSION}/mpfr-${MPFR_VERSION}.tar.bz2"
 MPC_ARCHIVE="http://www.multiprecision.org/mpc/download/mpc-${MPC_VERSION}.tar.gz"
 LIBELF_ARCHIVE="http://www.mr511.de/software/libelf-${LIBELF_VERSION}.tar.gz"
-GCC_ARCHIVE="ftp://ftp.gwdg.de/pub/gnu/ftp/gnu/gcc/gcc-${GCC_VERSION}/gcc-core-${GCC_VERSION}.tar.bz2"
+GCC_ARCHIVE="ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-${GCC_VERSION}/gcc-core-${GCC_VERSION}.tar.bz2"
 BINUTILS_ARCHIVE="http://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_VERSION}.tar.bz2"
 GDB_ARCHIVE="http://ftp.gnu.org/gnu/gdb/gdb-${GDB_VERSION}.tar.bz2"
-W32API_ARCHIVE="http://downloads.sourceforge.net/project/mingw/MinGW%20API%20for%20MS-Windows/w32api-${W32API_VERSION}/w32api-${W32API_VERSION}-mingw32-src.tar.gz"
-MINGWRT_ARCHIVE="http://downloads.sourceforge.net/project/mingw/MinGW%20Runtime/mingwrt-${MINGWRT_VERSION}/mingwrt-${MINGWRT_VERSION}-mingw32-src.tar.gz"
+W32API_ARCHIVE="http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/Win32-API/w32api-${W32API_VERSION_SHORT}/w32api-${W32API_VERSION}-mingw32-src.tar.lzma"
+MINGWRT_ARCHIVE="http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/mingwrt-${MINGWRT_VERSION}/mingwrt-${MINGWRT_VERSION}-mingw32-src.tar.gz"
+IASL_ARCHIVE="http://www.acpica.org/download/acpica-unix-${IASL_VERSION}.tar.gz"
+PYTHON_ARCHIVE="http://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.bz2"
+EXPAT_ARCHIVE="http://downloads.sourceforge.net/sourceforge/expat/expat-${EXPAT_VERSION}.tar.gz"
 
 GMP_DIR="gmp-${GMP_VERSION}"
 MPFR_DIR="mpfr-${MPFR_VERSION}"
@@ -57,18 +67,23 @@ BINUTILS_DIR="binutils-${BINUTILS_VERSION}"
 GDB_DIR="gdb-${GDB_VERSION}"
 W32API_DIR="w32api-${W32API_VERSION}-mingw32"
 MINGWRT_DIR="mingwrt-${MINGWRT_VERSION}-mingw32"
+IASL_DIR="acpica-unix-${IASL_VERSION}"
+PYTHON_DIR="Python-${PYTHON_VERSION}"
+EXPAT_DIR="expat-${EXPAT_VERSION}"
 
 SAVETEMPS=0
-
-red='\e[0;31m'
-RED='\e[1;31m'
-green='\e[0;32m'
-GREEN='\e[1;32m'
-blue='\e[0;34m'
-BLUE='\e[1;34m'
-cyan='\e[0;36m'
-CYAN='\e[1;36m'
-NC='\e[0m' # No Color
+SKIPGDB=1
+SKIPPYTHON=1
+
+red='\033[0;31m'
+RED='\033[1;31m'
+green='\033[0;32m'
+GREEN='\033[1;32m'
+blue='\033[0;34m'
+BLUE='\033[1;34m'
+cyan='\033[0;36m'
+CYAN='\033[1;36m'
+NC='\033[0m' # No Color
 
 searchgnu()
 {
@@ -77,7 +92,8 @@ searchgnu()
 	#         or no output if no GNU version was found
 	for i in "$1" "g$1" "gnu$1"; do
 		if test -x "`which $i 2>/dev/null`"; then
-			if test `$i --version 2>/dev/null |grep -c GNU` -gt 0; then
+			if test `$i --version 2>/dev/null |grep -c GNU` \
+			    -gt 0; then
 				echo $i
 				return
 			fi
@@ -87,20 +103,21 @@ searchgnu()
 	exit 1
 }
 
-TAR=`searchgnu tar`
-PATCH=`searchgnu patch`
-MAKE=`searchgnu make`
+TAR=`searchgnu tar` || exit $?
+PATCH=`searchgnu patch` || exit $?
+MAKE=`searchgnu make` || exit $?
 
 cleanup()
 {
 	printf "Cleaning up temporary files... "
-	rm -rf build-* combined gcc-* gmp-* mpfr-* mpc-* libelf-* binutils-* gdb-* w32api-* mingwrt-*
+	rm -rf build-* combined gcc-* gmp-* mpfr-* mpc-* libelf-* binutils-*
+	rm -rf gdb-* w32api-* mingwrt-* acpica-* python-* expat-*
 	printf "${green}ok${NC}\n"
 }
 
 myhelp()
 {
-	printf "Usage: $0 [-V] [-c] [-p <platform>] [-d <target directory>] [-D <dest dir>]\n"
+	printf "Usage: $0 [-V] [-c] [-p <platform>] [-d <target directory>] [-D <dest dir>] [-G] [-S]\n"
 	printf "       $0 [-V|--version]\n"
 	printf "       $0 [-h|--help]\n\n"
 
@@ -115,7 +132,9 @@ myhelp()
 	printf "    [-d|--directory <target dir>] target directory to install cross compiler to\n"
 	printf "                                  (defaults to $TARGETDIR)\n\n"
 	printf "    [-D|--destdir <dest dir>]     destination directory to install cross compiler to\n"
-	printf "                                  (for RPM builds, default unset)\n\n"
+	printf "                                  (for RPM builds, default unset)\n"
+	printf "    [-G|--gdb]                    build GNU debugger\n"
+	printf "    [-S|--scripting]              build scripting support for GDB\n\n"
 }
 
 myversion()
@@ -124,6 +143,7 @@ myversion()
 
 	cat << EOF
 Copyright (C) 2008-2010 by coresystems GmbH
+Copyright (C) 2011 by Sage Electronic Engineering
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -137,21 +157,21 @@ GNU General Public License for more details.
 EOF
 }
 
-printf "${blue}Welcome to the ${red}coresystems${blue} cross toolchain builder v$CROSSGCC_VERSION ($CROSSGCC_DATE)${NC}\n\n"
+printf "${blue}Welcome to the ${red}coreboot${blue} cross toolchain builder v$CROSSGCC_VERSION ($CROSSGCC_DATE)${NC}\n\n"
 
 # Look if we have getopt. If not, build it.
 export PATH=$PATH:.
 getopt - > /dev/null 2>/dev/null || gcc -o getopt getopt.c
 
 # parse parameters.. try to find out whether we're running GNU getopt
-getoptbrand="`getopt -V`"
-if [ "${getoptbrand:0:6}" == "getopt" ]; then
+getoptbrand="`getopt -V | sed -e '1!d' -e 's,^\(......\).*,\1,'`"
+if [ "${getoptbrand}" = "getopt" ]; then
 	# Detected GNU getopt that supports long options.
-	args=`getopt -l version,help,clean,directory:,platform:,jobs:,destdir:,savetemps Vhcd:p:j:D:t -- "$@"`
+	args=`getopt -l version,help,clean,directory:,platform:,jobs:,destdir:,savetemps,skip-gdb Vhcd:p:j:D:tG -- "$@"`
 	eval set "$args"
 else
 	# Detected non-GNU getopt
-	args=`getopt Vhcd:p:j:D:t $*`
+	args=`getopt Vhcd:p:j:D:tG $*`
 	set -- $args
 fi
 
@@ -170,25 +190,42 @@ while true ; do
 		-p|--platform)	shift; TARGETARCH="$1"; shift;;
 		-D|--destdir)	shift; DESTDIR="$1"; shift;;
 		-j|--jobs)	shift; JOBS="-j $1"; shift;;
+		-G|--gdb)	shift; SKIPGDB=0;;
+		-S|--scripting) shift; SKIPPYTHON=0;;
 		--)		shift; break;;
 		-*)		printf "Invalid option\n\n"; myhelp; exit 1;;
 		*)		break;;
 	esac
 done
 
+GDB_PACKAGE="GDB"
+PYTHON_PACKAGE="PYTHON"
+EXPAT_PACKAGE="EXPAT"
+if [ $SKIPGDB -eq 1 ]; then
+	printf "Will skip GDB ... ${green}ok${NC}\n"
+	GDB_ARCHIVE=""
+	GDB_PACKAGE=""
+	if [ $SKIPPYTHON -eq 0 ]; then
+		printf "Python scripting needs GDB ... disabling ... ${green}ok${NC}\n"
+		SKIPPYTHON=1
+	fi
+fi
+if [ $SKIPPYTHON -eq 1 ]; then
+	PYTHON_PACKAGE=""
+	EXPAT_PACKAGE=""
+fi
+
 MINGW_ARCHIVES=""
 if [ "$TARGETARCH" = "i386-mingw32" ]; then
 	MINGW_ARCHIVES="$W32API_ARCHIVE $MINGWRT_ARCHIVE"
 fi
 
-if [ ${GCC_VERSION} == "4.5.0" -o ${GCC_VERSION} == "4.6.0" ]; then
-  # coreboot does not like the GOLD linker
-  # USE_GOLD="--enable-gold"
-  USE_GOLD=""
-  GCC_OPTIONS="--enable-lto"
-fi
+# coreboot does not like the GOLD linker
+# USE_GOLD="--enable-gold"
+USE_GOLD=""
+GCC_OPTIONS="--enable-lto"
 
-if [ ${GCC_VERSION} == "4.6.0" ]; then
+if [ ${GCC_VERSION} = "trunk" ]; then
   if [ ! -r tarballs/gcc-core-${GCC_VERSION}.tar.bz2 ]; then
     printf "Pre-Release GCC ${GCC_VERSION}, checking out subversion trunk\n"
     mkdir -p tarballs/.tmp
@@ -207,7 +244,9 @@ fi
 
 printf "Downloading tar balls ... \n"
 mkdir -p tarballs
-for ARCHIVE in $GMP_ARCHIVE $MPFR_ARCHIVE $MPC_ARCHIVE $LIBELF_ARCHIVE $GCC_ARCHIVE $BINUTILS_ARCHIVE $GDB_ARCHIVE $MINGW_ARCHIVES; do
+for ARCHIVE in $GMP_ARCHIVE $MPFR_ARCHIVE $MPC_ARCHIVE $LIBELF_ARCHIVE  \
+	    $GCC_ARCHIVE $BINUTILS_ARCHIVE $GDB_ARCHIVE $MINGW_ARCHIVES \
+	    $IASL_ARCHIVE $PYTHON_ARCHIVE $EXPAT_ARCHIVE; do
 	FILE=`basename $ARCHIVE`
 	printf " * $FILE "
 	test -f tarballs/$FILE && printf "(cached)" || (
@@ -215,7 +254,8 @@ for ARCHIVE in $GMP_ARCHIVE $MPFR_ARCHIVE $MPC_ARCHIVE $LIBELF_ARCHIVE $GCC_ARCH
 		cd tarballs
 		wget -q $ARCHIVE
 	)
-	test -f tarballs/$FILE || printf "\n${RED}Failed to download $FILE.${red}\n"
+	test -f tarballs/$FILE || \
+		printf "\n${RED}Failed to download $FILE.${red}\n"
 	test -f tarballs/$FILE || exit 1
 	printf "\n"
 done
@@ -228,20 +268,25 @@ if [ "$TARGETARCH" = "i386-mingw32" ]; then
 fi
 
 printf "Unpacking and patching ... \n"
-for PACKAGE in GMP MPFR MPC LIBELF GCC BINUTILS GDB $MINGW_PACKAGES; do
+for PACKAGE in GMP MPFR MPC LIBELF GCC BINUTILS $PYTHON_PACKAGE \
+	    $EXPAT_PACKAGE $GDB_PACKAGE $MINGW_PACKAGES IASL; do
 	archive=$PACKAGE"_ARCHIVE"
-	archive=${!archive}
+	archive="`eval echo '$'$archive`"
 	dir=$PACKAGE"_DIR"
-	test -d ${!dir} || (
+	dir="`eval echo '$'${dir}`"
+	test -d ${dir} || (
 		printf " * `basename $archive`\n"
 		FLAGS=zxf
-		test ${archive:${#archive}-2:2} = "gz" && FLAGS=zxf
-		test ${archive:${#archive}-3:3} = "bz2" && FLAGS=jxf
+		suffix=`echo $archive | sed 's,.*\.,,'`
+		test "$suffix" = "gz" && FLAGS=zxf
+		test "$suffix" = "bz2" && FLAGS=jxf
+		test "$suffix" = "lzma" && FLAGS="--lzma -xf"
 		$TAR $FLAGS tarballs/`basename $archive`
-		for patch in patches/${!dir}_*.patch; do
+		for patch in patches/${dir}_*.patch; do
 			test -r $patch || continue
 			printf "   o `basename $patch`\n"
-			$PATCH -s -N -p0 < `echo $patch`
+			$PATCH -s -N -p0 < `echo $patch` || \
+				printf "\n${RED}Failed $patch.${red}\n"
 		done
 	)
 done
@@ -250,9 +295,11 @@ printf "${green}ok${NC}\n"
 
 if [ "$TARGETARCH" = "i386-mingw32" ]; then
 	mkdir -p $TARGETDIR/i386-mingw32/sys-include
-	mv $MINGWRT_DIR/include/* $W32API_DIR/include/* $TARGETDIR/i386-mingw32/sys-include
+	mv $MINGWRT_DIR/include/* $W32API_DIR/include/* \
+				  $TARGETDIR/i386-mingw32/sys-include
 fi
 
+CC=cc
 if [ `uname` = "Darwin" ]; then
 	#GCC_OPTIONS="$GCC_OPTIONS --enable-threads=posix"
 
@@ -266,16 +313,21 @@ if [ `uname` = "Darwin" ]; then
 	else
 		OPTIONS="ABI=32"
 	fi
-	# old check:
-	#OPTIONS="ABI=32"
-	#touch .architecture_check.c
-	#gcc .architecture_check.c -c -o .architecture_check.o
-	#ARCH=`file .architecture_check.o |cut -f5 -d\ `
-	#test  "$ARCH" = "x86_64" && OPTIONS="ABI=64"
-	#rm .architecture_check.c .architecture_check.o
+
+	# In Xcode 4 the default compiler was switched to gcc-llvm.
+	# However, this compiler fails to compile gcc 4.6.x. As a
+	# workaround it's possible to compile gcc with gcc-4.2 or
+	# clang.
+	if $CC -v 2>&1 | grep -q LLVM; then
+		CC=clang
+	fi
 fi
 
-mkdir -p build-gmp build-mpfr build-mpc build-libelf build-binutils build-gcc build-gdb
+mkdir -p build-gmp build-mpfr build-mpc build-libelf build-binutils \
+		build-gcc build-python build-expat
+if [ $SKIPGDB -eq 0 ]; then
+	mkdir -p build-gdb
+fi
 if [ -f build-gmp/.success ]; then
 	printf "Skipping GMP as it is already built\n"
 else
@@ -288,8 +340,9 @@ printf "Building GMP ${GMP_VERSION} ... "
 	$MAKE $JOBS || touch .failed
 	$MAKE install DESTDIR=$DESTDIR || touch .failed
 	if [ ! -f .failed ]; then touch .success; fi
-) &> build-gmp/crossgcc-build.log
-test -r build-gmp/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n"
+) > build-gmp/crossgcc-build.log 2>&1
+test -r build-gmp/.failed && printf "${RED}failed${NC}\n" || \
+	printf "${green}ok${NC}\n"
 test -r build-gmp/.failed && exit 1
 fi
 
@@ -298,8 +351,10 @@ fi
 #	ln -s $DESTDIR$TARGETDIR $TARGETDIR
 #fi
 
-# Now set CFLAGS to match GMP CFLAGS.
-HOSTCFLAGS=`grep __GMP_CFLAGS $DESTDIR$TARGETDIR/include/gmp.h |cut -d\" -f2`
+# Now set CFLAGS to match GMP CFLAGS but strip out -pedantic
+# as GCC 4.6.x fails if it's there.
+HOSTCFLAGS=`grep __GMP_CFLAGS $DESTDIR$TARGETDIR/include/gmp.h |cut -d\" -f2 |\
+	    sed s,-pedantic,,`
 
 if [ -f build-mpfr/.success ]; then
 	printf "Skipping MPFR as it is already built\n"
@@ -311,7 +366,8 @@ printf "Building MPFR ${MPFR_VERSION} ... "
 	rm -f .failed
 	../${MPFR_DIR}/configure --disable-shared --prefix=$TARGETDIR \
 		--infodir=$TARGETDIR/info \
-		--with-gmp=$DESTDIR$TARGETDIR CFLAGS="$HOSTCFLAGS" || touch .failed
+		--with-gmp=$DESTDIR$TARGETDIR CFLAGS="$HOSTCFLAGS" || \
+		touch .failed
 	$MAKE $JOBS || touch .failed
 	$MAKE install DESTDIR=$DESTDIR || touch .failed
 
@@ -321,8 +377,9 @@ printf "Building MPFR ${MPFR_VERSION} ... "
 	fi
 
 	if [ ! -f .failed ]; then touch .success; fi
-) &> build-mpfr/crossgcc-build.log
-test -r build-mpfr/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n"
+) > build-mpfr/crossgcc-build.log 2>&1
+test -r build-mpfr/.failed && printf "${RED}failed${NC}\n" || \
+	     printf "${green}ok${NC}\n"
 test -r build-mpfr/.failed && exit 1
 fi
 
@@ -336,13 +393,15 @@ printf "Building MPC ${MPC_VERSION} ... "
 	rm -f .failed
 	../${MPC_DIR}/configure --disable-shared --prefix=$TARGETDIR \
 		--infodir=$TARGETDIR/info --with-mpfr=$DESTDIR$TARGETDIR \
-		--with-gmp=$DESTDIR$TARGETDIR CFLAGS="$HOSTCFLAGS" || touch .failed
+		--with-gmp=$DESTDIR$TARGETDIR CFLAGS="$HOSTCFLAGS" || \
+		touch .failed
 	$MAKE $JOBS || touch .failed
 	$MAKE install DESTDIR=$DESTDIR || touch .failed
 
 	if [ ! -f .failed ]; then touch .success; fi
-) &> build-mpc/crossgcc-build.log
-test -r build-mpc/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n"
+) > build-mpc/crossgcc-build.log 2>&1
+test -r build-mpc/.failed && printf "${RED}failed${NC}\n" || \
+	     printf "${green}ok${NC}\n"
 test -r build-mpc/.failed && exit 1
 fi
 
@@ -354,14 +413,16 @@ printf "Building libelf ${LIBELF_VERSION} ... "
 	cd build-libelf
 	rm -f .failed
 	echo "$HOSTCFLAGS"
-	CFLAGS="$HOSTCFLAGS"  ../${LIBELF_DIR}/configure --disable-shared --prefix=$TARGETDIR \
+	CFLAGS="$HOSTCFLAGS" libelf_cv_elf_h_works=no \
+	../${LIBELF_DIR}/configure --disable-shared --prefix=$TARGETDIR \
 		--infodir=$TARGETDIR/info CFLAGS="$HOSTCFLAGS" || touch .failed
 	$MAKE $JOBS || touch .failed
 	$MAKE install DESTDIR=$DESTDIR || touch .failed
 
 	if [ ! -f .failed ]; then touch .success; fi
-) &> build-libelf/crossgcc-build.log
-test -r build-libelf/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n"
+) > build-libelf/crossgcc-build.log 2>&1
+test -r build-libelf/.failed && printf "${RED}failed${NC}\n" || \
+	     printf "${green}ok${NC}\n"
 test -r build-libelf/.failed && exit 1
 fi
 
@@ -370,19 +431,23 @@ if [ -f build-binutils/.success ]; then
 else
 printf "Building binutils ${BINUTILS_VERSION} ... "
 (
-	# workaround for building binutils 2.20.1 on MINGW:
- 	touch ../binutils-${BINUTILS_VERSION}/bfd/doc/bfd.info
-	# now build binutils
+	# What a pain: binutils don't come with configure
+	# script anymore. Create it:
+	cd binutils-${BINUTILS_VERSION}/
+	autoconf
+	cd ..
+	# Now build binutils
 	cd build-binutils
 	rm -f .failed
-	../binutils-${BINUTILS_VERSION}/configure --prefix=$TARGETDIR --target=${TARGETARCH} \
-		--disable-werror --disable-nls $USE_GOLD \
-		CFLAGS="$HOSTCFLAGS" || touch .failed
+	../binutils-${BINUTILS_VERSION}/configure --prefix=$TARGETDIR \
+		--target=${TARGETARCH} --disable-werror --disable-nls \
+		$USE_GOLD CFLAGS="$HOSTCFLAGS" || touch .failed
 	$MAKE $JOBS || touch .failed
 	$MAKE install DESTDIR=$DESTDIR || touch .failed
 	if [ ! -f .failed ]; then touch .success; fi
-) &> build-binutils/crossgcc-build.log
-test -r build-binutils/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n"
+) > build-binutils/crossgcc-build.log 2>&1
+test -r build-binutils/.failed && printf "${RED}failed${NC}\n" || \
+	     printf "${green}ok${NC}\n"
 test -r build-binutils/.failed && exit 1
 fi
 
@@ -391,17 +456,33 @@ if [ -f build-gcc/.success ]; then
 else
 printf "Building GCC ${GCC_VERSION} ... "
 (
+	# Even worse than binutils: GCC does not come with configure
+	# script anymore, but also enforces an obsolete autoconf version
+	# to create it. This is a poster child of how autotools help make
+	# software portable.
+	cd gcc-${GCC_VERSION}
+	sed '/dnl Ensure exactly this Autoconf version is used/d' \
+		config/override.m4 > config/override.m4.new
+	autoconf_version=`autoconf -V | grep "autoconf" | tr ' ' '\n' | tail -1`
+	sed "s/${GCC_AUTOCONF_VERSION}/${autoconf_version}/g" \
+		config/override.m4.new > config/override.m4
+	autoconf
+	cd ..
+	# Now, finally, we can build gcc:
 	cd build-gcc
+	export PATH=$PATH:$DESTDIR$TARGETDIR/bin
 	rm -f .failed
 	# GCC does not honour HOSTCFLAGS at all. CFLAGS are used for
 	# both target and host object files. This is pretty misdesigned.
 	# There's a work-around called CFLAGS_FOR_BUILD and CFLAGS_FOR_TARGET
 	# but it does not seem to work properly. At least the host library
 	# libiberty is not compiled with CFLAGS_FOR_BUILD.
-	CFLAGS_FOR_TARGET="-O2" CFLAGS="$HOSTCFLAGS" CFLAGS_FOR_BUILD="$HOSTCFLAGS" ../gcc-${GCC_VERSION}/configure \
+	CC="$CC" CFLAGS_FOR_TARGET="-O2" CFLAGS="$HOSTCFLAGS" \
+		CFLAGS_FOR_BUILD="$HOSTCFLAGS" ../gcc-${GCC_VERSION}/configure \
 		--prefix=$TARGETDIR --libexecdir=$TARGETDIR/lib \
 		--target=${TARGETARCH} --disable-werror --disable-shared \
 		--disable-libssp --disable-bootstrap --disable-nls \
+		--disable-libquadmath \
 		$GCC_OPTIONS --enable-languages="c" $USE_GOLD \
 		--with-gmp=$DESTDIR$TARGETDIR --with-mpfr=$DESTDIR$TARGETDIR \
 		--with-mpc=$DESTDIR$TARGETDIR --with-libelf=$DESTDIR$TARGETDIR \
@@ -410,29 +491,100 @@ printf "Building GCC ${GCC_VERSION} ... "
 	$MAKE $JOBS CFLAGS_FOR_BUILD="$HOSTCFLAGS" || touch .failed
 	$MAKE install DESTDIR=$DESTDIR || touch .failed
 	if [ ! -f .failed ]; then touch .success; fi
-) &> build-gcc/crossgcc-build.log
-test -r build-gcc/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n"
+) > build-gcc/crossgcc-build.log 2>&1
+test -r build-gcc/.failed && printf "${RED}failed${NC}\n" || \
+	     printf "${green}ok${NC}\n"
 test -r build-gcc/.failed && exit 1
 fi
 
+if [ -f build-expat/.success ]; then
+	printf "Skipping Expat as it is already built\n"
+elif [ $SKIPPYTHON -eq 1 ]; then
+	printf "Skipping Expat (Python scripting not enabled)\n"
+else
+printf "Building Expat ${EXPAT_VERSION} ... "
+(
+	cd build-expat
+	export PATH=$PATH:$DESTDIR$TARGETDIR/bin
+	rm -f .failed
+	CFLAGS="$HOSTCFLAGS" ../${EXPAT_DIR}/configure --disable-shared \
+		--prefix=$TARGETDIR --target=${TARGETARCH} || touch .failed
+	$MAKE || touch .failed
+	$MAKE install DESTDIR=$DESTDIR || touch .failed
+	if [ ! -f .failed ]; then touch .success; fi
+) &> build-expat/crossgcc-build.log
+test -r build-expat/.failed && printf "${RED}failed${NC}\n" || \
+	     printf "${green}ok${NC}\n"
+test -r build-expat/.failed && exit 1
+fi
+
+
+if [ -f build-python/.success ]; then
+	printf "Skipping Python as it is already built\n"
+elif [ $SKIPPYTHON -eq 1 ]; then
+	printf "Skipping Python (Python scripting not enabled)\n"
+else
+printf "Building Python ${PYTHON_VERSION} ... "
+(
+	cd build-python
+	export PATH=$PATH:$DESTDIR$TARGETDIR/bin
+	rm -f .failed
+	CFLAGS="$HOSTCFLAGS" ../${PYTHON_DIR}/configure --prefix=$TARGETDIR \
+		--target=${TARGETARCH} || touch .failed
+	$MAKE $JOBS || touch .failed
+	$MAKE install DESTDIR=$DESTDIR || touch .failed
+	if [ ! -f .failed ]; then touch .success; fi
+) &> build-gdb/crossgcc-build.log
+test -r build-python/.failed && printf "${RED}failed${NC}\n" || \
+	     printf "${green}ok${NC}\n"
+test -r build-python/.failed && exit 1
+fi
+
+
 if [ -f build-gdb/.success ]; then
 	printf "Skipping GDB as it is already built\n"
+elif [ $SKIPGDB -eq 1 ]; then
+	printf "Skipping GDB (GDB support not enabled)\n"
 else
 printf "Building GDB ${GDB_VERSION} ... "
 (
 	cd build-gdb
-	export PATH=$PATH:$PREFIX/bin
+	export PATH=$PATH:$DESTDIR$TARGETDIR/bin
+	export PYTHONHOME=$DESTDIR$TARGETDIR
 	rm -f .failed
-	CFLAGS="$HOSTCFLAGS" ../gdb-${GDB_VERSION}/configure --prefix=$TARGETDIR --target=${TARGETARCH} \
-		--without-python --disable-werror --disable-nls
+	LDFLAGS="-Wl,-rpath,\$\$ORIGIN/../lib/ -L$DESTDIR$TARGETDIR/lib \
+		 -lpthread -ldl -lutil" \
+	CFLAGS="$HOSTCFLAGS -I$DESTDIR$TARGETDIR/include" \
+	../gdb-${GDB_VERSION}/configure --prefix=$TARGETDIR \
+		--target=${TARGETARCH} --disable-werror --disable-nls
 	$MAKE $JOBS || touch .failed
 	$MAKE install DESTDIR=$DESTDIR || touch .failed
 	if [ ! -f .failed ]; then touch .success; fi
-) &> build-gdb/crossgcc-build.log
-test -r build-gdb/.failed && printf "${RED}failed${NC}\n" || printf "${green}ok${NC}\n"
+) > build-gdb/crossgcc-build.log 2>&1
+test -r build-gdb/.failed && printf "${RED}failed${NC}\n" || \
+	     printf "${green}ok${NC}\n"
 test -r build-gdb/.failed && exit 1
 fi
 
+if [ -f $IASL_DIR/compiler/.success ]; then
+	printf "Skipping IASL as it is already built\n"
+else
+printf "Building IASL ${IASL_VERSION} ... "
+(
+	cd $IASL_DIR/compiler
+	export PATH=$PATH:$DESTDIR$TARGETDIR/bin
+	rm -f .failed
+	CFLAGS="$HOSTCFLAGS"
+	$MAKE || touch .failed
+	rm -f $DESTDIR$TARGETDIR/bin/iasl || touch .failed
+	cp iasl $DESTDIR$TARGETDIR/bin || touch .failed
+	if [ ! -f .failed ]; then touch .success; fi
+) > $IASL_DIR/compiler/crossgcc-build.log 2>&1
+test -r $IASL_DIR/compiler/.failed && printf "${RED}failed${NC}\n" || \
+	     printf "${green}ok${NC}\n"
+test -r $IASL_DIR/compiler/.failed && exit 1
+fi
+
 if [ $SAVETEMPS -eq 0 ]; then
 	printf "Cleaning up... "
 	rm -rf ${GMP_DIR} build-gmp
@@ -442,6 +594,9 @@ if [ $SAVETEMPS -eq 0 ]; then
 	rm -rf ${BINUTILS_DIR} build-binutils
 	rm -rf ${GCC_DIR} build-gcc
 	rm -rf ${GDB_DIR} build-gdb
+	rm -rf ${EXPAT_DIR} build-expat
+	rm -rf ${PYTHON_DIR} build-python
+	rm -rf ${IASL_DIR}
 	printf "${green}ok${NC}\n"
 else
 	printf "Leaving temporary files around... ${green}ok${NC}\n"