From 8149cf760191c4fb361437a28252e5dd741dd8a6 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 12 Dec 2017 20:16:59 +0000 Subject: work in progress getting gcc 7 for m68k-atari-mint to work --- m68k-atari-mint/Makefile | 91 ++++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/m68k-atari-mint/Makefile b/m68k-atari-mint/Makefile index d60f818..70cf8e9 100644 --- a/m68k-atari-mint/Makefile +++ b/m68k-atari-mint/Makefile @@ -2,24 +2,23 @@ # Build cross toolchain for m68k processor with an atari mint ABI -UPSTREAM_GCC_VERSION := 4.6.4 -UPSTREAM_GCC_TARBALL := gcc-$(UPSTREAM_GCC_VERSION).tar.bz2 +UPSTREAM_GCC_VERSION := 7.2.0 +UPSTREAM_GCC_TARBALL := gcc-$(UPSTREAM_GCC_VERSION).tar.xz UPSTREAM_GCC_URI := http://ftp.gnu.org/gnu/gcc/gcc-$(UPSTREAM_GCC_VERSION)/$(UPSTREAM_GCC_TARBALL) -UPSTREAM_GCC_PATCH := gcc-4.6.4-mint-20130415.patch.bz2 -UPSTREAM_GCC_PATCH_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_GCC_PATCH) +UPSTREAM_GCC_PATCH := gcc-7.2.0-mint-20171006.tar.xz +UPSTREAM_GCC_PATCH_URI := http://tho-otto.de/download/mint/$(UPSTREAM_GCC_PATCH) -UPSTREAM_BINUTILS_VERSION := 2.24 -UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION).tar.bz2 +UPSTREAM_BINUTILS_VERSION := 2.29.1 +UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION).tar.xz UPSTREAM_BINUTILS_URI := ftp://ftp.gnu.org/gnu/binutils/$(UPSTREAM_BINUTILS_TARBALL) -UPSTREAM_BINUTILS_PATCH := binutils-2.24-mint-20131217.patch.bz2 -UPSTREAM_BINUTILS_PATCH_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_BINUTILS_PATCH) +UPSTREAM_BINUTILS_PATCH := binutils-2.29.1-mint-20171011.tar.xz +UPSTREAM_BINUTILS_PATCH_URI := http://tho-otto.de/download/mint/$(UPSTREAM_BINUTILS_PATCH) UPSTREAM_GMP_VERSION := 4.3.2 UPSTREAM_GMP_TARBALL := gmp-$(UPSTREAM_GMP_VERSION).tar.bz2 UPSTREAM_GMP_URI := http://ftp.gnu.org/gnu/gmp/$(UPSTREAM_GMP_TARBALL) -# Would use 3.0.0, but that dislikes in-tree gmp sources -UPSTREAM_MPFR_VERSION := 2.4.2 +UPSTREAM_MPFR_VERSION := 3.1.6 UPSTREAM_MPFR_TARBALL := mpfr-$(UPSTREAM_MPFR_VERSION).tar.bz2 UPSTREAM_MPFR_URI := http://www.mpfr.org/mpfr-$(UPSTREAM_MPFR_VERSION)/$(UPSTREAM_MPFR_TARBALL) @@ -27,13 +26,13 @@ UPSTREAM_MPC_VERSION := 0.8.2 UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz UPSTREAM_MPC_URI := http://www.multiprecision.org/mpc/download/$(UPSTREAM_MPC_TARBALL) -UPSTREAM_MINTBIN_VERSION := CVS-20110527 -UPSTREAM_MINTBIN_TARBALL := mintbin-$(UPSTREAM_MINTBIN_VERSION).tar.gz -UPSTREAM_MINTBIN_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_MINTBIN_TARBALL) +UPSTREAM_MINTBIN_VERSION := 0.3 +UPSTREAM_MINTBIN_TARBALL := mintbin-$(UPSTREAM_MINTBIN_VERSION).tar.xz +UPSTREAM_MINTBIN_URI := http://tho-otto.de/download/mint/$(UPSTREAM_MINTBIN_TARBALL) -UPSTREAM_MINTLIB_VERSION := Git-20170304 -UPSTREAM_MINTLIB_TARBALL := mintlib-$(UPSTREAM_MINTLIB_VERSION).tar.gz -UPSTREAM_MINTLIB_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_MINTLIB_TARBALL) +UPSTREAM_MINTLIB_VERSION := 0.60.1 +UPSTREAM_MINTLIB_TARBALL := mintlib-$(UPSTREAM_MINTLIB_VERSION).tar.xz +UPSTREAM_MINTLIB_URI := http://tho-otto.de/download/mint/$(UPSTREAM_MINTLIB_TARBALL) UPSTREAM_PML_VERSION := 2.03 UPSTREAM_PML_TARBALL := pml-$(UPSTREAM_PML_VERSION).tar.bz2 @@ -78,7 +77,7 @@ distclean: clean ### $(BUILDSTEPS)/gemlib.d: $(BUILDSTEPS)/stage2.d $(SOURCESDIR)/$(UPSTREAM_GEMLIB_TARBALL) - tar xjf $(SOURCESDIR)/$(UPSTREAM_GEMLIB_TARBALL) + tar xaf $(SOURCESDIR)/$(UPSTREAM_GEMLIB_TARBALL) mv gemlib-$(UPSTREAM_GEMLIB_VERSION) $(BUILDDIR)/gemlib for p in `ls $(RECIPES)/patches/gemlib/*.p` ; do patch -d $(BUILDDIR)/gemlib -p0 <$$p ; done cd $(BUILDDIR)/gemlib/gemlib && PATH="$(PREFIX)/bin:$(PATH)" make @@ -99,10 +98,10 @@ $(BUILDSTEPS)/stage2.d: $(BUILDSTEPS)/pml.d ### $(BUILDSTEPS)/pml.d: $(BUILDSTEPS)/mintlib.d $(SOURCESDIR)/$(UPSTREAM_PML_TARBALL) $(SOURCESDIR)/$(UPSTREAM_PML_PATCH) - tar xjf $(SOURCESDIR)/$(UPSTREAM_PML_TARBALL) + tar xaf $(SOURCESDIR)/$(UPSTREAM_PML_TARBALL) mv pml-$(UPSTREAM_PML_VERSION) $(BUILDDIR)/pml bzcat $(SOURCESDIR)/$(UPSTREAM_PML_PATCH) | patch -d $(BUILDDIR)/pml -p1 - for p in `ls $(RECIPES)/patches/pml/*.p` ; do patch -d $(BUILDDIR)/pml -p0 <$$p ; done +# for p in `ls $(RECIPES)/patches/pml/*.p` ; do patch -d $(BUILDDIR)/pml -p0 <$$p ; done cd $(BUILDDIR)/pml/pmlsrc && PATH="$(PREFIX)/bin:$(PATH)" make cd $(BUILDDIR)/pml/pmlsrc && PATH="$(PREFIX)/bin:$(PATH)" make install cd $(BUILDDIR)/pml/pmlsrc && PATH="$(PREFIX)/bin:$(PATH)" make clean @@ -119,9 +118,9 @@ $(BUILDSTEPS)/pml.d: $(BUILDSTEPS)/mintlib.d $(SOURCESDIR)/$(UPSTREAM_PML_TARBAL ### $(BUILDSTEPS)/mintlib.d: $(BUILDSTEPS)/bootstrap-compiler.d $(SOURCESDIR)/$(UPSTREAM_MINTLIB_TARBALL) - tar xzf $(SOURCESDIR)/$(UPSTREAM_MINTLIB_TARBALL) + tar xaf $(SOURCESDIR)/$(UPSTREAM_MINTLIB_TARBALL) mv mintlib-$(UPSTREAM_MINTLIB_VERSION) $(BUILDDIR)/mintlib - for p in `ls $(RECIPES)/patches/mintlib/*.p` ; do patch -d $(BUILDDIR)/mintlib -p0 <$$p ; done +# for p in `ls $(RECIPES)/patches/mintlib/*.p` ; do patch -d $(BUILDDIR)/mintlib -p0 <$$p ; done echo "$(PREFIX)/lib/gcc/$(TARGET_NAME)/$(UPSTREAM_GCC_VERSION)/include -I$(PREFIX)/lib/gcc/$(TARGET_NAME)/$(UPSTREAM_GCC_VERSION)/include-fixed -I$(PREFIX)/include" > $(BUILDDIR)/mintlib/includepath cd $(BUILDDIR)/mintlib && PATH="$(PREFIX)/bin:$(PATH)" make cd $(BUILDDIR)/mintlib && PATH="$(PREFIX)/bin:$(PATH)" make install @@ -133,12 +132,16 @@ $(BUILDSTEPS)/mintlib.d: $(BUILDSTEPS)/bootstrap-compiler.d $(SOURCESDIR)/$(UPST GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER) AUTOM4TE=$(GCC_AUTOM4TE) PATH="$(PREFIX)/bin:$(PATH)" -$(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/binutils.d $(BUILDSTEPS)/mintbin.d +$(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-patched-gcc.d $(BUILDSTEPS)/binutils.d $(BUILDSTEPS)/mintbin.d cd $(BUILDDIR) && $(GCC_ENV_PARAMS) $(GCC_SRCDIR)/configure \ - --prefix=$(PREFIX) --target=$(TARGET_NAME) \ - --disable-nls --enable-languages=c \ - --enable-checking=no --enable-c99 \ - --enable-maintainer-mode --without-headers + --prefix=$(PREFIX) \ + --target=$(TARGET_NAME) \ + --disable-nls \ + --enable-languages=c \ + --enable-checking=no \ + --enable-c99 \ + --enable-maintainer-mode \ + --without-headers cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all-gcc cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make install-gcc cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all-target-libgcc @@ -149,33 +152,29 @@ $(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/b # Rules to create the GCC source tree ### - -$(BUILDSTEPS)/srcdir-step3.d: $(BUILDSTEPS)/srcdir-step2.d $(SOURCESDIR)/$(UPSTREAM_GCC_PATCH) - bzcat $(SOURCESDIR)/$(UPSTREAM_GCC_PATCH) | patch -d $(GCC_SRCDIR) -p1 - cd $(GCC_SRCDIR) && ./contrib/gcc_update --touch - $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libmudflap - $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libssp - $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libquadmath - for p in `ls $(RECIPES)/patches/gcc/*.p` ; do patch -d $(GCC_SRCDIR) -p0 <$$p ; done +$(BUILDSTEPS)/srcdir-patched-gcc.d: $(BUILDSTEPS)/srcdir-step2.d $(SOURCESDIR)/$(UPSTREAM_GCC_PATCH) + tar -xaf $(SOURCESDIR)/$(UPSTREAM_GCC_PATCH) --wildcards *.patch --to-command="patch -d $(GCC_SRCDIR) -p1" +# cd $(GCC_SRCDIR) && ./contrib/gcc_update --touch +# $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libmudflap +# $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libssp +# $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libquadmath +# for p in `ls $(RECIPES)/patches/gcc/*.p` ; do patch -d $(GCC_SRCDIR) -p0 <$$p ; done touch $@ -$(BUILDSTEPS)/srcdir-step2.d: $(BUILDSTEPS)/srcdir-step1.d $(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL) $(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL) $(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL) - tar xjf $(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL) +$(BUILDSTEPS)/srcdir-step2.d: $(BUILDSTEPS)/srcdir-unpacked-upstream-gcc.d $(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL) $(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL) $(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL) + tar xaf $(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL) mv gmp-$(UPSTREAM_GMP_VERSION) $(GCC_SRCDIR)/gmp - tar xjf $(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL) + tar xaf $(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL) mv mpfr-$(UPSTREAM_MPFR_VERSION) $(GCC_SRCDIR)/mpfr - tar xzf $(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL) + tar xaf $(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL) mv mpc-$(UPSTREAM_MPC_VERSION) $(GCC_SRCDIR)/mpc touch $@ -$(BUILDSTEPS)/srcdir-step1.d: $(BUILDSTEPS)/$(UPSTREAM_GCC_TARBALL).d - tar xjf $(SOURCESDIR)/$(UPSTREAM_GCC_TARBALL) +$(BUILDSTEPS)/srcdir-unpacked-upstream-gcc.d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTREAM_GCC_TARBALL) + tar xaf $(SOURCESDIR)/$(UPSTREAM_GCC_TARBALL) mv gcc-$(UPSTREAM_GCC_VERSION) $(GCC_SRCDIR) touch $@ -$(BUILDSTEPS)/$(UPSTREAM_GCC_TARBALL).d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTREAM_GCC_TARBALL) - touch $@ - ### # Rules to build and install mintbin ### @@ -188,7 +187,7 @@ $(BUILDSTEPS)/mintbin.d: $(BUILDSTEPS)/mintbin-srcdir.d touch $@ $(BUILDSTEPS)/mintbin-srcdir.d: $(SOURCESDIR)/$(UPSTREAM_MINTBIN_TARBALL) - tar xzf $(SOURCESDIR)/$(UPSTREAM_MINTBIN_TARBALL) + tar xaf $(SOURCESDIR)/$(UPSTREAM_MINTBIN_TARBALL) mv mintbin-$(UPSTREAM_MINTBIN_VERSION) $(MINTBIN_SRCDIR) touch $@ @@ -204,9 +203,9 @@ $(BUILDSTEPS)/binutils.d: $(BUILDSTEPS)/binutils-srcdir.d touch $@ $(BUILDSTEPS)/binutils-srcdir.d: $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL) $(SOURCESDIR)/$(UPSTREAM_BINUTILS_PATCH) - tar xjf $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL) + tar axf $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL) mv binutils-$(UPSTREAM_BINUTILS_VERSION) $(BINUTILS_SRCDIR) - bzcat $(SOURCESDIR)/$(UPSTREAM_BINUTILS_PATCH) | patch -d $(BINUTILS_SRCDIR) -p1 + tar -xaf $(SOURCESDIR)/$(UPSTREAM_BINUTILS_PATCH) --wildcards *.patch --to-command="patch -d $(BINUTILS_SRCDIR) -p1" touch $@ ### -- cgit v1.2.3