From: Victor Martinez <pitillo@ono.com>
Date: Sat, 6 Oct 2012 11:41:49 +0000 (+0000)
Subject: Toolchain update libgmp 5.0.5, libmpfr 3.1.1, libmpc 1.0.1, binutils 2.22, glibc... 
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=d14a4148e733540b76092fe370548b15aa7db76f;p=toolchain-softfp.git

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

Fixed builds:
gcc-static: --disable-libquadmath (arm hasn't __float128)
glibc: "libc_cv_ctors_header=yes" (gcc constructor support is configured without the configure test)
gcc-final: --disable-bootstrap (removed the three times build bootstrap)
           --disable-libgomp (not needed for cross compilations)
---

diff --git a/Makefile b/Makefile
index 1a17dd5..be67014 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
@@ -182,7 +184,7 @@ $(CROSSTOOLS)/lib/gcc: $(WORK)/build-gcc-static $(WORK)/gcc-$(GCC_VERSION)
 		--nfp --without-fp --with-softfloat-support=internal \
 		--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 && \
 		make && make install || exit 1
 	touch $(CROSSTOOLS)/lib/gcc
 
@@ -202,13 +204,12 @@ $(WORK)/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)-pot.patch
+$(WORK)/glibc-$(GLIBC_VERSION): $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2 $(WORK)/glibc-ports-$(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 && \
-		patch -p1 -i $(WORK)/glibc-$(GLIBC_VERSION)-pot.patch && \
 		mv glibc-ports-$(GLIBC_VERSION) ports && \
-		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)
@@ -221,6 +222,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" \
@@ -258,7 +260,7 @@ $(CLFS)/lib/gcc: $(WORK)/build-gcc-final $(WORK)/gcc-$(GCC_VERSION)
 		--disable-multilib --with-sysroot=$(CLFS) --disable-nls \
 		--enable-languages=c,c++ --enable-__cxa_atexit \
 		--with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) --with-mpc=$(CROSSTOOLS) \
-		--enable-c99 --enable-long-long --enable-threads=posix && \
+		--enable-threads=posix --disable-libstdcxx-pch --disable-bootstrap --disable-libgomp && \
 		make AS_FOR_TARGET="$(TARGET)-as" LD_FOR_TARGET="$(TARGET)-ld" && \
 		make install || exit 1
 	touch $(CLFS)/lib/gcc
diff --git a/vars.mk b/vars.mk
index 8453672..22efee9 100644
--- a/vars.mk
+++ b/vars.mk
@@ -11,11 +11,11 @@ CROSSTOOLS = $(PWD)/crosstools
 WORK = $(PWD)/work
 
 KERNEL_HEADERS_VERSION = 2.6.35.6
-LIBGMP_VERSION = 5.0.1
-LIBMPFR_VERSION = 3.0.0
-LIBMPC_VERSION = 0.8.2
-BINUTILS_VERSION = 2.20.1
-GCC_VERSION = 4.5.2
-GLIBC_VERSION = 2.12.1
+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
 
 # End of file
diff --git a/work/glibc-2.12.1-pot.patch b/work/glibc-2.12.1-pot.patch
deleted file mode 100644
index dacb3c7..0000000
--- a/work/glibc-2.12.1-pot.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ruN glibc-2.12.1.orig//manual/Makefile glibc-2.12.1//manual/Makefile
---- glibc-2.12.1.orig//manual/Makefile	2010-07-27 11:34:39.000000000 +0000
-+++ glibc-2.12.1//manual/Makefile	2011-04-05 12:48:47.000000000 +0000
-@@ -232,7 +232,10 @@
- .PHONY: stubs
- stubs: $(objpfx)stubs
- endif
--$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
-+$(objpfx)stubs ../po/manual.pot:
-+	$(make-target-directory)
-+	touch $@
-+$(objpfx)stamp%:
- 	$(make-target-directory)
- 	touch $@
- 
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 0000000..4fe891e
Binary files /dev/null and b/work/libmpfr-3.1.1-p2.patch.gz differ