From d75c6e4b7c4f9fc9ecdbe29f9f8d9db6038f5633 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Sun, 4 Oct 2015 15:17:17 +0000 Subject: [PATCH] Toolchain update for 3.2 - Added makejobs support - libmpfr 3.1.3 - libmpc 1.0.3 - binutils 2.25.1 - gcc 5.2.0 - glibc 2.22 --- Makefile | 32 ++++++++++++++------------------ vars.mk | 15 +++++++++------ work/gcc-4.8.3-gnueabihf.patch | 13 ------------- 3 files changed, 23 insertions(+), 37 deletions(-) delete mode 100644 work/gcc-4.8.3-gnueabihf.patch diff --git a/Makefile b/Makefile index b09b9df..14046d4 100644 --- a/Makefile +++ b/Makefile @@ -15,11 +15,11 @@ 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/v3.0/linux-$(KERNEL_HEADERS_VERSION).tar.bz2 +$(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.xz: + wget -P $(WORK) -c ftp://ftp.kernel.org/pub/linux/kernel/v4.x/linux-$(KERNEL_HEADERS_VERSION).tar.xz -$(WORK)/linux-$(KERNEL_HEADERS_VERSION): $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.bz2 - tar -C $(WORK) -xvjf $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.bz2 +$(WORK)/linux-$(KERNEL_HEADERS_VERSION): $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.xz + tar -C $(WORK) -xvf $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.xz touch $(WORK)/linux-$(KERNEL_HEADERS_VERSION) $(CLFS)/usr/include/asm: $(WORK)/linux-$(KERNEL_HEADERS_VERSION) @@ -36,7 +36,7 @@ linux-headers-clean: rm -vrf $(WORK)/linux-$(KERNEL_HEADERS_VERSION) linux-headers-distclean: linux-headers-clean - rm -vf $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.bz2 + rm -vf $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.xz # LIBGMP @@ -57,7 +57,7 @@ $(CROSSTOOLS)/lib/libgmp.so: $(WORK)/build-libgmp unset CFLAGS && unset CXXFLAGS && \ CPPFLAGS=-fexceptions \ $(WORK)/gmp-$(LIBGMP_VERSION)/configure --prefix=$(CROSSTOOLS) --enable-cxx && \ - make && make install || exit 1 + make $(MJ) && make install || exit 1 touch $(CROSSTOOLS)/lib/libgmp.so libgmp: $(CROSSTOOLS)/lib/libgmp.so @@ -86,7 +86,7 @@ $(CROSSTOOLS)/lib/libmpfr.so: $(WORK)/build-libmpfr unset CFLAGS && unset CXXFLAGS && \ LDFLAGS="-Wl,-rpath,$(CROSSTOOLS)/lib" && \ $(WORK)/mpfr-$(LIBMPFR_VERSION)/configure --prefix=$(CROSSTOOLS) --enable-shared --with-gmp=$(CROSSTOOLS) && \ - make && make install || exit 1 + make $(MJ) && make install || exit 1 touch $(CROSSTOOLS)/lib/libmpfr.so libmpfr: $(CROSSTOOLS)/lib/libmpfr.so @@ -116,7 +116,7 @@ $(CROSSTOOLS)/lib/libmpc.so: $(WORK)/build-libmpc LDFLAGS="-Wl,-rpath,$(CROSSTOOLS)/lib" && \ $(WORK)/mpc-$(LIBMPC_VERSION)/configure --prefix=$(CROSSTOOLS) \ --enable-shared --with-gmp=$(CROSSTOOLS) --with-mpfr=$(CROSSTOOLS) && \ - make && make install || exit 1 + make $(MJ) && make install || exit 1 touch $(CROSSTOOLS)/lib/libmpc.so libmpc: $(CROSSTOOLS)/lib/libmpc.so @@ -148,7 +148,7 @@ $(CLFS)/usr/include/libiberty.h: $(WORK)/build-binutils $(WORK)/binutils-$(BINUTILS_VERSION)/configure --prefix=$(CROSSTOOLS) \ --host=$(HOST) --target=$(TARGET) --with-sysroot=$(CLFS) \ --disable-nls --enable-shared --disable-multilib --enable-interwork && \ - make configure-host && make && make install || exit 1 + make configure-host && make $(MJ) && make install || exit 1 cp -va $(WORK)/binutils-$(BINUTILS_VERSION)/include/libiberty.h $(CLFS)/usr/include touch $(CLFS)/usr/include/libiberty.h @@ -163,12 +163,10 @@ binutils-distclean: binutils-clean # GCC-STATIC $(WORK)/gcc-$(GCC_VERSION).tar.bz2: - wget -P $(WORK) -c ftp://sources.redhat.com/pub/gcc/releases/gcc-$(GCC_VERSION)/gcc-$(GCC_VERSION).tar.bz2 + wget -P $(WORK) -c ftp://gcc.gnu.org/pub/gcc/releases/gcc-$(GCC_VERSION)/gcc-$(GCC_VERSION).tar.bz2 -$(WORK)/gcc-$(GCC_VERSION): $(WORK)/gcc-$(GCC_VERSION).tar.bz2 $(WORK)/gcc-$(GCC_VERSION)-gnueabihf.patch +$(WORK)/gcc-$(GCC_VERSION): $(WORK)/gcc-$(GCC_VERSION).tar.bz2 tar -C $(WORK) -xvjf $(WORK)/gcc-$(GCC_VERSION).tar.bz2 - cd $(WORK)/gcc-$(GCC_VERSION) && \ - patch -p1 -i $(WORK)/gcc-$(GCC_VERSION)-gnueabihf.patch touch $(WORK)/gcc-$(GCC_VERSION) $(WORK)/build-gcc-static: $(WORK)/gcc-$(GCC_VERSION) @@ -187,7 +185,7 @@ $(CROSSTOOLS)/lib/gcc: $(WORK)/build-gcc-static $(WORK)/gcc-$(GCC_VERSION) --with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) --with-mpc=$(CROSSTOOLS) \ --disable-shared --disable-threads --enable-languages=c --disable-libquadmath \ --with-abi=$(ABI) --with-mode=$(MODE) --with-float=$(FLOAT) && \ - make all-gcc all-target-libgcc && make install-gcc install-target-libgcc || exit 1 + make $(MJ) all-gcc all-target-libgcc && make install-gcc install-target-libgcc || exit 1 touch $(CROSSTOOLS)/lib/gcc gcc-static: linux-headers libgmp libmpfr binutils $(CROSSTOOLS)/lib/gcc @@ -215,8 +213,6 @@ $(CLFS)/usr/lib/libc.so: $(WORK)/build-glibc $(WORK)/glibc-$(GLIBC_VERSION) cd $(WORK)/build-glibc && \ export PATH=$(CROSSTOOLS)/bin:$$PATH && \ echo "libc_cv_forced_unwind=yes" > config.cache && \ - echo "libc_cv_c_cleanup=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" \ @@ -226,7 +222,7 @@ $(CLFS)/usr/lib/libc.so: $(WORK)/build-glibc $(WORK)/glibc-$(GLIBC_VERSION) --disable-profile --enable-add-ons --with-tls --enable-kernel=2.6.0 \ --with-__thread --with-binutils=$(CROSSTOOLS)/bin --with-fp=yes --enable-obsolete-rpc \ --with-headers=$(CLFS)/usr/include --cache-file=config.cache && \ - make && make install || exit 1 + make $(MJ) && make install || exit 1 touch $(CLFS)/usr/lib/libc.so glibc: binutils gcc-static $(CLFS)/usr/lib/libc.so @@ -256,7 +252,7 @@ $(CLFS)/lib/gcc: $(WORK)/build-gcc-final $(WORK)/gcc-$(GCC_VERSION) --enable-threads=posix --disable-libstdcxx-pch --disable-bootstrap --disable-libgomp \ --with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) --with-mpc=$(CROSSTOOLS) \ --with-abi=$(ABI) --with-mode=$(MODE) --with-float=$(FLOAT) && \ - make AS_FOR_TARGET="$(TARGET)-as" LD_FOR_TARGET="$(TARGET)-ld" && \ + make $(MJ) 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 c648ca8..b32384e 100644 --- a/vars.mk +++ b/vars.mk @@ -10,16 +10,19 @@ CLFS = $(TOPDIR)/clfs CROSSTOOLS = $(TOPDIR)/crosstools WORK = $(TOPDIR)/work -KERNEL_HEADERS_VERSION = 3.5.4 +KERNEL_HEADERS_VERSION = 4.1.1 LIBGMP_VERSION = 6.0.0a -LIBMPFR_VERSION = 3.1.2 -LIBMPC_VERSION = 1.0.2 -BINUTILS_VERSION = 2.24 -GCC_VERSION = 4.8.3 -GLIBC_VERSION = 2.19 +LIBMPFR_VERSION = 3.1.3 +LIBMPC_VERSION = 1.0.3 +BINUTILS_VERSION = 2.25.1 +GCC_VERSION = 5.2.0 +GLIBC_VERSION = 2.22 ABI = aapcs-linux MODE = arm FLOAT = hard +# Make jobs +MJ=-j2 + # End of file diff --git a/work/gcc-4.8.3-gnueabihf.patch b/work/gcc-4.8.3-gnueabihf.patch deleted file mode 100644 index 7864e41..0000000 --- a/work/gcc-4.8.3-gnueabihf.patch +++ /dev/null @@ -1,13 +0,0 @@ -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