From 7c85890475fce37d39863f27cd4183d806fd0e7a Mon Sep 17 00:00:00 2001 From: Stephen Moody Date: Thu, 28 Jun 2018 08:54:27 +0100 Subject: [PATCH 01/10] Updated for MinGW Build --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 6b5643a..e03c782 100644 --- a/Makefile +++ b/Makefile @@ -210,7 +210,7 @@ status-all: # gcc # ================================================= CONFIG_GCC=--prefix=$(PREFIX) --target=m68k-amigaos --enable-languages=c,c++,objc --enable-version-specific-runtime-libs --disable-libssp --disable-nls \ - --with-headers=$(PWD)/projects/newlib-cygwin/newlib/libc/sys/amigaos/include/ --disable-shared + --with-headers=../../projects/newlib-cygwin/newlib/libc/sys/amigaos/include/ --disable-shared GCC_CMD = m68k-amigaos-c++ m68k-amigaos-g++ m68k-amigaos-gcc-$(GCC_VERSION) m68k-amigaos-gcc-nm \ @@ -232,7 +232,7 @@ build/gcc/_done: build/gcc/Makefile $(shell find 2>/dev/null $(GCCD) -maxdepth 1 build/gcc/Makefile: projects/gcc/configure build/binutils/_done @mkdir -p build/gcc # if [ "$(UNAME_S)" == "Darwin" ]; then cd build/gcc && contrib/download_prerequisites; fi - cd build/gcc && $(E) $(PWD)/projects/gcc/configure $(CONFIG_GCC) $(LOG) + cd build/gcc && $(E) ../../projects/gcc/configure $(CONFIG_GCC) $(LOG) projects/gcc/configure: @mkdir -p projects @@ -268,7 +268,7 @@ build/binutils/_done: build/binutils/gas/Makefile $(shell find 2>/dev/null proje build/binutils/gas/Makefile: projects/binutils/configure @mkdir -p build/binutils - cd build/binutils && $(E) $(PWD)/projects/binutils/configure $(CONFIG_BINUTILS) $(LOG) + cd build/binutils && $(E) ../../projects/binutils/configure $(CONFIG_BINUTILS) $(LOG) projects/binutils/configure: @mkdir -p projects @@ -296,7 +296,7 @@ build/fd2sfd/Makefile: projects/fd2sfd/configure projects/fd2sfd/configure: @mkdir -p projects - cd projects && git clone -b master --depth 4 https://github.com/cahirwpz/fd2sfd + cd projects && git clone -b master --depth 4 https://github.com/SteveMoody73/fd2sfd # ================================================= # fd2pragma @@ -740,7 +740,7 @@ endif build/newlib/newlib/Makefile: projects/newlib-cygwin/configure mkdir -p build/newlib/newlib - cd build/newlib/newlib && $(NEWLIB_CONFIG) CFLAGS="$(TARGET_C_FLAGS)" $(PWD)/projects/newlib-cygwin/newlib/configure --host=m68k-amigaos --prefix=$(PREFIX) $(LOG) + cd build/newlib/newlib && $(NEWLIB_CONFIG) CFLAGS="$(TARGET_C_FLAGS)" ../../../projects/newlib-cygwin/newlib/configure --host=m68k-amigaos --prefix=$(PREFIX) $(LOG) projects/newlib-cygwin/newlib/configure: @mkdir -p projects From dacde38095af3e7ce502e1113880e2bf90534ffe Mon Sep 17 00:00:00 2001 From: Stephen Moody Date: Thu, 28 Jun 2018 14:51:40 +0100 Subject: [PATCH 02/10] Added patches for fd2sfd and sfdc for MSYS2 --- Makefile | 31 +++++++++++++++++++------------ patches/fd2sfd/fd2inline.c.diff | 14 ++++++++++++++ patches/sfdc/sfdc.diff | 12 ++++++++++++ 3 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 patches/fd2sfd/fd2inline.c.diff create mode 100644 patches/sfdc/sfdc.diff diff --git a/Makefile b/Makefile index e03c782..52a2b42 100644 --- a/Makefile +++ b/Makefile @@ -291,12 +291,15 @@ $(PREFIX)/bin/fd2sfd: build/fd2sfd/Makefile $(shell find 2>/dev/null projects/fd mkdir -p $(PREFIX)/bin/ $(MAKE) -C build/fd2sfd install $(LOG) build/fd2sfd/Makefile: projects/fd2sfd/configure + for i in $$(find patches/fd2sfd/ -type f); \ + do if [[ "$$i" == *.diff ]] ; \ + then j=$${i:8}; patch -N "projects/$${j%.diff}" "$$i"; fi ; done @mkdir -p build/fd2sfd - cd build/fd2sfd && $(E) $(PWD)/projects/fd2sfd/configure $(CONFIG_FD2SFD) $(LOG) + cd build/fd2sfd && $(E) ../../projects/fd2sfd/configure $(CONFIG_FD2SFD) $(LOG) projects/fd2sfd/configure: @mkdir -p projects - cd projects && git clone -b master --depth 4 https://github.com/SteveMoody73/fd2sfd + cd projects && git clone -b master --depth 4 https://github.com/cahirwpz/fd2sfd # ================================================= # fd2pragma @@ -313,7 +316,7 @@ $(PREFIX)/bin/fd2pragma: build/fd2pragma/fd2pragma build/fd2pragma/fd2pragma: projects/fd2pragma/makefile $(shell find 2>/dev/null projects/fd2pragma -not \( -path projects/fd2pragma/.git -prune \) -type f) @mkdir -p build/fd2pragma - cd projects/fd2pragma && $(CC) -o $(PWD)/$@ $(CFLAGS) fd2pragma.c + cd projects/fd2pragma && $(CC) -o ./$@ $(CFLAGS) fd2pragma.c projects/fd2pragma/makefile: @mkdir -p projects @@ -334,7 +337,7 @@ $(PREFIX)/bin/ira: build/ira/ira build/ira/ira: projects/ira/Makefile $(shell find 2>/dev/null projects/ira -not \( -path projects/ira/.git -prune \) -type f) @mkdir -p build/ira - cd projects/ira && $(CC) -o $(PWD)/$@ $(CFLAGS) *.c -std=c99 + cd projects/ira && $(CC) -o ./$@ $(CFLAGS) *.c -std=c99 projects/ira/Makefile: @mkdir -p projects @@ -357,8 +360,12 @@ $(PREFIX)/bin/sfdc: build/sfdc/Makefile $(shell find 2>/dev/null projects/sfdc - install build/sfdc/sfdc $(PREFIX)/bin build/sfdc/Makefile: projects/sfdc/configure + for i in $$(find patches/sfdc/ -type f); \ + do if [[ "$$i" == *.diff ]] ; \ + then j=$${i:8}; patch -N "projects/$${j%.diff}" "$$i"; fi ; done + rsync -a projects/sfdc build --exclude .git - cd build/sfdc && $(E) $(PWD)/build/sfdc/configure $(CONFIG_SFDC) $(LOG) + cd build/sfdc && $(E) ./configure $(CONFIG_SFDC) $(LOG) projects/sfdc/configure: @mkdir -p projects @@ -463,12 +470,12 @@ build/ndk-include/_ndk: build/ndk-include/_ndk0 $(NDK_INCLUDE_INLINE) $(NDK_INCL build/ndk-include/_ndk0: projects/NDK_3.9.info $(NDK_INCLUDE) mkdir -p $(PREFIX)/m68k-amigaos/ndk-include - rsync -a $(PWD)/projects/NDK_3.9/Include/include_h/* $(PREFIX)/m68k-amigaos/ndk-include --exclude proto - rsync -a $(PWD)/projects/NDK_3.9/Include/include_i/* $(PREFIX)/m68k-amigaos/ndk-include + rsync -a ./projects/NDK_3.9/Include/include_h/* $(PREFIX)/m68k-amigaos/ndk-include --exclude proto + rsync -a ./projects/NDK_3.9/Include/include_i/* $(PREFIX)/m68k-amigaos/ndk-include mkdir -p $(PREFIX)/m68k-amigaos/ndk/lib - rsync -a $(PWD)/projects/NDK_3.9/Include/fd $(PREFIX)/m68k-amigaos/ndk/lib - rsync -a $(PWD)/projects/NDK_3.9/Include/sfd $(PREFIX)/m68k-amigaos/ndk/lib - rsync -a $(PWD)/projects/NDK_3.9/Include/linker_libs $(PREFIX)/m68k-amigaos/ndk/lib + rsync -a ./projects/NDK_3.9/Include/fd $(PREFIX)/m68k-amigaos/ndk/lib + rsync -a ./projects/NDK_3.9/Include/sfd $(PREFIX)/m68k-amigaos/ndk/lib + rsync -a ./projects/NDK_3.9/Include/linker_libs $(PREFIX)/m68k-amigaos/ndk/lib mkdir -p $(PREFIX)/m68k-amigaos/ndk-include/proto cp -p projects/NDK_3.9/Include/include_h/proto/alib.h $(PREFIX)/m68k-amigaos/ndk-include/proto cp -p projects/NDK_3.9/Include/include_h/proto/cardres.h $(PREFIX)/m68k-amigaos/ndk-include/proto @@ -557,7 +564,7 @@ build/ndk-include/_ndk13: build/ndk-include/_ndk # ================================================= build/_netinclude: projects/amiga-netinclude/README.md build/ndk-include/_ndk $(shell find 2>/dev/null projects/amiga-netinclude/include -type f) mkdir -p $(PREFIX)/m68k-amigaos/ndk-include - rsync -a $(PWD)/projects/amiga-netinclude/include/* $(PREFIX)/m68k-amigaos/ndk-include + rsync -a projects/amiga-netinclude/include/* $(PREFIX)/m68k-amigaos/ndk-include echo "done" >$@ projects/amiga-netinclude/README.md: @@ -666,7 +673,7 @@ build/libdebug/_done: build/libdebug/Makefile build/libdebug/Makefile: build/libnix/_done projects/libdebug/configure $(shell find 2>/dev/null projects/libdebug -not \( -path projects/libdebug/.git -prune \) -type f) mkdir -p build/libdebug - cd build/libdebug && CFLAGS="$(TARGET_C_FLAGS)" $(PWD)/projects/libdebug/configure $(CONFIG_LIBDEBUG) $(LOG) + cd build/libdebug && CFLAGS="$(TARGET_C_FLAGS)" ../../projects/libdebug/configure $(CONFIG_LIBDEBUG) $(LOG) projects/libdebug/configure: @mkdir -p projects diff --git a/patches/fd2sfd/fd2inline.c.diff b/patches/fd2sfd/fd2inline.c.diff new file mode 100644 index 0000000..6624e83 --- /dev/null +++ b/patches/fd2sfd/fd2inline.c.diff @@ -0,0 +1,14 @@ +--- fd2sfd/fd2inline.c 2018-06-28 14:37:19.772087300 +0100 ++++ fd2sfd-patched/fd2inline.c 2018-06-28 09:06:12.977739500 +0100 +@@ -46,6 +46,11 @@ + #define REGS 16 /* d0=0,...,a7=15 */ + #define FDS 1000 + ++ ++#ifdef __MINGW32__ ++#define bcopy(s1, s2, n) memmove((s2), (s1), (n)) ++#endif ++ + typedef enum + { + d0, d1, d2, d3, d4, d5, d6, d7, a0, a1, a2, a3, a4, a5, a6, a7, illegal diff --git a/patches/sfdc/sfdc.diff b/patches/sfdc/sfdc.diff new file mode 100644 index 0000000..e835d22 --- /dev/null +++ b/patches/sfdc/sfdc.diff @@ -0,0 +1,12 @@ +--- sfdc/sfdc 2018-06-28 14:37:26.434918400 +0100 ++++ sfdc-patched/sfdc 2018-06-28 14:42:58.370540300 +0100 +@@ -484,7 +484,8 @@ + while (my $line = ) { + + ++$line_no; +- ++ $line =~ s/\r//g; ++ + for ($line) { + /==copyright\s/ && do { + ( $$result{'copyright'} = $_ ) =~ s/==copyright\s+(.*)\s*/$1/; From fedf131257c6e8f772f2312cc6a7cd45912d300b Mon Sep 17 00:00:00 2001 From: Stephen Moody Date: Thu, 28 Jun 2018 16:05:58 +0100 Subject: [PATCH 03/10] Moved patching of sfdc and fd2sfd to after git checkout --- Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 52a2b42..9d89000 100644 --- a/Makefile +++ b/Makefile @@ -291,15 +291,15 @@ $(PREFIX)/bin/fd2sfd: build/fd2sfd/Makefile $(shell find 2>/dev/null projects/fd mkdir -p $(PREFIX)/bin/ $(MAKE) -C build/fd2sfd install $(LOG) build/fd2sfd/Makefile: projects/fd2sfd/configure - for i in $$(find patches/fd2sfd/ -type f); \ - do if [[ "$$i" == *.diff ]] ; \ - then j=$${i:8}; patch -N "projects/$${j%.diff}" "$$i"; fi ; done @mkdir -p build/fd2sfd cd build/fd2sfd && $(E) ../../projects/fd2sfd/configure $(CONFIG_FD2SFD) $(LOG) projects/fd2sfd/configure: @mkdir -p projects cd projects && git clone -b master --depth 4 https://github.com/cahirwpz/fd2sfd + for i in $$(find patches/fd2sfd/ -type f); \ + do if [[ "$$i" == *.diff ]] ; \ + then j=$${i:8}; patch -N "projects/$${j%.diff}" "$$i"; fi ; done # ================================================= # fd2pragma @@ -360,16 +360,15 @@ $(PREFIX)/bin/sfdc: build/sfdc/Makefile $(shell find 2>/dev/null projects/sfdc - install build/sfdc/sfdc $(PREFIX)/bin build/sfdc/Makefile: projects/sfdc/configure - for i in $$(find patches/sfdc/ -type f); \ - do if [[ "$$i" == *.diff ]] ; \ - then j=$${i:8}; patch -N "projects/$${j%.diff}" "$$i"; fi ; done - rsync -a projects/sfdc build --exclude .git cd build/sfdc && $(E) ./configure $(CONFIG_SFDC) $(LOG) projects/sfdc/configure: @mkdir -p projects cd projects && git clone -b master --depth 4 https://github.com/adtools/sfdc + for i in $$(find patches/sfdc/ -type f); \ + do if [[ "$$i" == *.diff ]] ; \ + then j=$${i:8}; patch -N "projects/$${j%.diff}" "$$i"; fi ; done # ================================================= # vasm From c63a363fe1b74208215afa7f027a77204abf0488 Mon Sep 17 00:00:00 2001 From: Stephen Moody Date: Thu, 28 Jun 2018 16:22:29 +0100 Subject: [PATCH 04/10] Fix fd2pragma building --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9d89000..49f3b72 100644 --- a/Makefile +++ b/Makefile @@ -316,7 +316,7 @@ $(PREFIX)/bin/fd2pragma: build/fd2pragma/fd2pragma build/fd2pragma/fd2pragma: projects/fd2pragma/makefile $(shell find 2>/dev/null projects/fd2pragma -not \( -path projects/fd2pragma/.git -prune \) -type f) @mkdir -p build/fd2pragma - cd projects/fd2pragma && $(CC) -o ./$@ $(CFLAGS) fd2pragma.c + cd projects/fd2pragma && $(CC) -o $(PWD)/$@ $(CFLAGS) fd2pragma.c projects/fd2pragma/makefile: @mkdir -p projects From 547108a8e1cbe4132cab9c4f05298b7e4243f568 Mon Sep 17 00:00:00 2001 From: Stephen Moody Date: Thu, 28 Jun 2018 16:25:59 +0100 Subject: [PATCH 05/10] Fix for ira building --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 49f3b72..8524372 100644 --- a/Makefile +++ b/Makefile @@ -337,7 +337,7 @@ $(PREFIX)/bin/ira: build/ira/ira build/ira/ira: projects/ira/Makefile $(shell find 2>/dev/null projects/ira -not \( -path projects/ira/.git -prune \) -type f) @mkdir -p build/ira - cd projects/ira && $(CC) -o ./$@ $(CFLAGS) *.c -std=c99 + cd projects/ira && $(CC) -o $(PWD)/$@ $(CFLAGS) *.c -std=c99 projects/ira/Makefile: @mkdir -p projects From 4f1de4b3c55032b197f2b9e70e4716f645047608 Mon Sep 17 00:00:00 2001 From: Stephen Moody Date: Fri, 29 Jun 2018 09:25:09 +0100 Subject: [PATCH 06/10] Add GMP, MPC and MPFR to GCC build --- Makefile | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8524372..2355ff0 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,15 @@ EXEEXT=$(MYMAKEEXE:%=.exe) UNAME_S := $(shell uname -s) +# Files for GMP, MPC and MPFR + +GMP = gmp-6.1.2 +GMPFILE = $(GMP).tar.bz2 +MPC = mpc-1.0.3 +MPCFILE = $(MPC).tar.gz +MPFR = mpfr-3.1.6 +MPFRFILE = $(MPFR).tar.bz2 + # ================================================= .PHONY: x @@ -73,13 +82,22 @@ all: gcc binutils fd2sfd fd2pragma ira sfdc vbcc vasm vlink libnix ixemul libgcc # ================================================= # clean # ================================================= -.PHONY: clean-prefix clean clean-gcc clean-binutils clean-fd2sfd clean-fd2pragma clean-ira clean-sfdc clean-vasm clean-vbcc clean-vlink clean-libnix clean-ixemul clean-libgcc clean-clib2 clean-libdebug clean-libSDL12 clean-newlib clean-ndk -clean: clean-gcc clean-binutils clean-fd2sfd clean-fd2pragma clean-ira clean-sfdc clean-vasm clean-vbcc clean-vlink clean-libnix clean-ixemul clean-clib2 clean-libdebug clean-libSDL12 clean-newlib clean-ndk +.PHONY: clean-prefix clean clean-gcc clean-binutils clean-fd2sfd clean-fd2pragma clean-ira clean-sfdc clean-vasm clean-vbcc clean-vlink clean-libnix clean-ixemul clean-libgcc clean-clib2 clean-libdebug clean-libSDL12 clean-newlib clean-ndk clean-gmp clean-mpc clean-mpfr +clean: clean-gcc clean-binutils clean-fd2sfd clean-fd2pragma clean-ira clean-sfdc clean-vasm clean-vbcc clean-vlink clean-libnix clean-ixemul clean-clib2 clean-libdebug clean-libSDL12 clean-newlib clean-ndk clean-gmp clean-mpc clean-mpfr rm -rf build clean-gcc: rm -rf build/gcc +clean-gmp: + rm -rf projects/gcc/gmp + +clean-mpc: + rm -rf projects/gcc/mpc + +clean-mpfr: + rm -rf projects/gcc/mpfr + clean-libgcc: rm -rf build/gcc/m68k-amigaos rm build/gcc/_libgcc_done @@ -140,8 +158,8 @@ clean-prefix: # ================================================= # update all projects # ================================================= -.PHONY: update update-gcc update-binutils update-fd2sfd update-fd2pragma update-ira update-sfdc update-vasm update-vbcc update-vlink update-libnix update-ixemul update-clib2 update-libdebug update-libSDL12 update-ndk update-newlib update-netinclude -update: update-gcc update-binutils update-fd2sfd update-fd2pragma update-ira update-sfdc update-vasm update-vbcc update-vlink update-libnix update-ixemul update-clib2 update-libdebug update-libSDL12 update-ndk update-newlib update-netinclude +.PHONY: update update-gcc update-binutils update-fd2sfd update-fd2pragma update-ira update-sfdc update-vasm update-vbcc update-vlink update-libnix update-ixemul update-clib2 update-libdebug update-libSDL12 update-ndk update-newlib update-netinclude update-gmp update-mpc update-mpfr +update: update-gcc update-binutils update-fd2sfd update-fd2pragma update-ira update-sfdc update-vasm update-vbcc update-vlink update-libnix update-ixemul update-clib2 update-libdebug update-libSDL12 update-ndk update-newlib update-netinclude update-gmp update-mpc update-mpfr update-gcc: projects/gcc/configure cd projects/gcc && export DEPTH=16; while true; do echo "trying depth=$$DEPTH"; git pull --depth $$DEPTH && break; export DEPTH=$$(($$DEPTH+$$DEPTH));done @@ -200,6 +218,30 @@ update-newlib: projects/newlib-cygwin/newlib/configure update-netinclude: projects/amiga-netinclude/README.md cd projects/amiga-netinclude && git pull +update-gmp: + @mkdir -p download + if [ -a download/$(GMPFILE) ]; \ + then rm -rf projects/$(GMP); rm -rf projects/gcc/gmp; \ + else cd download && wget ftp://ftp.gnu.org/gnu/gmp/$(GMPFILE); \ + fi; + cd projects && tar xf ../download/$(GMPFILE) + +update-mpc: + @mkdir -p download + if [ -a download/$(MPCFILE) ]; \ + then rm -rf projcts/$(MPC); rm -rf projects/gcc/mpc; \ + else cd download && wget ftp://ftp.gnu.org/gnu/mpc/$(MPCFILE); \ + fi; + cd projects && tar xf ../download/$(MPCFILE) + +update-mpfr: + @mkdir -p download + if [ -a download/$(MPFRFILE) ]; \ + then rm -rf projects/$(MPFR); rm -rf projects/gcc/mpfr; \ + else cd download && wget ftp://ftp.gnu.org/gnu/mpfr/$(MPFRFILE); \ + fi; + cd projects && tar xf ../download/$(MPFRFILE) + status-all: GCC_VERSION=$(shell cat 2>/dev/null projects/gcc/gcc/BASE-VER) # ================================================= @@ -231,6 +273,13 @@ build/gcc/_done: build/gcc/Makefile $(shell find 2>/dev/null $(GCCD) -maxdepth 1 build/gcc/Makefile: projects/gcc/configure build/binutils/_done @mkdir -p build/gcc + @mkdir -p projects/gcc/gmp + @mkdir -p projects/gcc/mpc + @mkdir -p projects/gcc/mpfr + + rsync -a projects/$(GMP)/* projects/gcc/gmp + rsync -a projects/$(MPC)/* projects/gcc/mpc + rsync -a projects/$(MPFR)/* projects/gcc/mpfr # if [ "$(UNAME_S)" == "Darwin" ]; then cd build/gcc && contrib/download_prerequisites; fi cd build/gcc && $(E) ../../projects/gcc/configure $(CONFIG_GCC) $(LOG) @@ -530,6 +579,7 @@ download/NDK39.lha: mkdir -p download cd download && wget http://www.haage-partner.de/download/AmigaOS/NDK39.lha + # ================================================= # NDK1.3 - emulated from NDK # ================================================= From b3d9fd6fccc86557390e955874309b3d1aa1405a Mon Sep 17 00:00:00 2001 From: Stephen Moody Date: Fri, 29 Jun 2018 11:30:22 +0100 Subject: [PATCH 07/10] Updated to allow building under MSYS2/MinGW To get the code to build successfully under MinGW the following changes were made. The configure command for some of the projects had to be changed from absolute paths to relative paths to avoid build errors relating to path name issues under windows. GMP, MPC and MPFR are built as part of GCC. fd2sfd has a patch for it to build under MinGW. sfdc is patched to remove carrage returns from the sfd files. This was causing errors in the generated include files. --- Makefile | 73 +++++++++++++++++++++++++++++---- patches/fd2sfd/fd2inline.c.diff | 14 +++++++ patches/sfdc/sfdc.diff | 12 ++++++ 3 files changed, 90 insertions(+), 9 deletions(-) create mode 100644 patches/fd2sfd/fd2inline.c.diff create mode 100644 patches/sfdc/sfdc.diff diff --git a/Makefile b/Makefile index 6b5643a..6d415cf 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,15 @@ EXEEXT=$(MYMAKEEXE:%=.exe) UNAME_S := $(shell uname -s) +# Files for GMP, MPC and MPFR + +GMP = gmp-6.1.2 +GMPFILE = $(GMP).tar.bz2 +MPC = mpc-1.0.3 +MPCFILE = $(MPC).tar.gz +MPFR = mpfr-3.1.6 +MPFRFILE = $(MPFR).tar.bz2 + # ================================================= .PHONY: x @@ -73,13 +82,22 @@ all: gcc binutils fd2sfd fd2pragma ira sfdc vbcc vasm vlink libnix ixemul libgcc # ================================================= # clean # ================================================= -.PHONY: clean-prefix clean clean-gcc clean-binutils clean-fd2sfd clean-fd2pragma clean-ira clean-sfdc clean-vasm clean-vbcc clean-vlink clean-libnix clean-ixemul clean-libgcc clean-clib2 clean-libdebug clean-libSDL12 clean-newlib clean-ndk -clean: clean-gcc clean-binutils clean-fd2sfd clean-fd2pragma clean-ira clean-sfdc clean-vasm clean-vbcc clean-vlink clean-libnix clean-ixemul clean-clib2 clean-libdebug clean-libSDL12 clean-newlib clean-ndk +.PHONY: clean-prefix clean clean-gcc clean-binutils clean-fd2sfd clean-fd2pragma clean-ira clean-sfdc clean-vasm clean-vbcc clean-vlink clean-libnix clean-ixemul clean-libgcc clean-clib2 clean-libdebug clean-libSDL12 clean-newlib clean-ndk clean-gmp clean-mpc clean-mpfr +clean: clean-gcc clean-binutils clean-fd2sfd clean-fd2pragma clean-ira clean-sfdc clean-vasm clean-vbcc clean-vlink clean-libnix clean-ixemul clean-clib2 clean-libdebug clean-libSDL12 clean-newlib clean-ndk clean-gmp clean-mpc clean-mpfr rm -rf build clean-gcc: rm -rf build/gcc +clean-gmp: + rm -rf projects/gcc/gmp + +clean-mpc: + rm -rf projects/gcc/mpc + +clean-mpfr: + rm -rf projects/gcc/mpfr + clean-libgcc: rm -rf build/gcc/m68k-amigaos rm build/gcc/_libgcc_done @@ -140,8 +158,8 @@ clean-prefix: # ================================================= # update all projects # ================================================= -.PHONY: update update-gcc update-binutils update-fd2sfd update-fd2pragma update-ira update-sfdc update-vasm update-vbcc update-vlink update-libnix update-ixemul update-clib2 update-libdebug update-libSDL12 update-ndk update-newlib update-netinclude -update: update-gcc update-binutils update-fd2sfd update-fd2pragma update-ira update-sfdc update-vasm update-vbcc update-vlink update-libnix update-ixemul update-clib2 update-libdebug update-libSDL12 update-ndk update-newlib update-netinclude +.PHONY: update update-gcc update-binutils update-fd2sfd update-fd2pragma update-ira update-sfdc update-vasm update-vbcc update-vlink update-libnix update-ixemul update-clib2 update-libdebug update-libSDL12 update-ndk update-newlib update-netinclude update-gmp update-mpc update-mpfr +update: update-gcc update-binutils update-fd2sfd update-fd2pragma update-ira update-sfdc update-vasm update-vbcc update-vlink update-libnix update-ixemul update-clib2 update-libdebug update-libSDL12 update-ndk update-newlib update-netinclude update-gmp update-mpc update-mpfr update-gcc: projects/gcc/configure cd projects/gcc && export DEPTH=16; while true; do echo "trying depth=$$DEPTH"; git pull --depth $$DEPTH && break; export DEPTH=$$(($$DEPTH+$$DEPTH));done @@ -200,6 +218,30 @@ update-newlib: projects/newlib-cygwin/newlib/configure update-netinclude: projects/amiga-netinclude/README.md cd projects/amiga-netinclude && git pull +update-gmp: + @mkdir -p download + if [ -a download/$(GMPFILE) ]; \ + then rm -rf projects/$(GMP); rm -rf projects/gcc/gmp; \ + else cd download && wget ftp://ftp.gnu.org/gnu/gmp/$(GMPFILE); \ + fi; + cd projects && tar xf ../download/$(GMPFILE) + +update-mpc: + @mkdir -p download + if [ -a download/$(MPCFILE) ]; \ + then rm -rf projcts/$(MPC); rm -rf projects/gcc/mpc; \ + else cd download && wget ftp://ftp.gnu.org/gnu/mpc/$(MPCFILE); \ + fi; + cd projects && tar xf ../download/$(MPCFILE) + +update-mpfr: + @mkdir -p download + if [ -a download/$(MPFRFILE) ]; \ + then rm -rf projects/$(MPFR); rm -rf projects/gcc/mpfr; \ + else cd download && wget ftp://ftp.gnu.org/gnu/mpfr/$(MPFRFILE); \ + fi; + cd projects && tar xf ../download/$(MPFRFILE) + status-all: GCC_VERSION=$(shell cat 2>/dev/null projects/gcc/gcc/BASE-VER) # ================================================= @@ -210,7 +252,7 @@ status-all: # gcc # ================================================= CONFIG_GCC=--prefix=$(PREFIX) --target=m68k-amigaos --enable-languages=c,c++,objc --enable-version-specific-runtime-libs --disable-libssp --disable-nls \ - --with-headers=$(PWD)/projects/newlib-cygwin/newlib/libc/sys/amigaos/include/ --disable-shared + --with-headers=../../projects/newlib-cygwin/newlib/libc/sys/amigaos/include/ --disable-shared GCC_CMD = m68k-amigaos-c++ m68k-amigaos-g++ m68k-amigaos-gcc-$(GCC_VERSION) m68k-amigaos-gcc-nm \ @@ -231,8 +273,15 @@ build/gcc/_done: build/gcc/Makefile $(shell find 2>/dev/null $(GCCD) -maxdepth 1 build/gcc/Makefile: projects/gcc/configure build/binutils/_done @mkdir -p build/gcc + @mkdir -p projects/gcc/gmp + @mkdir -p projects/gcc/mpc + @mkdir -p projects/gcc/mpfr + + rsync -a projects/$(GMP)/* projects/gcc/gmp + rsync -a projects/$(MPC)/* projects/gcc/mpc + rsync -a projects/$(MPFR)/* projects/gcc/mpfr # if [ "$(UNAME_S)" == "Darwin" ]; then cd build/gcc && contrib/download_prerequisites; fi - cd build/gcc && $(E) $(PWD)/projects/gcc/configure $(CONFIG_GCC) $(LOG) + cd build/gcc && $(E) ../../projects/gcc/configure $(CONFIG_GCC) $(LOG) projects/gcc/configure: @mkdir -p projects @@ -268,7 +317,7 @@ build/binutils/_done: build/binutils/gas/Makefile $(shell find 2>/dev/null proje build/binutils/gas/Makefile: projects/binutils/configure @mkdir -p build/binutils - cd build/binutils && $(E) $(PWD)/projects/binutils/configure $(CONFIG_BINUTILS) $(LOG) + cd build/binutils && $(E) ../../projects/binutils/configure $(CONFIG_BINUTILS) $(LOG) projects/binutils/configure: @mkdir -p projects @@ -297,6 +346,9 @@ build/fd2sfd/Makefile: projects/fd2sfd/configure projects/fd2sfd/configure: @mkdir -p projects cd projects && git clone -b master --depth 4 https://github.com/cahirwpz/fd2sfd + for i in $$(find patches/fd2sfd/ -type f); \ + do if [[ "$$i" == *.diff ]] ; \ + then j=$${i:8}; patch -N "projects/$${j%.diff}" "$$i"; fi ; done # ================================================= # fd2pragma @@ -363,6 +415,9 @@ build/sfdc/Makefile: projects/sfdc/configure projects/sfdc/configure: @mkdir -p projects cd projects && git clone -b master --depth 4 https://github.com/adtools/sfdc + for i in $$(find patches/sfdc/ -type f); \ + do if [[ "$$i" == *.diff ]] ; \ + then j=$${i:8}; patch -N "projects/$${j%.diff}" "$$i"; fi ; done # ================================================= # vasm @@ -666,7 +721,7 @@ build/libdebug/_done: build/libdebug/Makefile build/libdebug/Makefile: build/libnix/_done projects/libdebug/configure $(shell find 2>/dev/null projects/libdebug -not \( -path projects/libdebug/.git -prune \) -type f) mkdir -p build/libdebug - cd build/libdebug && CFLAGS="$(TARGET_C_FLAGS)" $(PWD)/projects/libdebug/configure $(CONFIG_LIBDEBUG) $(LOG) + cd build/libdebug && CFLAGS="$(TARGET_C_FLAGS)" ../../projects/libdebug/configure $(CONFIG_LIBDEBUG) $(LOG) projects/libdebug/configure: @mkdir -p projects @@ -740,7 +795,7 @@ endif build/newlib/newlib/Makefile: projects/newlib-cygwin/configure mkdir -p build/newlib/newlib - cd build/newlib/newlib && $(NEWLIB_CONFIG) CFLAGS="$(TARGET_C_FLAGS)" $(PWD)/projects/newlib-cygwin/newlib/configure --host=m68k-amigaos --prefix=$(PREFIX) $(LOG) + cd build/newlib/newlib && $(NEWLIB_CONFIG) CFLAGS="$(TARGET_C_FLAGS)" ../../../projects/newlib-cygwin/newlib/configure --host=m68k-amigaos --prefix=$(PREFIX) $(LOG) projects/newlib-cygwin/newlib/configure: @mkdir -p projects diff --git a/patches/fd2sfd/fd2inline.c.diff b/patches/fd2sfd/fd2inline.c.diff new file mode 100644 index 0000000..6624e83 --- /dev/null +++ b/patches/fd2sfd/fd2inline.c.diff @@ -0,0 +1,14 @@ +--- fd2sfd/fd2inline.c 2018-06-28 14:37:19.772087300 +0100 ++++ fd2sfd-patched/fd2inline.c 2018-06-28 09:06:12.977739500 +0100 +@@ -46,6 +46,11 @@ + #define REGS 16 /* d0=0,...,a7=15 */ + #define FDS 1000 + ++ ++#ifdef __MINGW32__ ++#define bcopy(s1, s2, n) memmove((s2), (s1), (n)) ++#endif ++ + typedef enum + { + d0, d1, d2, d3, d4, d5, d6, d7, a0, a1, a2, a3, a4, a5, a6, a7, illegal diff --git a/patches/sfdc/sfdc.diff b/patches/sfdc/sfdc.diff new file mode 100644 index 0000000..e835d22 --- /dev/null +++ b/patches/sfdc/sfdc.diff @@ -0,0 +1,12 @@ +--- sfdc/sfdc 2018-06-28 14:37:26.434918400 +0100 ++++ sfdc-patched/sfdc 2018-06-28 14:42:58.370540300 +0100 +@@ -484,7 +484,8 @@ + while (my $line = ) { + + ++$line_no; +- ++ $line =~ s/\r//g; ++ + for ($line) { + /==copyright\s/ && do { + ( $$result{'copyright'} = $_ ) =~ s/==copyright\s+(.*)\s*/$1/; From 3cdb2ec829b483bec4924a49d2990b48222417f9 Mon Sep 17 00:00:00 2001 From: Stephen Moody Date: Fri, 29 Jun 2018 11:58:42 +0100 Subject: [PATCH 08/10] Added installer scripts (untested) --- icon.ico | Bin 0 -> 23681 bytes install-32.iss | 85 +++++++++++++++++++++++++++++++++++++++++++++++ install-64.iss | 87 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 172 insertions(+) create mode 100644 icon.ico create mode 100644 install-32.iss create mode 100644 install-64.iss diff --git a/icon.ico b/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..9a5269c0497326ea927c8a9390c04fe7db6a5cbb GIT binary patch literal 23681 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 NuUx<4?lM!4{|A Date: Fri, 29 Jun 2018 12:01:36 +0100 Subject: [PATCH 09/10] Corrected installer prompt text --- install-32.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-32.iss b/install-32.iss index 0bd2bd6..bd6a46b 100644 --- a/install-32.iss +++ b/install-32.iss @@ -52,7 +52,7 @@ var procedure InitializeWizard; begin OptionPage := CreateInputOptionPage(wpSelectDir, 'Add to PATH?', '', '', False, False); - OptionPage.Add('Add CGG m68k elf tools to PATH?'); + OptionPage.Add('Add Amiga GCC tools to PATH?'); OptionPage.Values[0] := True; end; From 1206308c1ec896b187260e79418f36721d51c8ff Mon Sep 17 00:00:00 2001 From: Stephen Moody Date: Mon, 2 Jul 2018 09:29:09 +0100 Subject: [PATCH 10/10] Updated installer files --- .gitignore | 1 + install-32.iss | 16 +++++++++++----- install-64.iss | 16 +++++++++++----- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 1fdf1e6..e307243 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ build projects download +Output diff --git a/install-32.iss b/install-32.iss index bd6a46b..c9a1d9b 100644 --- a/install-32.iss +++ b/install-32.iss @@ -2,10 +2,10 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Amiga GCC" -#define MyAppVersion "6.4.1" +#define MyAppVersion "6.4.1b" #define MyAppPublisher "Stephen Moody" #define MyAppURL "https://github.com/SteveMoody73/" -#define MinGWFolder "D:\Dev\Shell\msys64" +#define MinGWFolder "C:\Dev\msys64" [Setup] ; NOTE: The value of AppId uniquely identifies this application. @@ -37,13 +37,19 @@ Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" [Files] Source: "{#MinGWFolder}\opt\amiga-gcc-32\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "{#MinGWFolder}\mingw32\bin\libwinpthread-1.dll"; DestDir: "{app}\bin"; Flags: ignoreversion -Source: "{#MinGWFolder}\mingw32\bin\libwinpthread-1.dll"; DestDir: "{app}\libexec\gcc\m68k-amigaos\8.1.0"; Flags: ignoreversion +Source: "{#MinGWFolder}\mingw32\bin\libwinpthread-1.dll"; DestDir: "{app}\libexec\gcc\m68k-amigaos\{#MyAppVersion}"; Flags: ignoreversion Source: "{#MinGWFolder}\mingw32\bin\libwinpthread-1.dll"; DestDir: "{app}\m68k-amigaos\bin"; Flags: ignoreversion +Source: "{#MinGWFolder}\mingw32\bin\libintl-8.dll"; DestDir: "{app}\bin"; Flags: ignoreversion +Source: "{#MinGWFolder}\mingw32\bin\libintl-8.dll"; DestDir: "{app}\libexec\gcc\m68k-amigaos\{#MyAppVersion}"; Flags: ignoreversion +Source: "{#MinGWFolder}\mingw32\bin\libintl-8.dll"; DestDir: "{app}\m68k-amigaos\bin"; Flags: ignoreversion +Source: "{#MinGWFolder}\mingw32\bin\libgcc_s_dw2-1.dll"; DestDir: "{app}\bin"; Flags: ignoreversion +Source: "{#MinGWFolder}\mingw32\bin\libgcc_s_dw2-1.dll"; DestDir: "{app}\libexec\gcc\m68k-amigaos\{#MyAppVersion}"; Flags: ignoreversion +Source: "{#MinGWFolder}\mingw32\bin\libgcc_s_dw2-1.dll"; DestDir: "{app}\m68k-amigaos\bin"; Flags: ignoreversion [Registry] Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; \ - ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}"; \ - Check: NeedsAddPath(ExpandConstant('{app}')) + ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}\bin"; \ + Check: NeedsAddPath(ExpandConstant('{app}\bin')) [Code] var diff --git a/install-64.iss b/install-64.iss index b15a63e..56b5af5 100644 --- a/install-64.iss +++ b/install-64.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Amiga GCC" -#define MyAppVersion "6.4.1" +#define MyAppVersion "6.4.1b" #define MyAppPublisher "Stephen Moody" #define MyAppURL "https://github.com/SteveMoody73/" #define MinGWFolder "D:\Dev\Shell\msys64" @@ -39,13 +39,19 @@ Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" [Files] Source: "{#MinGWFolder}\opt\amiga-gcc-64\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "{#MinGWFolder}\mingw64\bin\libwinpthread-1.dll"; DestDir: "{app}\bin"; Flags: ignoreversion -Source: "{#MinGWFolder}\mingw64\bin\libwinpthread-1.dll"; DestDir: "{app}\libexec\gcc\m68k-amigaos\8.1.0"; Flags: ignoreversion +Source: "{#MinGWFolder}\mingw64\bin\libwinpthread-1.dll"; DestDir: "{app}\libexec\gcc\m68k-amigaos\{#MyAppVersion}"; Flags: ignoreversion Source: "{#MinGWFolder}\mingw64\bin\libwinpthread-1.dll"; DestDir: "{app}\m68k-amigaos\bin"; Flags: ignoreversion +Source: "{#MinGWFolder}\mingw64\bin\libintl-8.dll"; DestDir: "{app}\bin"; Flags: ignoreversion +Source: "{#MinGWFolder}\mingw64\bin\libintl-8.dll"; DestDir: "{app}\libexec\gcc\m68k-amigaos\{#MyAppVersion}"; Flags: ignoreversion +Source: "{#MinGWFolder}\mingw64\bin\libintl-8.dll"; DestDir: "{app}\m68k-amigaos\bin"; Flags: ignoreversion +Source: "{#MinGWFolder}\mingw64\bin\libgcc_s_dw2-1.dll"; DestDir: "{app}\bin"; Flags: ignoreversion +Source: "{#MinGWFolder}\mingw64\bin\libgcc_s_dw2-1.dll"; DestDir: "{app}\libexec\gcc\m68k-amigaos\{#MyAppVersion}"; Flags: ignoreversion +Source: "{#MinGWFolder}\mingw64\bin\libgcc_s_dw2-1.dll"; DestDir: "{app}\m68k-amigaos\bin"; Flags: ignoreversion [Registry] Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; \ - ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}"; \ - Check: NeedsAddPath(ExpandConstant('{app}')) + ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}\bin"; \ + Check: NeedsAddPath(ExpandConstant('{app}\bin')) [Code] var @@ -54,7 +60,7 @@ var procedure InitializeWizard; begin OptionPage := CreateInputOptionPage(wpSelectDir, 'Add to PATH?', '', '', False, False); - OptionPage.Add('Add CGG m68k elf tools to PATH?'); + OptionPage.Add('Add Amiga GCC tools to PATH?'); OptionPage.Values[0] := True; end;