From 4132625108a121dcf391e2cc03d31aa072d63857 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 11 Sep 2013 23:32:49 +0000 Subject: [PATCH 01/16] Removed not used vars to build a generic hardfp toolchain --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 85039c8..b7c1475 100644 --- a/Makefile +++ b/Makefile @@ -185,7 +185,7 @@ $(CROSSTOOLS)/lib/gcc: $(WORK)/build-gcc-static $(WORK)/gcc-$(GCC_VERSION) --disable-libgomp --disable-libmudflap --disable-libssp \ --with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) --with-mpc=$(CROSSTOOLS) \ --disable-shared --disable-threads --enable-languages=c --disable-libquadmath \ - --with-abi=$(ABI) --with-arch=$(ARCH) --with-mode=$(MODE) --with-float=$(FLOAT) --with-fpu=$(FPU) && \ + --with-abi=$(ABI) --with-mode=$(MODE) --with-float=$(FLOAT) && \ make all-gcc all-target-libgcc && make install-gcc install-target-libgcc || exit 1 touch $(CROSSTOOLS)/lib/gcc @@ -262,7 +262,7 @@ $(CLFS)/lib/gcc: $(WORK)/build-gcc-final $(WORK)/gcc-$(GCC_VERSION) --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-abi=$(ABI) --with-mode=$(MODE) --with-float=$(FLOAT) && \ make AS_FOR_TARGET="$(TARGET)-as" LD_FOR_TARGET="$(TARGET)-ld" && \ make install || exit 1 touch $(CLFS)/lib/gcc -- 2.26.2 From a43bb1e23e00be959f97dbea1f897b2eeed85276 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Sat, 14 Sep 2013 10:02:00 +0000 Subject: [PATCH 02/16] Removed libtool test from toolchain --- Makefile | 37 +++---------------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/Makefile b/Makefile index b7c1475..5b5feaf 100644 --- a/Makefile +++ b/Makefile @@ -6,12 +6,12 @@ include vars.mk .PHONY: all clean distclean -all: linux-headers libgmp libmpfr libmpc binutils gcc-static glibc gcc-final libtool setup test +all: linux-headers libgmp libmpfr libmpc binutils gcc-static glibc gcc-final setup test -clean: linux-headers-clean libgmp-clean libmpfr-clean libmpc-clean binutils-clean gcc-static-clean glibc-clean gcc-final-clean libtool-clean test-clean +clean: linux-headers-clean libgmp-clean libmpfr-clean libmpc-clean binutils-clean gcc-static-clean glibc-clean gcc-final-clean test-clean rm -rvf $(CROSSTOOLS)/* $(CLFS)/* -distclean: clean linux-headers-distclean libgmp-distclean libmpfr-distclean libmpc-distclean binutils-distclean gcc-static-distclean glibc-distclean gcc-final-distclean libtool-distclean test-distclean +distclean: clean linux-headers-distclean libgmp-distclean libmpfr-distclean libmpc-distclean binutils-distclean gcc-static-distclean glibc-distclean gcc-final-distclean test-distclean # LINUX HEADERS @@ -276,37 +276,6 @@ gcc-final-distclean: gcc-final-clean rm -vf $(WORK)/gcc-$(GCC_VERSION).tar.bz2 -# LIBTOOL - -$(WORK)/libtool-$(LIBTOOL_VERSION).tar.xz: - wget -P $(WORK) -c http://ftp.gnu.org/gnu/libtool/libtool-$(LIBTOOL_VERSION).tar.xz - -$(WORK)/libtool-$(LIBTOOL_VERSION): $(WORK)/libtool-$(LIBTOOL_VERSION).tar.xz - tar -C $(WORK) -xvJf $(WORK)/libtool-$(LIBTOOL_VERSION).tar.xz - touch $(WORK)/libtool-$(LIBTOOL_VERSION) - -$(WORK)/build-libtool: $(WORK)/libtool-$(LIBTOOL_VERSION) - mkdir -p $(WORK)/build-libtool - touch $(WORK)/build-libtool - -$(CROSSTOOLS)/lib/libltdl.so: $(WORK)/build-libtool $(WORK)/libtool-$(LIBTOOL_VERSION) - cd $(WORK)/build-libtool && \ - unset CFLAGS && unset CXXFLAGS && \ - LDFLAGS="-Wl,-rpath,$(CROSSTOOLS)/lib" && \ - $(WORK)/libtool-$(LIBTOOL_VERSION)/configure --prefix=$(CROSSTOOLS) \ - --program-prefix=$(TARGET)- && \ - make && make install || exit 1 - touch $(CROSSTOOLS)/lib/libltdl.so - -libtool: gcc-final $(CROSSTOOLS)/lib/libltdl.so - -libtool-clean: - rm -vrf $(WORK)/build-libtool $(WORK)/libtool-$(LIBTOOL_VERSION) - -libtool-distclean: - rm -vf $(WORK)/libtool-$(LIBTOOL_VERSION).tar.xz - - # SETUP FOR PKGUTILS-CROSS $(CLFS)/var/lib/pkg/db: install -d -m 0755 $(CLFS)/var/lib/pkg -- 2.26.2 From 054777b4f1c646e3c01d6e0fd1593ac4d52048e2 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Fri, 29 Aug 2014 11:50:24 +0000 Subject: [PATCH 03/16] 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 Date: Sat, 29 Nov 2014 00:29:31 +0000 Subject: [PATCH 04/16] Added .gitignore file --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f3dec6a --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +clfs/ +crosstools/ +work/ -- 2.26.2 From f8864e8dc63af915b869ffe0ef357c26ccee1470 Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Sat, 29 Nov 2014 22:08:34 +0000 Subject: [PATCH 05/16] Updated README and .gitignore file --- .gitignore | 1 + README | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f3dec6a..dcd7aef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ clfs/ crosstools/ work/ +*~ diff --git a/README b/README index 1665103..2de25ab 100644 --- a/README +++ b/README @@ -1,5 +1,9 @@ -To compile the last toolchain just do: -$ git branch 3.0 origin/3.0 -$ git checkout 3.0 +README for toolchain + + +To compile the lastest toolchain: $ make + +Log to a file would be useful: +$ make 2>&1 | tee make.log -- 2.26.2 From 2bab474cbe6dba1d2c032f6080ac0f47b51951ad Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Sat, 29 Nov 2014 23:11:38 +0000 Subject: [PATCH 06/16] Fixed and cleanup libgmp stage in Makefile and config in vars.mk --- Makefile | 5 +++-- vars.mk | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0ecebb7..b09b9df 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ include vars.mk all: linux-headers libgmp libmpfr libmpc binutils gcc-static glibc gcc-final setup test clean: linux-headers-clean libgmp-clean libmpfr-clean libmpc-clean binutils-clean gcc-static-clean glibc-clean gcc-final-clean test-clean - rm -rvf $(CROSSTOOLS)/* $(CLFS)/* + rm -rvf $(CROSSTOOLS) $(CLFS) distclean: clean linux-headers-distclean libgmp-distclean libmpfr-distclean libmpc-distclean binutils-distclean gcc-static-distclean glibc-distclean gcc-final-distclean test-distclean @@ -45,6 +45,7 @@ $(WORK)/gmp-$(LIBGMP_VERSION).tar.bz2: $(WORK)/gmp-$(LIBGMP_VERSION): $(WORK)/gmp-$(LIBGMP_VERSION).tar.bz2 tar -C $(WORK) -xvjf $(WORK)/gmp-$(LIBGMP_VERSION).tar.bz2 + mv `find $(WORK) -type d -name 'gmp-*'` $(WORK)/gmp-$(LIBGMP_VERSION) touch $(WORK)/gmp-$(LIBGMP_VERSION) $(WORK)/build-libgmp: $(WORK)/gmp-$(LIBGMP_VERSION) @@ -55,7 +56,7 @@ $(CROSSTOOLS)/lib/libgmp.so: $(WORK)/build-libgmp cd $(WORK)/build-libgmp && \ unset CFLAGS && unset CXXFLAGS && \ CPPFLAGS=-fexceptions \ - $(WORK)/gmp-$(LIBGMP_VERSION_MIN)/configure --prefix=$(CROSSTOOLS) --enable-cxx && \ + $(WORK)/gmp-$(LIBGMP_VERSION)/configure --prefix=$(CROSSTOOLS) --enable-cxx && \ make && make install || exit 1 touch $(CROSSTOOLS)/lib/libgmp.so diff --git a/vars.mk b/vars.mk index a194618..c648ca8 100644 --- a/vars.mk +++ b/vars.mk @@ -12,7 +12,6 @@ WORK = $(TOPDIR)/work KERNEL_HEADERS_VERSION = 3.5.4 LIBGMP_VERSION = 6.0.0a -LIBGMP_VERSION_MIN = 6.0.0 LIBMPFR_VERSION = 3.1.2 LIBMPC_VERSION = 1.0.2 BINUTILS_VERSION = 2.24 -- 2.26.2 From d75c6e4b7c4f9fc9ecdbe29f9f8d9db6038f5633 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Sun, 4 Oct 2015 15:17:17 +0000 Subject: [PATCH 07/16] 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 Date: Sun, 4 Oct 2015 15:29:13 +0000 Subject: [PATCH 08/16] New toolchain support aarch64 --- Makefile | 5 ++--- vars.mk | 6 +----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 14046d4..25f8063 100644 --- a/Makefile +++ b/Makefile @@ -26,8 +26,8 @@ $(CLFS)/usr/include/asm: $(WORK)/linux-$(KERNEL_HEADERS_VERSION) mkdir -p $(CLFS)/usr/include cd $(WORK)/linux-$(KERNEL_HEADERS_VERSION) && \ make mrproper && \ - make ARCH=arm headers_check && \ - make ARCH=arm INSTALL_HDR_PATH=$(CLFS)/usr headers_install + make ARCH=arm64 headers_check && \ + make ARCH=arm64 INSTALL_HDR_PATH=$(CLFS)/usr headers_install touch $(CLFS)/usr/include/asm linux-headers: $(CLFS)/usr/include/asm @@ -279,7 +279,6 @@ $(WORK)/test: $(WORK)/test.c unset CFLAGS && unset CXXFLAGS && unset CC && \ AR=ar LDFLAGS="-Wl,-rpath,$(CROSSTOOLS)/lib" \ $(TARGET)-gcc -Wall -o $(WORK)/test $(WORK)/test.c - [ "`file -b $(WORK)/test | cut -d',' -f2 | sed 's| ||g'`" = "ARM" ] || exit 1 touch $(WORK)/test test: gcc-final $(WORK)/test diff --git a/vars.mk b/vars.mk index b32384e..629fe04 100644 --- a/vars.mk +++ b/vars.mk @@ -3,7 +3,7 @@ # HOST = $(shell echo $$MACHTYPE | sed "s/$$(echo $$MACHTYPE | cut -d- -f2)/cross/") -TARGET = arm-crux-linux-gnueabihf +TARGET = aarch64-crux-linux-gnueabi TOPDIR = $(shell pwd) CLFS = $(TOPDIR)/clfs @@ -18,10 +18,6 @@ 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 -- 2.26.2 From ab2c1d6e0727d478973dbfc7ba8a99fef12c5ebe Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 3 Mar 2016 16:58:35 +0100 Subject: [PATCH 09/16] Fixes: - Disabled libssp and libmudflap - Fix for FS#71: We weren't copying libstdc++.so* and libgcc_s.so* to our CLFS - Cleaned not used vars in gcc builds --- Makefile | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 25f8063..c077c34 100644 --- a/Makefile +++ b/Makefile @@ -184,7 +184,6 @@ $(CROSSTOOLS)/lib/gcc: $(WORK)/build-gcc-static $(WORK)/gcc-$(GCC_VERSION) --disable-libgomp --disable-libmudflap --disable-libssp \ --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 $(MJ) all-gcc all-target-libgcc && make install-gcc install-target-libgcc || exit 1 touch $(CROSSTOOLS)/lib/gcc @@ -209,7 +208,7 @@ $(WORK)/build-glibc: $(WORK)/glibc-$(GLIBC_VERSION) mkdir -p $(WORK)/build-glibc touch $(WORK)/build-glibc -$(CLFS)/usr/lib/libc.so: $(WORK)/build-glibc $(WORK)/glibc-$(GLIBC_VERSION) +$(CLFS)/usr/lib64/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 && \ @@ -218,14 +217,14 @@ $(CLFS)/usr/lib/libc.so: $(WORK)/build-glibc $(WORK)/glibc-$(GLIBC_VERSION) BUILD_CC="gcc" CC="$(TARGET)-gcc" AR="$(TARGET)-ar" \ RANLIB="$(TARGET)-ranlib" \ $(WORK)/glibc-$(GLIBC_VERSION)/configure --prefix=/usr \ - --libexecdir=/usr/lib/glibc --host=$(TARGET) --build=$(HOST) \ - --disable-profile --enable-add-ons --with-tls --enable-kernel=2.6.0 \ + --libexecdir=/usr/lib --host=$(TARGET) --build=$(HOST) \ + --enable-multi-arch --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 $(MJ) && make install || exit 1 - touch $(CLFS)/usr/lib/libc.so + make $(MJ) && make install install_root=${CLFS} || exit 1 + touch $(CLFS)/usr/lib64/libc.so -glibc: binutils gcc-static $(CLFS)/usr/lib/libc.so +glibc: binutils gcc-static $(CLFS)/usr/lib64/libc.so glibc-clean: rm -vrf $(WORK)/build-glibc $(WORK)/glibc-$(GLIBC_VERSION) @@ -247,13 +246,15 @@ $(CLFS)/lib/gcc: $(WORK)/build-gcc-final $(WORK)/gcc-$(GCC_VERSION) $(WORK)/gcc-$(GCC_VERSION)/configure --prefix=$(CROSSTOOLS) \ --build=$(HOST) --host=$(HOST) --target=$(TARGET) \ --with-headers=$(CLFS)/usr/include --enable-shared \ - --disable-multilib --with-sysroot=$(CLFS) --disable-nls \ + --disable-multilib --with-sysroot=$(CLFS) --disable-nls \ --enable-languages=c,c++ --enable-__cxa_atexit \ - --enable-threads=posix --disable-libstdcxx-pch --disable-bootstrap --disable-libgomp \ + --enable-threads=posix --disable-libstdcxx-pch --disable-bootstrap \ + --disable-libgomp --disable-libssp --disable-libmudflap \ --with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) --with-mpc=$(CROSSTOOLS) \ - --with-abi=$(ABI) --with-mode=$(MODE) --with-float=$(FLOAT) && \ make $(MJ) AS_FOR_TARGET="$(TARGET)-as" LD_FOR_TARGET="$(TARGET)-ld" && \ make install || exit 1 + cp -va $(WORK)/build-gcc-final/$(TARGET)/libstdc++-v3/src/.libs/libstdc++.so* $(CLFS)/usr/lib + cp -va $(WORK)/build-gcc-final/$(TARGET)/libgcc/libgcc_s.so* $(CLFS)/usr/lib touch $(CLFS)/lib/gcc gcc-final: libgmp libmpfr glibc $(CLFS)/lib/gcc -- 2.26.2 From cc836523d9ec1097d46aa377003c1ae608b1b79e Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Sat, 14 May 2016 01:13:57 +0000 Subject: [PATCH 10/16] Updates: - Removed verbosity - libgmp -> 6.1.0 - libmpfr -> 3.1.4 - gcc -> 5.3.0 - Fixed build --- Makefile | 53 ++++++++++++++++++++++++++--------------------------- vars.mk | 6 +++--- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index c077c34..17eeab3 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ include vars.mk all: linux-headers libgmp libmpfr libmpc binutils gcc-static glibc gcc-final setup test clean: linux-headers-clean libgmp-clean libmpfr-clean libmpc-clean binutils-clean gcc-static-clean glibc-clean gcc-final-clean test-clean - rm -rvf $(CROSSTOOLS) $(CLFS) + rm -rf $(CROSSTOOLS) $(CLFS) distclean: clean linux-headers-distclean libgmp-distclean libmpfr-distclean libmpc-distclean binutils-distclean gcc-static-distclean glibc-distclean gcc-final-distclean test-distclean @@ -19,7 +19,7 @@ $(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.xz - tar -C $(WORK) -xvf $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.xz + tar -C $(WORK) -xf $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.xz touch $(WORK)/linux-$(KERNEL_HEADERS_VERSION) $(CLFS)/usr/include/asm: $(WORK)/linux-$(KERNEL_HEADERS_VERSION) @@ -33,10 +33,10 @@ $(CLFS)/usr/include/asm: $(WORK)/linux-$(KERNEL_HEADERS_VERSION) linux-headers: $(CLFS)/usr/include/asm linux-headers-clean: - rm -vrf $(WORK)/linux-$(KERNEL_HEADERS_VERSION) + rm -rf $(WORK)/linux-$(KERNEL_HEADERS_VERSION) linux-headers-distclean: linux-headers-clean - rm -vf $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.xz + rm -f $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.xz # LIBGMP @@ -44,8 +44,7 @@ $(WORK)/gmp-$(LIBGMP_VERSION).tar.bz2: wget -P $(WORK) -c ftp://ftp.gnu.org/gnu/gmp/gmp-$(LIBGMP_VERSION).tar.bz2 $(WORK)/gmp-$(LIBGMP_VERSION): $(WORK)/gmp-$(LIBGMP_VERSION).tar.bz2 - tar -C $(WORK) -xvjf $(WORK)/gmp-$(LIBGMP_VERSION).tar.bz2 - mv `find $(WORK) -type d -name 'gmp-*'` $(WORK)/gmp-$(LIBGMP_VERSION) + tar -C $(WORK) -xjf $(WORK)/gmp-$(LIBGMP_VERSION).tar.bz2 touch $(WORK)/gmp-$(LIBGMP_VERSION) $(WORK)/build-libgmp: $(WORK)/gmp-$(LIBGMP_VERSION) @@ -63,10 +62,10 @@ $(CROSSTOOLS)/lib/libgmp.so: $(WORK)/build-libgmp libgmp: $(CROSSTOOLS)/lib/libgmp.so libgmp-clean: - rm -vrf $(WORK)/build-libgmp $(WORK)/gmp-$(LIBGMP_VERSION) + rm -rf $(WORK)/build-libgmp $(WORK)/gmp-$(LIBGMP_VERSION) libgmp-distclean: libgmp-clean - rm -vrf $(WORK)/gmp-$(LIBGMP_VERSION).tar.bz2 + rm -rf $(WORK)/gmp-$(LIBGMP_VERSION).tar.bz2 # LIBMPFR @@ -74,7 +73,7 @@ $(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 - tar -C $(WORK) -xvjf $(WORK)/mpfr-$(LIBMPFR_VERSION).tar.bz2 + tar -C $(WORK) -xjf $(WORK)/mpfr-$(LIBMPFR_VERSION).tar.bz2 touch $(WORK)/mpfr-$(LIBMPFR_VERSION) $(WORK)/build-libmpfr: $(WORK)/mpfr-$(LIBMPFR_VERSION) @@ -92,10 +91,10 @@ $(CROSSTOOLS)/lib/libmpfr.so: $(WORK)/build-libmpfr libmpfr: $(CROSSTOOLS)/lib/libmpfr.so libmpfr-clean: - rm -vrf $(WORK)/build-libmpfr $(WORK)/mpfr-$(LIBMPFR_VERSION) + rm -rf $(WORK)/build-libmpfr $(WORK)/mpfr-$(LIBMPFR_VERSION) libmpfr-distclean: libmpfr-clean - rm -vrf $(WORK)/mpfr-$(LIBMPFR_VERSION).tar.bz2 + rm -rf $(WORK)/mpfr-$(LIBMPFR_VERSION).tar.bz2 # LIBMPC @@ -103,7 +102,7 @@ $(WORK)/mpc-$(LIBMPC_VERSION).tar.gz: wget -P $(WORK) -c http://www.multiprecision.org/mpc/download/mpc-$(LIBMPC_VERSION).tar.gz $(WORK)/mpc-$(LIBMPC_VERSION): $(WORK)/mpc-$(LIBMPC_VERSION).tar.gz - tar -C $(WORK) -xvzf $(WORK)/mpc-$(LIBMPC_VERSION).tar.gz + tar -C $(WORK) -xzf $(WORK)/mpc-$(LIBMPC_VERSION).tar.gz touch $(WORK)/mpc-$(LIBMPC_VERSION) $(WORK)/build-libmpc: $(WORK)/mpc-$(LIBMPC_VERSION) @@ -122,10 +121,10 @@ $(CROSSTOOLS)/lib/libmpc.so: $(WORK)/build-libmpc libmpc: $(CROSSTOOLS)/lib/libmpc.so libmpc-clean: - rm -vrf $(WORK)/build-libmpc $(WORK)/mpc-$(LIBMPC_VERSION) + rm -rf $(WORK)/build-libmpc $(WORK)/mpc-$(LIBMPC_VERSION) libmpc-distclean: libmpc-clean - rm -vrf $(WORK)/mpc-$(LIBMPC_VERSION).tar.bz2 + rm -rf $(WORK)/mpc-$(LIBMPC_VERSION).tar.bz2 # BINUTILS @@ -133,7 +132,7 @@ $(WORK)/binutils-$(BINUTILS_VERSION).tar.bz2: wget -P $(WORK) -c ftp://ftp.gnu.org/gnu/binutils/binutils-$(BINUTILS_VERSION).tar.bz2 $(WORK)/binutils-$(BINUTILS_VERSION): $(WORK)/binutils-$(BINUTILS_VERSION).tar.bz2 - tar -C $(WORK) -xvf $(WORK)/binutils-$(BINUTILS_VERSION).tar.bz2 + tar -C $(WORK) -xf $(WORK)/binutils-$(BINUTILS_VERSION).tar.bz2 sed -i '/^SUBDIRS/s/doc//' $(WORK)/binutils-$(BINUTILS_VERSION)/*/Makefile.in touch $(WORK)/binutils-$(BINUTILS_VERSION) @@ -155,7 +154,7 @@ $(CLFS)/usr/include/libiberty.h: $(WORK)/build-binutils binutils: linux-headers $(CLFS)/usr/include/libiberty.h binutils-clean: - rm -vrf $(WORK)/build-binutils $(WORK)/binutils-$(BINUTILS_VERSION) + rm -rf $(WORK)/build-binutils $(WORK)/binutils-$(BINUTILS_VERSION) binutils-distclean: binutils-clean rm -f $(WORK)/binutils-$(BINUTILS_VERSION).tar.bz2 @@ -166,7 +165,7 @@ $(WORK)/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 - tar -C $(WORK) -xvjf $(WORK)/gcc-$(GCC_VERSION).tar.bz2 + tar -C $(WORK) -xjf $(WORK)/gcc-$(GCC_VERSION).tar.bz2 touch $(WORK)/gcc-$(GCC_VERSION) $(WORK)/build-gcc-static: $(WORK)/gcc-$(GCC_VERSION) @@ -183,17 +182,17 @@ $(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-libquadmath \ + --disable-shared --disable-threads --enable-languages=c --disable-libquadmath && \ 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 gcc-static-clean: - rm -vrf $(WORK)/build-gcc-static $(WORK)/gcc-$(GCC_VERSION) + rm -rf $(WORK)/build-gcc-static $(WORK)/gcc-$(GCC_VERSION) gcc-static-distclean: gcc-static-clean - rm -vf $(WORK)/gcc-$(GCC_VERSION).tar.bz2 + rm -f $(WORK)/gcc-$(GCC_VERSION).tar.bz2 # GLIBC @@ -201,7 +200,7 @@ $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2: wget -P $(WORK) -c ftp://ftp.gnu.org/gnu/glibc/glibc-$(GLIBC_VERSION).tar.bz2 $(WORK)/glibc-$(GLIBC_VERSION): $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2 - tar -C $(WORK) -xvjf $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2 + tar -C $(WORK) -xjf $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2 touch $(WORK)/glibc-$(GLIBC_VERSION) $(WORK)/build-glibc: $(WORK)/glibc-$(GLIBC_VERSION) @@ -227,10 +226,10 @@ $(CLFS)/usr/lib64/libc.so: $(WORK)/build-glibc $(WORK)/glibc-$(GLIBC_VERSION) glibc: binutils gcc-static $(CLFS)/usr/lib64/libc.so glibc-clean: - rm -vrf $(WORK)/build-glibc $(WORK)/glibc-$(GLIBC_VERSION) + rm -rf $(WORK)/build-glibc $(WORK)/glibc-$(GLIBC_VERSION) glibc-distclean: glibc-clean - rm -vf $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2 $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2 + rm -f $(WORK)/glibc-$(GLIBC_VERSION).tar.bz2 $(WORK)/glibc-ports-$(GLIBC_VERSION).tar.bz2 # GCC-FINAL @@ -250,7 +249,7 @@ $(CLFS)/lib/gcc: $(WORK)/build-gcc-final $(WORK)/gcc-$(GCC_VERSION) --enable-languages=c,c++ --enable-__cxa_atexit \ --enable-threads=posix --disable-libstdcxx-pch --disable-bootstrap \ --disable-libgomp --disable-libssp --disable-libmudflap \ - --with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) --with-mpc=$(CROSSTOOLS) \ + --with-mpfr=$(CROSSTOOLS) --with-gmp=$(CROSSTOOLS) --with-mpc=$(CROSSTOOLS) && \ make $(MJ) AS_FOR_TARGET="$(TARGET)-as" LD_FOR_TARGET="$(TARGET)-ld" && \ make install || exit 1 cp -va $(WORK)/build-gcc-final/$(TARGET)/libstdc++-v3/src/.libs/libstdc++.so* $(CLFS)/usr/lib @@ -260,10 +259,10 @@ $(CLFS)/lib/gcc: $(WORK)/build-gcc-final $(WORK)/gcc-$(GCC_VERSION) gcc-final: libgmp libmpfr glibc $(CLFS)/lib/gcc gcc-final-clean: - rm -vrf $(WORK)/build-gcc-final $(WORK)/gcc-$(GCC_VERSION) + rm -rf $(WORK)/build-gcc-final $(WORK)/gcc-$(GCC_VERSION) gcc-final-distclean: gcc-final-clean - rm -vf $(WORK)/gcc-$(GCC_VERSION).tar.bz2 + rm -f $(WORK)/gcc-$(GCC_VERSION).tar.bz2 # SETUP FOR PKGUTILS-CROSS @@ -285,7 +284,7 @@ $(WORK)/test: $(WORK)/test.c test: gcc-final $(WORK)/test test-clean: - rm -vrf $(WORK)/test + rm -rf $(WORK)/test test-distclean: test-clean diff --git a/vars.mk b/vars.mk index 629fe04..7eedb7a 100644 --- a/vars.mk +++ b/vars.mk @@ -11,11 +11,11 @@ CROSSTOOLS = $(TOPDIR)/crosstools WORK = $(TOPDIR)/work KERNEL_HEADERS_VERSION = 4.1.1 -LIBGMP_VERSION = 6.0.0a -LIBMPFR_VERSION = 3.1.3 +LIBGMP_VERSION = 6.1.0 +LIBMPFR_VERSION = 3.1.4 LIBMPC_VERSION = 1.0.3 BINUTILS_VERSION = 2.25.1 -GCC_VERSION = 5.2.0 +GCC_VERSION = 5.3.0 GLIBC_VERSION = 2.22 # Make jobs -- 2.26.2 From 17facc6e952608047845d0a4af9635d79913e985 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 28 Feb 2017 01:19:17 +0000 Subject: [PATCH 11/16] Toolchain update for 3.3 - libgmp 6.1.2 - libmpfr 3.1.5 - binutils 2.27 - gcc 6.3.0 - glibc 2.24 - kernel headers 4.9.5 --- Makefile | 2 +- vars.mk | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 17eeab3..833802c 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ distclean: clean linux-headers-distclean libgmp-distclean libmpfr-distclean libm # LINUX HEADERS $(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 + wget -P $(WORK) -c https://www.kernel.org/pub/linux/kernel/v4.x/linux-$(KERNEL_HEADERS_VERSION).tar.xz $(WORK)/linux-$(KERNEL_HEADERS_VERSION): $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.xz tar -C $(WORK) -xf $(WORK)/linux-$(KERNEL_HEADERS_VERSION).tar.xz diff --git a/vars.mk b/vars.mk index 7eedb7a..6af07e4 100644 --- a/vars.mk +++ b/vars.mk @@ -10,13 +10,13 @@ CLFS = $(TOPDIR)/clfs CROSSTOOLS = $(TOPDIR)/crosstools WORK = $(TOPDIR)/work -KERNEL_HEADERS_VERSION = 4.1.1 -LIBGMP_VERSION = 6.1.0 -LIBMPFR_VERSION = 3.1.4 +KERNEL_HEADERS_VERSION = 4.9.5 +LIBGMP_VERSION = 6.1.2 +LIBMPFR_VERSION = 3.1.5 LIBMPC_VERSION = 1.0.3 -BINUTILS_VERSION = 2.25.1 -GCC_VERSION = 5.3.0 -GLIBC_VERSION = 2.22 +BINUTILS_VERSION = 2.27 +GCC_VERSION = 6.3.0 +GLIBC_VERSION = 2.24 # Make jobs MJ=-j2 -- 2.26.2 From 20f54973578749b6bb18e598d0daa819fce4a132 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 6 Apr 2017 01:32:55 +0000 Subject: [PATCH 12/16] Fixed /lib /lib64 problem at CLFS creation --- Makefile | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 833802c..d701faa 100644 --- a/Makefile +++ b/Makefile @@ -6,12 +6,26 @@ include vars.mk .PHONY: all clean distclean -all: linux-headers libgmp libmpfr libmpc binutils gcc-static glibc gcc-final setup test +all: filesystem linux-headers libgmp libmpfr libmpc binutils gcc-static glibc gcc-final setup test clean: linux-headers-clean libgmp-clean libmpfr-clean libmpc-clean binutils-clean gcc-static-clean glibc-clean gcc-final-clean test-clean rm -rf $(CROSSTOOLS) $(CLFS) -distclean: clean linux-headers-distclean libgmp-distclean libmpfr-distclean libmpc-distclean binutils-distclean gcc-static-distclean glibc-distclean gcc-final-distclean test-distclean +distclean: clean filesystem-clean linux-headers-distclean libgmp-distclean libmpfr-distclean libmpc-distclean binutils-distclean gcc-static-distclean glibc-distclean gcc-final-distclean test-distclean + + +# Prepare the filessytem +$(CLFS)/lib: + install -d $(CLFS)/lib + ln -s lib $(CLFS)/lib64 + install -d $(CLFS)/usr/lib + ln -s lib $(CLFS)/usr/lib64 + touch $(CLFS)/lib + +filesystem: $(CLFS)/lib + +filesystem-clean: + rm -rf $(CLFS)/lib* $(CLFS)/usr/lib* # LINUX HEADERS -- 2.26.2 From 54e92c2a908ddabf1efd0acd1a54c4bac589d87f Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 2 May 2018 19:22:10 +0000 Subject: [PATCH 13/16] Toolchain update for 3.4 --- Makefile | 10 +++++----- vars.mk | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index d701faa..caa6907 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ libmpfr-distclean: libmpfr-clean # LIBMPC $(WORK)/mpc-$(LIBMPC_VERSION).tar.gz: - wget -P $(WORK) -c http://www.multiprecision.org/mpc/download/mpc-$(LIBMPC_VERSION).tar.gz + wget -P $(WORK) -c https://ftp.gnu.org/gnu/mpc/mpc-$(LIBMPC_VERSION).tar.gz $(WORK)/mpc-$(LIBMPC_VERSION): $(WORK)/mpc-$(LIBMPC_VERSION).tar.gz tar -C $(WORK) -xzf $(WORK)/mpc-$(LIBMPC_VERSION).tar.gz @@ -176,10 +176,10 @@ binutils-distclean: binutils-clean # GCC-STATIC $(WORK)/gcc-$(GCC_VERSION).tar.bz2: - wget -P $(WORK) -c ftp://gcc.gnu.org/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.xz -$(WORK)/gcc-$(GCC_VERSION): $(WORK)/gcc-$(GCC_VERSION).tar.bz2 - tar -C $(WORK) -xjf $(WORK)/gcc-$(GCC_VERSION).tar.bz2 +$(WORK)/gcc-$(GCC_VERSION): $(WORK)/gcc-$(GCC_VERSION).tar.xz + tar -C $(WORK) -xf $(WORK)/gcc-$(GCC_VERSION).tar.xz touch $(WORK)/gcc-$(GCC_VERSION) $(WORK)/build-gcc-static: $(WORK)/gcc-$(GCC_VERSION) @@ -206,7 +206,7 @@ gcc-static-clean: rm -rf $(WORK)/build-gcc-static $(WORK)/gcc-$(GCC_VERSION) gcc-static-distclean: gcc-static-clean - rm -f $(WORK)/gcc-$(GCC_VERSION).tar.bz2 + rm -f $(WORK)/gcc-$(GCC_VERSION).tar.xz # GLIBC diff --git a/vars.mk b/vars.mk index 6af07e4..d3ce461 100644 --- a/vars.mk +++ b/vars.mk @@ -10,13 +10,13 @@ CLFS = $(TOPDIR)/clfs CROSSTOOLS = $(TOPDIR)/crosstools WORK = $(TOPDIR)/work -KERNEL_HEADERS_VERSION = 4.9.5 +KERNEL_HEADERS_VERSION = 4.14.34 LIBGMP_VERSION = 6.1.2 -LIBMPFR_VERSION = 3.1.5 -LIBMPC_VERSION = 1.0.3 -BINUTILS_VERSION = 2.27 -GCC_VERSION = 6.3.0 -GLIBC_VERSION = 2.24 +LIBMPFR_VERSION = 4.0.1 +LIBMPC_VERSION = 1.1.0 +BINUTILS_VERSION = 2.29.1 +GCC_VERSION = 7.3.0 +GLIBC_VERSION = 2.27 # Make jobs MJ=-j2 -- 2.26.2 From 76e759adb8d8c3a03680602bdc7b0efe658292e6 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 12 Jun 2018 01:44:58 +0000 Subject: [PATCH 14/16] Updated triplet and kernel headers version to 4.14.40 --- vars.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars.mk b/vars.mk index d3ce461..9f7e624 100644 --- a/vars.mk +++ b/vars.mk @@ -3,14 +3,14 @@ # HOST = $(shell echo $$MACHTYPE | sed "s/$$(echo $$MACHTYPE | cut -d- -f2)/cross/") -TARGET = aarch64-crux-linux-gnueabi +TARGET = aarch64-crux-linux-gnu TOPDIR = $(shell pwd) CLFS = $(TOPDIR)/clfs CROSSTOOLS = $(TOPDIR)/crosstools WORK = $(TOPDIR)/work -KERNEL_HEADERS_VERSION = 4.14.34 +KERNEL_HEADERS_VERSION = 4.14.40 LIBGMP_VERSION = 6.1.2 LIBMPFR_VERSION = 4.0.1 LIBMPC_VERSION = 1.1.0 -- 2.26.2 From 1c8517be72868cfd7a7586a7e43e729ff66bb032 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 19 Aug 2019 12:49:16 +0200 Subject: [PATCH 15/16] FS#78: Corrected gcc-static build. Thanks Mike --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index caa6907..8a73ece 100644 --- a/Makefile +++ b/Makefile @@ -175,7 +175,7 @@ binutils-distclean: binutils-clean # GCC-STATIC -$(WORK)/gcc-$(GCC_VERSION).tar.bz2: +$(WORK)/gcc-$(GCC_VERSION).tar.xz: wget -P $(WORK) -c ftp://gcc.gnu.org/pub/gcc/releases/gcc-$(GCC_VERSION)/gcc-$(GCC_VERSION).tar.xz $(WORK)/gcc-$(GCC_VERSION): $(WORK)/gcc-$(GCC_VERSION).tar.xz -- 2.26.2 From 868e79401356e937cab2d7156470dbb8a11dc168 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 19 Feb 2020 00:53:35 +0000 Subject: [PATCH 16/16] Toolchain update for 3.5 - binutils -> 2.32 - gcc -> 8.3.0 - glibc -> 2.28 --- vars.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars.mk b/vars.mk index 9f7e624..b91c1e3 100644 --- a/vars.mk +++ b/vars.mk @@ -10,13 +10,13 @@ CLFS = $(TOPDIR)/clfs CROSSTOOLS = $(TOPDIR)/crosstools WORK = $(TOPDIR)/work -KERNEL_HEADERS_VERSION = 4.14.40 +KERNEL_HEADERS_VERSION = 4.19.24 LIBGMP_VERSION = 6.1.2 LIBMPFR_VERSION = 4.0.1 LIBMPC_VERSION = 1.1.0 -BINUTILS_VERSION = 2.29.1 -GCC_VERSION = 7.3.0 -GLIBC_VERSION = 2.27 +BINUTILS_VERSION = 2.32 +GCC_VERSION = 8.3.0 +GLIBC_VERSION = 2.28 # Make jobs MJ=-j2 -- 2.26.2