diff --git a/.gitattributes b/.gitattributes
index 3d66bbee1c..51f9e86f09 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11360,7 +11360,7 @@ packager/globallinks/filefindlaz-1.0.2.lpl svneol=native#text/plain
 packager/globallinks/fpcunitconsolerunner-1.lpl svneol=native#text/plain
 packager/globallinks/fpcunitide-0.1.lpl svneol=native#text/plain
 packager/globallinks/fpcunittestrunner-0.1.lpl svneol=native#text/plain
-packager/globallinks/fpdebug-0.9.lpl svneol=native#text/pascal
+packager/globallinks/fpdebug-1.lpl svneol=native#text/pascal
 packager/globallinks/fppkgpackagemanager-0.1.lpl svneol=native#text/plain
 packager/globallinks/fpvectorial2aggpaspkg-0.lpl svneol=native#text/plain
 packager/globallinks/fpvectorialpkg-0.lpl svneol=native#text/plain
@@ -11375,6 +11375,7 @@ packager/globallinks/idescout-0.0.1.lpl svneol=native#text/plain
 packager/globallinks/imagesforlazarus-1.0.1.lpl svneol=native#text/plain
 packager/globallinks/instantfpclaz-1.lpl svneol=native#text/plain
 packager/globallinks/jcfidelazarus-2.lpl svneol=native#text/plain
+packager/globallinks/jitclasses-1.lpl svneol=native#text/plain
 packager/globallinks/jumptoimplementation-0.lpl svneol=native#text/plain
 packager/globallinks/laz.virtualtreeview_package-5.5.3.1.lpl svneol=native#text/plain
 packager/globallinks/lazactivex-0.1.lpl svneol=native#text/plain
@@ -11385,7 +11386,7 @@ packager/globallinks/lazcustforms-1.lpl svneol=native#text/plain
 packager/globallinks/lazdaemon-0.9.9.lpl svneol=native#text/plain
 packager/globallinks/lazdatadict-0.lpl svneol=native#text/plain
 packager/globallinks/lazdbexport-1.lpl svneol=native#text/plain
-packager/globallinks/lazdebuggerfp-0.9.lpl svneol=native#text/plain
+packager/globallinks/lazdebuggerfp-1.lpl svneol=native#text/plain
 packager/globallinks/lazdebuggerfpdserver-0.1.lpl svneol=native#text/plain
 packager/globallinks/lazdebuggerfpgdbmi-0.1.lpl svneol=native#text/plain
 packager/globallinks/lazdebuggerfplldb-0.lpl svneol=native#text/plain
@@ -11409,8 +11410,8 @@ packager/globallinks/lazthread-0.lpl svneol=native#text/plain
 packager/globallinks/lazutils-1.lpl svneol=native#text/plain
 packager/globallinks/lazvlc-1.lpl svneol=native#text/plain
 packager/globallinks/lazwiki-1.0.1.lpl svneol=native#text/plain
-packager/globallinks/lcl-2.1.lpl svneol=native#text/plain
-packager/globallinks/lclbase-2.1.lpl svneol=native#text/plain
+packager/globallinks/lcl-2.2.0.1.lpl svneol=native#text/plain
+packager/globallinks/lclbase-2.2.0.1.lpl svneol=native#text/plain
 packager/globallinks/lclextensions_package-0.6.1.lpl svneol=native#text/plain
 packager/globallinks/lclfpreport-0.lpl svneol=native#text/plain
 packager/globallinks/leakview-1.lpl svneol=native#text/plain
diff --git a/Makefile b/Makefile
index d5f2034265..af052f31a3 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded m68k-sinclairql powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android mips64el-linux jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-win64 aarch64-android aarch64-ios wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos z80-amstradcpc
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded m68k-sinclairql powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android mips64el-linux jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-freebsd aarch64-darwin aarch64-win64 aarch64-android aarch64-ios wasm32-embedded wasm32-wasi sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos z80-amstradcpc
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@@ -628,6 +628,9 @@ endif
 ifeq ($(FULL_TARGET),aarch64-linux)
 override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
 endif
+ifeq ($(FULL_TARGET),aarch64-freebsd)
+override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
 endif
@@ -640,7 +643,10 @@ endif
 ifeq ($(FULL_TARGET),aarch64-ios)
 override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
+ifeq ($(FULL_TARGET),wasm32-embedded)
+override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+endif
+ifeq ($(FULL_TARGET),wasm32-wasi)
 override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
 endif
 ifeq ($(FULL_TARGET),sparc64-linux)
@@ -940,6 +946,9 @@ endif
 ifeq ($(FULL_TARGET),aarch64-linux)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
 endif
+ifeq ($(FULL_TARGET),aarch64-freebsd)
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
 endif
@@ -952,7 +961,10 @@ endif
 ifeq ($(FULL_TARGET),aarch64-ios)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
+ifeq ($(FULL_TARGET),wasm32-embedded)
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+endif
+ifeq ($(FULL_TARGET),wasm32-wasi)
 override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
 endif
 ifeq ($(FULL_TARGET),sparc64-linux)
@@ -1243,10 +1255,18 @@ else
 ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),)
 FPCMAKE_CROSSGCCOPT=-mabi=32
 else
+ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),)
+FPCMAKE_CROSSGCCOPT=-mabi=lp64
+else
+ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),)
+FPCMAKE_CROSSGCCOPT=-mabi=ilp32
+else
 FPCMAKE_CROSSGCCOPT=-m32
 endif
 endif
 endif
