From 054777b4f1c646e3c01d6e0fd1593ac4d52048e2 Mon Sep 17 00:00:00 2001
From: Victor Martinez <pitillo@ono.com>
Date: Fri, 29 Aug 2014 11:50:24 +0000
Subject: [PATCH] Toolchain update for 3.1

- libgmp 6.0.0a
- libmpc 1.0.2
- binutils 2.24
- glibc 2.19
- gcc 4.8.3
---
 Makefile                       | 12 ++----------
 vars.mk                        | 12 ++++++------
 work/gcc-4.7.3-gnueabihf.patch | 28 ----------------------------
 work/gcc-4.8.3-gnueabihf.patch | 13 +++++++++++++
 4 files changed, 21 insertions(+), 44 deletions(-)
 delete mode 100644 work/gcc-4.7.3-gnueabihf.patch
 create mode 100644 work/gcc-4.8.3-gnueabihf.patch

diff --git a/Makefile b/Makefile
index 5b5feaf..0ecebb7 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ $(CROSSTOOLS)/lib/libgmp.so: $(WORK)/build-libgmp
 	cd $(WORK)/build-libgmp && \
 		unset CFLAGS && unset CXXFLAGS && \
 		CPPFLAGS=-fexceptions \
-		$(WORK)/gmp-$(LIBGMP_VERSION)/configure --prefix=$(CROSSTOOLS) --enable-cxx && \
+		$(WORK)/gmp-$(LIBGMP_VERSION_MIN)/configure --prefix=$(CROSSTOOLS) --enable-cxx && \
 		make && make install || exit 1
 	touch $(CROSSTOOLS)/lib/libgmp.so
 
@@ -202,15 +202,8 @@ gcc-static-distclean: gcc-static-clean
 $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2:
 	wget -P $(WORK) -c ftp://ftp.gnu.org/gnu/glibc/glibc-$(GLIBC_VERSION).tar.bz2
 
-$(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2:
-	wget -P $(WORK) -c ftp://ftp.gnu.org/gnu/glibc/glibc-ports-$(GLIBC_VERSION).tar.bz2
-
-$(WORK)/glibc-$(GLIBC_VERSION): $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2 $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2
+$(WORK)/glibc-$(GLIBC_VERSION): $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2
 	tar -C $(WORK) -xvjf $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2
-	cd $(WORK)/glibc-$(GLIBC_VERSION) && \
-		tar xvjf $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2 && \
-		mv glibc-ports-$(GLIBC_VERSION) ports && \
-		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)
@@ -222,7 +215,6 @@ $(CLFS)/usr/lib/libc.so: $(WORK)/build-glibc $(WORK)/glibc-$(GLIBC_VERSION)
 		export PATH=$(CROSSTOOLS)/bin:$$PATH && \
 		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 && \
diff --git a/vars.mk b/vars.mk
index 6708bb9..a194618 100644
--- a/vars.mk
+++ b/vars.mk
@@ -11,13 +11,13 @@ CROSSTOOLS = $(TOPDIR)/crosstools
 WORK = $(TOPDIR)/work
 
 KERNEL_HEADERS_VERSION = 3.5.4
-LIBGMP_VERSION = 5.1.2
+LIBGMP_VERSION = 6.0.0a
+LIBGMP_VERSION_MIN = 6.0.0
 LIBMPFR_VERSION = 3.1.2
-LIBMPC_VERSION = 1.0.1
-BINUTILS_VERSION = 2.23.1
-GCC_VERSION = 4.7.3
-GLIBC_VERSION = 2.16.0
-LIBTOOL_VERSION = 2.4.2
+LIBMPC_VERSION = 1.0.2
+BINUTILS_VERSION = 2.24
+GCC_VERSION = 4.8.3
+GLIBC_VERSION = 2.19
 
 ABI = aapcs-linux
 MODE = arm
