From 5b25b02679a2a7ff244bf2850dbd3c6eba420ca8 Mon Sep 17 00:00:00 2001
From: weissms <weissms@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Sun, 28 Aug 2011 08:29:16 +0000
Subject: [PATCH] binutils-2.20.1 disappeared, switch to latest 2.21.1a.

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@40924 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 tools/crosstools/binutils-2.21.1a-aros.diff | 103 ++++++++++++++++++++++++++++
 tools/crosstools/mmakefile.src              |   3 +-
 2 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 tools/crosstools/binutils-2.21.1a-aros.diff

diff --git a/tools/crosstools/binutils-2.21.1a-aros.diff b/tools/crosstools/binutils-2.21.1a-aros.diff
new file mode 100644
index 0000000000..25203969c8
--- /dev/null
+++ b/tools/crosstools/binutils-2.21.1a-aros.diff
@@ -0,0 +1,103 @@
+diff -ruN binutils-2.21.1/bfd/config.bfd binutils-2.21.1.aros/bfd/config.bfd
+--- binutils-2.21.1/bfd/config.bfd	2011-04-01 14:02:42.000000000 +0200
++++ binutils-2.21.1.aros/bfd/config.bfd	2011-06-27 09:39:00.000000000 +0200
+@@ -281,7 +281,7 @@
+     ;;
+   arm-*-elf | arm-*-freebsd* | arm*-*-linux-* | arm*-*-conix* | \
+   arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
+-  arm*-*-eabi* )
++  arm*-*-eabi* | arm-*-aros)
+     targ_defvec=bfd_elf32_littlearm_vec
+     targ_selvecs=bfd_elf32_bigarm_vec
+     ;;
+@@ -518,6 +518,8 @@
+     ;;
+   i[3-7]86-*-aros*)
+     targ_defvec=bfd_elf32_i386_vec
++    targ_selvecs="bfd_elf64_x86_64_vec bfd_elf32_powerpc_vec"
++    want64=true
+     ;;
+   i[3-7]86-*-chorus*)
+     targ_defvec=bfd_elf32_i386_vec
+@@ -647,6 +649,11 @@
+     want64=true
+     targ_underscore=no
+     ;;
++  x86_64-*-aros*)
++    targ_defvec=bfd_elf64_x86_64_vec
++    targ_selvecs="bfd_elf32_i386_vec bfd_elf32_powerpc_vec"
++    want64=true
++    ;;
+ #endif
+   i[3-7]86-*-lynxos*)
+     targ_defvec=bfd_elf32_i386_vec
+@@ -1197,6 +1204,11 @@
+     targ_defvec=bfd_elf32_rx_le_vec
+     targ_selvecs="bfd_elf32_rx_be_vec bfd_elf32_rx_le_vec"
+     ;;
++  powerpc-*-aros*)
++    targ_defvec=bfd_elf32_powerpc_vec
++    targ_selvecs="bfd_elf32_i386_vec bfd_elf64_x86_64_vec"
++    want64=true
++    ;;
+ 
+   s390-*-linux*)
+     targ_defvec=bfd_elf32_s390_vec
+diff -ruN binutils-2.21.1/config.guess binutils-2.21.1.aros/config.guess
+--- binutils-2.21.1/config.guess	2010-06-01 19:53:40.000000000 +0200
++++ binutils-2.21.1.aros/config.guess	2011-06-27 09:39:00.000000000 +0200
+@@ -289,6 +289,9 @@
+     *:[Mm]orph[Oo][Ss]:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-morphos
+ 	exit ;;
++    *:AROS:*:*)
++	echo ${UNAME_MACHINE}-unknown-aros
++	exit ;;
+     *:OS/390:*:*)
+ 	echo i370-ibm-openedition
+ 	exit ;;
+diff -ruN binutils-2.21.1/intl/configure binutils-2.21.1.aros/intl/configure
+--- binutils-2.21.1/intl/configure	2010-11-05 11:31:38.000000000 +0100
++++ binutils-2.21.1.aros/intl/configure	2011-06-27 09:39:00.000000000 +0200
+@@ -4606,6 +4606,9 @@
+ 
+ int main ()
+ {
++#if defined(__AROS__)
++  exit (1);
++#endif
+   signal (SIGFPE, sigfpe_handler);
+ /* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
+ #if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
+diff -ruN binutils-2.21.1/ld/configure.tgt binutils-2.21.1.aros/ld/configure.tgt
+--- binutils-2.21.1/ld/configure.tgt	2011-04-01 14:03:54.000000000 +0200
++++ binutils-2.21.1.aros/ld/configure.tgt	2011-06-27 09:39:00.000000000 +0200
+@@ -79,6 +79,10 @@
+ 			targ_extra_emuls="armelfb armelf armelf_linux"
+ 			targ_extra_libpath="armelf_linux"
+ 			;;
++arm*-*-aros*)		targ_emul=armelf_linux_eabi
++			targ_extra_emuls=armelfb_linux_eabi
++			targ_extra_libpath=$targ_extra_emuls
++			;;
+ arm*-*-linux-*eabi)	targ_emul=armelf_linux_eabi
+ 			targ_extra_emuls=armelfb_linux_eabi
+ 			targ_extra_libpath=$targ_extra_emuls
+@@ -245,6 +249,9 @@
+ x86_64-*-elf*)		targ_emul=elf_x86_64
+ 			targ_extra_emuls="elf_i386 elf_l1om"
+ 			;;
++x86_64-*-aros*)		targ_emul=elf_x86_64
++			targ_extra_emuls=elf_i386
++			;;
+ i[3-7]86-*-kaos*)	targ_emul=elf_i386 ;;
+ i[3-7]86-*-freebsdaout* | i[3-7]86-*-freebsd[12].* | i[3-7]86-*-freebsd[12])
+ 			targ_emul=i386bsd ;;
+@@ -504,6 +511,7 @@
+ powerpc-*-beos*)	targ_emul=aixppc ;;
+ powerpc-*-windiss*)	targ_emul=elf32ppcwindiss ;;
+ powerpc-*-lynxos*)	targ_emul=ppclynx ;;
++powerpc-*-aros*)	targ_emul=elf32ppc ;;
+ rs6000-*-aix[5-9]*)	targ_emul=aix5rs6 ;;
+ rs6000-*-aix*)		targ_emul=aixrs6
+ 			;;
diff --git a/tools/crosstools/mmakefile.src b/tools/crosstools/mmakefile.src
index 062eefb047..8ef0c37b65 100644
--- a/tools/crosstools/mmakefile.src
+++ b/tools/crosstools/mmakefile.src
@@ -1,6 +1,6 @@
 include $(TOP)/config/make.cfg
 
-BINUTILS_VERSION = 2.20.1
+BINUTILS_VERSION = 2.21.1a
 
 GCC_LANGUAGES = c,c++
 
@@ -57,6 +57,7 @@ tools-crosstools-binutils :
 %fetch_and_build mmake=crosstools-binutils package=binutils version=$(BINUTILS_VERSION) compiler=host \
 	package_repo="$(GNU_REPOSITORY)/binutils" \
 	patch=yes \
+	srcdir=binutils-2.21.1 \
 	prefix="$(CROSSTOOLSDIR)" \
 	extraoptions="--target=$(AROS_TARGET_CPU)-aros -bindir=$(CROSSTOOLSDIR) --with-sysroot=$(AROS_DEVELOPMENT) --disable-werror"
 
-- 
2.11.4.GIT