From 0d50b215bf341f98fadfa2eb17ddc8d4c6aefd18 Mon Sep 17 00:00:00 2001
From: Victor Martinez <pitillo@ono.com>
Date: Wed, 7 Nov 2012 16:58:21 +0000
Subject: [PATCH] Toolchain update libgmp 5.0.5, libmpfr 3.1.1, libmpc 1.0.1,
 binutils 2.22, glibc 2.16.0, gcc 4.7.2

First attempt to make a generic hardfp build with optimized files per device options. It breaks
initrd creation when it tries to load the included file from its Makefile as it picks current
directory ($pwd/initrd) to look for that include instead of toolchain path.

Fixed builds:
binutils: Removed patch binutils-2.21.1-gnueabihf.patch. Fixed in last sources (binutils 2.22)

gcc-static: --disable-libquadmath (arm hasn't __float128)
            Adapted gcc-4.7.2-gnueabihf.patch

glibc: "libc_cv_ctors_header=yes" (gcc constructor support is configured without the configure test)
       Removed patch glibc-2.13-gnueabihf.patch. Fixed in last sources (glibc 2.16.0)
       Removed patch glibc-2.13-prelink.patch

gcc-final: --disable-bootstrap (removed the three times build bootstrap)
           --disable-libgomp (not needed for cross compilations)
           --disable-libstdcxx-pch (don't build the pre-compiled header (PCH) for libstdc++)
           --enable-c99 --enable-long-long (removed these options as in softfp)
---
 Makefile                             |  19 +--
 efikamx.mk                           |   8 ++
 generic.mk                           |   4 +
 raspberrypi.mk                       |   8 ++
 vars.mk                              |  31 +++--
 work/binutils-2.21.1-gnueabihf.patch |  35 ------
 work/gcc-4.6.1-gnueabihf.patch       | 166 ---------------------------
 work/gcc-4.7.2-gnueabihf.patch       | 135 ++++++++++++++++++++++
 work/glibc-2.13-gnueabihf.patch      |  11 --
 work/glibc-2.13-prelink.patch        |  26 -----
 work/libmpfr-3.1.1-p2.patch.gz       | Bin 0 -> 3597 bytes
 11 files changed, 179 insertions(+), 264 deletions(-)
 create mode 100644 efikamx.mk
 create mode 100644 generic.mk
 create mode 100644 raspberrypi.mk
 delete mode 100644 work/binutils-2.21.1-gnueabihf.patch
 delete mode 100644 work/gcc-4.6.1-gnueabihf.patch
 create mode 100644 work/gcc-4.7.2-gnueabihf.patch
 delete mode 100644 work/glibc-2.13-gnueabihf.patch
 delete mode 100644 work/glibc-2.13-prelink.patch
 create mode 100644 work/libmpfr-3.1.1-p2.patch.gz

diff --git a/Makefile b/Makefile
index da7e72b..177b39c 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ distclean: clean linux-headers-distclean libgmp-distclean libmpfr-distclean libm
 
 # LINUX HEADERS
 $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.bz2:
-	wget -P $(WORK) -c ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$(KERNEL_HEADERS_VERSION).tar.bz2
+	wget -P $(WORK) -c ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$(KERNEL_HEADERS_VERSION).tar.bz2
 
 $(WORK)/linux-$(KERNEL_HEADERS_VERSION): $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.bz2
 	tar -C $(WORK) -xvjf $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.bz2
@@ -71,8 +71,10 @@ libgmp-distclean: libgmp-clean
 $(WORK)/mpfr-$(LIBMPFR_VERSION).tar.bz2:
 	wget -P $(WORK) -c http://ftp.gnu.org/gnu/mpfr/mpfr-$(LIBMPFR_VERSION).tar.bz2
 
-$(WORK)/mpfr-$(LIBMPFR_VERSION): $(WORK)/mpfr-$(LIBMPFR_VERSION).tar.bz2
+$(WORK)/mpfr-$(LIBMPFR_VERSION): $(WORK)/mpfr-$(LIBMPFR_VERSION).tar.bz2 $(WORK)/libmpfr-3.1.1-p2.patch.gz
 	tar -C $(WORK) -xvjf $(WORK)/mpfr-$(LIBMPFR_VERSION).tar.bz2
+	cd $(WORK)/mpfr-$(LIBMPFR_VERSION) && \
+		gunzip -c $(WORK)/libmpfr-$(LIBMPFR_VERSION)-p2.patch.gz | patch -p1
 	touch $(WORK)/mpfr-$(LIBMPFR_VERSION)
 
 $(WORK)/build-libmpfr: $(WORK)/mpfr-$(LIBMPFR_VERSION)
@@ -132,8 +134,7 @@ $(WORK)/binutils-$(BINUTILS_VERSION).tar.bz2:
 
 $(WORK)/binutils-$(BINUTILS_VERSION): $(WORK)/binutils-$(BINUTILS_VERSION).tar.bz2
 	tar -C $(WORK) -xvjf $(WORK)/binutils-$(BINUTILS_VERSION).tar.bz2
-	cd $(WORK)/binutils-$(BINUTILS_VERSION) && \
-		patch -p1 -i $(WORK)/binutils-$(BINUTILS_VERSION)-gnueabihf.patch
+	sed -i '/^SUBDIRS/s/doc//' $(WORK)/binutils-$(BINUTILS_VERSION)/*/Makefile.in
 	touch $(WORK)/binutils-$(BINUTILS_VERSION)
 
 $(WORK)/build-binutils: $(WORK)/binutils-$(BINUTILS_VERSION)
@@ -184,7 +185,7 @@ $(CROSSTOOLS)/lib/gcc: $(WORK)/build-gcc-static $(WORK)/gcc-$(GCC_VERSION)
 		--without-headers --enable-__cxa_atexit --enable-symvers=gnu --disable-decimal-float \
 		--disable-libgomp --disable-libmudflap --disable-libssp \
 		--with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) --with-mpc=$(CROSSTOOLS) \
-		--disable-shared --disable-threads --enable-languages=c \
+		--disable-shared --disable-threads --enable-languages=c --disable-libquadmath \
 		--with-abi=$(ABI) --with-arch=$(ARCH) --with-mode=$(MODE) --with-float=$(FLOAT) --with-fpu=$(FPU) && \
 		make all-gcc all-target-libgcc && make install-gcc install-target-libgcc || exit 1
 	touch $(CROSSTOOLS)/lib/gcc
@@ -210,9 +211,7 @@ $(WORK)/glibc-$(GLIBC_VERSION): $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2 $(WORK)/g
 	cd $(WORK)/glibc-$(GLIBC_VERSION) && \
 		tar xvjf $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2 && \
 		mv glibc-ports-$(GLIBC_VERSION) ports && \
-		patch -p1 -i $(WORK)/glibc-$(GLIBC_VERSION)-gnueabihf.patch && \
-		patch -p1 -i $(WORK)/glibc-$(GLIBC_VERSION)-prelink.patch && \
-		sed -e 's/-lgcc_eh//g' -i Makeconfig
+		sed -e 's/-lgcc_eh//g' -e 's/-lgcc_s//g' -i Makeconfig
 	touch $(WORK)/glibc-$(GLIBC_VERSION)
 
 $(WORK)/build-glibc: $(WORK)/glibc-$(GLIBC_VERSION)
@@ -225,6 +224,7 @@ $(CLFS)/usr/lib/libc.so: $(WORK)/build-glibc $(WORK)/glibc-$(GLIBC_VERSION)
 		echo "libc_cv_forced_unwind=yes" > config.cache && \
 		echo "libc_cv_c_cleanup=yes" >> config.cache && \
 		echo "libc_cv_gnu89_inline=yes" >> config.cache && \
+		echo "libc_cv_ctors_header=yes" >> config.cache && \
 		echo "install_root=$(CLFS)" > configparms && \
 		unset CFLAGS && unset CXXFLAGS && \
 		BUILD_CC="gcc" CC="$(TARGET)-gcc" AR="$(TARGET)-ar" \
@@ -260,7 +260,8 @@ $(CLFS)/lib/gcc: $(WORK)/build-gcc-final $(WORK)/gcc-$(GCC_VERSION)
 		--build=$(HOST) --host=$(HOST) --target=$(TARGET) \
 		--with-headers=$(CLFS)/usr/include --enable-shared  \
 		--disable-multilib --with-sysroot=$(CLFS) --disable-nls \
-		--enable-languages=c,c++ --enable-__cxa_atexit --enable-c99 --enable-long-long --enable-threads=posix \
+		--enable-languages=c,c++ --enable-__cxa_atexit \
+		--enable-threads=posix --disable-libstdcxx-pch --disable-bootstrap --disable-libgomp \
 		--with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) --with-mpc=$(CROSSTOOLS) \
 		--with-abi=$(ABI) --with-arch=$(ARCH) --with-mode=$(MODE) --with-float=$(FLOAT) --with-fpu=$(FPU) && \
 		make AS_FOR_TARGET="$(TARGET)-as" LD_FOR_TARGET="$(TARGET)-ld" && \
diff --git a/efikamx.mk b/efikamx.mk
new file mode 100644
index 0000000..48c7cca
--- /dev/null
+++ b/efikamx.mk
@@ -0,0 +1,8 @@
+# Hardfp EfikaMX imx51
+ABI = aapcs-linux
+ARCH = armv7-a
+FPU = vfpv3-d16
+MODE = thumb
+FLOAT = hard
+
+# End of file
diff --git a/generic.mk b/generic.mk
new file mode 100644
index 0000000..b894fb4
--- /dev/null
+++ b/generic.mk
@@ -0,0 +1,4 @@
+# Generic hardfp toolchain
+ABI = aapcs-linux
+MODE = arm
+FLOAT = hard
diff --git a/raspberrypi.mk b/raspberrypi.mk
new file mode 100644
index 0000000..e96c6a3
--- /dev/null
+++ b/raspberrypi.mk
@@ -0,0 +1,8 @@
+# Hardfp raspberrypi
+ABI = aapcs-linux
+ARCH = armv6zk
+FPU = vfp
+MODE = thumb
+FLOAT = hard
+
+# End of file
diff --git a/vars.mk b/vars.mk
index 54761f2..e273fe4 100644
--- a/vars.mk
+++ b/vars.mk
@@ -5,24 +5,21 @@
 HOST = $(shell echo $$MACHTYPE | sed "s/$$(echo $$MACHTYPE | cut -d- -f2)/cross/")
 TARGET = arm-crux-linux-gnueabihf
 
-PWD  = $(shell pwd)
-CLFS = $(PWD)/clfs
-CROSSTOOLS = $(PWD)/crosstools
-WORK = $(PWD)/work
+TOPDIR  = $(shell pwd)
+CLFS = $(TOPDIR)/clfs
+CROSSTOOLS = $(TOPDIR)/crosstools
+WORK = $(TOPDIR)/work
 
-KERNEL_HEADERS_VERSION = 2.6.35.6
-LIBGMP_VERSION = 5.0.2
-LIBMPFR_VERSION = 3.1.0
-LIBMPC_VERSION = 0.9
-BINUTILS_VERSION = 2.21.1
-GCC_VERSION = 4.6.1
-GLIBC_VERSION = 2.13
+KERNEL_HEADERS_VERSION = 3.5.4
+LIBGMP_VERSION = 5.0.5
+LIBMPFR_VERSION = 3.1.1
+LIBMPC_VERSION = 1.0.1
+BINUTILS_VERSION = 2.22
+GCC_VERSION = 4.7.2
+GLIBC_VERSION = 2.16.0
 
-# Hardfp EfikaMX imx51
-ABI = aapcs-linux
-ARCH = armv7-a
-FPU = vfpv3-d16
-MODE = thumb
-FLOAT = hard
+# Optimizations per device: generic/efikamx/raspberrypi
+DEVICE=generic
+include $(TOPDIR)/$(DEVICE).mk
 
 # End of file
diff --git a/work/binutils-2.21.1-gnueabihf.patch b/work/binutils-2.21.1-gnueabihf.patch
deleted file mode 100644
index 10d7017..0000000
--- a/work/binutils-2.21.1-gnueabihf.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-===================================================================
-RCS file: /cvs/src/src/ld/configure.tgt,v
-retrieving revision 1.244
-retrieving revision 1.245
-diff -u -r1.244 -r1.245
---- src/ld/configure.tgt	2011/04/07 01:19:22	1.244
-+++ src/ld/configure.tgt	2011/04/08 16:05:12	1.245
-@@ -71,7 +71,7 @@
- arm*-*-symbianelf*)     targ_emul=armsymbian;;
- arm-*-kaos*)		targ_emul=armelf ;;
- arm9e-*-elf)		targ_emul=armelf ;;
--arm*b-*-linux-*eabi)	targ_emul=armelfb_linux_eabi
-+arm*b-*-linux-*eabi*)	targ_emul=armelfb_linux_eabi
- 			targ_extra_emuls=armelf_linux_eabi
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
-@@ -79,7 +79,7 @@
- 			targ_extra_emuls="armelfb armelf armelf_linux"
- 			targ_extra_libpath="armelf_linux"
- 			;;
--arm*-*-linux-*eabi)	targ_emul=armelf_linux_eabi
-+arm*-*-linux-*eabi*)	targ_emul=armelf_linux_eabi
- 			targ_extra_emuls=armelfb_linux_eabi
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
-@@ -87,7 +87,7 @@
- 			targ_extra_emuls="armelf armelfb armelfb_linux"
- 			targ_extra_libpath="armelfb_linux"
- 			;;
--arm*-*-uclinux*eabi)	targ_emul=armelf_linux_eabi
-+arm*-*-uclinux*eabi*)	targ_emul=armelf_linux_eabi
- 			targ_extra_emuls=armelfb_linux_eabi
- 			targ_extra_libpath=$targ_extra_emuls
- 			;;
-
diff --git a/work/gcc-4.6.1-gnueabihf.patch b/work/gcc-4.6.1-gnueabihf.patch
deleted file mode 100644
index 49059d3..0000000
--- a/work/gcc-4.6.1-gnueabihf.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-http://gcc.gnu.org/ml/gcc/2011-02/msg00390.html
-
-Triplet for ARM Linux HardFP ABI, again
-
-    * From: Guillem Jover <guillem at debian dot org>
-    * To: gcc at gcc dot gnu dot org
-    * Date: Mon, 21 Feb 2011 11:12:09 +0100
-    * Subject: Triplet for ARM Linux HardFP ABI, again
-
-
-diff --git a/configure b/configure
-index 501c6ff..43ff04f 100755
---- a/configure
-+++ b/configure
-diff --git a/configure b/configure
-index 501c6ff..43ff04f 100755
---- a/configure
-+++ b/configure
-@@ -3236,7 +3236,7 @@ case "${target}" in
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*eabi*)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     case ${with_newlib} in
-       no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
-diff --git a/configure.ac b/configure.ac
-index 9121d65..e1a42e0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -682,7 +682,7 @@ case "${target}" in
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*eabi*)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     case ${with_newlib} in
-       no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
-diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
-index b64ba55..cbe6b70 100644
---- a/gcc/ada/gcc-interface/Makefile.in
-+++ b/gcc/ada/gcc-interface/Makefile.in
-@@ -1841,7 +1841,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(arch) $(osys))),)
-   LIBRARY_VERSION := $(LIB_VERSION)
- endif
- 
--ifeq ($(strip $(filter-out arm% linux-gnueabi,$(arch) $(osys)-$(word 4,$(targ)))),)
-+ifeq ($(strip $(filter-out arm% linux%,$(arch) $(osys))),)
-   LIBGNAT_TARGET_PAIRS = \
-   a-intnam.ads<a-intnam-linux.ads \
-   s-inmaop.adb<s-inmaop-posix.adb \
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 54b822e..1a47343 100644
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -820,13 +820,13 @@ arm*-*-linux*)			# ARM GNU/Linux with ELF
- 	esac
- 	tmake_file="${tmake_file} t-linux arm/t-arm"
- 	case ${target} in
--	arm*-*-linux-*eabi)
-+	arm*-*-linux-*eabi*)
- 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
- 	    tm_file="$tm_file ../../libgcc/config/arm/bpabi-lib.h"
- 	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
- 	    # Define multilib configuration for arm-linux-androideabi.
- 	    case ${target} in
--	    *-androideabi)
-+	    *-androideabi*)
- 		tmake_file="$tmake_file arm/t-linux-androideabi"
- 		;;
- 	    esac
-@@ -848,7 +848,7 @@ arm*-*-uclinux*)		# ARM ucLinux
- 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/linux-gas.h arm/uclinux-elf.h glibc-stdint.h"
- 	tmake_file="arm/t-arm arm/t-arm-elf"
- 	case ${target} in
--	arm*-*-uclinux*eabi)
-+	arm*-*-uclinux*eabi*)
- 	    tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
- 	    tm_file="$tm_file ../../libgcc/config/arm/bpabi-lib.h"
- 	    tmake_file="$tmake_file arm/t-bpabi"
-diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
-index 02cb7ac..885c0e0 100644
---- a/gcc/testsuite/lib/target-supports.exp
-+++ b/gcc/testsuite/lib/target-supports.exp
-@@ -3219,7 +3219,7 @@ proc check_effective_target_sync_int_long { } {
- 	     || [istarget i?86-*-*]
- 	     || [istarget x86_64-*-*]
- 	     || [istarget alpha*-*-*] 
--	     || [istarget arm*-*-linux-gnueabi] 
-+	     || [istarget arm*-*-linux-*eabi*]
- 	     || [istarget bfin*-*linux*]
- 	     || [istarget hppa*-*linux*]
- 	     || [istarget s390*-*-*] 
-@@ -3250,7 +3250,7 @@ proc check_effective_target_sync_char_short { } {
- 	     || [istarget i?86-*-*]
- 	     || [istarget x86_64-*-*]
- 	     || [istarget alpha*-*-*] 
--	     || [istarget arm*-*-linux-gnueabi] 
-+	     || [istarget arm*-*-linux-*eabi*]
- 	     || [istarget hppa*-*linux*]
- 	     || [istarget s390*-*-*] 
- 	     || [istarget powerpc*-*-*]
-diff --git a/libjava/configure b/libjava/configure
-index f79e53b..47e3f23 100755
---- a/libjava/configure
-+++ b/libjava/configure
-@@ -20527,7 +20527,7 @@ case "${host}" in
-     # on Darwin -single_module speeds up loading of the dynamic libraries.
-     extra_ldflags_libjava=-Wl,-single_module
-     ;;
--arm*linux*eabi)
-+arm*-*-linux-*eabi*)
-     # Some of the ARM unwinder code is actually in libstdc++.  We
-     # could in principle replicate it in libgcj, but it's better to
-     # have a dependency on libstdc++.
-diff --git a/libjava/configure.ac b/libjava/configure.ac
-index 8187eec..b59abb3 100644
---- a/libjava/configure.ac
-+++ b/libjava/configure.ac
-@@ -919,7 +919,7 @@ case "${host}" in
-     # on Darwin -single_module speeds up loading of the dynamic libraries.
-     extra_ldflags_libjava=-Wl,-single_module
-     ;;
--arm*linux*eabi)
-+arm*-*-linux-*eabi*)
-     # Some of the ARM unwinder code is actually in libstdc++.  We
-     # could in principle replicate it in libgcj, but it's better to
-     # have a dependency on libstdc++.
-diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
-index e29404c..a2e58a9 100644
---- a/libstdc++-v3/configure.host
-+++ b/libstdc++-v3/configure.host
-@@ -322,7 +322,7 @@ case "${host}" in
-         fi
-     esac
-     case "${host}" in
--      arm*-*-linux-*eabi)
-+      arm*-*-linux-*eabi*)
- 	port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver"
- 	;;
-     esac
-diff --git a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc
-index cb40b7b..6147d66 100644
---- a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc
-+++ b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc
-@@ -1,5 +1,5 @@
- // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
--// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
-+// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux-*eabi* } }
- 
- // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
- //
-diff --git a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc
-index d71c012..1086a18 100644
---- a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc
-+++ b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc
-@@ -1,5 +1,5 @@
- // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
--// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
-+// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux-*eabi* } }
- 
- // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
- //
-
diff --git a/work/gcc-4.7.2-gnueabihf.patch b/work/gcc-4.7.2-gnueabihf.patch
new file mode 100644
index 0000000..8a77a7a
--- /dev/null
+++ b/work/gcc-4.7.2-gnueabihf.patch
@@ -0,0 +1,135 @@
+diff -pruN gcc-4.7.2.orig/gcc/ada/gcc-interface/Makefile.in gcc-4.7.2/gcc/ada/gcc-interface/Makefile.in
+--- gcc-4.7.2.orig/gcc/ada/gcc-interface/Makefile.in	2012-08-06 14:34:27.000000000 +0000
++++ gcc-4.7.2/gcc/ada/gcc-interface/Makefile.in	2012-11-06 14:25:52.708613671 +0000
+@@ -1867,7 +1867,7 @@ ifeq ($(strip $(filter-out powerpc% linu
+   LIBRARY_VERSION := $(LIB_VERSION)
+ endif
+ 
+-ifeq ($(strip $(filter-out arm% linux-gnueabi,$(arch) $(osys)-$(word 4,$(targ)))),)
++ifeq ($(strip $(filter-out arm% linux-gnueabi%,$(arch) $(osys)-$(word 4,$(targ)))),)
+   LIBGNAT_TARGET_PAIRS = \
+   a-intnam.ads<a-intnam-linux.ads \
+   s-inmaop.adb<s-inmaop-posix.adb \
+diff -pruN gcc-4.7.2.orig/gcc/config.gcc gcc-4.7.2/gcc/config.gcc
+--- gcc-4.7.2.orig/gcc/config.gcc	2012-09-12 09:03:54.000000000 +0000
++++ gcc-4.7.2/gcc/config.gcc	2012-11-06 14:28:12.212618421 +0000
+@@ -850,12 +850,12 @@ arm*-*-linux*)			# ARM GNU/Linux with EL
+ 	esac
+ 	tmake_file="${tmake_file} arm/t-arm"
+ 	case ${target} in
+-	arm*-*-linux-*eabi)
++	arm*-*-linux-*eabi*)
+ 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
+ 	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
+ 	    # Define multilib configuration for arm-linux-androideabi.
+ 	    case ${target} in
+-	    *-androideabi)
++	    *-androideabi*)
+ 		tmake_file="$tmake_file arm/t-linux-androideabi"
+ 		;;
+ 	    esac
+@@ -877,7 +877,7 @@ arm*-*-uclinux*)		# ARM ucLinux
+ 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/linux-gas.h arm/uclinux-elf.h glibc-stdint.h"
+ 	tmake_file="arm/t-arm arm/t-arm-elf"
+ 	case ${target} in
+-	arm*-*-uclinux*eabi)
++	arm*-*-uclinux*eabi*)
+ 	    tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
+ 	    tmake_file="$tmake_file arm/t-bpabi"
+   	    # The BPABI long long divmod functions return a 128-bit value in
+diff -pruN gcc-4.7.2.orig/gcc/testsuite/lib/target-supports.exp gcc-4.7.2/gcc/testsuite/lib/target-supports.exp
+--- gcc-4.7.2.orig/gcc/testsuite/lib/target-supports.exp	2012-08-10 13:21:31.000000000 +0000
++++ gcc-4.7.2/gcc/testsuite/lib/target-supports.exp	2012-11-06 14:34:38.076631560 +0000
+@@ -509,7 +509,7 @@ proc check_profiling_available { test_wh
+ 	# Some targets don't have any implementation of __bb_init_func or are
+ 	# missing other needed machinery.
+ 	if {    [istarget am3*-*-linux*]
+-	     || [istarget arm*-*-eabi*]
++	     || [istarget arm*-*-*eabi*]
+ 	     || [istarget arm*-*-elf]
+ 	     || [istarget arm*-*-symbianelf*]
+ 	     || [istarget avr-*-*]
+@@ -528,7 +528,7 @@ proc check_profiling_available { test_wh
+ 	     || [istarget mn10300-*-elf*]
+ 	     || [istarget moxie-*-elf*]
+ 	     || [istarget picochip-*-*]
+-	     || [istarget powerpc-*-eabi*]
++	     || [istarget powerpc-*-eabi]
+ 	     || [istarget powerpc-*-elf]
+ 	     || [istarget rx-*-*]	
+ 	     || [istarget tic6x-*-elf]
+@@ -3860,7 +3860,7 @@ proc check_effective_target_sync_int_lon
+ 	     || [istarget i?86-*-*]
+ 	     || [istarget x86_64-*-*]
+ 	     || [istarget alpha*-*-*] 
+-	     || [istarget arm*-*-linux-gnueabi] 
++	     || [istarget arm*-*-linux-*eabi*] 
+ 	     || [istarget bfin*-*linux*]
+ 	     || [istarget hppa*-*linux*]
+ 	     || [istarget s390*-*-*] 
+@@ -3890,7 +3890,7 @@ proc check_effective_target_sync_char_sh
+ 	     || [istarget i?86-*-*]
+ 	     || [istarget x86_64-*-*]
+ 	     || [istarget alpha*-*-*] 
+-	     || [istarget arm*-*-linux-gnueabi] 
++	     || [istarget arm*-*-linux-*eabi*] 
+ 	     || [istarget hppa*-*linux*]
+ 	     || [istarget s390*-*-*] 
+ 	     || [istarget powerpc*-*-*]
+diff -pruN gcc-4.7.2.orig/libgcc/config.host gcc-4.7.2/libgcc/config.host
+--- gcc-4.7.2.orig/libgcc/config.host	2012-09-05 12:19:47.000000000 +0000
++++ gcc-4.7.2/libgcc/config.host	2012-11-06 14:29:57.164621996 +0000
+@@ -327,7 +327,7 @@ arm*-*-netbsdelf*)
+ arm*-*-linux*)			# ARM GNU/Linux with ELF
+ 	tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix"
+ 	case ${host} in
+-	arm*-*-linux-*eabi)
++	arm*-*-linux-*eabi*)
+ 	  tmake_file="${tmake_file} arm/t-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
+ 	  tm_file="$tm_file arm/bpabi-lib.h"
+ 	  unwind_header=config/arm/unwind-arm.h
+@@ -341,7 +341,7 @@ arm*-*-linux*)			# ARM GNU/Linux with EL
+ arm*-*-uclinux*)		# ARM ucLinux
+ 	tmake_file="${tmake_file} t-fixedpoint-gnu-prefix"
+ 	case ${host} in
+-	arm*-*-uclinux*eabi)
++	arm*-*-uclinux*eabi*)
+ 	  tmake_file="${tmake_file} arm/t-bpabi"
+ 	  tm_file="$tm_file arm/bpabi-lib.h"
+ 	  unwind_header=config/arm/unwind-arm.h
+diff -pruN gcc-4.7.2.orig/libjava/configure gcc-4.7.2/libjava/configure
+--- gcc-4.7.2.orig/libjava/configure	2012-09-20 07:23:55.000000000 +0000
++++ gcc-4.7.2/libjava/configure	2012-11-06 14:30:44.400623603 +0000
+@@ -20542,7 +20542,7 @@ case "${host}" in
+     # on Darwin -single_module speeds up loading of the dynamic libraries.
+     extra_ldflags_libjava=-Wl,-single_module
+     ;;
+-arm*linux*eabi)
++arm*linux*eabi*)
+     # Some of the ARM unwinder code is actually in libstdc++.  We
+     # could in principle replicate it in libgcj, but it's better to
+     # have a dependency on libstdc++.
+diff -pruN gcc-4.7.2.orig/libjava/configure.ac gcc-4.7.2/libjava/configure.ac
+--- gcc-4.7.2.orig/libjava/configure.ac	2012-05-21 18:14:01.000000000 +0000
++++ gcc-4.7.2/libjava/configure.ac	2012-11-06 14:31:02.548624223 +0000
+@@ -931,7 +931,7 @@ case "${host}" in
+     # on Darwin -single_module speeds up loading of the dynamic libraries.
+     extra_ldflags_libjava=-Wl,-single_module
+     ;;
+-arm*linux*eabi)
++arm*linux*eabi*)
+     # Some of the ARM unwinder code is actually in libstdc++.  We
+     # could in principle replicate it in libgcj, but it's better to
+     # have a dependency on libstdc++.
+diff -pruN gcc-4.7.2.orig/libstdc++-v3/configure.host gcc-4.7.2/libstdc++-v3/configure.host
+--- gcc-4.7.2.orig/libstdc++-v3/configure.host	2012-02-10 18:10:12.000000000 +0000
++++ gcc-4.7.2/libstdc++-v3/configure.host	2012-11-06 14:32:00.692626201 +0000
+@@ -340,7 +340,7 @@ case "${host}" in
+         fi
+     esac
+     case "${host}" in
+-      arm*-*-linux-*eabi)
++      arm*-*-linux-*eabi*)
+ 	port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver"
+ 	;;
+     esac
diff --git a/work/glibc-2.13-gnueabihf.patch b/work/glibc-2.13-gnueabihf.patch
deleted file mode 100644
index 255145e..0000000
--- a/work/glibc-2.13-gnueabihf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glibc-2.13/ports/sysdeps/arm/preconfigure	2010-12-06 20:43:02.000000000 +0000
-+++ glibc-2.13.armhf//ports/sysdeps/arm/preconfigure	2011-05-06 15:57:15.087298361 +0000
-@@ -2,7 +2,7 @@
- arm*)
- 	base_machine=arm
- 	case $config_os in
--	linux-gnueabi)
-+	linux-gnueabi*)
- 		machine=arm/eabi/$machine
- 		if [ "${CFLAGS+set}" != "set" ]; then
- 		  CFLAGS="-g -O2"
diff --git a/work/glibc-2.13-prelink.patch b/work/glibc-2.13-prelink.patch
deleted file mode 100644
index bef7998..0000000
--- a/work/glibc-2.13-prelink.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 9a560b3..201c9cf 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
-      we need it in the memory handling later.  */
-   GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist;
- 
-+  /* Remember the last search directory added at startup, now that
-+     malloc will no longer be the one from dl-minimal.c.  */
-+  GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
-+
-   if (prelinked)
-     {
-       if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL)
-@@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- 			  lossage);
-     }
- 
--  /* Remember the last search directory added at startup, now that
--     malloc will no longer be the one from dl-minimal.c.  */
--  GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
--
-   if (! prelinked && rtld_multiple_ref)
-     {
-       /* There was an explicit ref to the dynamic linker as a shared lib.
diff --git a/work/libmpfr-3.1.1-p2.patch.gz b/work/libmpfr-3.1.1-p2.patch.gz
new file mode 100644
index 0000000000000000000000000000000000000000..4fe891ee7b50da3361da8df2de88b17cc18cda45
GIT binary patch
literal 3597
zcmV+o4)XCIiwFo>d_PbC18iwxZE$9CEi*1LE-@`|GA?jobYo}$-CB8f+DH=rd;KYD
z$a4Zl!jiagoWwIGS<l!w&&OO&q9;(>Xa^)l5(#+X{p?%S-4c=zhcm~{uAZMkeN<Oh
zRagJ23fsB81+`~QeH+G;TVJhK^op)p`)`k~zWHbOGTGRV8h2Dx%^m#@L(>gaYpGQY
zw06g6b?SOWiykP`|DAHVoJ)19$**34sww!U!>d<2<vSLdHXAr&Yt*Ri*sC`4efQ$>
z<h++&RyHngMs`SknyOX>z24FEj$Ylone^n%o6+S~1c9Bhpfk}|Zzk{u`+VPxT4j)4
zJk_<lu~c`?_F9{_mq%jrCaZ?hfHMBqHQFoez!T@zX18$m_VtDN!%^?bJnnvTa&~lT
zzCJxay1K+6WgOzt80=}(%(J5(u?eujaoM5`+Ld<t=~i1c+s3iXMG@|l<F$_89-FVv
zFV2pxb|46?&>4W^hH!PGBb)Ex5PsVM08Ig10YibR0yPEd3N#dGD$r7(ja~Sn<C~7J
zI=&k?+@SF|!N3^?PBCx}ZdGWvW+(=3U9UA1y~g)0mo|@MvxSrun`6g?B5~%jI~@9v
zm3ELd6=3Q*o(m3R%(T5}f5c2S3w>)4!t7v2r4h4APzjtn+)FW@3@<^44rm9_05+T8
zfW`aRa);T55jN<&!Dr#rcd^|**eS=a5p^W4g5FiD?UrrhD$&=29e5x$@9)9DbA!;I
zBA4NiLA*^ES^gahLO^{wAp>_h?lT`gIpGlQkg^N75f}FMw~?4N`wJwdxAk^bXu4Kw
z)tmJL+Nklt(C|1T$7wnKTiaHU3#;xdz9&TKxl9c`6+cL-ADJKE_B!H(RclI<j#xu!
zaWey&KoXDSypX&UwG+U<rr6PEBkvRL<U_IAs+Zt7ZbUblZ7zBMHVPOxw@~Cq^}2U@
z@?H1zCnz#_0W_>sk_(~2`~kc;Oiu@)2zp{77ro=3;qzxG`mSw`J)6PdAw)gb@bu|I
zDqo>pmPlL?fxIa{M+4}23|-hf?Km~<kftT(NhRi3V{A+Z(P$E+P*uIgy<x4X=yj>9
z#PezB42Gy*-)F(ZbL{{^4}!xRt@556Ri#267A)5Wc8G_q84G$LB!)_)u2P!xZ%H|=
z6KIb%&0FX+m$K7xD1orIlUvX#b?yU@h0kaZpYc;T1t<n6pAng2FzvgZk8dR<j}Sg&
zO2N>Zj%@I~Dee_zP~MMR4f^c`uN4wN4i&n#OwtT`A6#33rwo0zaPLT7i76bF4)W$p
z-Ns@dnFKeHUf;v>LwHty1~2n>kT!{X=6gv8)7fSczXuX_v^3=*V>zo22$^@TqO%m}
zdBjn8%=DZCSQ6)<+2*dRrN^#IK5LEw-Sl`A@V`6?=(`dpA@*A2rpT==sK)*%lGyL^
zNo&QPRoNH%rbj9zGxsq*DiYm#@JS7o;W921?fI}%^yOgA_I8*vHGebUG@4{m{6AUL
z6A2r+)FeX3yY<`i3#hK@J?UYuzM_|hET`S?yQerr%^h-ib#c;r0|mZ|0^-q)gAnx>
z<V}BO4SX-aJKGvL?wvqIG!ddmhD<$|V(<E_XeoVVP=aEyXyJX14!Chz0yLmvpTD;F
z%K!~!t(qmi$cr)Ju6$+3-CrJKWJzqH^14z-mD7JxIftDv7+OB;?JO<>Nf(MAJ;#n<
zqC6r}RY`cZPz;A*E9Dj9wHEA${JO~x&GJSpOD}KKvJj2hW+ASjw3RFyT$VCkd*Zl*
z(G)$;^B}ZGPQNmIK~{R}`M_pQD6BCWQ{a5i`juhf4-MpS$tUr=udm<mb>sMeG%ACx
zHnFeQs|$d|4Iqfnz)XQc?s^3Q5n>N6Tw^pDigN{KOWiht{Mf)2FuRx-c`femqsz<g
z#g%z<`oqyrmr%6HVaE~>Lt;j!4yTaeCOIO#l)W@Cvl^c_7*F`<c}ZLrI50&s7LU5E
ze9G(PQ{GBGN2}$dCIti=1q9m)2(}dvKM?XnR9i}`nl!1wh*>1Dk_^+zNn<PzhHUVQ
z>7moPr5H;(o$_z7(0Cw<FBH5o-={EKq3c{BxR%rn1<3|ytlbc@qQgg5I1k-v4n=PK
zOSvrJ3GUQ9JwJcTp+gK=65xFiQj>I80%P(;32=l!Too7ZCCOThevow@svmMDUQ$Y{
zL&<~kVhkb^8O}?%b#iG^ASqy1(dT=P;%=ja!xG_dOa+hs)exgr?%H^4+jm^cpQ8^#
zbjV1AGAM<Ch4|0Ag+-n$86+&M-7yUc?n$o1A4(UWg`M=0uzQUe`^j+x2W>)eEQJy?
zG1J6H!Qse4*Y{DAI>j^@b0H1yV&JkHymJdHA|)a6LImXsD8ItQ3mpEkVh-N~U*C)&
zWzjEXLkwY$daCtdoi?OQ(&`{w{)O5=GpJ&)h6=6yH&kN$AE;zxAqe8ZP*JV63<_Eq
z{o|RQ%^FFIl&y%F|5Pnh|HriO5WDQe)lims8Q+&X=cuWuQ`ZAI%A8vxblmxx8zbqu
zrLSF1z|1zKUtpF>v&c=XOSbg9kaf6ijU9X9k@t^R?6dF_W3Hqkl2j3q09-Ew3xV|n
zqj~fWR(}*baFLP3Q|}>Vi)V^`CdpVn!>Q7yN%Kw^rF=3sqi(b^2q{K0f{T3gvIRVm
zPKUn=(9o0U1o5*>c_)@8+oS2r6n@uQYVKmGeMYLt?DYEoVyDRiMW=?K2ZnZ*lMLrL
zTC3?i!&+Trl*E~G+*{MNaJayKqR~e)^~UKoSL9QQV)ZPHOSXz*N^@y8w^Eal^FWRx
znlhNw4ps+{e?+;pTJPw_mzG=eCuhp7XlJ3vgFBzjt@_a#P1hugeoxu;ku~J}$*VV&
zF1u2_HLAQCe{%BcksDh%fA!w}Zpkm6*V-!oW&EA;U((p~@?UXRzP{t`ocvc~JC$ci
zY}R_C(IlrwABL7GE1^V-_X+`X^B&_`=p!KiP^4G-rcQ7*MBn$Ulqn|N<5;|{r=t+c
zVC>Cl41Uwo31be2xQ8B3T$3aCdn&ikY6=i>^#!dX8Nk?@ua&}2$l;~q4j6pGKMO&{
zeE(ix5=O<JPZny3swfH#7*p92?-c|XFr7@8pMi6IUNS;>dtV_$L=3**ku|{<#$l!B
z;^q*P^yL!$IT#<XD_c#Hu#L~p6vCE@VB?87a>jjxXoLAuxn}B8NP{blJTz#k9TVAo
zcysoaZ1!vO>yxX?4YNjamWuQDmS*Nv_lCr{5I2dKAQ*GK>D>@vHr~lR73z>E@@i;z
z9s)s^%|dhJd6OmH26L`<*R*Wg)Va<h-4ciLo<BW74$pgCI(VbyDi$$`gm}#(s#p&Q
zcZ;gD&wiacXo1Kfaw=$(jDyEBoT`?w8T|<0P<}prDwNETN4gpk>7TlcOl5^HN9My}
z0sjra>ysbPx*fQj`s^jKNC&f7)#zY0Yc=VRw|rul#FIf%oNq6>-yi}?7J2$Uvwk7`
z!M7W4zY~o>wx$!?3K<tJ>7B!98VEEnapw6FKc9SW_PRe_L6LeDJ|hy!15t}6{YBM-
zFSsyQkyvwQ{z26PQ7Tw2AQ;;f5LVnd+1{0fgEcqLBZ>x(zkGCE;|Ws!**0=Ar1LmK
zO2@=Uz->W)dPnh~=ZC@rf9nNoGK9+toXt_v+@ObHI0-uY`@wuXu_})1J67e^7q9!4
z1V{Ul&;4<5M?BRl!*D#}J|Y!a<AO9&Yw5L|(3);1^p8|`r;@)GWkjR68=YI6to3CG
zfLjZ08nyQd>`n6XwZ>9jf05;?Dq=a6esGovi!#4opldhr8-{i&<~kNrf*bxjw%|s8
zFW+@~e^z<6$QaWvnSul4miycTn3T&U;N5%F^^A$JL6nA>h=mKgHpZ0nBdZdSd)G@j
zyPYdg6P(0|K$;To3l!*GpPr^t_Ps@R#HYlRMwRZbq&|L~S|c+`$III{zI8KsB9vl6
zyYJk>;;xBDrZ~E_oDrHGo@Q(zkom5#8@ww}MhSwP$=%t64aiUta?ap|OmEN~s8!JH
zweGIX=Smr&T62iJ!3&trKZISiVaFs2sZ<%~)1Fc#V!mii<c!39wvc~1)s#JUIVq-C
zR7N{L$Al`M8PNeCgD0-Bkv_29QPL-%)*?eI=uGAAFKZYqo1CHc06S_*yp$+0OhUi3
zC`<80V^iWOVopreH)Ijy#6*RQ8^6QzcHoeu5ti_7i$MvkxsGjd)g-pC;HFx3_yN+M
z9V{AaqEU;RQe2LwBVL(eJYT9Wn|gfDu3%P-h)Op_KY=<^h%;HCaqXoVO$HFActrQ3
zYiKSy=aFhd2YF*JPu@h_Ee|l3PB<wsdBk(+8Y#NQQV?+NLe)_FXz62XFvKxPkth9d
zUK44ys;xHvXzTp&(6<`cUiKGN@fFsoR4N@2J6b`&{E+T%arQeL!lKwSbBShyf`jw#
zDw!^1uTfjUo?g$Ul{vS_91A)Lh8oS*N`?q(K8IqXhDMo<H{`CD$hEYU<c3I$gXSDc
zwOD=)o@32yb~y}M^2+?+mdIfXi@^&;D0M@ew8nFzJBq})Yb(;Q*QNP^Tv2}B9?fq#
z-dN$z#d0&@iE}KTo`hG<>rVN2!C5Y4V?E`Z?u_G)o<!m2Va1gYa6h!l!)9}+<mN5^
zZlFlui{C%qypOZ0x~}sK1L~=o$*UsR{b-G%bSKv)-ol#Eikb*mqJ}lCN{&bDBn8GY
TO>`}7n^XM{3FmE@!!iH>8%XMl

literal 0
HcmV?d00001

-- 
2.26.2