+endif
+endif
 FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`)
 endif
 endif
@@ -2531,6 +2551,15 @@ REQUIRE_PACKAGES_LIBTAR=1
 REQUIRE_PACKAGES_FPMKUNIT=1
 REQUIRE_PACKAGES_REGEXPR=1
 endif
+ifeq ($(FULL_TARGET),aarch64-freebsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_LIBTAR=1
+REQUIRE_PACKAGES_FPMKUNIT=1
+REQUIRE_PACKAGES_REGEXPR=1
+endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
@@ -2567,7 +2596,16 @@ REQUIRE_PACKAGES_LIBTAR=1
 REQUIRE_PACKAGES_FPMKUNIT=1
 REQUIRE_PACKAGES_REGEXPR=1
 endif
-ifeq ($(FULL_TARGET),wasm-wasm)
+ifeq ($(FULL_TARGET),wasm32-embedded)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_LIBTAR=1
+REQUIRE_PACKAGES_FPMKUNIT=1
+REQUIRE_PACKAGES_REGEXPR=1
+endif
+ifeq ($(FULL_TARGET),wasm32-wasi)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
@@ -3053,11 +3091,24 @@ override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
 override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
 endif
 endif
+ifdef SYSROOTPATH
+override FPCOPT+=-XR$(SYSROOTPATH)
+else
+ifeq ($(OS_TARGET),$(OS_SOURCE))
+ifneq ($(findstring $(OS_TARGET),darwin),)
+ifneq ($(findstring $(CPU_TARGET),aarch64),)
+ifneq ($(wildcard /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk),)
+override FPCOPT+=-XR/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
+endif
+endif
+endif
+endif
+endif
 ifdef CREATESHARED
 override FPCOPT+=-Cg
 endif
 ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),)
-ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel),)
+ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel riscv64),)
 override FPCOPT+=-Cg
 endif
 endif
diff --git a/components/fpdebug/Makefile b/components/fpdebug/Makefile
index 0d1580e1da..fd31ceffd4 100644
--- a/components/fpdebug/Makefile
+++ b/components/fpdebug/Makefile
@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded m68k-sinclairql powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android mips64el-linux jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-win64 aarch64-android aarch64-ios wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos z80-amstradcpc
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android aarch64-ios wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@@ -195,24 +195,6 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic
 endif
 override FPCOPT+=-Cp$(SUBARCH)
 endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-ifeq ($(SUBARCH),)
-$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined)
-endif
-override FPCOPT+=-Cp$(SUBARCH)
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-ifeq ($(SUBARCH),)
-$(error When compiling for xtensa-freertos, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined)
-endif
-override FPCOPT+=-Cp$(SUBARCH)
-endif
-ifeq ($(FULL_TARGET),arm-freertos)
-ifeq ($(SUBARCH),)
-$(error When compiling for arm-freertos, a sub-architecture (e.g. SUBARCH=armv6m or SUBARCH=armv7em) must be defined)
-endif
-override FPCOPT+=-Cp$(SUBARCH)
-endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 TARGETSUFFIX=$(OS_TARGET)
 SOURCESUFFIX=$(OS_SOURCE)
@@ -347,7 +329,7 @@ FPCFPMAKE=$(FPC)
 endif
 endif
 override PACKAGE_NAME=fpdebug
-override PACKAGE_VERSION=0.9
+override PACKAGE_VERSION=1.0
 ifndef LCL_PLATFORM
 ifeq ($(OS_TARGET),win32)
 LCL_PLATFORM=win32
@@ -458,9 +440,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 override TARGET_UNITS+=fpdebug.pas
 endif
-ifeq ($(FULL_TARGET),m68k-sinclairql)
-override TARGET_UNITS+=fpdebug.pas
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override TARGET_UNITS+=fpdebug.pas
 endif
@@ -569,9 +548,6 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override TARGET_UNITS+=fpdebug.pas
 endif
-ifeq ($(FULL_TARGET),arm-freertos)
-override TARGET_UNITS+=fpdebug.pas
-endif
 ifeq ($(FULL_TARGET),arm-ios)
 override TARGET_UNITS+=fpdebug.pas
 endif
@@ -608,9 +584,6 @@ endif
 ifeq ($(FULL_TARGET),mipsel-android)
 override TARGET_UNITS+=fpdebug.pas
 endif
-ifeq ($(FULL_TARGET),mips64el-linux)
-override TARGET_UNITS+=fpdebug.pas
-endif
 ifeq ($(FULL_TARGET),jvm-java)
 override TARGET_UNITS+=fpdebug.pas
 endif
@@ -632,9 +605,6 @@ endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 override TARGET_UNITS+=fpdebug.pas
 endif
-ifeq ($(FULL_TARGET),aarch64-win64)
-override TARGET_UNITS+=fpdebug.pas
-endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override TARGET_UNITS+=fpdebug.pas
 endif
@@ -647,39 +617,6 @@ endif
 ifeq ($(FULL_TARGET),sparc64-linux)
 override TARGET_UNITS+=fpdebug.pas
 endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override TARGET_UNITS+=fpdebug.pas
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override TARGET_UNITS+=fpdebug.pas
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-override TARGET_UNITS+=fpdebug.pas
-endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-override TARGET_UNITS+=fpdebug.pas
-endif
-ifeq ($(FULL_TARGET),xtensa-linux)
-override TARGET_UNITS+=fpdebug.pas
-endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-override TARGET_UNITS+=fpdebug.pas
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-override TARGET_UNITS+=fpdebug.pas
-endif
-ifeq ($(FULL_TARGET),z80-embedded)
-override TARGET_UNITS+=fpdebug.pas
-endif
-ifeq ($(FULL_TARGET),z80-zxspectrum)
-override TARGET_UNITS+=fpdebug.pas
-endif
-ifeq ($(FULL_TARGET),z80-msxdos)
-override TARGET_UNITS+=fpdebug.pas
-endif
-ifeq ($(FULL_TARGET),z80-amstradcpc)
-override TARGET_UNITS+=fpdebug.pas
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -770,9 +707,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),m68k-sinclairql)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -881,9 +815,6 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),arm-freertos)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),arm-ios)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -920,9 +851,6 @@ endif
 ifeq ($(FULL_TARGET),mipsel-android)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),mips64el-linux)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),jvm-java)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -944,9 +872,6 @@ endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),aarch64-win64)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -959,350 +884,272 @@ endif
 ifeq ($(FULL_TARGET),sparc64-linux)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),xtensa-linux)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),z80-embedded)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),z80-zxspectrum)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),z80-msxdos)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),z80-amstradcpc)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-aros)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-macosclassic)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),m68k-sinclairql)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-macosclassic)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-aix)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-haiku)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-openbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-iphonesim)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-aros)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-dragonfly)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-aros)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),arm-freertos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-ios)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc64-aix)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),mips-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),mipsel-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),mipsel-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),mips64el-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),jvm-java)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),jvm-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i8086-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i8086-msdos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i8086-win16)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),aarch64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),aarch64-win64)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),aarch64-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),aarch64-ios)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),wasm-wasm)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),sparc64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),xtensa-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),z80-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),z80-zxspectrum)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),z80-msxdos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),z80-amstradcpc)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
@@ -1394,9 +1241,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),m68k-sinclairql)
-override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
@@ -1505,9 +1349,6 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),arm-freertos)
-override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifeq ($(FULL_TARGET),arm-ios)
 override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
@@ -1544,9 +1385,6 @@ endif
 ifeq ($(FULL_TARGET),mipsel-android)
 override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),mips64el-linux)
-override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifeq ($(FULL_TARGET),jvm-java)
 override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
@@ -1568,9 +1406,6 @@ endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),aarch64-win64)
-override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
@@ -1583,39 +1418,6 @@ endif
 ifeq ($(FULL_TARGET),sparc64-linux)
 override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),xtensa-linux)
-override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),z80-embedded)
-override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),z80-zxspectrum)
-override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),z80-msxdos)
-override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),z80-amstradcpc)
-override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
@@ -1706,9 +1508,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),m68k-sinclairql)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
@@ -1817,9 +1616,6 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),arm-freertos)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifeq ($(FULL_TARGET),arm-ios)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
@@ -1856,9 +1652,6 @@ endif
 ifeq ($(FULL_TARGET),mipsel-android)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),mips64el-linux)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifeq ($(FULL_TARGET),jvm-java)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
@@ -1880,9 +1673,6 @@ endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),aarch64-win64)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
@@ -1895,39 +1685,6 @@ endif
 ifeq ($(FULL_TARGET),sparc64-linux)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),xtensa-linux)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),z80-embedded)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),z80-zxspectrum)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),z80-msxdos)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),z80-amstradcpc)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -2124,89 +1881,12 @@ endif
 else
 CROSSBINDIR=
 endif
-ifeq ($(OS_SOURCE),linux)
-ifndef GCCLIBDIR
-ifeq ($(CPU_TARGET),i386)
-ifneq ($(findstring x86_64,$(shell uname -a)),)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
-else
-CROSSGCCOPT=-m32
-endif
-endif
-endif
-ifeq ($(CPU_TARGET),powerpc)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
-else
-CROSSGCCOPT=-m32
-endif
-endif
-ifeq ($(CPU_TARGET),powerpc64)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)
-else
-CROSSGCCOPT=-m64
-endif
-endif
-ifeq ($(CPU_TARGET),sparc)
-ifneq ($(findstring sparc64,$(shell uname -a)),)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
-else
-ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),)
-CROSSGCCOPT=-mabi=32
-else
-CROSSGCCOPT=-m32
-endif
-endif
-endif
-endif
-endif
-ifdef FPCFPMAKE
-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
-else
-ifneq ($(findstring $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
-FPCMAKE_CROSSGCCOPT=-m64
-else
-ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
-FPCMAKE_CROSSGCCOPT=-mabi=64
-else
-ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),)
-FPCMAKE_CROSSGCCOPT=-mabi=32
-else
-FPCMAKE_CROSSGCCOPT=-m32
-endif
-endif
-endif
-FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`)
-endif
-endif
-ifndef FPCMAKEGCCLIBDIR
-FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
-endif
-ifndef GCCLIBDIR
-CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
-ifneq ($(CROSSGCC),)
-GCCLIBDIR:=$(shell dirname `$(CROSSGCC) $(CROSSGCCOPT) -print-libgcc-file-name`)
-endif
-endif
-endif
-ifdef inUnix
-ifeq ($(OS_SOURCE),netbsd)
-OTHERLIBDIR:=/usr/pkg/lib
-endif
-export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
-endif
 BATCHEXT=.bat
 LOADEREXT=.as
 EXEEXT=.exe
 PPLEXT=.ppl
 PPUEXT=.ppu
 OEXT=.o
