repo sync; bump versions to stable

buildtoolchain/buildit.sh

@@ -5,23 +5,24 @@
 # Copyright (C) 2009 Andre Heider "dhewg" <dhewg@wiibrew.org>
 
 # Released under the terms of the GNU GPL, version 2
+SCRIPTDIR=`dirname $PWD/$0`
 
-BINUTILS_VER=2.19.1
+BINUTILS_VER=2.20
 BINUTILS_DIR="binutils-$BINUTILS_VER"
 BINUTILS_TARBALL="binutils-$BINUTILS_VER.tar.bz2"
 BINUTILS_URI="http://ftp.gnu.org/gnu/binutils/$BINUTILS_TARBALL"
 
-GMP_VER=4.2.4
+GMP_VER=5.0.1
 GMP_DIR="gmp-$GMP_VER"
 GMP_TARBALL="gmp-$GMP_VER.tar.bz2"
 GMP_URI="http://ftp.gnu.org/gnu/gmp/$GMP_TARBALL"
 
-MPFR_VER=2.4.2
+MPFR_VER=3.0.0
 MPFR_DIR="mpfr-$MPFR_VER"
 MPFR_TARBALL="mpfr-$MPFR_VER.tar.bz2"
-MPFR_URI="http://www.mpfr.org/mpfr-$MPFR_VER/$MPFR_TARBALL"
+MPFR_URI="http://www.mpfr.org/mpfr-current/$MPFR_TARBALL"
 
-GCC_VER=4.4.0
+GCC_VER=4.4.4
 GCC_DIR="gcc-$GCC_VER"
 GCC_CORE_TARBALL="gcc-core-$GCC_VER.tar.bz2"
 GCC_CORE_URI="http://ftp.gnu.org/gnu/gcc/gcc-$GCC_VER/$GCC_CORE_TARBALL"
@@ -31,7 +32,9 @@ BUILDTYPE=$1
 ARM_TARGET=armeb-eabi
 POWERPC_TARGET=powerpc-elf
 
-MAKEOPTS=-j3
+if [ -z $MAKEOPTS ]; then
+	MAKEOPTS=-j3
+fi
 
 # End of configuration section.
 
@@ -64,7 +67,7 @@ download() {
 	DL=1
 	if [ -f "$WIIDEV/$2" ]; then
 		echo "Testing $2..."
-		tar tjf "$WIIDEV/$2" >/dev/null && DL=0
+		tar tjf "$WIIDEV/$2" >/dev/null 2>&1 && DL=0
 	fi
 
 	if [ $DL -eq 1 ]; then
@@ -89,7 +92,7 @@ buildbinutils() {
 		cd $WIIDEV/build_binutils && \
 		$WIIDEV/$BINUTILS_DIR/configure --target=$TARGET \
 			--prefix=$WIIDEV --disable-werror --disable-multilib && \
-		$MAKE $MAKEOPTS && \
+		nice $MAKE $MAKEOPTS && \
 		$MAKE install
 	) || die "Error building binutils for target $TARGET"
 }
@@ -105,7 +108,7 @@ buildgcc() {
 			--disable-libmudflap --disable-libssp --disable-libgomp \
 			--disable-decimal-float \
 			--enable-checking=release && \
-		$MAKE $MAKEOPTS && \
+		nice $MAKE $MAKEOPTS && \
 		$MAKE install
 	) || die "Error building binutils for target $TARGET"
 }
@@ -160,10 +163,16 @@ cleansrc
 extract "$BINUTILS_TARBALL" "$WIIDEV"
 extract "$GCC_CORE_TARBALL" "$WIIDEV"
 extract "$GMP_TARBALL" "$WIIDEV/$GCC_DIR"
-mv "$WIIDEV/$GCC_DIR/$GMP_DIR" "$WIIDEV/$GCC_DIR/gmp" || die "Error renaming $GMP_DIR -> gmp"
 extract "$MPFR_TARBALL" "$WIIDEV/$GCC_DIR"
+
+# in-tree gmp and mpfr
+mv "$WIIDEV/$GCC_DIR/$GMP_DIR" "$WIIDEV/$GCC_DIR/gmp" || die "Error renaming $GMP_DIR -> gmp"
 mv "$WIIDEV/$GCC_DIR/$MPFR_DIR" "$WIIDEV/$GCC_DIR/mpfr" || die "Error renaming $MPFR_DIR -> mpfr"
 
+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42424
+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44455
+patch -d $WIIDEV/$GCC_DIR -u -i $SCRIPTDIR/gcc.patch || die "Error applying gcc patch"
+
 case $BUILDTYPE in
 	arm)		buildarm ;;
 	powerpc)	buildpowerpc ;;

buildtoolchain/gcc.patch

@@ -0,0 +1,54 @@
+--- old-configure	2010-07-11 15:10:39.470057633 +0200
++++ configure	2010-07-11 15:13:36.892556492 +0200
+@@ -4492,7 +4492,12 @@
+ echo "${ECHO_T}$gcc_cv_prog_cmp_skip" >&6
+ do_compare="$gcc_cv_prog_cmp_skip"
+ 
++lt_cv_objdir=.libs
++objdir=$lt_cv_objdir
+ 
++cat >>confdefs.h <<_ACEOF
++#define LT_OBJDIR "$lt_cv_objdir/"
++_ACEOF
+ 
+ # Check for GMP and MPFR
+ gmplibs="-lmpfr -lgmp"
+@@ -4542,7 +4547,7 @@
+   gmplibs="-L$with_mpfr_lib $gmplibs"
+ fi
+ if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then
+-  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/.libs -L$$r/$(HOST_SUBDIR)/mpfr/_libs '"$gmplibs"
++  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"
+   gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
+   # Do not test the mpfr version.  Assume that it is sufficient, since
+   # it is in the source tree, and the library has not been built yet
+@@ -4594,9 +4599,9 @@
+   gmplibs="-L$with_gmp_lib $gmplibs"
+ fi
+ if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
+-  gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/gmp/_libs '"$gmplibs"
++  gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir $gmplibs"
+   gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
+-  extra_mpfr_configure_flags='--with-gmp-build=$$r/$(HOST_SUBDIR)/gmp'
++  extra_mpfr_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
+   # Do not test the gmp version.  Assume that it is sufficient, since
+   # it is in the source tree, and the library has not been built yet
+   # but it would be included on the link line in the version check below
+@@ -4871,7 +4876,7 @@
+   LIBS="$ppllibs $LIBS"
+ fi
+ if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
+-  ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/.libs -L$$r/$(HOST_SUBDIR)/ppl/_libs -lppl_c -lppl -lgmpxx '"$with_host_libstdcxx "
++  ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/interfaces/C/'"$lt_cv_objdir"' -L$$r/$(HOST_SUBDIR)/ppl/src/'"$lt_cv_objdir"' -lppl_c -lppl -lgmpxx '
+   pplinc='-I$$r/$(HOST_SUBDIR)/ppl/include -I$$s/ppl/include '
+   LIBS="$ppllibs $LIBS"
+ fi
+@@ -4990,7 +4995,7 @@
+   LIBS="$clooglibs $LIBS"
+ fi
+ if test "x$with_cloog$with_cloog_include$with_cloog_lib" = x && test -d ${srcdir}/cloog; then
+-  clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/.libs -L$$r/$(HOST_SUBDIR)/cloog/_libs -lcloog '
++  clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' -lcloog '
+   clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -DCLOOG_PPL_BACKEND '
+   LIBS="$clooglibs $LIBS"
+ fi