From 0940b0728c5056dc6b2cccf6ec19ba9d1006e59e Mon Sep 17 00:00:00 2001 From: HenrykRichter Date: Wed, 27 Jun 2018 08:32:13 +0200 Subject: [PATCH] workaround for GCC linking issues --- Driver/baxnet/source/Common.mk | 5 ++--- Driver/baxnet/source/Makefile.sdnet | 4 ++-- Driver/baxnet/source/enc624j6net/intervaltimer.asm | 4 ++-- Driver/baxnet/source/sdnet/intervaltimer.asm | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Driver/baxnet/source/Common.mk b/Driver/baxnet/source/Common.mk index 30fb8c5..a4d86f8 100644 --- a/Driver/baxnet/source/Common.mk +++ b/Driver/baxnet/source/Common.mk @@ -42,9 +42,8 @@ ifeq ($(compiler_vcc),1) CCX = vc LINK = vlink -bamigahunk -x -s -mrel -Cvbcc -Bstatic -nostdlib #-Rshort #LINK = $(CCX) -nostdlib -CFLAGS = -Os -+ -sc -c99 -cpu=68020 -CFLAGS2 = -Os -+ -sc -c99 -cpu=68020 - +CFLAGS = -Os -+ -sc -c99 -cpu=$(CPU) +CFLAGS2 = -Os -+ -sc -c99 -cpu=$(CPU2) else diff --git a/Driver/baxnet/source/Makefile.sdnet b/Driver/baxnet/source/Makefile.sdnet index f706828..2d493b1 100644 --- a/Driver/baxnet/source/Makefile.sdnet +++ b/Driver/baxnet/source/Makefile.sdnet @@ -21,8 +21,8 @@ # ############################################################################### DEVICEVERSION=1 -DEVICEREVISION=91 -DEVICEDATE=06.06.2018 +DEVICEREVISION=92 +DEVICEDATE=27.06.2018 DEVICEEXTRA=Beta ASMOBJECTS = $(SUBDIR)/vampuuid.o $(SUBDIR)/intervaltimer.o $(SUBDIR)/enc28j60.o $(SUBDIR)/enc28j60l.o SUBDIR=sdnet diff --git a/Driver/baxnet/source/enc624j6net/intervaltimer.asm b/Driver/baxnet/source/enc624j6net/intervaltimer.asm index c63cb1f..b0796bb 100644 --- a/Driver/baxnet/source/enc624j6net/intervaltimer.asm +++ b/Driver/baxnet/source/enc624j6net/intervaltimer.asm @@ -50,7 +50,7 @@ CALLEXEC macro jsr _LVO\1(a6) endm - section code,text + ;section code,text ifne DO_TEST @@ -325,7 +325,7 @@ _StopIntervalTimer: rts - section data,data + ;section data,data dosbase: dc.l 0 stdout: dc.l 0 timerbase: ds.b IVT_Size diff --git a/Driver/baxnet/source/sdnet/intervaltimer.asm b/Driver/baxnet/source/sdnet/intervaltimer.asm index c63cb1f..b0796bb 100644 --- a/Driver/baxnet/source/sdnet/intervaltimer.asm +++ b/Driver/baxnet/source/sdnet/intervaltimer.asm @@ -50,7 +50,7 @@ CALLEXEC macro jsr _LVO\1(a6) endm - section code,text + ;section code,text ifne DO_TEST @@ -325,7 +325,7 @@ _StopIntervalTimer: rts - section data,data + ;section data,data dosbase: dc.l 0 stdout: dc.l 0 timerbase: ds.b IVT_Size