Menu
▾
▴
[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-45-gabd905c
|
From: Lawrence S. <ljs...@us...> - 2014-02-17 14:43:35
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".
The branch, master has been updated
via abd905c6a87e888d0abef384e83acfdbb7df339d (commit)
from 4701ba49c8bb62a3fbd2be5655d8e6312112414a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit abd905c6a87e888d0abef384e83acfdbb7df339d
Author: Lawrence Sebald <ljs...@us...>
Date: Mon Feb 17 09:42:24 2014 -0500
dc-chain: Rolling back, once again, to GCC 4.7.3 due to some performance regressions in 4.8.x. Also, added a flag to the download.sh and unpack.sh scripts to not download/set up the GCC dependencies (in case you install them separately).
-----------------------------------------------------------------------
Summary of changes:
utils/dc-chain/Makefile | 2 +-
utils/dc-chain/download.sh | 69 +++++++++++++++++++++++++++++++++++--------
utils/dc-chain/unpack.sh | 49 ++++++++++++++++++++++++++-----
3 files changed, 98 insertions(+), 22 deletions(-)
diff --git a/utils/dc-chain/Makefile b/utils/dc-chain/Makefile
index d3e0c79..6cec899 100644
--- a/utils/dc-chain/Makefile
+++ b/utils/dc-chain/Makefile
@@ -29,7 +29,7 @@ kos_root=$(CURDIR)/../../..
# kos_base: equivalent of KOS_BASE (contains include/ and kernel/)
kos_base=$(CURDIR)/../..
binutils_ver=2.23.2
-gcc_ver=4.8.2
+gcc_ver=4.7.3
newlib_ver=2.0.0
gdb_ver=6.7.1
insight_ver=6.7.1
diff --git a/utils/dc-chain/download.sh b/utils/dc-chain/download.sh
index e5dce05..3c18d76 100755
--- a/utils/dc-chain/download.sh
+++ b/utils/dc-chain/download.sh
@@ -1,13 +1,38 @@
#!/bin/sh
# These version numbers are all that should ever have to be changed.
-export GCC_VER=4.8.2
+export GCC_VER=4.7.3
export BINUTILS_VER=2.23.2
export NEWLIB_VER=2.0.0
export GMP_VER=5.1.3
export MPFR_VER=3.1.2
export MPC_VER=1.0.1
+while [ "$1" != "" ]; do
+ PARAM=`echo $1 | awk -F= '{print $1}'`
+ case $PARAM in
+ --no-gmp)
+ unset GMP_VER
+ ;;
+ --no-mpfr)
+ unset MPFR_VER
+ ;;
+ --no-mpc)
+ unset MPC_VER
+ ;;
+ --no-deps)
+ unset GMP_VER
+ unset MPFR_VER
+ unset MPC_VER
+ ;;
+ *)
+ echo "ERROR: unknown parameter \"$PARAM\""
+ exit 1
+ ;;
+ esac
+ shift
+done
+
# Download everything.
if command -v wget >/dev/null 2>&1; then
echo "Downloading binutils-$BINUTILS_VER..."
@@ -16,12 +41,21 @@ if command -v wget >/dev/null 2>&1; then
wget -c ftp://ftp.gnu.org/gnu/gcc/gcc-$GCC_VER/gcc-$GCC_VER.tar.bz2 || exit 1
echo "Downloading Newlib $NEWLIB_VER..."
wget -c ftp://sourceware.org/pub/newlib/newlib-$NEWLIB_VER.tar.gz || exit 1
- echo "Downloading GMP $GMP_VER..."
- wget -c ftp://ftp.gnu.org/gnu/gmp/gmp-$GMP_VER.tar.bz2 || exit 1
- echo "Downloading MPFR $MPFR_VER..."
- wget -c http://www.mpfr.org/mpfr-current/mpfr-$MPFR_VER.tar.bz2 || exit 1
- echo "Downloading MPC $MPC_VER..."
- wget -c http://www.multiprecision.org/mpc/download/mpc-$MPC_VER.tar.gz || exit 1
+
+ if [ -n "$GMP_VER" ]; then
+ echo "Downloading GMP $GMP_VER..."
+ wget -c ftp://ftp.gnu.org/gnu/gmp/gmp-$GMP_VER.tar.bz2 || exit 1
+ fi
+
+ if [ -n "$MPFR_VER" ]; then
+ echo "Downloading MPFR $MPFR_VER..."
+ wget -c http://www.mpfr.org/mpfr-current/mpfr-$MPFR_VER.tar.bz2 || exit 1
+ fi
+
+ if [ -n "$MPC_VER" ]; then
+ echo "Downloading MPC $MPC_VER..."
+ wget -c http://www.multiprecision.org/mpc/download/mpc-$MPC_VER.tar.gz || exit 1
+ fi
elif command -v curl >/dev/null 2>&1; then
echo "Downloading Binutils $BINUTILS_VER..."
curl -C - -O ftp://ftp.gnu.org/gnu/binutils/binutils-$BINUTILS_VER.tar.bz2 || exit 1
@@ -29,12 +63,21 @@ elif command -v curl >/dev/null 2>&1; then
curl -C - -O ftp://ftp.gnu.org/gnu/gcc/gcc-$GCC_VER/gcc-$GCC_VER.tar.bz2 || exit 1
echo "Downloading Newlib $NEWLIB_VER..."
curl -C - -O ftp://sourceware.org/pub/newlib/newlib-$NEWLIB_VER.tar.gz || exit 1
- echo "Downloading GMP $GMP_VER..."
- curl -C - -O ftp://ftp.gnu.org/gnu/gmp/gmp-$GMP_VER.tar.bz2 || exit 1
- echo "Downloading MPFR $MPFR_VER..."
- curl -O http://www.mpfr.org/mpfr-current/mpfr-$MPFR_VER.tar.bz2 || exit 1
- echo "Downloading MPC $MPC_VER..."
- curl -O http://www.multiprecision.org/mpc/download/mpc-$MPC_VER.tar.gz || exit 1
+
+ if [ -n "$GMP_VER" ]; then
+ echo "Downloading GMP $GMP_VER..."
+ curl -C -O ftp://ftp.gnu.org/gnu/gmp/gmp-$GMP_VER.tar.bz2 || exit 1
+ fi
+
+ if [ -n "$MPFR_VER" ]; then
+ echo "Downloading MPFR $MPFR_VER..."
+ curl -O http://www.mpfr.org/mpfr-current/mpfr-$MPFR_VER.tar.bz2 || exit 1
+ fi
+
+ if [ -n "$MPC_VER" ]; then
+ echo "Downloading MPC $MPC_VER..."
+ curl -O http://www.multiprecision.org/mpc/download/mpc-$MPC_VER.tar.gz || exit 1
+ fi
else
echo >&2 "You must have either wget or cURL installed to use this script!"
exit 1
diff --git a/utils/dc-chain/unpack.sh b/utils/dc-chain/unpack.sh
index 342eb13..ffecabb 100755
--- a/utils/dc-chain/unpack.sh
+++ b/utils/dc-chain/unpack.sh
@@ -1,13 +1,38 @@
#!/bin/sh
# These version numbers are all that should ever have to be changed.
-export GCC_VER=4.8.2
+export GCC_VER=4.7.3
export BINUTILS_VER=2.23.2
export NEWLIB_VER=2.0.0
export GMP_VER=5.1.3
export MPFR_VER=3.1.2
export MPC_VER=1.0.1
+while [ "$1" != "" ]; do
+ PARAM=`echo $1 | awk -F= '{print $1}'`
+ case $PARAM in
+ --no-gmp)
+ unset GMP_VER
+ ;;
+ --no-mpfr)
+ unset MPFR_VER
+ ;;
+ --no-mpc)
+ unset MPC_VER
+ ;;
+ --no-deps)
+ unset GMP_VER
+ unset MPFR_VER
+ unset MPC_VER
+ ;;
+ *)
+ echo "ERROR: unknown parameter \"$PARAM\""
+ exit 1
+ ;;
+ esac
+ shift
+done
+
# Clean up from any old builds.
rm -rf binutils-$BINUTILS_VER gcc-$GCC_VER newlib-$NEWLIB_VER
rm -rf gmp-$GMP_VER mpfr-$MPFR_VER mpc-$MPC_VER
@@ -16,11 +41,19 @@ rm -rf gmp-$GMP_VER mpfr-$MPFR_VER mpc-$MPC_VER
tar jxf binutils-$BINUTILS_VER.tar.bz2 || exit 1
tar jxf gcc-$GCC_VER.tar.bz2 || exit 1
tar zxf newlib-$NEWLIB_VER.tar.gz || exit 1
-tar jxf gmp-$GMP_VER.tar.bz2 || exit 1
-tar jxf mpfr-$MPFR_VER.tar.bz2 || exit 1
-tar zxf mpc-$MPC_VER.tar.gz || exit 1
-# Move the GCC dependencies into their required locations.
-mv gmp-$GMP_VER gcc-$GCC_VER/gmp
-mv mpfr-$MPFR_VER gcc-$GCC_VER/mpfr
-mv mpc-$MPC_VER gcc-$GCC_VER/mpc
+# Unpack the GCC dependencies and move them into their required locations.
+if [ -n "$GMP_VER" ]; then
+ tar jxf gmp-$GMP_VER.tar.bz2 || exit 1
+ mv gmp-$GMP_VER gcc-$GCC_VER/gmp
+fi
+
+if [ -n "$MPFR_VER" ]; then
+ tar jxf mpfr-$MPFR_VER.tar.bz2 || exit 1
+ mv mpfr-$MPFR_VER gcc-$GCC_VER/mpfr
+fi
+
+if [ -n "$MPC_VER" ]; then
+ tar zxf mpc-$MPC_VER.tar.gz || exit 1
+ mv mpc-$MPC_VER gcc-$GCC_VER/mpc
+fi
hooks/post-receive
--
A pseudo Operating System for the Dreamcast.
|