-LTOEXT=.bc
 ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
@@ -2401,11 +2081,6 @@ STATICLIBPREFIX=
 STATICLIBEXT=.a
 SHORTSUFFIX=d16
 endif
-ifeq ($(OS_TARGET),msxdos)
-STATICLIBPREFIX=
-STATICLIBEXT=.a
-SHORTSUFFIX=msd
-endif
 ifeq ($(OS_TARGET),embedded)
 ifeq ($(CPU_TARGET),i8086)
 STATICLIBPREFIX=
@@ -2413,9 +2088,6 @@ STATICLIBEXT=.a
 else
 EXEEXT=.bin
 endif
-ifeq ($(CPU_TARGET),z80)
-OEXT=.rel
-endif
 SHORTSUFFIX=emb
 endif
 ifeq ($(OS_TARGET),win16)
@@ -2424,9 +2096,6 @@ STATICLIBEXT=.a
 SHAREDLIBEXT=.dll
 SHORTSUFFIX=w16
 endif
-ifeq ($(OS_TARGET),zxspectrum)
-OEXT=.rel
-endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 FPCMADE=fpcmade.$(SHORTSUFFIX)
 ZIPSUFFIX=$(SHORTSUFFIX)
@@ -2772,9 +2441,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),m68k-sinclairql)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -2883,9 +2549,6 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),arm-freertos)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),arm-ios)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -2922,9 +2585,6 @@ endif
 ifeq ($(FULL_TARGET),mipsel-android)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),mips64el-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),jvm-java)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -2946,9 +2606,6 @@ endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),aarch64-win64)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),aarch64-android)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -2961,39 +2618,6 @@ endif
 ifeq ($(FULL_TARGET),sparc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),xtensa-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),z80-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),z80-zxspectrum)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),z80-msxdos)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),z80-amstradcpc)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -3049,9 +2673,9 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-ifneq ($(RLINKPATH),)
-override FPCOPT+=-Xr$(RLINKPATH)
 endif
+ifneq ($(BINUTILSPREFIX),)
+override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
 ifndef CROSSCOMPILE
@@ -3145,17 +2769,6 @@ endif
 endif
 ifdef LINKSHARED
 endif
-ifdef GCCLIBDIR
-override FPCOPT+=-Fl$(GCCLIBDIR)
-ifdef FPCMAKEGCCLIBDIR
-override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
-else
-override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
-endif
-endif
-ifdef OTHERLIBDIR
-override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
-endif
 ifdef OPT
 override FPCOPT+=$(OPT)
 endif
@@ -3222,7 +2835,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
 $(COMPILER_UNITTARGETDIR):
 	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
 $(COMPILER_TARGETDIR):
@@ -3253,7 +2866,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.inc $(COMPILER_INCLUDEDIR)
 vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_shared
 override INSTALLTARGET+=fpc_shared_install
@@ -3274,7 +2886,7 @@ fpc_shared:
 ifdef HASSHAREDLIB
 	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
 ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -P$(BINUTILSPREFIX)
+	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
 endif
 else
 	@$(ECHO) Shared Libraries not supported
@@ -3296,15 +2908,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
 endif
 ifdef INSTALLPPUFILES
 ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 endif
 ifneq ($(UNITTARGETDIRPREFIX),)
-override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))
-override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))
-override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILENAMES))
-override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILENAMES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
 endif
 override INSTALL_CREATEPACKAGEFPC=1
 endif
@@ -3459,14 +3069,12 @@ ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
 endif
 ifdef CLEANPPUFILES
-override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
 ifdef DEBUGSYMEXT
 override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
 endif
-override CLEANPPUFILENAMES:=$(CLEANPPUFILES)
-override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILENAMES))
-override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)
-override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILENAMES)))
+override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
 endif
 fpc_clean: $(CLEANTARGET)
 ifdef CLEANEXEFILES
@@ -3490,9 +3098,8 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -3513,14 +3120,13 @@ ifdef CLEAN_FILES
 endif
 	-$(DELTREE) units
 	-$(DELTREE) bin
-	-$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
 ifneq ($(PPUEXT),.ppu)
 	-$(DEL) *.o *.ppu *.a
 endif
 	-$(DELTREE) *$(SMARTEXT)
-	-$(DEL) fpcmade.* Package.fpc *.fpm
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif
diff --git a/components/fpdebug/Makefile.compiled b/components/fpdebug/Makefile.compiled
index fe9995b5e4..8f03c9ba8d 100644
--- a/components/fpdebug/Makefile.compiled
+++ b/components/fpdebug/Makefile.compiled
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <Makefile Value="2"/>
-  <Params Value=" -Fu.;../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)  -MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 fpdebug.pas"/>
+  <Params Value=" -Fu.;../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)  -MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 fpdebug.pas"/>
 </CONFIG>
diff --git a/components/fpdebug/Makefile.fpc b/components/fpdebug/Makefile.fpc
index cb619c82b6..aab21c8ec9 100644
--- a/components/fpdebug/Makefile.fpc
+++ b/components/fpdebug/Makefile.fpc
@@ -1,17 +1,17 @@
 #   File generated automatically by Lazarus Package Manager
 #
-#   Makefile.fpc for fpdebug 0.9
+#   Makefile.fpc for fpdebug 1.0
 #
-#   This file was generated on 14-7-20
+#   This file was generated on 15-6-21
 
 [package]
 name=fpdebug
-version=0.9
+version=1.0
 
 [compiler]
 unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)
 unitdir=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
-options= -MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+options= -MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm6058,3057 $(DBG_OPTIONS)
 
 [target]
 units=fpdebug.pas
diff --git a/components/lazdebuggers/lazdebuggerfp/Makefile b/components/lazdebuggers/lazdebuggerfp/Makefile
index be4d2f85a2..292ada4a93 100644
--- a/components/lazdebuggers/lazdebuggerfp/Makefile
+++ b/components/lazdebuggers/lazdebuggerfp/Makefile
@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded m68k-sinclairql powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android mips64el-linux jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-win64 aarch64-android aarch64-ios wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos z80-amstradcpc
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android aarch64-ios wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@@ -195,24 +195,6 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic
 endif
 override FPCOPT+=-Cp$(SUBARCH)
 endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-ifeq ($(SUBARCH),)
-$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined)
-endif
-override FPCOPT+=-Cp$(SUBARCH)
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-ifeq ($(SUBARCH),)
-$(error When compiling for xtensa-freertos, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined)
-endif
-override FPCOPT+=-Cp$(SUBARCH)
-endif
-ifeq ($(FULL_TARGET),arm-freertos)
-ifeq ($(SUBARCH),)
-$(error When compiling for arm-freertos, a sub-architecture (e.g. SUBARCH=armv6m or SUBARCH=armv7em) must be defined)
-endif
-override FPCOPT+=-Cp$(SUBARCH)
-endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 TARGETSUFFIX=$(OS_TARGET)
 SOURCESUFFIX=$(OS_SOURCE)
