From e0f2aa73a061081048d21c57c921b27a17fd6146 Mon Sep 17 00:00:00 2001
From: wolfwood <wolfwood@xomb.org>
Date: Thu, 24 Jan 2013 01:01:08 -0500
Subject: [PATCH] gcc 4.7 whole compile old gccs so version bump.  also gcc
 switch to a unified tarball.  bump newlib version too, but it still needs an
 old version of automake so, compile antique autotools. a few small patch
 updates to get to whole thang going.

---
 build.sh                  | 23 +++++++++++++++++++++++
 gcc-files/gcc/config/os.h |  3 ---
 patches/newlib.patch      |  6 +++---
 scripts/config.sh         | 10 +++++++---
 scripts/fetchandpatch.sh  | 19 ++++++++++++-------
 5 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/build.sh b/build.sh
index 47109b8..a76af4b 100755
--- a/build.sh
+++ b/build.sh
@@ -27,6 +27,9 @@ mkdir -p gmp-obj
 mkdir -p mpfr-obj
 mkdir -p mpc-obj
 
+mkdir -p autoconf-obj
+mkdir -p automake-obj
+
 
 # --- Fetch and extract each package ---
 source ../scripts/fetchandpatch.sh
@@ -85,6 +88,26 @@ make -j$NCPU all-gcc || exit
 make install-gcc || exit
 cd ..
 
+setphase "COMPILE AUTOCONF"
+cd autoconf-obj
+../autoconf-${AUTOCONF_VER}/configure --prefix=$PREFIX || exit
+make -j$NCPU all || exit
+make install || exit
+cd ..
+
+setphase "COMPILE AUTOMAKE"
+cd automake-obj
+../automake-${AUTOMAKE_VER}/configure --prefix=$PREFIX || exit
+make -j$NCPU all || exit
+make install || exit
+cd ..
+
+cd ../local/share
+ln -s aclocal-1.11 aclocal
+cd ../../build
+
+hash -r
+
 setphase "AUTOCONF NEWLIB-XOMB"
 cd newlib-${NEWLIB_VER}/newlib/libc/sys
 autoconf || exit
diff --git a/gcc-files/gcc/config/os.h b/gcc-files/gcc/config/os.h
index 6f6efb9..4d7d671 100644
--- a/gcc-files/gcc/config/os.h
+++ b/gcc-files/gcc/config/os.h
@@ -6,6 +6,3 @@
     builtin_assert ("system=xomb");   \
     builtin_assert ("system=unix");   \
   } while(0);
-
-#undef TARGET_VERSION
-#define TARGET_VERSION fprintf(stderr, " (x86_64 xomb)");
diff --git a/patches/newlib.patch b/patches/newlib.patch
index a342ebf..39ac338 100644
--- a/patches/newlib.patch
+++ b/patches/newlib.patch
@@ -29,6 +29,6 @@
 + posix_dir=posix
 +	sys_dir=xomb
 +	;;
-   xscale-*-*)
- 	sys_dir=arm
- 	if [ "x${newlib_may_supply_syscalls}" = "xno" ] ; then
+   z8k-*-coff)
+ 	sys_dir=z8ksim
+ 	;;
diff --git a/scripts/config.sh b/scripts/config.sh
index b3c264d..ce71a80 100644
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -3,14 +3,18 @@ OSNAME=xomb
 NCPU=4
 
 BINUTILS_VER=2.21.1
-GCC_VER=4.6.1
+GCC_VER=4.7.2
 GMP_VER=5.0.2
 MPFR_VER=3.1.0
-NEWLIB_VER=1.19.0
+#NEWLIB_VER=1.20.0
+NEWLIB_VER=2.0.0
 MPC_VER=0.9
 PPL_VER=0.11.2
 CLOOG_VER=0.16.3
+
+AUTOCONF_VER=2.68
+AUTOMAKE_VER=1.11.6
 # NO M0AR EDITS PLZ
 
 TARGET=x86_64-pc-${OSNAME}
-WFLAGS=-c
\ No newline at end of file
+WFLAGS=-c
diff --git a/scripts/fetchandpatch.sh b/scripts/fetchandpatch.sh
index 8e16f5f..7d45c45 100644
--- a/scripts/fetchandpatch.sh
+++ b/scripts/fetchandpatch.sh
@@ -5,12 +5,8 @@ wget $WFLAGS http://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_VER}.tar.bz2
 tar -xf binutils-${BINUTILS_VER}.tar.bz2
 
 setphase "FETCH GCC"
-wget $WFLAGS http://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/gcc-core-${GCC_VER}.tar.gz
-tar -xf gcc-core-${GCC_VER}.tar.gz
-wget $WFLAGS http://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/gcc-g++-${GCC_VER}.tar.gz
-tar -xf gcc-g++-${GCC_VER}.tar.gz
-wget $WFLAGS http://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/gcc-fortran-${GCC_VER}.tar.gz
-tar -xf gcc-fortran-${GCC_VER}.tar.gz
+wget $WFLAGS http://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/gcc-${GCC_VER}.tar.gz
+tar -xf gcc-${GCC_VER}.tar.gz
 
 setphase "FETCH GMP"
 wget $WFLAGS http://ftp.gnu.org/gnu/gmp/gmp-${GMP_VER}.tar.gz
@@ -25,7 +21,7 @@ wget $WFLAGS http://www.multiprecision.org/mpc/download/mpc-${MPC_VER}.tar.gz
 tar -xf mpc-${MPC_VER}.tar.gz
 
 setphase "FETCH NEWLIB"
-wget $WFLAGS ftp://sources.redhat.com/pub/newlib/newlib-${NEWLIB_VER}.tar.gz
+wget $WFLAGS  ftp://sourceware.org/pub/newlib/newlib-${NEWLIB_VER}.tar.gz
 tar -xf newlib-${NEWLIB_VER}.tar.gz
 
 if [ $EXTRAS -eq 1 ]; then
@@ -38,6 +34,15 @@ wget $WFLAGS http://www.bastoul.net/cloog/pages/download/count.php3?url=./cloog-
 tar -xf cloog-${CLOOG_VER}.tar.gz
 fi
 
+setphase "FETCH AUTOCONF"
+wget $WFLAGS ftp://ftp.gnu.org/gnu/autoconf/autoconf-${AUTOCONF_VER}.tar.gz -O autoconf-${AUTOCONF_VER}.tar.gz
+tar -xf autoconf-${AUTOCONF_VER}.tar.gz
+
+setphase "FETCH AUTOMAKE"
+wget $WFLAGS ftp://ftp.gnu.org/gnu/automake/automake-${AUTOMAKE_VER}.tar.gz -O automake-${AUTOMAKE_VER}.tar.gz
+tar -xf automake-${AUTOMAKE_VER}.tar.gz
+
+
 # --- Patch and push new code into each package ---
 
 # Fix patches with osname