From 648540c29b0b4124cd68ec2a998a0b6fceebc707 Mon Sep 17 00:00:00 2001
From: wolfwood <wolfwood@xomb.org>
Date: Sat, 17 Sep 2011 21:50:31 -0400
Subject: [PATCH] binutils mandatory version bump, including patch fix, and
 change of compression format.  gcc bump as well

---
 binutils.2.2X.patch | 14 +++++++-------
 build.sh            |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/binutils.2.2X.patch b/binutils.2.2X.patch
index cdb3711..b8c4606 100644
--- a/binutils.2.2X.patch
+++ b/binutils.2.2X.patch
@@ -15,18 +15,18 @@
  			targ64_extra_libpath=elf_x86_64
  			tdir_i386linux=${targ_alias}aout ;;
 +x86_64-*-xomb*)         targ_emul=xomb_x86_64 ;;
-+			
++
  x86_64-*-linux-*)	targ_emul=elf_x86_64
  			targ_extra_emuls="elf_i386 i386linux elf_l1om"
  			targ_extra_libpath=elf_i386
 --- ../../binutils-2.20/ld/Makefile.in	2009-09-07 08:10:24.000000000 -0400
 +++ ld/Makefile.in	2010-04-03 18:01:16.000000000 -0400
-@@ -2451,6 +2451,9 @@ eelf64ltsmip.c: $(srcdir)/emulparams/elf
- eelf_i386.c: $(srcdir)/emulparams/elf_i386.sh \
+@@ -3303,6 +3303,9 @@
+   $(srcdir)/emulparams/elf_l1om.sh \
    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
- 	${GENSCRIPTS} elf_i386 "$(tdir_elf_i386)"
+ 	${GENSCRIPTS} elf_l1om_fbsd "$(tdir_elf_l1om_fbsd)"
 +exomb_x86_64.c: $(srcdir)/emulparams/xomb_x86_64.sh \
-+  $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
++	$(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 +	${GENSCRIPTS} xomb_x86_64 "$(tdir_xomb_x86_64)"
  eelf_x86_64.c: $(srcdir)/emulparams/elf_x86_64.sh \
    $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -53,6 +53,6 @@
    i386-*-rdos*)				fmt=elf ;;
    i386-*-darwin*)			fmt=macho ;;
 +  i386-*-xomb*)				fmt=elf ;;
- 
+
    i860-*-*)				fmt=elf endian=little ;;
- 
+
diff --git a/build.sh b/build.sh
index 7b6009b..483ae85 100755
--- a/build.sh
+++ b/build.sh
@@ -1,8 +1,8 @@
 OSNAME=xomb
 NCPU=4
 
-BINUTILS_VER=2.21
-GCC_VER=4.6.0
+BINUTILS_VER=2.21.1
+GCC_VER=4.6.1
 GMP_VER=5.0.2
 MPFR_VER=3.0.1
 NEWLIB_VER=1.19.0
@@ -27,8 +27,8 @@ export PATH=$PREFIX/bin:$PATH
 # Fetch each package
 
 echo "FETCH BINUTILS"
-wget $WFLAGS http://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_VER}.tar.gz 
-tar -xf binutils-${BINUTILS_VER}.tar.gz
+wget $WFLAGS http://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_VER}.tar.bz2
+tar -xf binutils-${BINUTILS_VER}.tar.bz2
 
 echo "FETCH GCC"
 wget $WFLAGS http://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/gcc-core-${GCC_VER}.tar.gz