@@ -347,7 +329,7 @@ FPCFPMAKE=$(FPC)
 endif
 endif
 override PACKAGE_NAME=lazdebuggerfp
-override PACKAGE_VERSION=0.9
+override PACKAGE_VERSION=1.0
 ifndef LCL_PLATFORM
 ifeq ($(OS_TARGET),win32)
 LCL_PLATFORM=win32
@@ -458,9 +440,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 override TARGET_UNITS+=lazdebuggerfp.pas
 endif
-ifeq ($(FULL_TARGET),m68k-sinclairql)
-override TARGET_UNITS+=lazdebuggerfp.pas
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override TARGET_UNITS+=lazdebuggerfp.pas
 endif
@@ -569,9 +548,6 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override TARGET_UNITS+=lazdebuggerfp.pas
 endif
-ifeq ($(FULL_TARGET),arm-freertos)
-override TARGET_UNITS+=lazdebuggerfp.pas
-endif
 ifeq ($(FULL_TARGET),arm-ios)
 override TARGET_UNITS+=lazdebuggerfp.pas
 endif
@@ -608,9 +584,6 @@ endif
 ifeq ($(FULL_TARGET),mipsel-android)
 override TARGET_UNITS+=lazdebuggerfp.pas
 endif
-ifeq ($(FULL_TARGET),mips64el-linux)
-override TARGET_UNITS+=lazdebuggerfp.pas
-endif
 ifeq ($(FULL_TARGET),jvm-java)
 override TARGET_UNITS+=lazdebuggerfp.pas
 endif
@@ -632,9 +605,6 @@ endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 override TARGET_UNITS+=lazdebuggerfp.pas
 endif
-ifeq ($(FULL_TARGET),aarch64-win64)
-override TARGET_UNITS+=lazdebuggerfp.pas
-endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override TARGET_UNITS+=lazdebuggerfp.pas
 endif
@@ -647,39 +617,6 @@ endif
 ifeq ($(FULL_TARGET),sparc64-linux)
 override TARGET_UNITS+=lazdebuggerfp.pas
 endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override TARGET_UNITS+=lazdebuggerfp.pas
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override TARGET_UNITS+=lazdebuggerfp.pas
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-override TARGET_UNITS+=lazdebuggerfp.pas
-endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-override TARGET_UNITS+=lazdebuggerfp.pas
-endif
-ifeq ($(FULL_TARGET),xtensa-linux)
-override TARGET_UNITS+=lazdebuggerfp.pas
-endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-override TARGET_UNITS+=lazdebuggerfp.pas
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-override TARGET_UNITS+=lazdebuggerfp.pas
-endif
-ifeq ($(FULL_TARGET),z80-embedded)
-override TARGET_UNITS+=lazdebuggerfp.pas
-endif
-ifeq ($(FULL_TARGET),z80-zxspectrum)
-override TARGET_UNITS+=lazdebuggerfp.pas
-endif
-ifeq ($(FULL_TARGET),z80-msxdos)
-override TARGET_UNITS+=lazdebuggerfp.pas
-endif
-ifeq ($(FULL_TARGET),z80-amstradcpc)
-override TARGET_UNITS+=lazdebuggerfp.pas
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -770,9 +707,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),m68k-sinclairql)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -881,9 +815,6 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),arm-freertos)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),arm-ios)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -920,9 +851,6 @@ endif
 ifeq ($(FULL_TARGET),mipsel-android)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),mips64el-linux)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),jvm-java)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -944,9 +872,6 @@ endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),aarch64-win64)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -959,350 +884,272 @@ endif
 ifeq ($(FULL_TARGET),sparc64-linux)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),xtensa-linux)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),z80-embedded)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),z80-zxspectrum)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),z80-msxdos)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),z80-amstradcpc)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-aros)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-macosclassic)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),m68k-sinclairql)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-macosclassic)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-aix)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-haiku)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-openbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-iphonesim)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-aros)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-dragonfly)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-aros)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),arm-freertos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-ios)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc64-aix)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),mips-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),mipsel-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),mipsel-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),mips64el-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),jvm-java)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),jvm-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i8086-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i8086-msdos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i8086-win16)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),aarch64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),aarch64-win64)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),aarch64-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),aarch64-ios)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),wasm-wasm)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),sparc64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),xtensa-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),z80-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),z80-zxspectrum)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),z80-msxdos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),z80-amstradcpc)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
@@ -1394,9 +1241,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
 endif
-ifeq ($(FULL_TARGET),m68k-sinclairql)
-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
 endif
@@ -1505,9 +1349,6 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
 endif
-ifeq ($(FULL_TARGET),arm-freertos)
-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
-endif
 ifeq ($(FULL_TARGET),arm-ios)
 override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
 endif
@@ -1544,9 +1385,6 @@ endif
 ifeq ($(FULL_TARGET),mipsel-android)
 override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
 endif
-ifeq ($(FULL_TARGET),mips64el-linux)
-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
-endif
 ifeq ($(FULL_TARGET),jvm-java)
 override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
 endif
@@ -1568,9 +1406,6 @@ endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
 endif
-ifeq ($(FULL_TARGET),aarch64-win64)
-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
-endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
 endif
@@ -1583,39 +1418,6 @@ endif
 ifeq ($(FULL_TARGET),sparc64-linux)
 override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
 endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
-endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
-endif
-ifeq ($(FULL_TARGET),xtensa-linux)
-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
-endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
-endif
-ifeq ($(FULL_TARGET),z80-embedded)
-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
-endif
-ifeq ($(FULL_TARGET),z80-zxspectrum)
-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
-endif
-ifeq ($(FULL_TARGET),z80-msxdos)
-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
-endif
-ifeq ($(FULL_TARGET),z80-amstradcpc)
-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
@@ -1706,9 +1508,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),m68k-sinclairql)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
@@ -1817,9 +1616,6 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),arm-freertos)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifeq ($(FULL_TARGET),arm-ios)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
@@ -1856,9 +1652,6 @@ endif
 ifeq ($(FULL_TARGET),mipsel-android)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),mips64el-linux)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifeq ($(FULL_TARGET),jvm-java)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
@@ -1880,9 +1673,6 @@ endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),aarch64-win64)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
@@ -1895,39 +1685,6 @@ endif
 ifeq ($(FULL_TARGET),sparc64-linux)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
 endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),xtensa-linux)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),z80-embedded)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),z80-zxspectrum)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),z80-msxdos)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
-ifeq ($(FULL_TARGET),z80-amstradcpc)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -2124,89 +1881,12 @@ endif
 else
 CROSSBINDIR=
 endif
