From bcb573bfbfcca912991ac86e826a10d2dd6f5f4f Mon Sep 17 00:00:00 2001 From: dhewg Date: Thu, 22 Nov 2012 19:57:40 +0100 Subject: [PATCH] update toolchain to latest stable but revert depending libs to recommended version for gcc. --- buildtoolchain/buildit.sh | 13 +++----- buildtoolchain/gcc.patch | 67 --------------------------------------- 2 files changed, 5 insertions(+), 75 deletions(-) delete mode 100644 buildtoolchain/gcc.patch diff --git a/buildtoolchain/buildit.sh b/buildtoolchain/buildit.sh index c342d09..8218fc2 100755 --- a/buildtoolchain/buildit.sh +++ b/buildtoolchain/buildit.sh @@ -7,27 +7,27 @@ # Released under the terms of the GNU GPL, version 2 SCRIPTDIR=`dirname $PWD/$0` -BINUTILS_VER=2.22 +BINUTILS_VER=2.23.1 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.5 +GMP_VER=4.3.2 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.1.0 +MPFR_VER=2.4.2 MPFR_DIR="mpfr-$MPFR_VER" MPFR_TARBALL="mpfr-$MPFR_VER.tar.bz2" MPFR_URI="http://ftp.gnu.org/gnu/mpfr/$MPFR_TARBALL" -MPC_VER=0.9 +MPC_VER=0.8.1 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_VER=4.7.2 GCC_DIR="gcc-$GCC_VER" GCC_TARBALL="gcc-$GCC_VER.tar.bz2" GCC_URI="http://ftp.gnu.org/gnu/gcc/gcc-$GCC_VER/$GCC_TARBALL" @@ -178,9 +178,6 @@ mv "$WIIDEV/$GCC_DIR/$GMP_DIR" "$WIIDEV/$GCC_DIR/gmp" || die "Error renaming $GM 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/git/?p=gcc.git;a=commitdiff;h=37ca432506c69627cd91cc76717a1304bfaccabb -patch -d $WIIDEV/$GCC_DIR -u -i $SCRIPTDIR/gcc.patch || die "Error applying gcc patch" - case $BUILDTYPE in arm) buildarm ;; powerpc) buildpowerpc ;; diff --git a/buildtoolchain/gcc.patch b/buildtoolchain/gcc.patch deleted file mode 100644 index 776590d..0000000 --- a/buildtoolchain/gcc.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 37ca432506c69627cd91cc76717a1304bfaccabb Mon Sep 17 00:00:00 2001 -From: nickc -Date: Wed, 9 May 2012 16:20:17 +0000 -Subject: [PATCH] PR bootstrap/50461 - * 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. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@187341 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - ChangeLog | 9 +++++++++ - configure | 13 ++++++++++--- - configure.ac | 13 ++++++++++--- - 3 files changed, 29 insertions(+), 6 deletions(-) - -diff --git a/configure b/configure -index faabb33..083f2ce 100755 ---- a/configure -+++ b/configure -@@ -5204,9 +5204,16 @@ if test "x$with_mpfr_lib" != x; then - 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/'"$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" -+ # 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 - # but it would be included on the link line in the version check below -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_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then -- 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" -+ # 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 - # but it would be included on the link line in the version check below --- -1.7.3.4 -