update toolchain to latest stable

buildtoolchain/buildit.sh

@@ -7,25 +7,30 @@
 # Released under the terms of the GNU GPL, version 2
 SCRIPTDIR=`dirname $PWD/$0`
 
-BINUTILS_VER=2.20
+BINUTILS_VER=2.22
 BINUTILS_DIR="binutils-$BINUTILS_VER"
 BINUTILS_TARBALL="binutils-$BINUTILS_VER.tar.bz2"
 BINUTILS_URI="http://ftp.gnu.org/gnu/binutils/$BINUTILS_TARBALL"
 
-GMP_VER=5.0.1
+GMP_VER=5.0.5
 GMP_DIR="gmp-$GMP_VER"
 GMP_TARBALL="gmp-$GMP_VER.tar.bz2"
 GMP_URI="http://ftp.gnu.org/gnu/gmp/$GMP_TARBALL"
 
-MPFR_VER=3.0.0
+MPFR_VER=3.1.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://ftp.gnu.org/gnu/mpfr/$MPFR_TARBALL"
 
-GCC_VER=4.4.4
+MPC_VER=0.9
+MPC_DIR="mpc-$MPC_VER"
+MPC_TARBALL="mpc-$MPC_VER.tar.gz"
+MPC_URI="http://www.multiprecision.org/mpc/download/$MPC_TARBALL"
+
+GCC_VER=4.7.1
 GCC_DIR="gcc-$GCC_VER"
-GCC_CORE_TARBALL="gcc-core-$GCC_VER.tar.bz2"
+GCC_TARBALL="gcc-$GCC_VER.tar.bz2"
-GCC_CORE_URI="http://ftp.gnu.org/gnu/gcc/gcc-$GCC_VER/$GCC_CORE_TARBALL"
+GCC_URI="http://ftp.gnu.org/gnu/gcc/gcc-$GCC_VER/$GCC_TARBALL"
 
 BUILDTYPE=$1
 
@@ -67,7 +72,7 @@ download() {
 	DL=1
 	if [ -f "$WIIDEV/$2" ]; then
 		echo "Testing $2..."
-		tar tjf "$WIIDEV/$2" >/dev/null 2>&1 && DL=0
+		tar tf "$WIIDEV/$2" >/dev/null 2>&1 && DL=0
 	fi
 
 	if [ $DL -eq 1 ]; then
@@ -78,7 +83,7 @@ download() {
 
 extract() {
 	echo "Extracting $1..."
-	tar xjf "$WIIDEV/$1" -C "$2" || die "Error unpacking $1"
+	tar xf "$WIIDEV/$1" -C "$2" || die "Error unpacking $1"
 }
 
 makedirs() {
@@ -157,21 +162,23 @@ fi
 download "$BINUTILS_URI" "$BINUTILS_TARBALL"
 download "$GMP_URI" "$GMP_TARBALL"
 download "$MPFR_URI" "$MPFR_TARBALL"
-download "$GCC_CORE_URI" "$GCC_CORE_TARBALL"
+download "$MPC_URI" "$MPC_TARBALL"
+download "$GCC_URI" "$GCC_TARBALL"
 
 cleansrc
 
 extract "$BINUTILS_TARBALL" "$WIIDEV"
-extract "$GCC_CORE_TARBALL" "$WIIDEV"
+extract "$GCC_TARBALL" "$WIIDEV"
 extract "$GMP_TARBALL" "$WIIDEV/$GCC_DIR"
 extract "$MPFR_TARBALL" "$WIIDEV/$GCC_DIR"
+extract "$MPC_TARBALL" "$WIIDEV/$GCC_DIR"
 
-# in-tree gmp and mpfr
+# in-tree gmp, mpfr and mpc
 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"
+mv "$WIIDEV/$GCC_DIR/$MPC_DIR" "$WIIDEV/$GCC_DIR/mpc" || die "Error renaming $MPC_DIR -> mpc"
 
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42424
+# http://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=37ca432506c69627cd91cc76717a1304bfaccabb
-# 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
@@ -179,4 +186,3 @@ case $BUILDTYPE in
 	powerpc)	buildpowerpc ;;
 	both)		buildarm ; buildpowerpc; cleanbuild; cleansrc ;;
 esac
-

buildtoolchain/gcc.patch

@@ -1,54 +1,67 @@
---- old-configure	2010-07-11 15:10:39.470057633 +0200
+From 37ca432506c69627cd91cc76717a1304bfaccabb Mon Sep 17 00:00:00 2001
-+++ configure	2010-07-11 15:13:36.892556492 +0200
+From: nickc <nickc@138bc75d-0d04-0410-961f-82ee72b054a4>
-@@ -4492,7 +4492,12 @@
+Date: Wed, 9 May 2012 16:20:17 +0000
- echo "${ECHO_T}$gcc_cv_prog_cmp_skip" >&6
+Subject: [PATCH] 	PR bootstrap/50461
- do_compare="$gcc_cv_prog_cmp_skip"
+ 	* configure.ac (mpfr-dir): When using in-tree MPFR sources
+ 	allow for the fact that from release v3.1.0 of MPFR the source
+ 	files were moved into a src sub-directory.
+ 	* configure: Regenerate.
 
-+lt_cv_objdir=.libs
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@187341 138bc75d-0d04-0410-961f-82ee72b054a4
-+objdir=$lt_cv_objdir
+---
+ ChangeLog    |    9 +++++++++
+ configure    |   13 ++++++++++---
+ configure.ac |   13 ++++++++++---
+ 3 files changed, 29 insertions(+), 6 deletions(-)
 
-+cat >>confdefs.h <<_ACEOF
+diff --git a/configure b/configure
-+#define LT_OBJDIR "$lt_cv_objdir/"
+index faabb33..083f2ce 100755
-+_ACEOF
+--- a/configure
- 
++++ b/configure
- # Check for GMP and MPFR
+@@ -5204,9 +5204,16 @@ if test "x$with_mpfr_lib" != x; then
- 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"
-+  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"
+-  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
-   gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
+-  extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir"
++  # MPFR v3.1.0 moved the sources into a src sub-directory.
++  if test -d ${srcdir}/mpfr/src; then
++    gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs"
++    gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc"
++    extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir"
++  else
++    gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"
++    gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
++    extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir"
++  fi
    # 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 @@
+   # but it would be included on the link line in the version check below
-   gmplibs="-L$with_gmp_lib $gmplibs"
+diff --git a/configure.ac b/configure.ac
+index 0159f5e..378e9f5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1289,9 +1289,16 @@ if test "x$with_mpfr_lib" != x; then
+   gmplibs="-L$with_mpfr_lib $gmplibs"
  fi
- if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
+ if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then
--  gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/gmp/_libs '"$gmplibs"
+-  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"
-+  gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir $gmplibs"
+-  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
-   gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
+-  extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir"
--  extra_mpfr_configure_flags='--with-gmp-build=$$r/$(HOST_SUBDIR)/gmp'
++  # MPFR v3.1.0 moved the sources into a src sub-directory.
-+  extra_mpfr_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
++  if test -d ${srcdir}/mpfr/src; then
-   # Do not test the gmp version.  Assume that it is sufficient, since
++    gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs"
++    gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc"
++    extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir"
++  else
++    gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"
++    gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
++    extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir"
++  fi
+   # 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
    # but it would be included on the link line in the version check below
-@@ -4871,7 +4876,7 @@
+-- 
-   LIBS="$ppllibs $LIBS"
+1.7.3.4
- 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