-ifeq ($(OS_SOURCE),linux)
-ifndef GCCLIBDIR
-ifeq ($(CPU_TARGET),i386)
-ifneq ($(findstring x86_64,$(shell uname -a)),)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
-else
-CROSSGCCOPT=-m32
-endif
-endif
-endif
-ifeq ($(CPU_TARGET),powerpc)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
-else
-CROSSGCCOPT=-m32
-endif
-endif
-ifeq ($(CPU_TARGET),powerpc64)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)
-else
-CROSSGCCOPT=-m64
-endif
-endif
-ifeq ($(CPU_TARGET),sparc)
-ifneq ($(findstring sparc64,$(shell uname -a)),)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
-else
-ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),)
-CROSSGCCOPT=-mabi=32
-else
-CROSSGCCOPT=-m32
-endif
-endif
-endif
-endif
-endif
-ifdef FPCFPMAKE
-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
-else
-ifneq ($(findstring $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
-FPCMAKE_CROSSGCCOPT=-m64
-else
-ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
-FPCMAKE_CROSSGCCOPT=-mabi=64
-else
-ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),)
-FPCMAKE_CROSSGCCOPT=-mabi=32
-else
-FPCMAKE_CROSSGCCOPT=-m32
-endif
-endif
-endif
-FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`)
-endif
-endif
-ifndef FPCMAKEGCCLIBDIR
-FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
-endif
-ifndef GCCLIBDIR
-CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
-ifneq ($(CROSSGCC),)
-GCCLIBDIR:=$(shell dirname `$(CROSSGCC) $(CROSSGCCOPT) -print-libgcc-file-name`)
-endif
-endif
-endif
-ifdef inUnix
-ifeq ($(OS_SOURCE),netbsd)
-OTHERLIBDIR:=/usr/pkg/lib
-endif
-export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
-endif
 BATCHEXT=.bat
 LOADEREXT=.as
 EXEEXT=.exe
 PPLEXT=.ppl
 PPUEXT=.ppu
 OEXT=.o
-LTOEXT=.bc
 ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
@@ -2401,11 +2081,6 @@ STATICLIBPREFIX=
 STATICLIBEXT=.a
 SHORTSUFFIX=d16
 endif
-ifeq ($(OS_TARGET),msxdos)
-STATICLIBPREFIX=
-STATICLIBEXT=.a
-SHORTSUFFIX=msd
-endif
 ifeq ($(OS_TARGET),embedded)
 ifeq ($(CPU_TARGET),i8086)
 STATICLIBPREFIX=
@@ -2413,9 +2088,6 @@ STATICLIBEXT=.a
 else
 EXEEXT=.bin
 endif
-ifeq ($(CPU_TARGET),z80)
-OEXT=.rel
-endif
 SHORTSUFFIX=emb
 endif
 ifeq ($(OS_TARGET),win16)
@@ -2424,9 +2096,6 @@ STATICLIBEXT=.a
 SHAREDLIBEXT=.dll
 SHORTSUFFIX=w16
 endif
-ifeq ($(OS_TARGET),zxspectrum)
-OEXT=.rel
-endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 FPCMADE=fpcmade.$(SHORTSUFFIX)
 ZIPSUFFIX=$(SHORTSUFFIX)
@@ -2772,9 +2441,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),m68k-sinclairql)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -2883,9 +2549,6 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),arm-freertos)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),arm-ios)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -2922,9 +2585,6 @@ endif
 ifeq ($(FULL_TARGET),mipsel-android)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),mips64el-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),jvm-java)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -2946,9 +2606,6 @@ endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),aarch64-win64)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),aarch64-android)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -2961,39 +2618,6 @@ endif
 ifeq ($(FULL_TARGET),sparc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),xtensa-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),z80-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),z80-zxspectrum)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),z80-msxdos)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),z80-amstradcpc)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -3049,9 +2673,9 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-ifneq ($(RLINKPATH),)
-override FPCOPT+=-Xr$(RLINKPATH)
 endif
+ifneq ($(BINUTILSPREFIX),)
+override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
 ifndef CROSSCOMPILE
@@ -3145,17 +2769,6 @@ endif
 endif
 ifdef LINKSHARED
 endif
-ifdef GCCLIBDIR
-override FPCOPT+=-Fl$(GCCLIBDIR)
-ifdef FPCMAKEGCCLIBDIR
-override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
-else
-override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
-endif
-endif
-ifdef OTHERLIBDIR
-override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
-endif
 ifdef OPT
 override FPCOPT+=$(OPT)
 endif
@@ -3222,7 +2835,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
 $(COMPILER_UNITTARGETDIR):
 	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
 $(COMPILER_TARGETDIR):
@@ -3253,7 +2866,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.inc $(COMPILER_INCLUDEDIR)
 vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_shared
 override INSTALLTARGET+=fpc_shared_install
@@ -3274,7 +2886,7 @@ fpc_shared:
 ifdef HASSHAREDLIB
 	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
 ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -P$(BINUTILSPREFIX)
+	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
 endif
 else
 	@$(ECHO) Shared Libraries not supported
@@ -3296,15 +2908,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
 endif
 ifdef INSTALLPPUFILES
 ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 endif
 ifneq ($(UNITTARGETDIRPREFIX),)
-override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))
-override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))
-override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILENAMES))
-override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILENAMES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
 endif
 override INSTALL_CREATEPACKAGEFPC=1
 endif
@@ -3459,14 +3069,12 @@ ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
 endif
 ifdef CLEANPPUFILES
-override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
 ifdef DEBUGSYMEXT
 override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
 endif
-override CLEANPPUFILENAMES:=$(CLEANPPUFILES)
-override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILENAMES))
-override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)
-override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILENAMES)))
+override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
 endif
 fpc_clean: $(CLEANTARGET)
 ifdef CLEANEXEFILES
@@ -3490,9 +3098,8 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -3513,14 +3120,13 @@ ifdef CLEAN_FILES
 endif
 	-$(DELTREE) units
 	-$(DELTREE) bin
-	-$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
 ifneq ($(PPUEXT),.ppu)
 	-$(DEL) *.o *.ppu *.a
 endif
 	-$(DELTREE) *$(SMARTEXT)
-	-$(DEL) fpcmade.* Package.fpc *.fpm
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif
diff --git a/components/lazdebuggers/lazdebuggerfp/Makefile.compiled b/components/lazdebuggers/lazdebuggerfp/Makefile.compiled
index a3c2580947..42575e523c 100644
--- a/components/lazdebuggers/lazdebuggerfp/Makefile.compiled
+++ b/components/lazdebuggers/lazdebuggerfp/Makefile.compiled
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <Makefile Value="2"/>
-  <Params Value=" -Fu../../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET);../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET);.  -MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 lazdebuggerfp.pas"/>
+  <Params Value=" -Fu../../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET);../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET);.  -MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 lazdebuggerfp.pas"/>
 </CONFIG>
diff --git a/components/lazdebuggers/lazdebuggerfp/Makefile.fpc b/components/lazdebuggers/lazdebuggerfp/Makefile.fpc
index b4f5f873e6..89695de05c 100644
--- a/components/lazdebuggers/lazdebuggerfp/Makefile.fpc
+++ b/components/lazdebuggers/lazdebuggerfp/Makefile.fpc
@@ -1,17 +1,17 @@
 #   File generated automatically by Lazarus Package Manager
 #
-#   Makefile.fpc for LazDebuggerFp 0.9
+#   Makefile.fpc for LazDebuggerFp 1.0
 #
-#   This file was generated on 13-2-21
+#   This file was generated on 15-6-21
 
 [package]
 name=lazdebuggerfp
-version=0.9
+version=1.0
 
 [compiler]
 unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)
 unitdir=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) .
-options= -MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm3123 $(DBG_OPTIONS)
+options= -MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm6058,3123 $(DBG_OPTIONS)
 
 [target]
 units=lazdebuggerfp.pas
diff --git a/components/lazutils/lazversion.pas b/components/lazutils/lazversion.pas
index 904e1871c8..fde15a5bf4 100644
--- a/components/lazutils/lazversion.pas
+++ b/components/lazutils/lazversion.pas
@@ -21,11 +21,11 @@ interface
 
 const
   laz_major = 2;
-  laz_minor = 1;
+  laz_minor = 2;
   laz_release = 0;
-  laz_patch = 0;
+  laz_patch = 1;
   laz_fullversion = ((laz_major *  100 + laz_minor) * 100 + laz_release) * 100 + laz_patch;
-  laz_version = '2.1.0.0';
+  laz_version = '2.2.0.1';
 
 implementation
 
diff --git a/components/tachart/Makefile b/components/tachart/Makefile
index 1ed83c4a07..7faf6b0409 100644
--- a/components/tachart/Makefile
+++ b/components/tachart/Makefile
@@ -2,7 +2,7 @@
 # Don't edit, this file is generated by FPCMake Version 2.0.0
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded m68k-sinclairql powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android mips64el-linux jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-win64 aarch64-android aarch64-ios wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos z80-amstradcpc
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android aarch64-ios wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@@ -195,24 +195,6 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic
 endif
 override FPCOPT+=-Cp$(SUBARCH)
 endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-ifeq ($(SUBARCH),)
-$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined)
-endif
-override FPCOPT+=-Cp$(SUBARCH)
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-ifeq ($(SUBARCH),)
-$(error When compiling for xtensa-freertos, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined)
-endif
-override FPCOPT+=-Cp$(SUBARCH)
-endif
-ifeq ($(FULL_TARGET),arm-freertos)
-ifeq ($(SUBARCH),)
-$(error When compiling for arm-freertos, a sub-architecture (e.g. SUBARCH=armv6m or SUBARCH=armv7em) must be defined)
-endif
-override FPCOPT+=-Cp$(SUBARCH)
-endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 TARGETSUFFIX=$(OS_TARGET)
 SOURCESUFFIX=$(OS_SOURCE)
@@ -458,9 +440,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 override TARGET_UNITS+=tachartlazaruspkg.pas
 endif
-ifeq ($(FULL_TARGET),m68k-sinclairql)
-override TARGET_UNITS+=tachartlazaruspkg.pas
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override TARGET_UNITS+=tachartlazaruspkg.pas
 endif
@@ -569,9 +548,6 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override TARGET_UNITS+=tachartlazaruspkg.pas
 endif
-ifeq ($(FULL_TARGET),arm-freertos)
-override TARGET_UNITS+=tachartlazaruspkg.pas
-endif
 ifeq ($(FULL_TARGET),arm-ios)
 override TARGET_UNITS+=tachartlazaruspkg.pas
 endif
@@ -608,9 +584,6 @@ endif
 ifeq ($(FULL_TARGET),mipsel-android)
 override TARGET_UNITS+=tachartlazaruspkg.pas
 endif
-ifeq ($(FULL_TARGET),mips64el-linux)
-override TARGET_UNITS+=tachartlazaruspkg.pas
-endif
 ifeq ($(FULL_TARGET),jvm-java)
 override TARGET_UNITS+=tachartlazaruspkg.pas
 endif
@@ -632,9 +605,6 @@ endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 override TARGET_UNITS+=tachartlazaruspkg.pas
 endif
-ifeq ($(FULL_TARGET),aarch64-win64)
-override TARGET_UNITS+=tachartlazaruspkg.pas
-endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override TARGET_UNITS+=tachartlazaruspkg.pas
 endif
@@ -647,39 +617,6 @@ endif
 ifeq ($(FULL_TARGET),sparc64-linux)
 override TARGET_UNITS+=tachartlazaruspkg.pas
 endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override TARGET_UNITS+=tachartlazaruspkg.pas
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override TARGET_UNITS+=tachartlazaruspkg.pas
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-override TARGET_UNITS+=tachartlazaruspkg.pas
-endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-override TARGET_UNITS+=tachartlazaruspkg.pas
-endif
-ifeq ($(FULL_TARGET),xtensa-linux)
-override TARGET_UNITS+=tachartlazaruspkg.pas
-endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-override TARGET_UNITS+=tachartlazaruspkg.pas
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-override TARGET_UNITS+=tachartlazaruspkg.pas
-endif
-ifeq ($(FULL_TARGET),z80-embedded)
-override TARGET_UNITS+=tachartlazaruspkg.pas
-endif
-ifeq ($(FULL_TARGET),z80-zxspectrum)
-override TARGET_UNITS+=tachartlazaruspkg.pas
-endif
-ifeq ($(FULL_TARGET),z80-msxdos)
-override TARGET_UNITS+=tachartlazaruspkg.pas
-endif
-ifeq ($(FULL_TARGET),z80-amstradcpc)
-override TARGET_UNITS+=tachartlazaruspkg.pas
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -770,9 +707,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),m68k-sinclairql)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -881,9 +815,6 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),arm-freertos)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),arm-ios)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -920,9 +851,6 @@ endif
 ifeq ($(FULL_TARGET),mipsel-android)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),mips64el-linux)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),jvm-java)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -944,9 +872,6 @@ endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),aarch64-win64)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
@@ -959,350 +884,272 @@ endif
 ifeq ($(FULL_TARGET),sparc64-linux)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),xtensa-linux)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),z80-embedded)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),z80-zxspectrum)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),z80-msxdos)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
-ifeq ($(FULL_TARGET),z80-amstradcpc)
-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
-endif
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-aros)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-macosclassic)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),m68k-sinclairql)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-macosclassic)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc-aix)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-haiku)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-openbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-iphonesim)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-aros)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),x86_64-dragonfly)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-netbsd)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-aros)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),arm-freertos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),arm-ios)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),powerpc64-aix)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),mips-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),mipsel-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),mipsel-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),mips64el-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),jvm-java)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),jvm-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i8086-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i8086-msdos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i8086-win16)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),aarch64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),aarch64-win64)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),aarch64-android)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),aarch64-ios)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),wasm-wasm)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),sparc64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),xtensa-linux)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),z80-embedded)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),z80-zxspectrum)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),z80-msxdos)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
-endif
-ifeq ($(FULL_TARGET),z80-amstradcpc)
-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
@@ -1394,9 +1241,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
 endif
-ifeq ($(FULL_TARGET),m68k-sinclairql)
-override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
 endif
@@ -1505,9 +1349,6 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
 endif
-ifeq ($(FULL_TARGET),arm-freertos)
-override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
-endif
 ifeq ($(FULL_TARGET),arm-ios)
 override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
 endif
@@ -1544,9 +1385,6 @@ endif
 ifeq ($(FULL_TARGET),mipsel-android)
 override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
 endif
-ifeq ($(FULL_TARGET),mips64el-linux)
-override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
-endif
 ifeq ($(FULL_TARGET),jvm-java)
 override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
 endif
@@ -1568,9 +1406,6 @@ endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
 endif
-ifeq ($(FULL_TARGET),aarch64-win64)
-override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
-endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
 endif
@@ -1583,39 +1418,6 @@ endif
 ifeq ($(FULL_TARGET),sparc64-linux)
 override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
 endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
-endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
-endif
-ifeq ($(FULL_TARGET),xtensa-linux)
-override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
-endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
-endif
-ifeq ($(FULL_TARGET),z80-embedded)
-override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
-endif
-ifeq ($(FULL_TARGET),z80-zxspectrum)
-override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
-endif
-ifeq ($(FULL_TARGET),z80-msxdos)
-override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
-endif
-ifeq ($(FULL_TARGET),z80-amstradcpc)
-override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 endif
@@ -1706,9 +1508,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 endif
-ifeq ($(FULL_TARGET),m68k-sinclairql)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 endif
@@ -1817,9 +1616,6 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 endif
-ifeq ($(FULL_TARGET),arm-freertos)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-endif
 ifeq ($(FULL_TARGET),arm-ios)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 endif
@@ -1856,9 +1652,6 @@ endif
 ifeq ($(FULL_TARGET),mipsel-android)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 endif
-ifeq ($(FULL_TARGET),mips64el-linux)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-endif
 ifeq ($(FULL_TARGET),jvm-java)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 endif
@@ -1880,9 +1673,6 @@ endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 endif
-ifeq ($(FULL_TARGET),aarch64-win64)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-endif
 ifeq ($(FULL_TARGET),aarch64-android)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 endif
@@ -1895,39 +1685,6 @@ endif
 ifeq ($(FULL_TARGET),sparc64-linux)
 override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-endif
-ifeq ($(FULL_TARGET),xtensa-linux)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-endif
-ifeq ($(FULL_TARGET),z80-embedded)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-endif
-ifeq ($(FULL_TARGET),z80-zxspectrum)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-endif
-ifeq ($(FULL_TARGET),z80-msxdos)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-endif
-ifeq ($(FULL_TARGET),z80-amstradcpc)
-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -2124,89 +1881,12 @@ endif
 else
 CROSSBINDIR=
 endif
-ifeq ($(OS_SOURCE),linux)
-ifndef GCCLIBDIR
-ifeq ($(CPU_TARGET),i386)
-ifneq ($(findstring x86_64,$(shell uname -a)),)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
-else
-CROSSGCCOPT=-m32
-endif
-endif
-endif
-ifeq ($(CPU_TARGET),powerpc)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
-else
-CROSSGCCOPT=-m32
-endif
-endif
-ifeq ($(CPU_TARGET),powerpc64)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)
-else
-CROSSGCCOPT=-m64
-endif
-endif
-ifeq ($(CPU_TARGET),sparc)
-ifneq ($(findstring sparc64,$(shell uname -a)),)
-ifeq ($(BINUTILSPREFIX),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
-else
-ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),)
-CROSSGCCOPT=-mabi=32
-else
-CROSSGCCOPT=-m32
-endif
-endif
-endif
-endif
-endif
-ifdef FPCFPMAKE
-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
-else
-ifneq ($(findstring $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 sparc64 x86_64),)
-FPCMAKE_CROSSGCCOPT=-m64
-else
-ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)
-FPCMAKE_CROSSGCCOPT=-mabi=64
-else
-ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),)
-FPCMAKE_CROSSGCCOPT=-mabi=32
-else
-FPCMAKE_CROSSGCCOPT=-m32
-endif
-endif
-endif
-FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-libgcc-file-name`)
-endif
-endif
-ifndef FPCMAKEGCCLIBDIR
-FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
-endif
-ifndef GCCLIBDIR
-CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
-ifneq ($(CROSSGCC),)
-GCCLIBDIR:=$(shell dirname `$(CROSSGCC) $(CROSSGCCOPT) -print-libgcc-file-name`)
-endif
-endif
-endif
-ifdef inUnix
-ifeq ($(OS_SOURCE),netbsd)
-OTHERLIBDIR:=/usr/pkg/lib
-endif
-export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR
-endif
 BATCHEXT=.bat
 LOADEREXT=.as
 EXEEXT=.exe
 PPLEXT=.ppl
 PPUEXT=.ppu
 OEXT=.o
