From d14a4148e733540b76092fe370548b15aa7db76f Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Sat, 6 Oct 2012 11:41:49 +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 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) --- Makefile | 14 ++++++++------ vars.mk | 12 ++++++------ work/glibc-2.12.1-pot.patch | 15 --------------- work/libmpfr-3.1.1-p2.patch.gz | Bin 0 -> 3597 bytes 4 files changed, 14 insertions(+), 27 deletions(-) delete mode 100644 work/glibc-2.12.1-pot.patch create mode 100644 work/libmpfr-3.1.1-p2.patch.gz 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 0000000000000000000000000000000000000000..4fe891ee7b50da3361da8df2de88b17cc18cda45 GIT binary patch literal 3597 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 literal 0 HcmV?d00001 -- 2.26.2