diff --git a/work/gcc-4.7.3-gnueabihf.patch b/work/gcc-4.7.3-gnueabihf.patch
deleted file mode 100644
index 98f372d..0000000
--- a/work/gcc-4.7.3-gnueabihf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -pruN gcc-4.7.3.orig/gcc/ada/gcc-interface/Makefile.in gcc-4.7.3/gcc/ada/gcc-interface/Makefile.in
---- gcc-4.7.3.orig/gcc/ada/gcc-interface/Makefile.in    2013-08-09 16:53:45.190805185 +0200
-+++ gcc-4.7.3/gcc/ada/gcc-interface/Makefile.in 2013-08-09 17:02:38.730865077 +0200
-@@ -1866,7 +1866,7 @@ ifeq ($(strip $(filter-out powerpc% linu
-   LIBRARY_VERSION := $(LIB_VERSION)
- endif
-
--ifeq ($(strip $(filter-out arm%-linux,$(arch)-$(osys)) $(if $(findstring eabi,$(word 4,$(targ))),,$(word 4,$(targ)))),)
-+ifeq ($(strip $(filter-out arm%-linux,$(arch)-$(osys)) $(if $(findstring eabi%,$(word 4,$(targ))),,$(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.3.orig/gcc/config/arm/linux-eabi.h gcc-4.7.3/gcc/config/arm/linux-eabi.h
---- gcc-4.7.3.orig/gcc/config/arm/linux-eabi.h 2012-11-26 14:44:44.335493878 +0000
-+++ gcc-4.7.3/gcc/config/arm/linux-eabi.h      2012-11-26 14:55:06.599515067 +0000
-@@ -62,7 +62,11 @@
- /* Use ld-linux.so.3 so that it will be possible to run "classic"
-    GNU/Linux binaries on an EABI system.  */
- #undef  GLIBC_DYNAMIC_LINKER
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
-+#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3"
-+#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3"
-+#define GLIBC_DYNAMIC_LINKER \
-+   "%{mfloat-abi=hard:" GLIBC_DYNAMIC_LINKER_HARD_FLOAT "} \
-+    %{!mfloat-abi=hard:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "}"
-
- /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
-    use the GNU/Linux version, not the generic BPABI version.  */
diff --git a/work/gcc-4.8.3-gnueabihf.patch b/work/gcc-4.8.3-gnueabihf.patch
new file mode 100644
index 0000000..7864e41
--- /dev/null
+++ b/work/gcc-4.8.3-gnueabihf.patch
@@ -0,0 +1,13 @@
+Binary files gcc-4.8.3.orig/gcc/ada/gcc-interface/.Makefile.in.un~ and gcc-4.8.3/gcc/ada/gcc-interface/.Makefile.in.un~ differ
+diff -pruN gcc-4.8.3.orig/gcc/ada/gcc-interface/Makefile.in gcc-4.8.3/gcc/ada/gcc-interface/Makefile.in
+--- gcc-4.8.3.orig/gcc/ada/gcc-interface/Makefile.in	2014-08-28 12:00:40.838855906 +0000
++++ gcc-4.8.3/gcc/ada/gcc-interface/Makefile.in	2014-08-28 13:38:14.428930303 +0000
+@@ -1888,7 +1888,7 @@ ifeq ($(strip $(filter-out powerpc% e500
+   LIBRARY_VERSION := $(LIB_VERSION)
+ endif
+ 
+-ifeq ($(strip $(filter-out arm%-linux,$(arch)-$(osys)) $(if $(findstring eabi,$(word 4,$(targ))),,$(word 4,$(targ)))),)
++ifeq ($(strip $(filter-out arm%-linux,$(arch)-$(osys)) $(if $(findstring eabi%,$(word 4,$(targ))),,$(word 4,$(targ)))),)
+   LIBGNAT_TARGET_PAIRS = \
+   a-intnam.ads<a-intnam-linux.ads \
+   s-inmaop.adb<s-inmaop-posix.adb \
-- 
2.26.2