-LTOEXT=.bc
 ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
@@ -2401,11 +2081,6 @@ STATICLIBPREFIX=
 STATICLIBEXT=.a
 SHORTSUFFIX=d16
 endif
-ifeq ($(OS_TARGET),msxdos)
-STATICLIBPREFIX=
-STATICLIBEXT=.a
-SHORTSUFFIX=msd
-endif
 ifeq ($(OS_TARGET),embedded)
 ifeq ($(CPU_TARGET),i8086)
 STATICLIBPREFIX=
@@ -2413,9 +2088,6 @@ STATICLIBEXT=.a
 else
 EXEEXT=.bin
 endif
-ifeq ($(CPU_TARGET),z80)
-OEXT=.rel
-endif
 SHORTSUFFIX=emb
 endif
 ifeq ($(OS_TARGET),win16)
@@ -2424,9 +2096,6 @@ STATICLIBEXT=.a
 SHAREDLIBEXT=.dll
 SHORTSUFFIX=w16
 endif
-ifeq ($(OS_TARGET),zxspectrum)
-OEXT=.rel
-endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 FPCMADE=fpcmade.$(SHORTSUFFIX)
 ZIPSUFFIX=$(SHORTSUFFIX)
@@ -2772,9 +2441,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),m68k-sinclairql)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -2883,9 +2549,6 @@ endif
 ifeq ($(FULL_TARGET),arm-aros)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),arm-freertos)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),arm-ios)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -2922,9 +2585,6 @@ endif
 ifeq ($(FULL_TARGET),mipsel-android)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),mips64el-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),jvm-java)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -2946,9 +2606,6 @@ endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),aarch64-win64)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),aarch64-android)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -2961,39 +2618,6 @@ endif
 ifeq ($(FULL_TARGET),sparc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),riscv32-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv32-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv64-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),riscv64-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),xtensa-linux)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),z80-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),z80-zxspectrum)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),z80-msxdos)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),z80-amstradcpc)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -3049,9 +2673,9 @@ endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-XP$(BINUTILSPREFIX)
