From 31c225f6b5e88cc2da1662712b87dbe75114532d Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Sat, 20 May 2023 09:32:15 +0000 Subject: [PATCH] Change m68k-embedded target to handle standard RTL units as most other CPUs do (fixes compilation failure in utils/h2pas package) --- rtl/embedded/Makefile | 2 +- rtl/embedded/Makefile.fpc | 2 +- rtl/embedded/system.cfg | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/rtl/embedded/Makefile b/rtl/embedded/Makefile index bc3ed0c11d..158b93f976 100644 --- a/rtl/embedded/Makefile +++ b/rtl/embedded/Makefile @@ -491,7 +491,7 @@ ifeq ($(ARCH),x86_64) CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl macpas typinfo types rtlconsts getopts lineinfo endif ifeq ($(ARCH),m68k) -CPU_SPECIFIC_COMMON_UNITS=sysutils math +CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl macpas typinfo types rtlconsts getopts lineinfo endif ifeq ($(ARCH),mipsel) CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl macpas typinfo types rtlconsts getopts lineinfo diff --git a/rtl/embedded/Makefile.fpc b/rtl/embedded/Makefile.fpc index a3f2f801dd..193fffa64e 100644 --- a/rtl/embedded/Makefile.fpc +++ b/rtl/embedded/Makefile.fpc @@ -192,7 +192,7 @@ CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl macpas typinfo types rtlcons endif ifeq ($(ARCH),m68k) -CPU_SPECIFIC_COMMON_UNITS=sysutils math +CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl macpas typinfo types rtlconsts getopts lineinfo # CPU_UNITS=multiboot endif diff --git a/rtl/embedded/system.cfg b/rtl/embedded/system.cfg index 09df82d2b3..ece997fd1e 100644 --- a/rtl/embedded/system.cfg +++ b/rtl/embedded/system.cfg @@ -203,9 +203,7 @@ #endif #endif -# Minimal set for m68k, copied from AVR above -# does not require extra memory, neither code nor data -# in programs not using e. g. writeln based I/O +# m68k is powerful enough to handle most object pascal constructs #ifdef CPUM68K -SfSOFTFPU -SfOBJECTS