-ifneq ($(RLINKPATH),)
-override FPCOPT+=-Xr$(RLINKPATH)
 endif
+ifneq ($(BINUTILSPREFIX),)
+override FPCOPT+=-Xr$(RLINKPATH)
 endif
 endif
 ifndef CROSSCOMPILE
@@ -3145,17 +2769,6 @@ endif
 endif
 ifdef LINKSHARED
 endif
-ifdef GCCLIBDIR
-override FPCOPT+=-Fl$(GCCLIBDIR)
-ifdef FPCMAKEGCCLIBDIR
-override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)
-else
-override FPCMAKEOPT+=-Fl$(GCCLIBDIR)
-endif
-endif
-ifdef OTHERLIBDIR
-override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))
-endif
 ifdef OPT
 override FPCOPT+=$(OPT)
 endif
@@ -3222,7 +2835,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
 $(COMPILER_UNITTARGETDIR):
 	$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
 $(COMPILER_TARGETDIR):
@@ -3253,7 +2866,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.inc $(COMPILER_INCLUDEDIR)
 vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
-vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_shared
 override INSTALLTARGET+=fpc_shared_install
@@ -3274,7 +2886,7 @@ fpc_shared:
 ifdef HASSHAREDLIB
 	$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
 ifneq ($(SHARED_BUILD),n)
-	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -P$(BINUTILSPREFIX)
+	$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
 endif
 else
 	@$(ECHO) Shared Libraries not supported
@@ -3296,15 +2908,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
 endif
 ifdef INSTALLPPUFILES
 ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 endif
 ifneq ($(UNITTARGETDIRPREFIX),)
-override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))
-override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))
-override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILENAMES))
-override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILENAMES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
 endif
 override INSTALL_CREATEPACKAGEFPC=1
 endif
@@ -3459,14 +3069,12 @@ ifdef CLEAN_UNITS
 override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
 endif
 ifdef CLEANPPUFILES
-override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
 ifdef DEBUGSYMEXT
 override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES))
 endif
-override CLEANPPUFILENAMES:=$(CLEANPPUFILES)
-override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILENAMES))
-override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)
-override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILENAMES)))
+override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
 endif
 fpc_clean: $(CLEANTARGET)
 ifdef CLEANEXEFILES
@@ -3490,9 +3098,8 @@ endif
 ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
-	-$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -3513,14 +3120,13 @@ ifdef CLEAN_FILES
 endif
 	-$(DELTREE) units
 	-$(DELTREE) bin
-	-$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+	-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
 ifneq ($(PPUEXT),.ppu)
 	-$(DEL) *.o *.ppu *.a
 endif
 	-$(DELTREE) *$(SMARTEXT)
-	-$(DEL) fpcmade.* Package.fpc *.fpm
-	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res
-	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif
diff --git a/components/tachart/Makefile.compiled b/components/tachart/Makefile.compiled
index 96574e8e30..5675dcaf79 100644
--- a/components/tachart/Makefile.compiled
+++ b/components/tachart/Makefile.compiled
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <Makefile Value="2"/>
-  <Params Value=" -Funumlib_fix;editors;../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../buildintf/units/$(CPU_TARGET)-$(OS_TARGET);../freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);.  -MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING tachartlazaruspkg.pas"/>
+  <Params Value=" -Funumlib_fix;editors;../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);../buildintf/units/$(CPU_TARGET)-$(OS_TARGET);../freetype/lib/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET);../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM);.  -MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING tachartlazaruspkg.pas"/>
 </CONFIG>
diff --git a/components/tachart/Makefile.fpc b/components/tachart/Makefile.fpc
index 18f074f89b..f935e12556 100644
--- a/components/tachart/Makefile.fpc
+++ b/components/tachart/Makefile.fpc
@@ -2,7 +2,7 @@
 #
 #   Makefile.fpc for TAChartLazarusPkg 1.0
 #
-#   This file was generated on 13-2-21
+#   This file was generated on 15-6-21
 
 [package]
 name=tachartlazaruspkg
@@ -11,7 +11,7 @@ version=1.0
 [compiler]
 unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 unitdir=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../buildintf/units/$(CPU_TARGET)-$(OS_TARGET) ../freetype/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
-options= -MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -vm6058 -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
+options= -MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dCHECK_VALID_SCALING $(DBG_OPTIONS)
 
 [target]
 units=tachartlazaruspkg.pas
diff --git a/ide/lazarus.lpi b/ide/lazarus.lpi
index e91412a87e..dcbfd99b44 100644
--- a/ide/lazarus.lpi
+++ b/ide/lazarus.lpi
@@ -24,8 +24,10 @@
     <VersionInfo>
       <UseVersionInfo Value="True"/>
       <MajorVersionNr Value="2"/>
-      <MinorVersionNr Value="1"/>
+      <MinorVersionNr Value="2"/>
+      <BuildNr Value="1"/>
       <CharSet Value="04B0"/>
+      <Attributes pvaPreRelease="True"/>
       <StringTable ProductName="Lazarus IDE"/>
     </VersionInfo>
     <BuildModes Count="1">
diff --git a/ide/lazarus.res b/ide/lazarus.res
index 853e17f061..c009ab08fd 100644
Binary files a/ide/lazarus.res and b/ide/lazarus.res differ
diff --git a/ide/version.inc b/ide/version.inc
index dc8b63647f..a620c3bbe4 100644
--- a/ide/version.inc
+++ b/ide/version.inc
@@ -1 +1 @@
-'2.1.0'
+'2.2.0RC1'
diff --git a/lazarus.app/Contents/Info.plist b/lazarus.app/Contents/Info.plist
index 3d8f867938..6fa9c22b94 100644
--- a/lazarus.app/Contents/Info.plist
+++ b/lazarus.app/Contents/Info.plist
@@ -148,7 +148,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.0</string>
+	<string>2.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>laza</string>
 	<key>CFBundleVersion</key>
diff --git a/lcl/interfaces/lcl.lpk b/lcl/interfaces/lcl.lpk
index 6fcdfe7ffc..14293c152c 100644
--- a/lcl/interfaces/lcl.lpk
+++ b/lcl/interfaces/lcl.lpk
@@ -129,7 +129,7 @@ end;"/>
 "/>
     <License Value="modified LGPL-2
 "/>
-    <Version Major="2" Minor="1"/>
+    <Version Major="2" Minor="2" Build="1"/>
     <Files Count="488">
       <Item1>
         <Filename Value="carbon/agl.pp"/>
diff --git a/lcl/lclbase.lpk b/lcl/lclbase.lpk
index 5e08760471..c448c8860a 100644
--- a/lcl/lclbase.lpk
+++ b/lcl/lclbase.lpk
@@ -26,7 +26,7 @@
 "/>
     <License Value="modified LGPL-2
 "/>
-    <Version Major="2" Minor="1"/>
+    <Version Major="2" Minor="2" Build="1"/>
     <Files Count="287">
       <Item1>
         <Filename Value="checklst.pas"/>
diff --git a/packager/globallinks/fpdebug-0.9.lpl b/packager/globallinks/fpdebug-1.lpl
similarity index 100%
rename from packager/globallinks/fpdebug-0.9.lpl
rename to packager/globallinks/fpdebug-1.lpl
diff --git a/packager/globallinks/jitclasses-1.lpl b/packager/globallinks/jitclasses-1.lpl
new file mode 100644
index 0000000000..84dfe2dce9
--- /dev/null
+++ b/packager/globallinks/jitclasses-1.lpl
@@ -0,0 +1 @@
+$(LazarusDir)/components/jitclasses/jitclasses.lpk
diff --git a/packager/globallinks/lazdebuggerfp-0.9.lpl b/packager/globallinks/lazdebuggerfp-1.lpl
similarity index 100%
rename from packager/globallinks/lazdebuggerfp-0.9.lpl
rename to packager/globallinks/lazdebuggerfp-1.lpl
diff --git a/packager/globallinks/lcl-2.1.lpl b/packager/globallinks/lcl-2.2.0.1.lpl
similarity index 100%
rename from packager/globallinks/lcl-2.1.lpl
rename to packager/globallinks/lcl-2.2.0.1.lpl
diff --git a/packager/globallinks/lclbase-2.1.lpl b/packager/globallinks/lclbase-2.2.0.1.lpl
similarity index 100%
rename from packager/globallinks/lclbase-2.1.lpl
rename to packager/globallinks/lclbase-2.2.0.1.lpl
diff --git a/tools/install/linux/environmentoptions.xml b/tools/install/linux/environmentoptions.xml
index 2da03a54dc..1a4cb34f77 100644
--- a/tools/install/linux/environmentoptions.xml
+++ b/tools/install/linux/environmentoptions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <CONFIG>
   <EnvironmentOptions>
-    <Version Value="110" Lazarus="2.1.0"/>
+    <Version Value="110" Lazarus="2.2.0RC1"/>
     <LazarusDirectory Value="__LAZARUSDIR__">
       <History Count="1">
         <Item1 Value="/usr/lib/lazarus/"/>
diff --git a/tools/install/macosx/environmentoptions.xml b/tools/install/macosx/environmentoptions.xml
index 4e00f04164..3dfaacedc3 100644
--- a/tools/install/macosx/environmentoptions.xml
+++ b/tools/install/macosx/environmentoptions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <CONFIG>
   <EnvironmentOptions>
-    <Version Value="110" Lazarus="2.1.0"/>
+    <Version Value="110" Lazarus="2.2.0RC1"/>
     <LazarusDirectory Value="/Developer/lazarus/">
       <History Count="1">
         <Item1 Value="/Developer/lazarus/"/>
diff --git a/tools/install/win/environmentoptions.xml b/tools/install/win/environmentoptions.xml
index 5db7aa3f89..22661e6624 100644
--- a/tools/install/win/environmentoptions.xml
+++ b/tools/install/win/environmentoptions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <CONFIG>
   <EnvironmentOptions>
-    <Version Value="110" Lazarus="2.1.0"/>
+    <Version Value="110" Lazarus="2.2.0RC1"/>
     <LazarusDirectory Value="%LazDir%">
     </LazarusDirectory>
     <CompilerFilename Value="%FpcBinDir%\fpc.exe">