Page MenuHomeFreeBSD
Files F144603234

D28484.1775687857.diff
No OneTemporary
Actions

Size
3 MB
Referenced Files
None
Subscribers
None

D28484.1775687857.diff
View Options

This file is larger than 256 KB, so syntax highlighting was skipped.
Index: Mk/Uses/fpc.mk
===================================================================
--- Mk/Uses/fpc.mk
+++ Mk/Uses/fpc.mk
@@ -55,10 +55,12 @@
PPNAME= ppc386
.elif ${ARCH} == "amd64"
PPNAME= ppcx64
+.elif ${ARCH} == "aarch64"
+PPNAME= ppca64
.else
PPNAME= ppc_not_yet_ported
-ONLY_FOR_ARCHS= i386 amd64
-ONLY_FOR_ARCHS_REASON= not yet ported to anything other than i386 and amd64
+ONLY_FOR_ARCHS= aarch64 amd64 i386
+ONLY_FOR_ARCHS_REASON= not yet ported to target arch
.endif
BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils \
Index: Mk/Uses/lazarus.mk
===================================================================
--- Mk/Uses/lazarus.mk
+++ Mk/Uses/lazarus.mk
@@ -69,8 +69,8 @@
LAZARUS_PROJECT_FILES?= # empty
LAZARUS_DIR?= ${LOCALBASE}/share/lazarus-${LAZARUS_VER}
-ONLY_FOR_ARCHS= i386 amd64
-ONLY_FOR_ARCHS_REASON= not yet ported to anything other than i386 and amd64
+ONLY_FOR_ARCHS= aarch64 amd64 i386
+ONLY_FOR_ARCHS_REASON= not yet ported to target arch
BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils \
fpcres:lang/fpc-utils
Index: archivers/fpc-bzip2/files/patch-Makefile-aarch64
===================================================================
--- archivers/fpc-bzip2/files/patch-Makefile-aarch64
+++ archivers/fpc-bzip2/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/bzip2/Makefile b/packages/bzip2/Makefile
+index a69338fe..b9802d06 100644
+--- packages/bzip2/Makefile
++++ packages/bzip2/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: archivers/fpc-unzip/files/patch-Makefile-aarch64
===================================================================
--- archivers/fpc-unzip/files/patch-Makefile-aarch64
+++ archivers/fpc-unzip/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/unzip/Makefile b/packages/unzip/Makefile
+index edc2ba55..08611454 100644
+--- packages/unzip/Makefile
++++ packages/unzip/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: audio/fpc-a52/files/patch-Makefile-aarch64
===================================================================
--- audio/fpc-a52/files/patch-Makefile-aarch64
+++ audio/fpc-a52/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/a52/Makefile b/packages/a52/Makefile
+index 77d14dbc..08ef14fd 100644
+--- packages/a52/Makefile
++++ packages/a52/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: audio/fpc-mad/files/patch-Makefile-aarch64
===================================================================
--- audio/fpc-mad/files/patch-Makefile-aarch64
+++ audio/fpc-mad/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/mad/Makefile b/packages/mad/Makefile
+index c0556ea3..558b36e5 100644
+--- packages/mad/Makefile
++++ packages/mad/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: audio/fpc-modplug/files/patch-Makefile-aarch64
===================================================================
--- audio/fpc-modplug/files/patch-Makefile-aarch64
+++ audio/fpc-modplug/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/modplug/Makefile b/packages/modplug/Makefile
+index 20ee717c..2a009dc0 100644
+--- packages/modplug/Makefile
++++ packages/modplug/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: audio/fpc-oggvorbis/files/patch-Makefile-aarch64
===================================================================
--- audio/fpc-oggvorbis/files/patch-Makefile-aarch64
+++ audio/fpc-oggvorbis/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/oggvorbis/Makefile b/packages/oggvorbis/Makefile
+index ad378dd5..82efcd20 100644
+--- packages/oggvorbis/Makefile
++++ packages/oggvorbis/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: audio/fpc-openal/files/patch-Makefile-aarch64
===================================================================
--- audio/fpc-openal/files/patch-Makefile-aarch64
+++ audio/fpc-openal/files/patch-Makefile-aarch64
@@ -0,0 +1,73 @@
+// @generated
+diff --git a/packages/openal/Makefile b/packages/openal/Makefile
+index f819d2e7..d7c3ec83 100644
+--- packages/openal/Makefile
++++ packages/openal/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/openal/examples/Makefile b/packages/openal/examples/Makefile
+index 51fd2613..784f2aef 100644
+--- packages/openal/examples/Makefile
++++ packages/openal/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=captureplaybackopenal wavopenal madopenal
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=captureplaybackopenal wavopenal
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=captureplaybackopenal wavopenal
+ endif
+@@ -2448,6 +2451,20 @@ REQUIRE_PACKAGES_MODPLUG=1
+ REQUIRE_PACKAGES_MATROSKA=1
+ REQUIRE_PACKAGES_MAD=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_OPENAL=1
++REQUIRE_PACKAGES_OGGVORBIS=1
++REQUIRE_PACKAGES_A52=1
++REQUIRE_PACKAGES_DTS=1
++REQUIRE_PACKAGES_MODPLUG=1
++REQUIRE_PACKAGES_MATROSKA=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: converters/fpc-iconvenc/files/patch-Makefile-aarch64
===================================================================
--- converters/fpc-iconvenc/files/patch-Makefile-aarch64
+++ converters/fpc-iconvenc/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/iconvenc/Makefile b/packages/iconvenc/Makefile
+index 5f7f2f84..daf533cb 100644
+--- packages/iconvenc/Makefile
++++ packages/iconvenc/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/iconvenc/examples/Makefile b/packages/iconvenc/examples/Makefile
+index 88da59f6..9d72f659 100644
+--- packages/iconvenc/examples/Makefile
++++ packages/iconvenc/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=iconvtest
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=iconvtest
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=iconvtest
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_ICONVENC=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_ICONVENC=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: databases/fpc-dblib/files/patch-Makefile-aarch64
===================================================================
--- databases/fpc-dblib/files/patch-Makefile-aarch64
+++ databases/fpc-dblib/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/dblib/Makefile b/packages/dblib/Makefile
+index 8529a69a..974adb88 100644
+--- packages/dblib/Makefile
++++ packages/dblib/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: databases/fpc-fpindexer/files/patch-Makefile-aarch64
===================================================================
--- databases/fpc-fpindexer/files/patch-Makefile-aarch64
+++ databases/fpc-fpindexer/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/fpindexer/Makefile b/packages/fpindexer/Makefile
+index 7783a79c..4d000d78 100644
+--- packages/fpindexer/Makefile
++++ packages/fpindexer/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: databases/fpc-gdbm/files/patch-Makefile-aarch64
===================================================================
--- databases/fpc-gdbm/files/patch-Makefile-aarch64
+++ databases/fpc-gdbm/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/gdbm/Makefile b/packages/gdbm/Makefile
+index 8d710475..eaefa0a8 100644
+--- packages/gdbm/Makefile
++++ packages/gdbm/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/gdbm/examples/Makefile b/packages/gdbm/examples/Makefile
+index 16f80c6a..18196cb0 100644
+--- packages/gdbm/examples/Makefile
++++ packages/gdbm/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=testgdbm testgdbm2
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=testgdbm testgdbm2
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=testgdbm testgdbm2
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_GDBM=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_GDBM=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: databases/fpc-ibase/files/patch-Makefile-aarch64
===================================================================
--- databases/fpc-ibase/files/patch-Makefile-aarch64
+++ databases/fpc-ibase/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/ibase/Makefile b/packages/ibase/Makefile
+index fd2cb2e0..840c2e7a 100644
+--- packages/ibase/Makefile
++++ packages/ibase/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/ibase/examples/Makefile b/packages/ibase/examples/Makefile
+index fdad36fc..410ca3e0 100644
+--- packages/ibase/examples/Makefile
++++ packages/ibase/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=testib40 testib60
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=testib40 testib60
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=testib40 testib60
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_IBASE=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_IBASE=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: databases/fpc-mysql/files/patch-Makefile-aarch64
===================================================================
--- databases/fpc-mysql/files/patch-Makefile-aarch64
+++ databases/fpc-mysql/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/mysql/Makefile b/packages/mysql/Makefile
+index 1d0fa483..0d6352f9 100644
+--- packages/mysql/Makefile
++++ packages/mysql/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/mysql/examples/Makefile b/packages/mysql/examples/Makefile
+index bd770c7d..6ac05d16 100644
+--- packages/mysql/examples/Makefile
++++ packages/mysql/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=testdb4 mysqls testdb3 testdb5
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=testdb4 mysqls testdb3 testdb5
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=testdb4 mysqls testdb3 testdb5
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_MYSQL=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_MYSQL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: databases/fpc-odbc/files/patch-Makefile-aarch64
===================================================================
--- databases/fpc-odbc/files/patch-Makefile-aarch64
+++ databases/fpc-odbc/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/odbc/Makefile b/packages/odbc/Makefile
+index 8737d6c6..fcd72bef 100644
+--- packages/odbc/Makefile
++++ packages/odbc/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/odbc/examples/Makefile b/packages/odbc/examples/Makefile
+index 29ec1e4c..a42faf42 100644
+--- packages/odbc/examples/Makefile
++++ packages/odbc/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=testodbc
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=testodbc
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=testodbc
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_ODBC=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_ODBC=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: databases/fpc-oracle/files/patch-Makefile-aarch64
===================================================================
--- databases/fpc-oracle/files/patch-Makefile-aarch64
+++ databases/fpc-oracle/files/patch-Makefile-aarch64
@@ -0,0 +1,81 @@
+// @generated
+diff --git a/packages/oracle/Makefile b/packages/oracle/Makefile
+index 5d3a2523..534fd2b6 100644
+--- packages/oracle/Makefile
++++ packages/oracle/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/oracle/examples/Makefile b/packages/oracle/examples/Makefile
+index 9f33d169..85653440 100644
+--- packages/oracle/examples/Makefile
++++ packages/oracle/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=oraclew
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=oraclew
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=oraclew
+ endif
+@@ -845,6 +848,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_EXAMPLES+=test01
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_EXAMPLES+=test01
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_EXAMPLES+=test01
+ endif
+@@ -2532,6 +2538,18 @@ REQUIRE_PACKAGES_FCL-BASE=1
+ REQUIRE_PACKAGES_FCL-DB=1
+ REQUIRE_PACKAGES_FCL-XML=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_ORACLE=1
++REQUIRE_PACKAGES_FCL-BASE=1
++REQUIRE_PACKAGES_FCL-DB=1
++REQUIRE_PACKAGES_FCL-XML=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: databases/fpc-postgres/files/patch-Makefile-aarch64
===================================================================
--- databases/fpc-postgres/files/patch-Makefile-aarch64
+++ databases/fpc-postgres/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/postgres/Makefile b/packages/postgres/Makefile
+index cbcb6354..c990dd41 100644
+--- packages/postgres/Makefile
++++ packages/postgres/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/postgres/examples/Makefile b/packages/postgres/examples/Makefile
+index b38684cf..f41ad5ad 100644
+--- packages/postgres/examples/Makefile
++++ packages/postgres/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=testpg1 testpg2
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=testpg1 testpg2
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=testpg1 testpg2
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_POSTGRES=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_POSTGRES=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: databases/fpc-pxlib/files/patch-Makefile-aarch64
===================================================================
--- databases/fpc-pxlib/files/patch-Makefile-aarch64
+++ databases/fpc-pxlib/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/pxlib/Makefile b/packages/pxlib/Makefile
+index 50921cb1..1db9c1d0 100644
+--- packages/pxlib/Makefile
++++ packages/pxlib/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/pxlib/examples/Makefile b/packages/pxlib/examples/Makefile
+index 72cde78d..3ffbe244 100644
+--- packages/pxlib/examples/Makefile
++++ packages/pxlib/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -419,6 +419,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=ppxview
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=ppxview
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=ppxview
+ endif
+@@ -1848,6 +1851,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_PXLIB=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_PXLIB=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: databases/fpc-sqlite/files/patch-Makefile-aarch64
===================================================================
--- databases/fpc-sqlite/files/patch-Makefile-aarch64
+++ databases/fpc-sqlite/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/sqlite/Makefile b/packages/sqlite/Makefile
+index cab7cdc7..2bad00a5 100644
+--- packages/sqlite/Makefile
++++ packages/sqlite/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-bfd/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-bfd/files/patch-Makefile-aarch64
+++ devel/fpc-bfd/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/bfd/Makefile b/packages/bfd/Makefile
+index baa779b3..3db20a54 100644
+--- packages/bfd/Makefile
++++ packages/bfd/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-dbus/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-dbus/files/patch-Makefile-aarch64
+++ devel/fpc-dbus/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/dbus/Makefile b/packages/dbus/Makefile
+index 3aabcbaa..968fdf67 100644
+--- packages/dbus/Makefile
++++ packages/dbus/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/dbus/examples/Makefile b/packages/dbus/examples/Makefile
+index e63a6cdb..3ba8a583 100644
+--- packages/dbus/examples/Makefile
++++ packages/dbus/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=busexample
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=busexample
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=busexample
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_DBUS=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_DBUS=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fcl-async/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-async/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-async/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/fcl-async/Makefile b/packages/fcl-async/Makefile
+index 567dce54..047f6179 100644
+--- packages/fcl-async/Makefile
++++ packages/fcl-async/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fcl-base/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-base/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-base/files/patch-Makefile-aarch64
@@ -0,0 +1,76 @@
+// @generated
+diff --git a/packages/fcl-base/Makefile b/packages/fcl-base/Makefile
+index 955428fe..b93ddeb4 100644
+--- packages/fcl-base/Makefile
++++ packages/fcl-base/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-base/examples/Makefile b/packages/fcl-base/examples/Makefile
+index d8a971b9..e5c65eaf 100644
+--- packages/fcl-base/examples/Makefile
++++ packages/fcl-base/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=stringl dparser fstream mstream list threads testrtf cfgtest xmldump htdump testez tidea b64test b64test2 b64enc b64dec restest testz testz2 istream doecho testol testcont txmlreg testreg tstelcmd testapp testcgi testbs testbf cachetest poolmm1 poolmm2 tarmakercons tarmakerconsgzip avltreetest testmime decodeascii85 encodeascii85 sockcli isockcli dsockcli socksvr isocksvr dsocksvr testhres testnres testsres testrhre testrnre testrsre testur ipcserver ipcclient debugtest dbugsrv asiotest testtimer
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=stringl dparser fstream mstream list threads testrtf cfgtest xmldump htdump testez tidea b64test b64test2 b64enc b64dec restest testz testz2 istream doecho testol testcont txmlreg testreg tstelcmd testapp testcgi testbs testbf cachetest poolmm1 poolmm2 tarmakercons tarmakerconsgzip avltreetest testmime decodeascii85 encodeascii85 sockcli isockcli dsockcli socksvr isocksvr dsocksvr testhres testnres testsres testrhre testrnre testrsre testur ipcserver ipcclient debugtest dbugsrv asiotest testtimer
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=stringl dparser fstream mstream list threads testrtf cfgtest xmldump htdump testez tidea b64test b64test2 b64enc b64dec restest testz testz2 istream doecho testol testcont txmlreg testreg tstelcmd testapp testcgi testbs testbf cachetest poolmm1 poolmm2 tarmakercons tarmakerconsgzip avltreetest testmime decodeascii85 encodeascii85 sockcli isockcli dsockcli socksvr isocksvr dsocksvr testhres testnres testsres testrhre testrnre testrsre testur ipcserver ipcclient debugtest dbugsrv asiotest testtimer
+ endif
+@@ -2688,6 +2691,23 @@ REQUIRE_PACKAGES_FCL-REGISTRY=1
+ REQUIRE_PACKAGES_FCL-WEB=1
+ REQUIRE_PACKAGES_FCL-XML=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_FCL-BASE=1
++REQUIRE_PACKAGES_FCL-DB=1
++REQUIRE_PACKAGES_FCL-FPCUNIT=1
++REQUIRE_PACKAGES_FCL-IMAGE=1
++REQUIRE_PACKAGES_FCL-NET=1
++REQUIRE_PACKAGES_FCL-PASSRC=1
++REQUIRE_PACKAGES_FCL-REGISTRY=1
++REQUIRE_PACKAGES_FCL-WEB=1
++REQUIRE_PACKAGES_FCL-XML=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fcl-db/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-db/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-db/files/patch-Makefile-aarch64
@@ -0,0 +1,1191 @@
+// @generated
+diff --git a/packages/fcl-db/Makefile b/packages/fcl-db/Makefile
+index 40ff6d03..ca5e1602 100644
+--- packages/fcl-db/Makefile
++++ packages/fcl-db/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-db/src/base/Makefile b/packages/fcl-db/src/base/Makefile
+index 8056e2af..a33c8371 100644
+--- packages/fcl-db/src/base/Makefile
++++ packages/fcl-db/src/base/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -584,6 +584,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll sqlscript xmldatapacketreader
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll sqlscript xmldatapacketreader
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=dbconst db dbwhtml bufdataset_parser bufdataset dbcoll sqlscript xmldatapacketreader
+ endif
+@@ -848,6 +851,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=dbconst dbcoll sqlscript xmldatapacketreader
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=dbconst dbcoll sqlscript xmldatapacketreader
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=dbconst dbcoll sqlscript xmldatapacketreader
+ endif
+@@ -1113,6 +1119,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2h
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2h
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2h
+ endif
+@@ -1377,6 +1386,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../dbase
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=../dbase
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../dbase
+ endif
+@@ -2895,6 +2907,16 @@ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-BASE=1
+ REQUIRE_PACKAGES_FCL-XML=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_FCL-BASE=1
++REQUIRE_PACKAGES_FCL-XML=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-db/src/codegen/Makefile b/packages/fcl-db/src/codegen/Makefile
+index fce1caa1..1dd044d6 100644
+--- packages/fcl-db/src/codegen/Makefile
++++ packages/fcl-db/src/codegen/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf fpddpopcode
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf fpddpopcode
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=fpddcodegen fpcgcreatedbf fpcgdbcoll fpcgsqlconst fpcgtiopf fpddpopcode
+ endif
+@@ -847,6 +850,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=fpddcodegen fpcgsqlconst fpddpopcode
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=fpddcodegen fpcgsqlconst fpddpopcode
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=fpddcodegen fpcgsqlconst fpddpopcode
+ endif
+@@ -1112,6 +1118,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2h
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2h
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2h
+ endif
+@@ -2546,6 +2555,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-BASE=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_FCL-BASE=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-db/src/datadict/Makefile b/packages/fcl-db/src/datadict/Makefile
+index 0116906c..ca0ac06c 100644
+--- packages/fcl-db/src/datadict/Makefile
++++ packages/fcl-db/src/datadict/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=fpdatadict fpdddiff fpdddbf fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd fpddmysql51 fpddmysql55
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=fpdatadict fpdddiff fpdddbf fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd fpddmysql51 fpddmysql55
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=fpdatadict fpdddiff fpdddbf fpddsqldb fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd fpddmysql51 fpddmysql55
+ endif
+@@ -847,6 +850,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb fpdddiff fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd fpddmysql51 fpddmysql55
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb fpdddiff fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd fpddmysql51 fpddmysql55
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=fpdatadict fpddfb fpddsqldb fpdddiff fpddfb fpddmysql40 fpddmysql41 fpddmysql50 fpddodbc fpddpq fpddoracle fpddsqlite3 fpddregstd fpddmysql51 fpddmysql55
+ endif
+@@ -1112,6 +1118,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2h
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2h
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2h
+ endif
+@@ -2830,6 +2839,22 @@ REQUIRE_PACKAGES_SQLITE=1
+ REQUIRE_PACKAGES_ODBC=1
+ REQUIRE_PACKAGES_POSTGRES=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_FCL-BASE=1
++REQUIRE_PACKAGES_FCL-XML=1
++REQUIRE_PACKAGES_IBASE=1
++REQUIRE_PACKAGES_MYSQL=1
++REQUIRE_PACKAGES_ORACLE=1
++REQUIRE_PACKAGES_SQLITE=1
++REQUIRE_PACKAGES_ODBC=1
++REQUIRE_PACKAGES_POSTGRES=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-db/src/dbase/Makefile b/packages/fcl-db/src/dbase/Makefile
+index bbf3ed5c..be743cee 100644
+--- packages/fcl-db/src/dbase/Makefile
++++ packages/fcl-db/src/dbase/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -591,6 +591,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=dbf
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=dbf
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=dbf
+ endif
+@@ -855,6 +858,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_EXAMPLES+=testdbf
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_EXAMPLES+=testdbf
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_EXAMPLES+=testdbf
+ endif
+@@ -1119,6 +1125,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override CLEAN_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override CLEAN_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override CLEAN_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str
+ endif
+@@ -1383,6 +1392,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override INSTALL_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override INSTALL_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override INSTALL_UNITS+=dbf_collate dbf_common dbf_cursor dbf_dbffile dbf_fields dbf_idxcur dbf_idxfile dbf_lang dbf_memo dbf_parser dbf_pgfile dbf_prscore dbf_prsdef dbf_prssupp dbf_str
+ endif
+@@ -1648,6 +1660,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2 -Sh
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2 -Sh
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2 -Sh
+ endif
+@@ -3082,6 +3097,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-BASE=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_FCL-BASE=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-db/src/export/Makefile b/packages/fcl-db/src/export/Makefile
+index ebfd927d..5573e37b 100644
+--- packages/fcl-db/src/export/Makefile
++++ packages/fcl-db/src/export/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpxmlxsdexport fpstdexports
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpxmlxsdexport fpstdexports
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpxmlxsdexport fpstdexports
+ endif
+@@ -847,6 +850,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpxmlxsdexport fpstdexports
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpxmlxsdexport fpstdexports
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=fpdbexport fpcsvexport fpfixedexport fpsqlexport fpsimplexmlexport fpsimplejsonexport fpdbfexport fptexexport fprtfexport fpxmlxsdexport fpstdexports
+ endif
+@@ -1112,6 +1118,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2h
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2h
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2h
+ endif
+@@ -2630,6 +2639,16 @@ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-BASE=1
+ REQUIRE_PACKAGES_FCL-XML=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_FCL-BASE=1
++REQUIRE_PACKAGES_FCL-XML=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-db/src/json/Makefile b/packages/fcl-db/src/json/Makefile
+index 203da3fb..d33cc565 100644
+--- packages/fcl-db/src/json/Makefile
++++ packages/fcl-db/src/json/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=fpjsondataset extjsdataset
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=fpjsondataset extjsdataset
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=fpjsondataset extjsdataset
+ endif
+@@ -2102,6 +2105,16 @@ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-BASE=1
+ REQUIRE_PACKAGES_FCL-JSON=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_FCL-BASE=1
++REQUIRE_PACKAGES_FCL-JSON=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-db/src/memds/Makefile b/packages/fcl-db/src/memds/Makefile
+index a693001a..1e8ce3c5 100644
+--- packages/fcl-db/src/memds/Makefile
++++ packages/fcl-db/src/memds/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=memds
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=memds
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=memds
+ endif
+@@ -847,6 +850,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=memds
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=memds
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=memds
+ endif
+@@ -1111,6 +1117,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_EXAMPLES+=testpop testopen testld testcp
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_EXAMPLES+=testpop testopen testld testcp
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_EXAMPLES+=testpop testopen testld testcp
+ endif
+@@ -2546,6 +2555,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-BASE=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_FCL-BASE=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-db/src/paradox/Makefile b/packages/fcl-db/src/paradox/Makefile
+index 694faace..a45bdcde 100644
+--- packages/fcl-db/src/paradox/Makefile
++++ packages/fcl-db/src/paradox/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=paradox
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=paradox
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=paradox
+ endif
+@@ -847,6 +850,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=paradox
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=paradox
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=paradox
+ endif
+@@ -2366,6 +2372,16 @@ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_PXLIB=1
+ REQUIRE_PACKAGES_FCL-BASE=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_PXLIB=1
++REQUIRE_PACKAGES_FCL-BASE=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-db/src/sdf/Makefile b/packages/fcl-db/src/sdf/Makefile
+index be79d153..c332d424 100644
+--- packages/fcl-db/src/sdf/Makefile
++++ packages/fcl-db/src/sdf/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=sdfdata
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=sdfdata
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=sdfdata
+ endif
+@@ -847,6 +850,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_EXAMPLES+=testsdf testfix
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_EXAMPLES+=testsdf testfix
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_EXAMPLES+=testsdf testfix
+ endif
+@@ -2282,6 +2288,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-BASE=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_FCL-BASE=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-db/src/sql/Makefile b/packages/fcl-db/src/sql/Makefile
+index c3b50c1f..190dfeba 100644
+--- packages/fcl-db/src/sql/Makefile
++++ packages/fcl-db/src/sql/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=fpsqltree fpsqlscanner fpsqlparser
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=fpsqltree fpsqlscanner fpsqlparser
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=fpsqltree fpsqlscanner fpsqlparser
+ endif
+@@ -847,6 +850,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=fpsqltree fpsqlscanner fpsqlparser
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=fpsqltree fpsqlscanner fpsqlparser
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=fpsqltree fpsqlscanner fpsqlparser
+ endif
+@@ -1112,6 +1118,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2h
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2h
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2h
+ endif
+@@ -1376,6 +1385,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../dbase
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=../dbase
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../dbase
+ endif
+@@ -2810,6 +2822,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-BASE=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_FCL-BASE=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-db/src/sqldb/Makefile b/packages/fcl-db/src/sqldb/Makefile
+index a8049741..ea4cad3e 100644
+--- packages/fcl-db/src/sqldb/Makefile
++++ packages/fcl-db/src/sqldb/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -436,6 +436,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_DIRS+=interbase postgres mysql odbc oracle sqlite mssql
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_DIRS+=interbase postgres mysql odbc oracle sqlite mssql
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_DIRS+=interbase postgres mysql odbc oracle sqlite
+ endif
+@@ -694,6 +697,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=sqldb
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=sqldb
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=sqldb
+ endif
+@@ -958,6 +964,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=sqldb
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=sqldb
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=sqldb
+ endif
+@@ -1223,6 +1232,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2
+ endif
+@@ -2889,6 +2901,22 @@ REQUIRE_PACKAGES_ORACLE=1
+ REQUIRE_PACKAGES_SQLITE=1
+ REQUIRE_PACKAGES_DBLIB=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_FCL-XML=1
++REQUIRE_PACKAGES_IBASE=1
++REQUIRE_PACKAGES_POSTGRES=1
++REQUIRE_PACKAGES_MYSQL=1
++REQUIRE_PACKAGES_ODBC=1
++REQUIRE_PACKAGES_ORACLE=1
++REQUIRE_PACKAGES_SQLITE=1
++REQUIRE_PACKAGES_DBLIB=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+@@ -4284,6 +4312,15 @@ TARGET_DIRS_ORACLE=1
+ TARGET_DIRS_SQLITE=1
+ TARGET_DIRS_MSSQL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++TARGET_DIRS_INTERBASE=1
++TARGET_DIRS_POSTGRES=1
++TARGET_DIRS_MYSQL=1
++TARGET_DIRS_ODBC=1
++TARGET_DIRS_ORACLE=1
++TARGET_DIRS_SQLITE=1
++TARGET_DIRS_MSSQL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ TARGET_DIRS_INTERBASE=1
+ TARGET_DIRS_POSTGRES=1
+diff --git a/packages/fcl-db/src/sqldb/interbase/Makefile b/packages/fcl-db/src/sqldb/interbase/Makefile
+index 9bf12a9b..0a7e66d8 100644
+--- packages/fcl-db/src/sqldb/interbase/Makefile
++++ packages/fcl-db/src/sqldb/interbase/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=ibconnection fbadmin fbeventmonitor
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=ibconnection fbadmin fbeventmonitor
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=ibconnection fbadmin fbeventmonitor
+ endif
+@@ -848,6 +851,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2
+ endif
+@@ -2366,6 +2372,16 @@ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-XML=1
+ REQUIRE_PACKAGES_IBASE=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_FCL-XML=1
++REQUIRE_PACKAGES_IBASE=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-db/src/sqldb/mssql/Makefile b/packages/fcl-db/src/sqldb/mssql/Makefile
+index 79d605fe..edbf8f60 100644
+--- packages/fcl-db/src/sqldb/mssql/Makefile
++++ packages/fcl-db/src/sqldb/mssql/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=mssqlconn
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=mssqlconn
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=mssqlconn
+ endif
+@@ -848,6 +851,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2
+ endif
+@@ -2282,6 +2288,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_DBLIB=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_DBLIB=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-db/src/sqldb/mysql/Makefile b/packages/fcl-db/src/sqldb/mysql/Makefile
+index f9186bf8..9d127783 100644
+--- packages/fcl-db/src/sqldb/mysql/Makefile
++++ packages/fcl-db/src/sqldb/mysql/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql51conn mysql55conn mysql56conn mysql57conn
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql51conn mysql55conn mysql56conn mysql57conn
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=mysql40conn mysql41conn mysql50conn mysql51conn mysql55conn mysql56conn mysql57conn
+ endif
+@@ -847,6 +850,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql51conn mysql55conn mysql56conn mysql57conn
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql51conn mysql55conn mysql56conn mysql57conn
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=mysql40conn mysql41conn mysql50conn mysql51conn mysql55conn mysql56conn mysql57conn
+ endif
+@@ -1112,6 +1118,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2
+ endif
+@@ -2630,6 +2639,16 @@ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-XML=1
+ REQUIRE_PACKAGES_MYSQL=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_FCL-XML=1
++REQUIRE_PACKAGES_MYSQL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-db/src/sqldb/odbc/Makefile b/packages/fcl-db/src/sqldb/odbc/Makefile
+index d89ac680..bbb6c295 100644
+--- packages/fcl-db/src/sqldb/odbc/Makefile
++++ packages/fcl-db/src/sqldb/odbc/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=odbcconn
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=odbcconn
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=odbcconn
+ endif
+@@ -848,6 +851,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2
+ endif
+@@ -2366,6 +2372,16 @@ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-XML=1
+ REQUIRE_PACKAGES_ODBC=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_FCL-XML=1
++REQUIRE_PACKAGES_ODBC=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-db/src/sqldb/oracle/Makefile b/packages/fcl-db/src/sqldb/oracle/Makefile
+index 446c9443..fdcacb4c 100644
+--- packages/fcl-db/src/sqldb/oracle/Makefile
++++ packages/fcl-db/src/sqldb/oracle/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=oracleconnection
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=oracleconnection
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=oracleconnection
+ endif
+@@ -847,6 +850,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=oracleconnection
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=oracleconnection
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=oracleconnection
+ endif
+@@ -1112,6 +1118,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2
+ endif
+@@ -2630,6 +2639,16 @@ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-XML=1
+ REQUIRE_PACKAGES_ORACLE=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_FCL-XML=1
++REQUIRE_PACKAGES_ORACLE=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-db/src/sqldb/postgres/Makefile b/packages/fcl-db/src/sqldb/postgres/Makefile
+index 2a124f8d..1da6912d 100644
+--- packages/fcl-db/src/sqldb/postgres/Makefile
++++ packages/fcl-db/src/sqldb/postgres/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=pqconnection pqeventmonitor
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=pqconnection pqeventmonitor
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=pqconnection pqeventmonitor
+ endif
+@@ -847,6 +850,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=pqconnection
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=pqconnection
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=pqconnection
+ endif
+@@ -1112,6 +1118,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2
+ endif
+@@ -2630,6 +2639,16 @@ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-XML=1
+ REQUIRE_PACKAGES_POSTGRES=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_FCL-XML=1
++REQUIRE_PACKAGES_POSTGRES=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-db/src/sqldb/sqlite/Makefile b/packages/fcl-db/src/sqldb/sqlite/Makefile
+index 028abe7b..9cf33a55 100644
+--- packages/fcl-db/src/sqldb/sqlite/Makefile
++++ packages/fcl-db/src/sqldb/sqlite/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=sqlite3conn
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=sqlite3conn
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=sqlite3conn
+ endif
+@@ -848,6 +851,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2
+ endif
+@@ -2366,6 +2372,16 @@ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-XML=1
+ REQUIRE_PACKAGES_SQLITE=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_FCL-XML=1
++REQUIRE_PACKAGES_SQLITE=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-db/src/sqlite/Makefile b/packages/fcl-db/src/sqlite/Makefile
+index ae1d8183..ab445627 100644
+--- packages/fcl-db/src/sqlite/Makefile
++++ packages/fcl-db/src/sqlite/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=customsqliteds sqliteds sqlite3ds
+ endif
+@@ -2102,6 +2105,16 @@ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_SQLITE=1
+ REQUIRE_PACKAGES_FCL-BASE=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_SQLITE=1
++REQUIRE_PACKAGES_FCL-BASE=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-db/tests/Makefile b/packages/fcl-db/tests/Makefile
+index 14e2dded..4526f02d 100644
+--- packages/fcl-db/tests/Makefile
++++ packages/fcl-db/tests/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=toolsunit dbftoolsunit memdstoolsunit sqldbtoolsunit sdfdstoolsunit
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=toolsunit dbftoolsunit memdstoolsunit sqldbtoolsunit sdfdstoolsunit
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=toolsunit dbftoolsunit memdstoolsunit sqldbtoolsunit sdfdstoolsunit
+ endif
+@@ -847,6 +850,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_EXAMPLES+=dbtestframework testsqlfiles
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_EXAMPLES+=dbtestframework testsqlfiles
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_EXAMPLES+=dbtestframework testsqlfiles
+ endif
+@@ -2366,6 +2372,16 @@ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-FPCUNIT=1
+ REQUIRE_PACKAGES_FCL-DB=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_FCL-FPCUNIT=1
++REQUIRE_PACKAGES_FCL-DB=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fcl-extra/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-extra/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-extra/files/patch-Makefile-aarch64
@@ -0,0 +1,69 @@
+// @generated
+diff --git a/packages/fcl-extra/Makefile b/packages/fcl-extra/Makefile
+index 0a8ee820..834b52d0 100644
+--- packages/fcl-extra/Makefile
++++ packages/fcl-extra/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-extra/examples/Makefile b/packages/fcl-extra/examples/Makefile
+index c308899a..893cffef 100644
+--- packages/fcl-extra/examples/Makefile
++++ packages/fcl-extra/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -428,6 +428,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=daemon
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=daemon
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=daemon
+ endif
+@@ -1941,6 +1944,16 @@ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-BASE=1
+ REQUIRE_PACKAGES_FCL-EXTRA=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_FCL-BASE=1
++REQUIRE_PACKAGES_FCL-EXTRA=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fcl-fpcunit/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-fpcunit/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-fpcunit/files/patch-Makefile-aarch64
@@ -0,0 +1,131 @@
+// @generated
+diff --git a/packages/fcl-fpcunit/Makefile b/packages/fcl-fpcunit/Makefile
+index 109a1862..6d2ced18 100644
+--- packages/fcl-fpcunit/Makefile
++++ packages/fcl-fpcunit/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-fpcunit/src/exampletests/Makefile b/packages/fcl-fpcunit/src/exampletests/Makefile
+index 1aa830dd..d765c549 100644
+--- packages/fcl-fpcunit/src/exampletests/Makefile
++++ packages/fcl-fpcunit/src/exampletests/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=fpcunittests money moneytest testmockobject
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=fpcunittests money moneytest testmockobject
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=fpcunittests money moneytest testmockobject
+ endif
+@@ -848,6 +851,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2h
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2h
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2h
+ endif
+@@ -2450,6 +2456,17 @@ REQUIRE_PACKAGES_FCL-BASE=1
+ REQUIRE_PACKAGES_FCL-XML=1
+ REQUIRE_PACKAGES_FCL-FPCUNIT=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_FCL-BASE=1
++REQUIRE_PACKAGES_FCL-XML=1
++REQUIRE_PACKAGES_FCL-FPCUNIT=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-fpcunit/src/tests/Makefile b/packages/fcl-fpcunit/src/tests/Makefile
+index 320c5a34..f6d8db78 100644
+--- packages/fcl-fpcunit/src/tests/Makefile
++++ packages/fcl-fpcunit/src/tests/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=asserttest frameworktest suitetest
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=asserttest frameworktest suitetest
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=asserttest frameworktest suitetest
+ endif
+@@ -848,6 +851,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2h
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2h
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2h
+ endif
+@@ -2450,6 +2456,17 @@ REQUIRE_PACKAGES_FCL-BASE=1
+ REQUIRE_PACKAGES_FCL-XML=1
+ REQUIRE_PACKAGES_FCL-FPCUNIT=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_FCL-BASE=1
++REQUIRE_PACKAGES_FCL-XML=1
++REQUIRE_PACKAGES_FCL-FPCUNIT=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fcl-image/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-image/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-image/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/fcl-image/Makefile b/packages/fcl-image/Makefile
+index 824ffb4b..bddbd446 100644
+--- packages/fcl-image/Makefile
++++ packages/fcl-image/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-image/examples/Makefile b/packages/fcl-image/examples/Makefile
+index dd2253c7..5f9a37e1 100644
+--- packages/fcl-image/examples/Makefile
++++ packages/fcl-image/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=imgconv drawing xwdtobmp interpoldemo
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=imgconv drawing xwdtobmp interpoldemo
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=imgconv drawing xwdtobmp interpoldemo
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-IMAGE=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_FCL-IMAGE=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fcl-js/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-js/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-js/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/fcl-js/Makefile b/packages/fcl-js/Makefile
+index 47a061ee..5a46eac3 100644
+--- packages/fcl-js/Makefile
++++ packages/fcl-js/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fcl-json/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-json/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-json/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/fcl-json/Makefile b/packages/fcl-json/Makefile
+index 1a1fc0bc..aded2e7e 100644
+--- packages/fcl-json/Makefile
++++ packages/fcl-json/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fcl-net/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-net/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-net/files/patch-Makefile-aarch64
@@ -0,0 +1,90 @@
+// @generated
+diff --git a/packages/fcl-net/Makefile b/packages/fcl-net/Makefile
+index d2ac6ced..368cd393 100644
+--- packages/fcl-net/Makefile
++++ packages/fcl-net/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-net/examples/Makefile b/packages/fcl-net/examples/Makefile
+index a43de911..8830bddb 100644
+--- packages/fcl-net/examples/Makefile
++++ packages/fcl-net/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=rpcserv rpccli isockcli isocksvr
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=rpcserv rpccli isockcli isocksvr
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=rpcserv rpccli isockcli isocksvr
+ endif
+@@ -845,6 +848,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=svrclass svrclass_xmlrpc
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=svrclass svrclass_xmlrpc
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=svrclass svrclass_xmlrpc
+ endif
+@@ -1110,6 +1116,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2h
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2h
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2h
+ endif
+@@ -2712,6 +2721,17 @@ REQUIRE_PACKAGES_FCL-BASE=1
+ REQUIRE_PACKAGES_FCL-XML=1
+ REQUIRE_PACKAGES_FCL-NET=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_FCL-BASE=1
++REQUIRE_PACKAGES_FCL-XML=1
++REQUIRE_PACKAGES_FCL-NET=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fcl-passrc/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-passrc/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-passrc/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/fcl-passrc/Makefile b/packages/fcl-passrc/Makefile
+index 7a9fc5d4..e6cc0dd0 100644
+--- packages/fcl-passrc/Makefile
++++ packages/fcl-passrc/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fcl-pdf/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-pdf/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-pdf/files/patch-Makefile-aarch64
@@ -0,0 +1,30 @@
+// @generated
+diff --git a/packages/fcl-pdf/Makefile b/packages/fcl-pdf/Makefile
+index 16623f59..98cbeb20 100644
+--- packages/fcl-pdf/Makefile
++++ packages/fcl-pdf/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1786,6 +1786,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-BASE=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_FCL-BASE=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fcl-process/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-process/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-process/files/patch-Makefile-aarch64
@@ -0,0 +1,24 @@
+// @generated
+diff --git a/packages/fcl-process/Makefile b/packages/fcl-process/Makefile
+index ab777538..13e1ba6f 100644
+--- packages/fcl-process/Makefile
++++ packages/fcl-process/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1282,6 +1282,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
Index: devel/fpc-fcl-registry/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-registry/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-registry/files/patch-Makefile-aarch64
@@ -0,0 +1,62 @@
+// @generated
+diff --git a/packages/fcl-registry/Makefile b/packages/fcl-registry/Makefile
+index 0f621087..b8544782 100644
+--- packages/fcl-registry/Makefile
++++ packages/fcl-registry/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-registry/tests/Makefile b/packages/fcl-registry/tests/Makefile
+index 5b2f2ec1..97bdf5c6 100644
+--- packages/fcl-registry/tests/Makefile
++++ packages/fcl-registry/tests/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_EXAMPLES+=regtestframework
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_EXAMPLES+=regtestframework
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_EXAMPLES+=regtestframework
+ endif
+@@ -1514,6 +1517,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
Index: devel/fpc-fcl-report/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-report/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-report/files/patch-Makefile-aarch64
@@ -0,0 +1,32 @@
+// @generated
+diff --git a/packages/fcl-report/Makefile b/packages/fcl-report/Makefile
+index 953b1d6e..67baf020 100644
+--- packages/fcl-report/Makefile
++++ packages/fcl-report/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1930,6 +1930,17 @@ REQUIRE_PACKAGES_FCL-BASE=1
+ REQUIRE_PACKAGES_FCL-XML=1
+ REQUIRE_PACKAGES_FCL-IMAGE=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_FCL-BASE=1
++REQUIRE_PACKAGES_FCL-XML=1
++REQUIRE_PACKAGES_FCL-IMAGE=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fcl-res/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-res/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-res/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/fcl-res/Makefile b/packages/fcl-res/Makefile
+index c40aca4c..8c2e1710 100644
+--- packages/fcl-res/Makefile
++++ packages/fcl-res/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fcl-sdo/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-sdo/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-sdo/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/fcl-sdo/Makefile b/packages/fcl-sdo/Makefile
+index 0196e16d..bb6b8a9c 100644
+--- packages/fcl-sdo/Makefile
++++ packages/fcl-sdo/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fcl-sound/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-sound/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-sound/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/fcl-sound/Makefile b/packages/fcl-sound/Makefile
+index 578b5039..abc54ab9 100644
+--- packages/fcl-sound/Makefile
++++ packages/fcl-sound/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fcl-stl/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-stl/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-stl/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/fcl-stl/Makefile b/packages/fcl-stl/Makefile
+index 2f82803d..e2d5c0f7 100644
+--- packages/fcl-stl/Makefile
++++ packages/fcl-stl/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fcl-web/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-web/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-web/files/patch-Makefile-aarch64
@@ -0,0 +1,197 @@
+// @generated
+diff --git a/packages/fcl-web/Makefile b/packages/fcl-web/Makefile
+index f7dda9a3..3c037126 100644
+--- packages/fcl-web/Makefile
++++ packages/fcl-web/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-web/src/base/Makefile b/packages/fcl-web/src/base/Makefile
+index 602b9d53..8513d3d1 100644
+--- packages/fcl-web/src/base/Makefile
++++ packages/fcl-web/src/base/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -584,6 +584,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=httpdefs fphttp custweb custcgi fpcgi fphtml iniwebsession websession fpweb webutil fpdatasetform cgiapp ezcgi fpapache webpage fcgigate fphttpserver fphttpclient custhttpapp fphttpapp fpwebfile fpapache24 custfcgi fpfcgi
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=httpdefs fphttp custweb custcgi fpcgi fphtml iniwebsession websession fpweb webutil fpdatasetform cgiapp ezcgi fpapache webpage fcgigate fphttpserver fphttpclient custhttpapp fphttpapp fpwebfile fpapache24 custfcgi fpfcgi
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=httpdefs fphttp custweb custcgi fpcgi fphtml iniwebsession websession fpweb webutil fpdatasetform cgiapp ezcgi fpapache webpage fcgigate fphttpserver fphttpclient custhttpapp fphttpapp fpwebfile fpapache24
+ endif
+@@ -848,6 +851,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=fpcgi fphtml fpweb websession cgiapp fphttpserver fphttpclient
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=fpcgi fphtml fpweb websession cgiapp fphttpserver fphttpclient
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=fpcgi fphtml fpweb websession cgiapp fphttpserver fphttpclient
+ endif
+@@ -1113,6 +1119,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2h
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2h
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2h
+ endif
+@@ -3058,6 +3067,21 @@ REQUIRE_PACKAGES_FASTCGI=1
+ REQUIRE_PACKAGES_FCL-NET=1
+ REQUIRE_PACKAGES_HTTPD24=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_FCL-BASE=1
++REQUIRE_PACKAGES_FCL-XML=1
++REQUIRE_PACKAGES_FCL-DB=1
++REQUIRE_PACKAGES_HTTPD22=1
++REQUIRE_PACKAGES_FASTCGI=1
++REQUIRE_PACKAGES_FCL-NET=1
++REQUIRE_PACKAGES_HTTPD24=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-web/src/jsonrpc/Makefile b/packages/fcl-web/src/jsonrpc/Makefile
+index c1187609..e55c8bdd 100644
+--- packages/fcl-web/src/jsonrpc/Makefile
++++ packages/fcl-web/src/jsonrpc/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -584,6 +584,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=fpjsonrpc webjsonrpc fpextdirect
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=fpjsonrpc webjsonrpc fpextdirect
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=fpjsonrpc webjsonrpc fpextdirect
+ endif
+@@ -849,6 +852,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2h
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2h
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2h
+ endif
+@@ -2451,6 +2457,17 @@ REQUIRE_PACKAGES_FCL-BASE=1
+ REQUIRE_PACKAGES_FCL-XML=1
+ REQUIRE_PACKAGES_FCL-JSON=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_FCL-BASE=1
++REQUIRE_PACKAGES_FCL-XML=1
++REQUIRE_PACKAGES_FCL-JSON=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-web/src/webdata/Makefile b/packages/fcl-web/src/webdata/Makefile
+index ddb0fc6f..dabdf7fa 100644
+--- packages/fcl-web/src/webdata/Makefile
++++ packages/fcl-web/src/webdata/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -584,6 +584,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=fpwebdata sqldbwebdata fpextjs extjsjson extjsxml
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=fpwebdata sqldbwebdata fpextjs extjsjson extjsxml
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=fpwebdata sqldbwebdata fpextjs extjsjson extjsxml
+ endif
+@@ -849,6 +852,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2h
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2h
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2h
+ endif
+@@ -2535,6 +2541,18 @@ REQUIRE_PACKAGES_FCL-XML=1
+ REQUIRE_PACKAGES_FCL-DB=1
+ REQUIRE_PACKAGES_FCL-JSON=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_FCL-BASE=1
++REQUIRE_PACKAGES_FCL-XML=1
++REQUIRE_PACKAGES_FCL-DB=1
++REQUIRE_PACKAGES_FCL-JSON=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fcl-xml/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fcl-xml/files/patch-Makefile-aarch64
+++ devel/fpc-fcl-xml/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/fcl-xml/Makefile b/packages/fcl-xml/Makefile
+index 32f9e113..0a194ecb 100644
+--- packages/fcl-xml/Makefile
++++ packages/fcl-xml/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fppkg/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fppkg/files/patch-Makefile-aarch64
+++ devel/fpc-fppkg/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/fppkg/Makefile b/packages/fppkg/Makefile
+index 1208558e..4d4c6ba4 100644
+--- packages/fppkg/Makefile
++++ packages/fppkg/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-fv/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-fv/files/patch-Makefile-aarch64
+++ devel/fpc-fv/files/patch-Makefile-aarch64
@@ -0,0 +1,78 @@
+// @generated
+diff --git a/packages/fv/Makefile b/packages/fv/Makefile
+index 2cbab872..30faeb78 100644
+--- packages/fv/Makefile
++++ packages/fv/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fv/examples/Makefile b/packages/fv/examples/Makefile
+index d89496ef..d7ce42e5 100644
+--- packages/fv/examples/Makefile
++++ packages/fv/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=testapp
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=testapp
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=testapp
+ endif
+@@ -845,6 +848,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=../src
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=../src
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=../src
+ endif
+@@ -2279,6 +2285,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FV=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_FV=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-gdbint/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-gdbint/files/patch-Makefile-aarch64
+++ devel/fpc-gdbint/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/gdbint/Makefile b/packages/gdbint/Makefile
+index 4b14d832..3bddfa21 100644
+--- packages/gdbint/Makefile
++++ packages/gdbint/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-libmagic/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-libmagic/files/patch-Makefile-aarch64
+++ devel/fpc-libmagic/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/libmagic/Makefile b/packages/libmagic/Makefile
+index f31a814c..30cdddb2 100644
+--- packages/libmagic/Makefile
++++ packages/libmagic/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-newt/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-newt/files/patch-Makefile-aarch64
+++ devel/fpc-newt/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/newt/Makefile b/packages/newt/Makefile
+index bf9a30d2..6cae4221 100644
+--- packages/newt/Makefile
++++ packages/newt/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/newt/examples/Makefile b/packages/newt/examples/Makefile
+index 44fe1a4d..ad74660b 100644
+--- packages/newt/examples/Makefile
++++ packages/newt/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=newt1 newt2 newt3
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=newt1 newt2 newt3
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=newt1 newt2 newt3
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_NEWT=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_NEWT=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-odata/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-odata/files/patch-Makefile-aarch64
+++ devel/fpc-odata/files/patch-Makefile-aarch64
@@ -0,0 +1,31 @@
+// @generated
+diff --git a/packages/odata/Makefile b/packages/odata/Makefile
+index ea7b473b..868fecef 100644
+--- packages/odata/Makefile
++++ packages/odata/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1846,6 +1846,16 @@ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-BASE=1
+ REQUIRE_PACKAGES_FCL-WEB=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_FCL-BASE=1
++REQUIRE_PACKAGES_FCL-WEB=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-pthreads/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-pthreads/files/patch-Makefile-aarch64
+++ devel/fpc-pthreads/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/pthreads/Makefile b/packages/pthreads/Makefile
+index df548eef..a46df1d5 100644
+--- packages/pthreads/Makefile
++++ packages/pthreads/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-regexpr/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-regexpr/files/patch-Makefile-aarch64
+++ devel/fpc-regexpr/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/regexpr/Makefile b/packages/regexpr/Makefile
+index 9e789515..4a506a9d 100644
+--- packages/regexpr/Makefile
++++ packages/regexpr/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/regexpr/examples/Makefile b/packages/regexpr/examples/Makefile
+index fb85cd39..046d1cb9 100644
+--- packages/regexpr/examples/Makefile
++++ packages/regexpr/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=testreg1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=testreg1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=testreg1
+ endif
+@@ -2016,6 +2019,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
Index: devel/fpc-sdl/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-sdl/files/patch-Makefile-aarch64
+++ devel/fpc-sdl/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/sdl/Makefile b/packages/sdl/Makefile
+index 9ad85ea3..1c8ff9e1 100644
+--- packages/sdl/Makefile
++++ packages/sdl/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-symbolic/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-symbolic/files/patch-Makefile-aarch64
+++ devel/fpc-symbolic/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/symbolic/Makefile b/packages/symbolic/Makefile
+index 4d5647fb..5dbad429 100644
+--- packages/symbolic/Makefile
++++ packages/symbolic/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/symbolic/examples/Makefile b/packages/symbolic/examples/Makefile
+index 521152fc..250a23db 100644
+--- packages/symbolic/examples/Makefile
++++ packages/symbolic/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=evaltest rpnthing easyevalexample
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=evaltest rpnthing easyevalexample
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=evaltest rpnthing easyevalexample
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_SYMBOLIC=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_SYMBOLIC=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: devel/fpc-zlib/files/patch-Makefile-aarch64
===================================================================
--- devel/fpc-zlib/files/patch-Makefile-aarch64
+++ devel/fpc-zlib/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/zlib/Makefile b/packages/zlib/Makefile
+index 843eed8c..af494c10 100644
+--- packages/zlib/Makefile
++++ packages/zlib/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: editors/fpc-ide/files/patch-Makefile-aarch64
===================================================================
--- editors/fpc-ide/files/patch-Makefile-aarch64
+++ editors/fpc-ide/files/patch-Makefile-aarch64
@@ -0,0 +1,135 @@
+// @generated
+diff --git a/packages/ide/Makefile b/packages/ide/Makefile
+index b4570727..efaeb815 100644
+--- packages/ide/Makefile
++++ packages/ide/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -2024,6 +2024,18 @@ REQUIRE_PACKAGES_FV=1
+ REQUIRE_PACKAGES_CHM=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_RTL-EXTRA=1
++REQUIRE_PACKAGES_FV=1
++REQUIRE_PACKAGES_CHM=1
++REQUIRE_PACKAGES_REGEXPR=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/ide/compiler/Makefile b/packages/ide/compiler/Makefile
+index 7fc741ef..2976b51c 100644
+--- packages/ide/compiler/Makefile
++++ packages/ide/compiler/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -620,6 +620,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=compunit
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=compunit
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=compunit
+ endif
+@@ -885,6 +888,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-Ur -dNOCATCH
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-Ur -dNOCATCH
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-Ur -dNOCATCH
+ endif
+@@ -1149,6 +1155,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET)
+ endif
+@@ -1413,6 +1422,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=$(COMPILERDIR) $(COMPILERDIR)/$(PPC_TARGET) $(COMPILERDIR)/targets $(COMPILERDIR)/systems
+ endif
+@@ -2847,6 +2859,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_RTL-EXTRA=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_RTL-EXTRA=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/ide/fakegdb/Makefile b/packages/ide/fakegdb/Makefile
+index 8caa6a6f..55ef1a65 100644
+--- packages/ide/fakegdb/Makefile
++++ packages/ide/fakegdb/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=gdbcon gdbint
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=gdbcon gdbint
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=gdbcon gdbint
+ endif
+@@ -1514,6 +1517,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
Index: editors/lazarus/Makefile
===================================================================
--- editors/lazarus/Makefile
+++ editors/lazarus/Makefile
@@ -22,7 +22,7 @@
fpcres:lang/fpc-utils \
${LOCALBASE}/share/fpc-source-${FPC_DEFAULT}/Makefile.fpc:lang/fpc-source
-ONLY_FOR_ARCHS= i386 amd64
+ONLY_FOR_ARCHS= aarch64 i386 amd64
USES= desktop-file-utils fpc:run gettext gmake iconv shared-mime-info xorg
USE_FPC?= chm cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-net \
Index: editors/lazarus/files/patch-Makefile-aarch64
===================================================================
--- editors/lazarus/files/patch-Makefile-aarch64
+++ editors/lazarus/files/patch-Makefile-aarch64
@@ -0,0 +1,47596 @@
+// @generated
+--- Makefile 2021-01-08 13:40:28.235762000 +0100
++++ Makefile 2021-01-08 14:15:17.417658000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -563,9 +545,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+ endif
+@@ -599,9 +578,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+ endif
+@@ -620,10 +596,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -635,36 +611,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+ endif
+@@ -866,9 +812,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+ endif
+@@ -902,9 +845,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+ endif
+@@ -923,10 +863,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -938,36 +878,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(wildcard *.lfm)
+-endif
+ override INSTALL_BASEDIR=share/lazarus
+ override INSTALL_FPCPACKAGE=n
+ override DIST_DESTDIR=$(BASEDIR)/dist
+@@ -1167,63 +1077,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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -1418,11 +1277,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=
+@@ -1430,9 +1284,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -1441,9 +1292,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)
+@@ -2302,15 +2150,6 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_REGEXPR=1
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+@@ -2410,15 +2249,6 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_REGEXPR=1
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-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),jvm-java)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+@@ -2473,7 +2303,7 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_REGEXPR=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+ REQUIRE_PACKAGES_FCL-PROCESS=1
+@@ -2482,7 +2312,7 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_REGEXPR=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+ REQUIRE_PACKAGES_FCL-PROCESS=1
+@@ -2518,96 +2348,6 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_REGEXPR=1
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-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),riscv32-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),riscv64-linux)
+-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),riscv64-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),xtensa-linux)
+-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),xtensa-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),xtensa-freertos)
+-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),z80-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),z80-zxspectrum)
+-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),z80-msxdos)
+-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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -2925,7 +2665,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -2987,17 +2736,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
+@@ -3045,7 +2783,7 @@ endif
+ ifndef CROSSINSTALL
+ ifneq ($(TARGET_PROGRAMS),)
+ override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))
+-override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffix $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
++override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
+ override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))
+ override ALLTARGET+=fpc_exes
+ override INSTALLEXEFILES+=$(EXEFILES)
+@@ -3074,7 +2812,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):
+@@ -3105,7 +2843,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3126,7 +2863,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
+@@ -3148,15 +2885,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3311,14 +3046,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
+@@ -3342,9 +3075,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)
+@@ -3365,14 +3097,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 -durp lazarus/components/Makefile lazarus.tx1/components/Makefile
+--- components/Makefile 2018-11-11 22:09:04.000000000 +0100
++++ components/Makefile 2021-01-08 14:15:31.833644000 +0100
+@@ -1,8 +1,8 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2018-04-29 rev 38866]
++# 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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -465,6 +463,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
+ endif
+@@ -486,6 +487,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
+ endif
+@@ -576,9 +580,15 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),wasm-wasm)
+ override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
+ endif
+@@ -959,6 +969,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -1481,6 +1492,7 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+diff -durp lazarus/components/PascalScript/Source/Makefile lazarus.tx1/components/PascalScript/Source/Makefile
+--- components/PascalScript/Source/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/PascalScript/Source/Makefile 2021-01-08 14:15:39.565122000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=pascalscript.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=pascalscript.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=pascalscript.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=pascalscript.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=pascalscript.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=pascalscript.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=pascalscript.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=pascalscript.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=pascalscript.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=pascalscript.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=pascalscript.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=pascalscript.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=pascalscript.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=pascalscript.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=pascalscript.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=pascalscript.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=pascalscript.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=pascalscript.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=pascalscript.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=pascalscript.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/cairocanvas/Makefile lazarus.tx1/components/cairocanvas/Makefile
+--- components/cairocanvas/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/cairocanvas/Makefile 2021-01-08 14:15:35.694731000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=cairocanvas_pkg.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=cairocanvas_pkg.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=cairocanvas_pkg.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=cairocanvas_pkg.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=cairocanvas_pkg.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=cairocanvas_pkg.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=cairocanvas_pkg.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=cairocanvas_pkg.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=cairocanvas_pkg.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=cairocanvas_pkg.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=cairocanvas_pkg.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=cairocanvas_pkg.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=cairocanvas_pkg.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=cairocanvas_pkg.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=cairocanvas_pkg.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=cairocanvas_pkg.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=cairocanvas_pkg.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=cairocanvas_pkg.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=cairocanvas_pkg.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=cairocanvas_pkg.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/chmhelp/lhelp/Makefile lazarus.tx1/components/chmhelp/lhelp/Makefile
+--- components/chmhelp/lhelp/Makefile 2015-10-01 20:40:54.000000000 +0200
++++ components/chmhelp/lhelp/Makefile 2021-01-08 14:15:35.216907000 +0100
+@@ -1,11 +1,11 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-08-12 rev 31317]
++# 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-qnx 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-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android 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-msdos aarch64-linux aarch64-darwin
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android wasm-wasm sparc64-linux
+ BSDs = freebsd netbsd openbsd darwin dragonfly
+ UNIXs = linux $(BSDs) solaris qnx haiku aix
+-LIMIT83fs = go32v2 os2 emx watcom msdos
++LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
+ OSNeedsComspecToRunBatch = go32v2 watcom
+ FORCE:
+ .PHONY: FORCE
+@@ -231,7 +231,7 @@ endif
+ export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ ifdef FPCDIR
+ override FPCDIR:=$(subst \,/,$(FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ else
+@@ -240,7 +240,7 @@ endif
+ ifdef DEFAULT_FPCDIR
+ ifeq ($(FPCDIR),wrong)
+ override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ endif
+@@ -254,11 +254,11 @@ endif
+ else
+ override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(BASEDIR)
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=c:/pp
+ endif
+ endif
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -305,7 +303,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ ifeq ($(UNITSDIR),)
+ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+ endif
+-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
++PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+ ifndef FPCFPMAKE
+ ifdef CROSSCOMPILE
+ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+@@ -380,9 +378,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_PROGRAMS+=lhelp
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_PROGRAMS+=lhelp
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_PROGRAMS+=lhelp
+ endif
+@@ -428,9 +423,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_PROGRAMS+=lhelp
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_PROGRAMS+=lhelp
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_PROGRAMS+=lhelp
+ endif
+@@ -440,10 +432,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_PROGRAMS+=lhelp
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_PROGRAMS+=lhelp
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_PROGRAMS+=lhelp
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -494,6 +486,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_PROGRAMS+=lhelp
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_PROGRAMS+=lhelp
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_PROGRAMS+=lhelp
+ endif
+@@ -515,6 +510,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_PROGRAMS+=lhelp
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_PROGRAMS+=lhelp
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_PROGRAMS+=lhelp
+ endif
+@@ -524,6 +522,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_PROGRAMS+=lhelp
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_PROGRAMS+=lhelp
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_PROGRAMS+=lhelp
+ endif
+@@ -548,6 +549,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override TARGET_PROGRAMS+=lhelp
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override TARGET_PROGRAMS+=lhelp
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_PROGRAMS+=lhelp
+ endif
+@@ -587,15 +591,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override TARGET_PROGRAMS+=lhelp
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override TARGET_PROGRAMS+=lhelp
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override TARGET_PROGRAMS+=lhelp
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override TARGET_PROGRAMS+=lhelp
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=lhelp
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=lhelp
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=lhelp
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_PROGRAMS+=lhelp
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_PROGRAMS+=lhelp
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_PROGRAMS+=lhelp
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -623,9 +645,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -671,9 +690,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -683,10 +699,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -737,6 +753,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -758,6 +777,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -767,6 +789,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -791,6 +816,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -830,15 +858,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(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)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -866,9 +912,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -914,9 +957,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -926,10 +966,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -980,6 +1020,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1001,6 +1044,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1010,6 +1056,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1034,6 +1083,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1073,15 +1125,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_OPTIONS+=-gs -gl -Sghi -O3 -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1109,9 +1179,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1157,9 +1224,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1169,10 +1233,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1223,6 +1287,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1244,6 +1311,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1253,6 +1323,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1277,6 +1350,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1316,15 +1392,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../packages/help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1352,9 +1446,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_TARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_TARGETDIR+=.
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1400,9 +1491,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_TARGETDIR+=.
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1412,10 +1500,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_TARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_TARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_TARGETDIR+=.
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1466,6 +1554,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1487,6 +1578,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1496,6 +1590,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1520,6 +1617,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1559,15 +1659,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1595,9 +1713,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1643,9 +1758,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1655,10 +1767,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1709,6 +1821,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1730,6 +1845,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1739,6 +1857,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1763,6 +1884,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1802,15 +1926,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
++endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2216,6 +2358,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -2238,9 +2381,20 @@ STATICLIBEXT=.a
+ SHORTSUFFIX=d16
+ endif
+ ifeq ($(OS_TARGET),embedded)
++ifeq ($(CPU_TARGET),i8086)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++else
+ EXEEXT=.bin
++endif
+ SHORTSUFFIX=emb
+ endif
++ifeq ($(OS_TARGET),win16)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++SHAREDLIBEXT=.dll
++SHORTSUFFIX=w16
++endif
+ ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+ FPCMADE=fpcmade.$(SHORTSUFFIX)
+ ZIPSUFFIX=$(SHORTSUFFIX)
+@@ -2523,9 +2677,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2571,9 +2722,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2583,10 +2731,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -2637,6 +2785,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2658,6 +2809,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2667,6 +2821,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2691,6 +2848,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2730,15 +2890,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++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),)
+@@ -3053,7 +3231,11 @@ ifdef INSTALL_BUILDUNIT
+ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+ endif
+ ifdef INSTALLPPUFILES
++ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
+ 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)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
++endif
+ ifneq ($(UNITTARGETDIRPREFIX),)
+ override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+ override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+@@ -3241,7 +3423,7 @@ ifdef LIB_NAME
+ -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+ endif
+ -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
++ -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ fpc_cleanall: $(CLEANTARGET)
+ ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+@@ -3261,13 +3443,14 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+ endif
+ -$(DELTREE) *$(SMARTEXT)
+ -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *_ppas$(BATCHEXT)
++ -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ ifdef AOUTEXT
+ -$(DEL) *$(AOUTEXT)
+ endif
+diff -durp lazarus/components/chmhelp/packages/help/Makefile lazarus.tx1/components/chmhelp/packages/help/Makefile
+--- components/chmhelp/packages/help/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/chmhelp/packages/help/Makefile 2021-01-08 14:15:34.707438000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=lhelpcontrolpkg.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=lhelpcontrolpkg.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lhelpcontrolpkg.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=lhelpcontrolpkg.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=lhelpcontrolpkg.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=lhelpcontrolpkg.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lhelpcontrolpkg.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=lhelpcontrolpkg.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lhelpcontrolpkg.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=lhelpcontrolpkg.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=lhelpcontrolpkg.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=lhelpcontrolpkg.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=lhelpcontrolpkg.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=lhelpcontrolpkg.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=lhelpcontrolpkg.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=lhelpcontrolpkg.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=lhelpcontrolpkg.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=lhelpcontrolpkg.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=lhelpcontrolpkg.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=lhelpcontrolpkg.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/chmhelp/packages/idehelp/Makefile lazarus.tx1/components/chmhelp/packages/idehelp/Makefile
+--- components/chmhelp/packages/idehelp/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/chmhelp/packages/idehelp/Makefile 2021-01-08 14:15:34.229537000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=chmhelppkg.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=chmhelppkg.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=chmhelppkg.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=chmhelppkg.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=chmhelppkg.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=chmhelppkg.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=chmhelppkg.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=chmhelppkg.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=chmhelppkg.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=chmhelppkg.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=chmhelppkg.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=chmhelppkg.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=chmhelppkg.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=chmhelppkg.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=chmhelppkg.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=chmhelppkg.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=chmhelppkg.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=chmhelppkg.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=chmhelppkg.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=chmhelppkg.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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) ../help/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
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/codetools/Makefile lazarus.tx1/components/codetools/Makefile
+--- components/codetools/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/codetools/Makefile 2021-01-08 14:15:37.637990000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=codetools.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=codetools.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=codetools.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=codetools.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=codetools.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=codetools.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=codetools.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=codetools.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=codetools.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=codetools.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=codetools.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=codetools.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=codetools.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=codetools.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=codetools.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=codetools.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=codetools.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=codetools.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=codetools.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=codetools.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Sci -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1781,9 +1619,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1817,9 +1652,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +1685,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/codetools/ide/Makefile lazarus.tx1/components/codetools/ide/Makefile
+--- components/codetools/ide/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/codetools/ide/Makefile 2021-01-08 14:15:37.160808000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=cody.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=cody.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=cody.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=cody.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=cody.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=cody.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=cody.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=cody.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=cody.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=cody.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=cody.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=cody.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=cody.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=cody.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=cody.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=cody.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=cody.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=cody.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=cody.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=cody.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../units/$(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) ../../synedit/units/$(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
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/datetimectrls/Makefile lazarus.tx1/components/datetimectrls/Makefile
+--- components/datetimectrls/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/datetimectrls/Makefile 2021-01-08 14:15:23.420524000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=datetimectrls.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=datetimectrls.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=datetimectrls.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=datetimectrls.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=datetimectrls.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=datetimectrls.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=datetimectrls.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=datetimectrls.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=datetimectrls.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=datetimectrls.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=datetimectrls.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=datetimectrls.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=datetimectrls.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=datetimectrls.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=datetimectrls.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=datetimectrls.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=datetimectrls.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=datetimectrls.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=datetimectrls.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=datetimectrls.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O2 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(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) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/datetimectrls/design/Makefile lazarus.tx1/components/datetimectrls/design/Makefile
+--- components/datetimectrls/design/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/datetimectrls/design/Makefile 2021-01-08 14:15:22.943152000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=datetimectrlsdsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=datetimectrlsdsgn.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=datetimectrlsdsgn.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=datetimectrlsdsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=datetimectrlsdsgn.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=datetimectrlsdsgn.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=datetimectrlsdsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=datetimectrlsdsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=datetimectrlsdsgn.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=datetimectrlsdsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=datetimectrlsdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=datetimectrlsdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=datetimectrlsdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=datetimectrlsdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=datetimectrlsdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=datetimectrlsdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=datetimectrlsdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=datetimectrlsdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=datetimectrlsdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=datetimectrlsdsgn.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_INCLUDEDIR+=.
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_INCLUDEDIR+=.
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_INCLUDEDIR+=.
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_INCLUDEDIR+=.
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_INCLUDEDIR+=.
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_INCLUDEDIR+=.
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_INCLUDEDIR+=.
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_INCLUDEDIR+=.
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_INCLUDEDIR+=.
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_INCLUDEDIR+=.
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_INCLUDEDIR+=.
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_INCLUDEDIR+=.
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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
+@@ -1781,9 +1619,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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),powerpc64-linux)
+ override COMPILER_UNITDIR+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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
+@@ -1817,9 +1652,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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)
+@@ -1853,36 +1685,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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+=. ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../../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
+@@ -2084,9 +1886,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -2120,9 +1919,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
+@@ -2141,10 +1937,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2156,36 +1952,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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2382,63 +2148,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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2633,11 +2348,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=
+@@ -2645,9 +2355,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2656,9 +2363,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)
+@@ -3115,9 +2819,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -3151,9 +2852,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
+@@ -3172,10 +2870,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -3187,36 +2885,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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3306,7 +2974,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3368,17 +3045,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
+@@ -3445,7 +3111,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):
+@@ -3476,7 +3142,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3497,7 +3162,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
+@@ -3519,15 +3184,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3682,14 +3345,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
+@@ -3713,9 +3374,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)
+@@ -3736,14 +3396,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 -durp lazarus/components/debuggerintf/Makefile lazarus.tx1/components/debuggerintf/Makefile
+--- components/debuggerintf/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/debuggerintf/Makefile 2021-01-08 14:15:20.514927000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=debuggerintf.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=debuggerintf.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=debuggerintf.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=debuggerintf.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=debuggerintf.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=debuggerintf.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=debuggerintf.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=debuggerintf.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=debuggerintf.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=debuggerintf.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=debuggerintf.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=debuggerintf.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=debuggerintf.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=debuggerintf.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=debuggerintf.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=debuggerintf.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=debuggerintf.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=debuggerintf.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=debuggerintf.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=debuggerintf.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm4046 $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(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) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(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) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/externhelp/Makefile lazarus.tx1/components/externhelp/Makefile
+--- components/externhelp/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/externhelp/Makefile 2021-01-08 14:15:20.031905000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=externhelp.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=externhelp.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=externhelp.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=externhelp.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=externhelp.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=externhelp.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=externhelp.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=externhelp.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=externhelp.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=externhelp.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=externhelp.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=externhelp.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=externhelp.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=externhelp.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=externhelp.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=externhelp.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=externhelp.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=externhelp.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=externhelp.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=externhelp.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/fpcunit/Makefile lazarus.tx1/components/fpcunit/Makefile
+--- components/fpcunit/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/fpcunit/Makefile 2021-01-08 14:15:25.345583000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=fpcunittestrunner.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=fpcunittestrunner.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=fpcunittestrunner.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=fpcunittestrunner.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=fpcunittestrunner.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=fpcunittestrunner.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=fpcunittestrunner.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=fpcunittestrunner.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=fpcunittestrunner.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=fpcunittestrunner.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=fpcunittestrunner.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=fpcunittestrunner.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=fpcunittestrunner.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=fpcunittestrunner.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=fpcunittestrunner.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=fpcunittestrunner.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=fpcunittestrunner.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=fpcunittestrunner.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=fpcunittestrunner.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=fpcunittestrunner.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/fpcunit/ide/Makefile lazarus.tx1/components/fpcunit/ide/Makefile
+--- components/fpcunit/ide/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/fpcunit/ide/Makefile 2021-01-08 14:15:24.862475000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=fpcunitide.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=fpcunitide.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=fpcunitide.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=fpcunitide.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=fpcunitide.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=fpcunitide.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=fpcunitide.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=fpcunitide.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=fpcunitide.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=fpcunitide.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=fpcunitide.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=fpcunitide.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=fpcunitide.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=fpcunitide.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=fpcunitide.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=fpcunitide.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=fpcunitide.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=fpcunitide.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=fpcunitide.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=fpcunitide.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/fpdebug/Makefile lazarus.tx1/components/fpdebug/Makefile
+--- components/fpdebug/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/fpdebug/Makefile 2021-01-08 14:15:25.825631000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,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),powerpc64-linux)
+ override TARGET_UNITS+=fpdebug.pas
+ endif
+@@ -605,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
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=fpdebug.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=fpdebug.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=fpdebug.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +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),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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ 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)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ 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)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -venibq -vw-h- -vm3057 $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++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-android)
+@@ -1247,36 +1151,6 @@ 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),i386-linux)
+ override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../../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) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=. ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../../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) ../../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) ../../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) ../../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) ../../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) ../../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) ../../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) ../../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) ../../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) ../../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
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/ideintf/Makefile lazarus.tx1/components/ideintf/Makefile
+--- components/ideintf/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/ideintf/Makefile 2021-01-08 14:15:39.086902000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=ideintf.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=ideintf.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=ideintf.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=ideintf.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=ideintf.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=ideintf.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=ideintf.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=ideintf.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=ideintf.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=ideintf.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=ideintf.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=ideintf.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=ideintf.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=ideintf.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=ideintf.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=ideintf.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=ideintf.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=ideintf.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=ideintf.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=ideintf.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_INCLUDEDIR+=images
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_INCLUDEDIR+=images
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_INCLUDEDIR+=images
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_INCLUDEDIR+=images
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_INCLUDEDIR+=images
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_INCLUDEDIR+=images
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_INCLUDEDIR+=images
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=images
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_INCLUDEDIR+=images
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=images
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_INCLUDEDIR+=images
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_INCLUDEDIR+=images
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_INCLUDEDIR+=images
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_INCLUDEDIR+=images
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_INCLUDEDIR+=images
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_INCLUDEDIR+=images
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_INCLUDEDIR+=images
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_INCLUDEDIR+=images
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_INCLUDEDIR+=images
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_INCLUDEDIR+=images
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_INCLUDEDIR+=images
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+ endif
+@@ -1781,9 +1619,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+ endif
+@@ -1817,9 +1652,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+ endif
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +1685,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -2084,9 +1886,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -2120,9 +1919,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -2141,10 +1937,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2156,36 +1952,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2382,63 +2148,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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2633,11 +2348,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=
+@@ -2645,9 +2355,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2656,9 +2363,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)
+@@ -3115,9 +2819,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -3151,9 +2852,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
+@@ -3172,10 +2870,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -3187,36 +2885,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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3306,7 +2974,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3368,17 +3045,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
+@@ -3445,7 +3111,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):
+@@ -3476,7 +3142,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3497,7 +3162,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
+@@ -3519,15 +3184,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3682,14 +3345,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
+@@ -3713,9 +3374,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)
+@@ -3736,14 +3396,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 -durp lazarus/components/instantfpc/Makefile lazarus.tx1/components/instantfpc/Makefile
+--- components/instantfpc/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/instantfpc/Makefile 2021-01-08 14:15:29.720100000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=instantfpclaz.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=instantfpclaz.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=instantfpclaz.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=instantfpclaz.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=instantfpclaz.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=instantfpclaz.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=instantfpclaz.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=instantfpclaz.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=instantfpclaz.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=instantfpclaz.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=instantfpclaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=instantfpclaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=instantfpclaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=instantfpclaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=instantfpclaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=instantfpclaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=instantfpclaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=instantfpclaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=instantfpclaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=instantfpclaz.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/jcf2/IdePlugin/lazarus/Makefile lazarus.tx1/components/jcf2/IdePlugin/lazarus/Makefile
+--- components/jcf2/IdePlugin/lazarus/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/jcf2/IdePlugin/lazarus/Makefile 2021-01-08 14:15:19.549775000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=jcfidelazarus.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=jcfidelazarus.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=jcfidelazarus.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=jcfidelazarus.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=jcfidelazarus.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=jcfidelazarus.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=jcfidelazarus.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=jcfidelazarus.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=jcfidelazarus.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=jcfidelazarus.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=jcfidelazarus.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=jcfidelazarus.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=jcfidelazarus.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=jcfidelazarus.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=jcfidelazarus.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=jcfidelazarus.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=jcfidelazarus.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=jcfidelazarus.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=jcfidelazarus.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=jcfidelazarus.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_INCLUDEDIR+=../../Include ../../Ui/Settings
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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
+@@ -1781,9 +1619,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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),powerpc64-linux)
+ override COMPILER_UNITDIR+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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
+@@ -1817,9 +1652,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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)
+@@ -1853,36 +1685,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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+=../.. ../../Parse ../../Parse/PreProcessor ../../Parse/UI ../../Process ../../Process/Align ../../Process/Capitalisation ../../Process/Indent ../../Process/Info ../../Process/Obfuscate ../../Process/Onceoffs ../../Process/Returns ../../Process/Spacing ../../Process/Transform ../../Process/Warnings ../../ReadWrite ../../Settings ../../Settings/Streams ../../Ui ../../Ui/Settings ../../Utils ../../Utils/DragDrop ../../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lazutils/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
+@@ -2084,9 +1886,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -2120,9 +1919,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
+@@ -2141,10 +1937,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2156,36 +1952,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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2382,63 +2148,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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2633,11 +2348,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=
+@@ -2645,9 +2355,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2656,9 +2363,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)
+@@ -3115,9 +2819,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -3151,9 +2852,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
+@@ -3172,10 +2870,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -3187,36 +2885,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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3306,7 +2974,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3368,17 +3045,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
+@@ -3445,7 +3111,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):
+@@ -3476,7 +3142,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3497,7 +3162,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
+@@ -3519,15 +3184,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3682,14 +3345,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
+@@ -3713,9 +3374,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)
+@@ -3736,14 +3396,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 -durp lazarus/components/lazcontrols/Makefile lazarus.tx1/components/lazcontrols/Makefile
+--- components/lazcontrols/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/lazcontrols/Makefile 2021-01-08 14:15:31.639963000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=lazcontrols.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=lazcontrols.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lazcontrols.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=lazcontrols.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=lazcontrols.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=lazcontrols.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lazcontrols.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=lazcontrols.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lazcontrols.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=lazcontrols.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=lazcontrols.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=lazcontrols.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=lazcontrols.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=lazcontrols.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=lazcontrols.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=lazcontrols.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=lazcontrols.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=lazcontrols.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=lazcontrols.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=lazcontrols.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/lazcontrols/design/Makefile lazarus.tx1/components/lazcontrols/design/Makefile
+--- components/lazcontrols/design/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/lazcontrols/design/Makefile 2021-01-08 14:15:31.159581000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=lazcontroldsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=lazcontroldsgn.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lazcontroldsgn.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=lazcontroldsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=lazcontroldsgn.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=lazcontroldsgn.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lazcontroldsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=lazcontroldsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lazcontroldsgn.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=lazcontroldsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=lazcontroldsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=lazcontroldsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=lazcontroldsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=lazcontroldsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=lazcontroldsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=lazcontroldsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=lazcontroldsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=lazcontroldsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=lazcontroldsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=lazcontroldsgn.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../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
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/lazdebuggergdbmi/Makefile lazarus.tx1/components/lazdebuggergdbmi/Makefile
+--- components/lazdebuggergdbmi/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/lazdebuggergdbmi/Makefile 2021-01-08 14:15:38.119761000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=lazdebuggergdbmi.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=lazdebuggergdbmi.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lazdebuggergdbmi.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=lazdebuggergdbmi.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=lazdebuggergdbmi.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=lazdebuggergdbmi.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lazdebuggergdbmi.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=lazdebuggergdbmi.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lazdebuggergdbmi.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=lazdebuggergdbmi.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=lazdebuggergdbmi.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=lazdebuggergdbmi.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=lazdebuggergdbmi.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=lazdebuggergdbmi.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=lazdebuggergdbmi.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=lazdebuggergdbmi.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=lazdebuggergdbmi.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=lazdebuggergdbmi.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=lazdebuggergdbmi.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=lazdebuggergdbmi.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(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)
+ endif
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/lazdebuggers/Makefile lazarus.tx1/components/lazdebuggers/Makefile
+--- components/lazdebuggers/Makefile 2018-11-11 22:09:04.000000000 +0100
++++ components/lazdebuggers/Makefile 2021-01-08 14:15:18.567086000 +0100
+@@ -1,8 +1,8 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2018-04-29 rev 38866]
++# 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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -465,6 +463,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
+ endif
+@@ -486,6 +487,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
+ endif
+@@ -576,9 +580,15 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),wasm-wasm)
+ override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
+ endif
+@@ -959,6 +969,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -1481,6 +1492,7 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+diff -durp lazarus/components/lazdebuggers/cmdlinedebuggerbase/Makefile lazarus.tx1/components/lazdebuggers/cmdlinedebuggerbase/Makefile
+--- components/lazdebuggers/cmdlinedebuggerbase/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/lazdebuggers/cmdlinedebuggerbase/Makefile 2021-01-08 14:15:17.896196000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=cmdlinedebuggerbase.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=cmdlinedebuggerbase.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=cmdlinedebuggerbase.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=cmdlinedebuggerbase.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=cmdlinedebuggerbase.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=cmdlinedebuggerbase.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=cmdlinedebuggerbase.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=cmdlinedebuggerbase.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=cmdlinedebuggerbase.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=cmdlinedebuggerbase.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=cmdlinedebuggerbase.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=cmdlinedebuggerbase.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=cmdlinedebuggerbase.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=cmdlinedebuggerbase.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=cmdlinedebuggerbase.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=cmdlinedebuggerbase.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=cmdlinedebuggerbase.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=cmdlinedebuggerbase.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=cmdlinedebuggerbase.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=cmdlinedebuggerbase.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(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) ../../../lcl/units/$(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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(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) ../../../lcl/units/$(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) ../../../lcl/units/$(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) ../../../lcl/units/$(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) ../../../lcl/units/$(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) ../../../lcl/units/$(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) ../../../lcl/units/$(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) ../../../lcl/units/$(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) ../../../lcl/units/$(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) ../../../lcl/units/$(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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/lazdebuggers/lazdebuggerfplldb/Makefile lazarus.tx1/components/lazdebuggers/lazdebuggerfplldb/Makefile
+--- components/lazdebuggers/lazdebuggerfplldb/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/lazdebuggers/lazdebuggerfplldb/Makefile 2021-01-08 14:15:19.050072000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=lazdebuggerfplldb.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=lazdebuggerfplldb.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lazdebuggerfplldb.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=lazdebuggerfplldb.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=lazdebuggerfplldb.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=lazdebuggerfplldb.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lazdebuggerfplldb.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=lazdebuggerfplldb.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lazdebuggerfplldb.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=lazdebuggerfplldb.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=lazdebuggerfplldb.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=lazdebuggerfplldb.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=lazdebuggerfplldb.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=lazdebuggerfplldb.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=lazdebuggerfplldb.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=lazdebuggerfplldb.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=lazdebuggerfplldb.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=lazdebuggerfplldb.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=lazdebuggerfplldb.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=lazdebuggerfplldb.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../fpdebug/lib/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/lazdebuggers/lazdebuggerlldb/Makefile lazarus.tx1/components/lazdebuggers/lazdebuggerlldb/Makefile
+--- components/lazdebuggers/lazdebuggerlldb/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/lazdebuggers/lazdebuggerlldb/Makefile 2021-01-08 14:15:18.379717000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=lazdebuggerlldb.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=lazdebuggerlldb.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lazdebuggerlldb.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=lazdebuggerlldb.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=lazdebuggerlldb.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=lazdebuggerlldb.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lazdebuggerlldb.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=lazdebuggerlldb.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lazdebuggerlldb.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=lazdebuggerlldb.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=lazdebuggerlldb.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=lazdebuggerlldb.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=lazdebuggerlldb.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=lazdebuggerlldb.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=lazdebuggerlldb.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=lazdebuggerlldb.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=lazdebuggerlldb.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=lazdebuggerlldb.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=lazdebuggerlldb.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=lazdebuggerlldb.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(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) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../cmdlinedebuggerbase/lib/$(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
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/lazsvnpkg/Makefile lazarus.tx1/components/lazsvnpkg/Makefile
+--- components/lazsvnpkg/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/lazsvnpkg/Makefile 2021-01-08 14:15:22.453605000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=lazsvnpkg.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=lazsvnpkg.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lazsvnpkg.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=lazsvnpkg.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=lazsvnpkg.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=lazsvnpkg.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lazsvnpkg.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=lazsvnpkg.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lazsvnpkg.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=lazsvnpkg.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=lazsvnpkg.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=lazsvnpkg.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=lazsvnpkg.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=lazsvnpkg.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=lazsvnpkg.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=lazsvnpkg.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=lazsvnpkg.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=lazsvnpkg.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=lazsvnpkg.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=lazsvnpkg.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(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)
+ endif
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/lazutils/Makefile lazarus.tx1/components/lazutils/Makefile
+--- components/lazutils/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/lazutils/Makefile 2021-01-08 14:15:27.775575000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=lazutils.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=lazutils.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lazutils.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=lazutils.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=lazutils.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=lazutils.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lazutils.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=lazutils.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lazutils.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=lazutils.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=lazutils.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=lazutils.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=lazutils.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=lazutils.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=lazutils.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=lazutils.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=lazutils.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=lazutils.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=lazutils.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=lazutils.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/lclextensions/Makefile lazarus.tx1/components/lclextensions/Makefile
+--- components/lclextensions/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/lclextensions/Makefile 2021-01-08 14:15:26.316236000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=lclextensions_package.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=lclextensions_package.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lclextensions_package.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=lclextensions_package.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=lclextensions_package.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=lclextensions_package.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lclextensions_package.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=lclextensions_package.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lclextensions_package.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=lclextensions_package.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=lclextensions_package.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=lclextensions_package.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=lclextensions_package.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=lclextensions_package.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=lclextensions_package.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=lclextensions_package.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=lclextensions_package.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=lclextensions_package.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=lclextensions_package.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=lclextensions_package.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_INCLUDEDIR+=include/$(LCL_PLATFORM)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1781,9 +1619,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1817,9 +1652,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +1685,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
+ endif
+@@ -2084,9 +1886,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
+ endif
+@@ -2120,9 +1919,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
+@@ -2141,10 +1937,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2156,36 +1952,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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2382,63 +2148,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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2633,11 +2348,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=
+@@ -2645,9 +2355,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2656,9 +2363,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)
+@@ -3115,9 +2819,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -3151,9 +2852,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
+@@ -3172,10 +2870,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -3187,36 +2885,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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3306,7 +2974,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3368,17 +3045,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
+@@ -3445,7 +3111,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):
+@@ -3476,7 +3142,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3497,7 +3162,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
+@@ -3519,15 +3184,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3682,14 +3345,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
+@@ -3713,9 +3374,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)
+@@ -3736,14 +3396,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 -durp lazarus/components/leakview/Makefile lazarus.tx1/components/leakview/Makefile
+--- components/leakview/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/leakview/Makefile 2021-01-08 14:15:29.238488000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=leakview.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=leakview.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=leakview.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=leakview.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=leakview.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=leakview.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=leakview.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=leakview.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=leakview.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=leakview.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=leakview.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=leakview.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=leakview.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=leakview.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=leakview.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=leakview.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=leakview.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=leakview.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=leakview.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=leakview.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Sgi -O1 -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lazdebuggers/cmdlinedebuggerbase/lib/$(CPU_TARGET)-$(OS_TARGET) ../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lazdebuggers/lazdebuggerlldb/lib/$(CPU_TARGET)-$(OS_TARGET) ../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
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/macfiles/Makefile lazarus.tx1/components/macfiles/Makefile
+--- components/macfiles/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/macfiles/Makefile 2021-01-08 14:15:33.749538000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=macosfiles.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=macosfiles.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=macosfiles.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=macosfiles.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=macosfiles.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=macosfiles.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=macosfiles.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=macosfiles.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=macosfiles.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=macosfiles.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=macosfiles.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=macosfiles.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=macosfiles.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=macosfiles.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=macosfiles.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=macosfiles.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=macosfiles.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=macosfiles.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=macosfiles.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=macosfiles.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/macroscript/Makefile lazarus.tx1/components/macroscript/Makefile
+--- components/macroscript/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/macroscript/Makefile 2021-01-08 14:15:28.256385000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=editormacroscript.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=editormacroscript.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=editormacroscript.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=editormacroscript.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=editormacroscript.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=editormacroscript.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=editormacroscript.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=editormacroscript.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=editormacroscript.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=editormacroscript.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=editormacroscript.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=editormacroscript.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=editormacroscript.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=editormacroscript.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=editormacroscript.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=editormacroscript.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=editormacroscript.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=editormacroscript.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=editormacroscript.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=editormacroscript.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../PascalScript/Source/lib/$(CPU_TARGET)-$(OS_TARGET) ../synedit/units/$(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)
+ endif
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/memds/Makefile lazarus.tx1/components/memds/Makefile
+--- components/memds/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/memds/Makefile 2021-01-08 14:15:23.898385000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=memdslaz.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=memdslaz.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=memdslaz.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=memdslaz.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=memdslaz.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=memdslaz.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=memdslaz.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=memdslaz.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=memdslaz.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=memdslaz.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=memdslaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=memdslaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=memdslaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=memdslaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=memdslaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=memdslaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=memdslaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=memdslaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=memdslaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=memdslaz.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/onlinepackagemanager/Makefile lazarus.tx1/components/onlinepackagemanager/Makefile
+--- components/onlinepackagemanager/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/onlinepackagemanager/Makefile 2021-01-08 14:15:27.299198000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=onlinepackagemanager.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=onlinepackagemanager.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=onlinepackagemanager.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=onlinepackagemanager.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=onlinepackagemanager.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=onlinepackagemanager.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=onlinepackagemanager.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=onlinepackagemanager.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=onlinepackagemanager.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=onlinepackagemanager.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=onlinepackagemanager.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=onlinepackagemanager.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=onlinepackagemanager.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=onlinepackagemanager.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=onlinepackagemanager.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=onlinepackagemanager.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=onlinepackagemanager.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=onlinepackagemanager.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=onlinepackagemanager.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=onlinepackagemanager.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024 -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_INCLUDEDIR+=vst/include/intf/$(LCL_PLATFORM) vst/include/$(LCL_PLATFORM)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+ endif
+@@ -1781,9 +1619,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+ endif
+@@ -1817,9 +1652,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+ endif
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +1685,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=vst vst/units/$(LCL_PLATFORM) fpcmod frames ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../virtualtreeview/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -2084,9 +1886,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -2120,9 +1919,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
+@@ -2141,10 +1937,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2156,36 +1952,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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2382,63 +2148,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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2633,11 +2348,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=
+@@ -2645,9 +2355,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2656,9 +2363,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)
+@@ -3115,9 +2819,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -3151,9 +2852,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
+@@ -3172,10 +2870,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -3187,36 +2885,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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3306,7 +2974,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3368,17 +3045,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
+@@ -3445,7 +3111,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):
+@@ -3476,7 +3142,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3497,7 +3162,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
+@@ -3519,15 +3184,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3682,14 +3345,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
+@@ -3713,9 +3374,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)
+@@ -3736,14 +3396,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 -durp lazarus/components/pas2js/Makefile lazarus.tx1/components/pas2js/Makefile
+--- components/pas2js/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/pas2js/Makefile 2021-01-08 14:15:30.678840000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=pas2jsdsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=pas2jsdsgn.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=pas2jsdsgn.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=pas2jsdsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=pas2jsdsgn.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=pas2jsdsgn.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=pas2jsdsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=pas2jsdsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=pas2jsdsgn.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=pas2jsdsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=pas2jsdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=pas2jsdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=pas2jsdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=pas2jsdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=pas2jsdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=pas2jsdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=pas2jsdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=pas2jsdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=pas2jsdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=pas2jsdsgn.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Schi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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)
+ endif
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/printers/Makefile lazarus.tx1/components/printers/Makefile
+--- components/printers/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/printers/Makefile 2021-01-08 14:15:36.670302000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=printer4lazarus.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=printer4lazarus.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=printer4lazarus.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=printer4lazarus.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=printer4lazarus.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=printer4lazarus.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=printer4lazarus.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=printer4lazarus.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=printer4lazarus.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=printer4lazarus.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=printer4lazarus.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=printer4lazarus.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=printer4lazarus.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=printer4lazarus.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=printer4lazarus.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=printer4lazarus.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=printer4lazarus.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=printer4lazarus.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=printer4lazarus.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=printer4lazarus.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) -dUseCache -dNativePrint -dUSEUNICODE $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_INCLUDEDIR+=unix win32 carbon qt cocoa
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1781,9 +1619,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1817,9 +1652,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +1685,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=unix win32 carbon qt cocoa ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -2084,9 +1886,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -2120,9 +1919,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
+@@ -2141,10 +1937,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2156,36 +1952,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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2382,63 +2148,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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2633,11 +2348,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=
+@@ -2645,9 +2355,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2656,9 +2363,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)
+@@ -3115,9 +2819,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -3151,9 +2852,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
+@@ -3172,10 +2870,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -3187,36 +2885,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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3306,7 +2974,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3368,17 +3045,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
+@@ -3445,7 +3111,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):
+@@ -3476,7 +3142,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3497,7 +3162,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
+@@ -3519,15 +3184,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3682,14 +3345,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
+@@ -3713,9 +3374,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)
+@@ -3736,14 +3396,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 -durp lazarus/components/printers/design/Makefile lazarus.tx1/components/printers/design/Makefile
+--- components/printers/design/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/printers/design/Makefile 2021-01-08 14:15:36.177182000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=printers4lazide.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=printers4lazide.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=printers4lazide.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=printers4lazide.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=printers4lazide.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=printers4lazide.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=printers4lazide.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=printers4lazide.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=printers4lazide.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=printers4lazide.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=printers4lazide.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=printers4lazide.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=printers4lazide.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=printers4lazide.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=printers4lazide.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=printers4lazide.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=printers4lazide.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=printers4lazide.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=printers4lazide.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=printers4lazide.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/projecttemplates/Makefile lazarus.tx1/components/projecttemplates/Makefile
+--- components/projecttemplates/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/projecttemplates/Makefile 2021-01-08 14:15:40.043061000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=projtemplates.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=projtemplates.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=projtemplates.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=projtemplates.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=projtemplates.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=projtemplates.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=projtemplates.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=projtemplates.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=projtemplates.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=projtemplates.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=projtemplates.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=projtemplates.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=projtemplates.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=projtemplates.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=projtemplates.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=projtemplates.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=projtemplates.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=projtemplates.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=projtemplates.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=projtemplates.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/rtticontrols/Makefile lazarus.tx1/components/rtticontrols/Makefile
+--- components/rtticontrols/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/rtticontrols/Makefile 2021-01-08 14:15:33.270398000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=runtimetypeinfocontrols.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=runtimetypeinfocontrols.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=runtimetypeinfocontrols.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=runtimetypeinfocontrols.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=runtimetypeinfocontrols.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=runtimetypeinfocontrols.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=runtimetypeinfocontrols.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=runtimetypeinfocontrols.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=runtimetypeinfocontrols.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=runtimetypeinfocontrols.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=runtimetypeinfocontrols.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=runtimetypeinfocontrols.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=runtimetypeinfocontrols.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=runtimetypeinfocontrols.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=runtimetypeinfocontrols.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=runtimetypeinfocontrols.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=runtimetypeinfocontrols.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=runtimetypeinfocontrols.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=runtimetypeinfocontrols.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=runtimetypeinfocontrols.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/sdf/Makefile lazarus.tx1/components/sdf/Makefile
+--- components/sdf/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/sdf/Makefile 2021-01-08 14:15:30.197904000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=sdflaz.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=sdflaz.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=sdflaz.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=sdflaz.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=sdflaz.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=sdflaz.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=sdflaz.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=sdflaz.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=sdflaz.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=sdflaz.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=sdflaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=sdflaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=sdflaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=sdflaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=sdflaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=sdflaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=sdflaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=sdflaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=sdflaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=sdflaz.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/sqldb/Makefile lazarus.tx1/components/sqldb/Makefile
+--- components/sqldb/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/sqldb/Makefile 2021-01-08 14:15:21.973933000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=sqldblaz.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=sqldblaz.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=sqldblaz.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=sqldblaz.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=sqldblaz.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=sqldblaz.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=sqldblaz.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=sqldblaz.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=sqldblaz.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=sqldblaz.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=sqldblaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=sqldblaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=sqldblaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=sqldblaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=sqldblaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=sqldblaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=sqldblaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=sqldblaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=sqldblaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=sqldblaz.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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) ../synedit/units/$(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
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/synedit/Makefile lazarus.tx1/components/synedit/Makefile
+--- components/synedit/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/synedit/Makefile 2021-01-08 14:15:32.791799000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=allsynedit.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=allsynedit.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=allsynedit.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=allsynedit.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=allsynedit.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=allsynedit.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=allsynedit.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=allsynedit.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=allsynedit.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=allsynedit.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=allsynedit.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=allsynedit.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=allsynedit.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=allsynedit.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=allsynedit.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=allsynedit.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=allsynedit.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=allsynedit.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=allsynedit.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=allsynedit.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -CR -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -CR -dgc $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1781,9 +1619,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,9 +1652,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +1685,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/synedit/design/Makefile lazarus.tx1/components/synedit/design/Makefile
+--- components/synedit/design/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/synedit/design/Makefile 2021-01-08 14:15:32.315198000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=allsyneditdsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=allsyneditdsgn.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=allsyneditdsgn.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=allsyneditdsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=allsyneditdsgn.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=allsyneditdsgn.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=allsyneditdsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=allsyneditdsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=allsyneditdsgn.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=allsyneditdsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=allsyneditdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=allsyneditdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=allsyneditdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=allsyneditdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=allsyneditdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=allsyneditdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=allsyneditdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=allsyneditdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=allsyneditdsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=allsyneditdsgn.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -vm5024,4055 -dLCL -dLCL$(LCL_PLATFORM) -dgc $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/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) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1781,9 +1619,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,9 +1652,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +1685,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/tachart/Makefile lazarus.tx1/components/tachart/Makefile
+--- components/tachart/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/tachart/Makefile 2021-01-08 14:15:24.379553000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,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),powerpc64-linux)
+ override TARGET_UNITS+=tachartlazaruspkg.pas
+ endif
+@@ -605,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
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=tachartlazaruspkg.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=tachartlazaruspkg.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=tachartlazaruspkg.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +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),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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -Xg -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(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) ../../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
+@@ -1478,9 +1352,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) ../../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) ../../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),powerpc64-linux)
+ override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1514,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) ../../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) ../../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) ../../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
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=numlib_fix editors ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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)
+@@ -1550,36 +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) ../../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) ../../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) ../../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) ../../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) ../../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) ../../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) ../../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) ../../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) ../../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) ../../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) ../../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
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/tdbf/Makefile lazarus.tx1/components/tdbf/Makefile
+--- components/tdbf/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/tdbf/Makefile 2021-01-08 14:15:38.596629000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=dbflaz.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=dbflaz.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=dbflaz.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=dbflaz.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=dbflaz.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=dbflaz.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=dbflaz.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=dbflaz.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=dbflaz.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=dbflaz.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=dbflaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=dbflaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=dbflaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=dbflaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=dbflaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=dbflaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=dbflaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=dbflaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=dbflaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=dbflaz.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/todolist/Makefile lazarus.tx1/components/todolist/Makefile
+--- components/todolist/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/todolist/Makefile 2021-01-08 14:15:26.803109000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=todolistlaz.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=todolistlaz.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=todolistlaz.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=todolistlaz.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=todolistlaz.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=todolistlaz.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=todolistlaz.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=todolistlaz.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=todolistlaz.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=todolistlaz.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=todolistlaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=todolistlaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=todolistlaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=todolistlaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=todolistlaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=todolistlaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=todolistlaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=todolistlaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=todolistlaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=todolistlaz.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../codetools/units/$(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
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/turbopower_ipro/Makefile lazarus.tx1/components/turbopower_ipro/Makefile
+--- components/turbopower_ipro/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/turbopower_ipro/Makefile 2021-01-08 14:15:20.996996000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=turbopoweripro.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=turbopoweripro.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=turbopoweripro.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=turbopoweripro.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=turbopoweripro.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=turbopoweripro.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=turbopoweripro.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=turbopoweripro.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=turbopoweripro.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=turbopoweripro.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=turbopoweripro.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=turbopoweripro.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=turbopoweripro.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=turbopoweripro.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=turbopoweripro.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=turbopoweripro.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=turbopoweripro.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=turbopoweripro.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=turbopoweripro.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=turbopoweripro.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnibq -vh- -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1781,9 +1619,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,9 +1652,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +1685,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/turbopower_ipro/design/Makefile lazarus.tx1/components/turbopower_ipro/design/Makefile
+--- components/turbopower_ipro/design/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ components/turbopower_ipro/design/Makefile 2021-01-08 14:15:21.486609000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=turbopoweriprodsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=turbopoweriprodsgn.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=turbopoweriprodsgn.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=turbopoweriprodsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=turbopoweriprodsgn.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=turbopoweriprodsgn.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=turbopoweriprodsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=turbopoweriprodsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=turbopoweriprodsgn.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=turbopoweriprodsgn.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=turbopoweriprodsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=turbopoweriprodsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=turbopoweriprodsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=turbopoweriprodsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=turbopoweriprodsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=turbopoweriprodsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=turbopoweriprodsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=turbopoweriprodsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=turbopoweriprodsgn.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=turbopoweriprodsgn.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scgi -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../../printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1781,9 +1619,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),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1817,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
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +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
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/components/virtualtreeview/Makefile lazarus.tx1/components/virtualtreeview/Makefile
+--- components/virtualtreeview/Makefile 2018-06-04 10:54:14.000000000 +0200
++++ components/virtualtreeview/Makefile 2021-01-08 14:15:28.751629000 +0100
+@@ -1,8 +1,8 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2018-04-29 rev 38866]
++# 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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -487,6 +485,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_UNITS+=virtualtreeview_package.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_UNITS+=virtualtreeview_package.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_UNITS+=virtualtreeview_package.pas
+ endif
+@@ -508,6 +509,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_UNITS+=virtualtreeview_package.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_UNITS+=virtualtreeview_package.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_UNITS+=virtualtreeview_package.pas
+ endif
+@@ -598,9 +602,15 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=virtualtreeview_package.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=virtualtreeview_package.pas
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=virtualtreeview_package.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_UNITS+=virtualtreeview_package.pas
++endif
+ ifeq ($(FULL_TARGET),wasm-wasm)
+ override TARGET_UNITS+=virtualtreeview_package.pas
+ endif
+@@ -742,6 +752,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ 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),x86_64-haiku)
++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),x86_64-netbsd)
+ 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
+@@ -763,6 +776,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ 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),x86_64-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),x86_64-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
+@@ -853,9 +869,15 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-freebsd)
++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-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-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),wasm-wasm)
+ 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
+@@ -997,6 +1019,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgim -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_OPTIONS+=-MObjFPC -Scgim -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgim -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1018,6 +1043,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgim -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_OPTIONS+=-MObjFPC -Scgim -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgim -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1108,9 +1136,15 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgim -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-MObjFPC -Scgim -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgim -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_OPTIONS+=-MObjFPC -Scgim -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),wasm-wasm)
+ override COMPILER_OPTIONS+=-MObjFPC -Scgim -O1 -g -gl -l -vewnhibq -dLCL -dLCL$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1252,6 +1286,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_INCLUDEDIR+=include/intf/$(LCL_PLATFORM) units include/intf
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_INCLUDEDIR+=include/intf/$(LCL_PLATFORM) units include/intf
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_INCLUDEDIR+=include/intf/$(LCL_PLATFORM) units include/intf
+ endif
+@@ -1273,6 +1310,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_INCLUDEDIR+=include/intf/$(LCL_PLATFORM) units include/intf
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_INCLUDEDIR+=include/intf/$(LCL_PLATFORM) units include/intf
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_INCLUDEDIR+=include/intf/$(LCL_PLATFORM) units include/intf
+ endif
+@@ -1363,9 +1403,15 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=include/intf/$(LCL_PLATFORM) units include/intf
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=include/intf/$(LCL_PLATFORM) units include/intf
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=include/intf/$(LCL_PLATFORM) units include/intf
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_INCLUDEDIR+=include/intf/$(LCL_PLATFORM) units include/intf
++endif
+ ifeq ($(FULL_TARGET),wasm-wasm)
+ override COMPILER_INCLUDEDIR+=include/intf/$(LCL_PLATFORM) units include/intf
+ endif
+@@ -1507,6 +1553,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITDIR+=units/$(LCL_PLATFORM) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITDIR+=units/$(LCL_PLATFORM) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITDIR+=units/$(LCL_PLATFORM) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1528,6 +1577,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITDIR+=units/$(LCL_PLATFORM) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITDIR+=units/$(LCL_PLATFORM) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITDIR+=units/$(LCL_PLATFORM) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1618,9 +1670,15 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=units/$(LCL_PLATFORM) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=units/$(LCL_PLATFORM) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=units/$(LCL_PLATFORM) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITDIR+=units/$(LCL_PLATFORM) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
++endif
+ ifeq ($(FULL_TARGET),wasm-wasm)
+ override COMPILER_UNITDIR+=units/$(LCL_PLATFORM) ../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/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) ../lclextensions/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM) ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ endif
+@@ -1762,6 +1820,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
+ endif
+@@ -1783,6 +1844,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
+ endif
+@@ -1873,9 +1937,15 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ 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
+ ifeq ($(FULL_TARGET),wasm-wasm)
+ override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
+ endif
+@@ -2256,6 +2326,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -2682,6 +2753,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2703,6 +2777,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2793,9 +2870,15 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),wasm-wasm)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -3312,6 +3395,7 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+diff -durp lazarus/ide/Makefile lazarus.tx1/ide/Makefile
+--- ide/Makefile 2018-11-11 22:09:04.000000000 +0100
++++ ide/Makefile 2021-01-08 14:15:16.207087000 +0100
+@@ -1,8 +1,8 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2018-04-29 rev 38866]
++# 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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -545,6 +543,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+ endif
+@@ -566,6 +567,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+ endif
+@@ -656,9 +660,15 @@ 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
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
++endif
+ ifeq ($(FULL_TARGET),wasm-wasm)
+ override TARGET_PROGRAMS+=lazarus startlazarus lazbuild
+ endif
+@@ -800,6 +810,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -821,6 +834,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -911,9 +927,15 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++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)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(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)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),wasm-wasm)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard ../designer/*$(OEXT)) $(wildcard ../designer/*$(PPUEXT)) $(wildcard ../debugger/*$(OEXT)) $(wildcard ../debugger/*$(PPUEXT)) $(wildcard ../converter/*$(OEXT)) $(wildcard ../converter/*$(PPUEXT)) $(wildcard ../packager/*$(OEXT)) $(wildcard ../packager/*$(PPUEXT)) $(wildcard ../*$(OEXT)) $(wildcard ../*$(PPUEXT)) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -1058,6 +1080,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_OPTIONS+=-gl -vbqewnhi -Sci -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_OPTIONS+=-gl -vbqewnhi -Sci -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_OPTIONS+=-gl -vbqewnhi -Sci -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1079,6 +1104,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_OPTIONS+=-gl -vbqewnhi -Sci -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_OPTIONS+=-gl -vbqewnhi -Sci -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_OPTIONS+=-gl -vbqewnhi -Sci -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1169,9 +1197,15 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-gl -vbqewnhi -Sci -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-gl -vbqewnhi -Sci -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-gl -vbqewnhi -Sci -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_OPTIONS+=-gl -vbqewnhi -Sci -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),wasm-wasm)
+ override COMPILER_OPTIONS+=-gl -vbqewnhi -Sci -dlcl$(LCL_PLATFORM) $(DBG_OPTIONS)
+ endif
+@@ -1313,6 +1347,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
+ endif
+@@ -1334,6 +1371,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
+ endif
+@@ -1424,9 +1464,15 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
++endif
+ ifeq ($(FULL_TARGET),wasm-wasm)
+ override COMPILER_INCLUDEDIR+=include include/$(OS_TARGET) ../images
+ endif
+@@ -1568,6 +1614,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITDIR+=../designer ../debugger ../debugger/frames ../converter ../packager ../packager/frames ../components/custom $(HEAPTRC_UNIT_PATH) frames .
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITDIR+=../designer ../debugger ../debugger/frames ../converter ../packager ../packager/frames ../components/custom $(HEAPTRC_UNIT_PATH) frames .
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITDIR+=../designer ../debugger ../debugger/frames ../converter ../packager ../packager/frames ../components/custom $(HEAPTRC_UNIT_PATH) frames .
+ endif
+@@ -1589,6 +1638,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITDIR+=../designer ../debugger ../debugger/frames ../converter ../packager ../packager/frames ../components/custom $(HEAPTRC_UNIT_PATH) frames .
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITDIR+=../designer ../debugger ../debugger/frames ../converter ../packager ../packager/frames ../components/custom $(HEAPTRC_UNIT_PATH) frames .
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITDIR+=../designer ../debugger ../debugger/frames ../converter ../packager ../packager/frames ../components/custom $(HEAPTRC_UNIT_PATH) frames .
+ endif
+@@ -1679,9 +1731,15 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../designer ../debugger ../debugger/frames ../converter ../packager ../packager/frames ../components/custom $(HEAPTRC_UNIT_PATH) frames .
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=../designer ../debugger ../debugger/frames ../converter ../packager ../packager/frames ../components/custom $(HEAPTRC_UNIT_PATH) frames .
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../designer ../debugger ../debugger/frames ../converter ../packager ../packager/frames ../components/custom $(HEAPTRC_UNIT_PATH) frames .
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITDIR+=../designer ../debugger ../debugger/frames ../converter ../packager ../packager/frames ../components/custom $(HEAPTRC_UNIT_PATH) frames .
++endif
+ ifeq ($(FULL_TARGET),wasm-wasm)
+ override COMPILER_UNITDIR+=../designer ../debugger ../debugger/frames ../converter ../packager ../packager/frames ../components/custom $(HEAPTRC_UNIT_PATH) frames .
+ endif
+@@ -1823,6 +1881,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_TARGETDIR+=..
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_TARGETDIR+=..
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_TARGETDIR+=..
+ endif
+@@ -1844,6 +1905,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_TARGETDIR+=..
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_TARGETDIR+=..
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_TARGETDIR+=..
+ endif
+@@ -1934,9 +1998,15 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_TARGETDIR+=..
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_TARGETDIR+=..
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_TARGETDIR+=..
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_TARGETDIR+=..
++endif
+ ifeq ($(FULL_TARGET),wasm-wasm)
+ override COMPILER_TARGETDIR+=..
+ endif
+@@ -2078,6 +2148,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -2099,6 +2172,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -2189,9 +2265,15 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),wasm-wasm)
+ override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -2603,6 +2685,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -3299,6 +3382,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_REGEXPR=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++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),x86_64-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+@@ -3362,6 +3454,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_REGEXPR=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++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),x86_64-aros)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+@@ -3632,6 +3733,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
+@@ -3641,6 +3751,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_REGEXPR=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++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),wasm-wasm)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+@@ -4413,6 +4532,7 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+diff -durp lazarus/lcl/Makefile lazarus.tx1/lcl/Makefile
+--- lcl/Makefile 2017-01-15 19:01:52.000000000 +0100
++++ lcl/Makefile 2021-01-08 14:15:41.804788000 +0100
+@@ -1,11 +1,11 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805]
++# 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-qnx 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-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android wasm-wasm sparc64-linux
+ BSDs = freebsd netbsd openbsd darwin dragonfly
+ UNIXs = linux $(BSDs) solaris qnx haiku aix
+-LIMIT83fs = go32v2 os2 emx watcom msdos win16
++LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
+ OSNeedsComspecToRunBatch = go32v2 watcom
+ FORCE:
+ .PHONY: FORCE
+@@ -231,7 +231,7 @@ endif
+ export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ ifdef FPCDIR
+ override FPCDIR:=$(subst \,/,$(FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ else
+@@ -240,7 +240,7 @@ endif
+ ifdef DEFAULT_FPCDIR
+ ifeq ($(FPCDIR),wrong)
+ override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ endif
+@@ -254,11 +254,11 @@ endif
+ else
+ override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(BASEDIR)
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=c:/pp
+ endif
+ endif
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -305,7 +303,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ ifeq ($(UNITSDIR),)
+ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+ endif
+-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
++PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+ ifndef FPCFPMAKE
+ ifdef CROSSCOMPILE
+ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+@@ -374,9 +372,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_DIRS+=interfaces
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_DIRS+=interfaces
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_DIRS+=interfaces
+ endif
+@@ -422,9 +417,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_DIRS+=interfaces
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_DIRS+=interfaces
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_DIRS+=interfaces
+ endif
+@@ -434,10 +426,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_DIRS+=interfaces
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_DIRS+=interfaces
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_DIRS+=interfaces
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -488,6 +480,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_DIRS+=interfaces
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_DIRS+=interfaces
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_DIRS+=interfaces
+ endif
+@@ -509,6 +504,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_DIRS+=interfaces
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_DIRS+=interfaces
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_DIRS+=interfaces
+ endif
+@@ -518,6 +516,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_DIRS+=interfaces
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_DIRS+=interfaces
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_DIRS+=interfaces
+ endif
+@@ -596,9 +597,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_DIRS+=interfaces
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_DIRS+=interfaces
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_DIRS+=interfaces
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_DIRS+=interfaces
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_DIRS+=interfaces
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_DIRS+=interfaces
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override TARGET_UNITS+=alllclunits
+ endif
+@@ -626,9 +639,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_UNITS+=alllclunits
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_UNITS+=alllclunits
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_UNITS+=alllclunits
+ endif
+@@ -674,9 +684,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_UNITS+=alllclunits
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_UNITS+=alllclunits
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_UNITS+=alllclunits
+ endif
+@@ -686,10 +693,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_UNITS+=alllclunits
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_UNITS+=alllclunits
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_UNITS+=alllclunits
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -740,6 +747,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_UNITS+=alllclunits
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_UNITS+=alllclunits
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_UNITS+=alllclunits
+ endif
+@@ -761,6 +771,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_UNITS+=alllclunits
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_UNITS+=alllclunits
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_UNITS+=alllclunits
+ endif
+@@ -770,6 +783,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_UNITS+=alllclunits
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_UNITS+=alllclunits
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_UNITS+=alllclunits
+ endif
+@@ -848,9 +864,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=alllclunits
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=alllclunits
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=alllclunits
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_UNITS+=alllclunits
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_UNITS+=alllclunits
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_UNITS+=alllclunits
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+ endif
+@@ -878,9 +906,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+ endif
+@@ -926,9 +951,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+ endif
+@@ -938,10 +960,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -992,6 +1014,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+ endif
+@@ -1013,6 +1038,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+ endif
+@@ -1022,6 +1050,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+ endif
+@@ -1100,9 +1131,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_IMPLICITUNITS+=actnlist arrow avglvltree buttons calendar chart checklst clipbrd clistbox comctrls controls dbactns dbctrls dbgrids dialogs dynamicarray dynhasharray editbtn extctrls extdlgs extendedstrings extgraphics filectrl forms fpcadds graphics graphmath graphtype grids imglist inipropstorage interfacebase lazlinkedlist lclintf lclmemmanager lclproc lclrescache lclstrconsts lcltype lclunicodedata lconvencoding lmessages lresources maskedit menus pairsplitter popupnotifier postscriptprinter printers propertystorage spin stdactns stdctrls stringhashlist textstrings toolwin utrace xmlpropstorage
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override TARGET_RSTS+=lclstrconsts
+ endif
+@@ -1130,9 +1173,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_RSTS+=lclstrconsts
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_RSTS+=lclstrconsts
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_RSTS+=lclstrconsts
+ endif
+@@ -1178,9 +1218,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_RSTS+=lclstrconsts
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_RSTS+=lclstrconsts
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_RSTS+=lclstrconsts
+ endif
+@@ -1190,10 +1227,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_RSTS+=lclstrconsts
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_RSTS+=lclstrconsts
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_RSTS+=lclstrconsts
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1244,6 +1281,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_RSTS+=lclstrconsts
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_RSTS+=lclstrconsts
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_RSTS+=lclstrconsts
+ endif
+@@ -1265,6 +1305,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_RSTS+=lclstrconsts
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_RSTS+=lclstrconsts
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_RSTS+=lclstrconsts
+ endif
+@@ -1274,6 +1317,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_RSTS+=lclstrconsts
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_RSTS+=lclstrconsts
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_RSTS+=lclstrconsts
+ endif
+@@ -1352,9 +1398,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=lclstrconsts
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=lclstrconsts
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=lclstrconsts
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_RSTS+=lclstrconsts
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_RSTS+=lclstrconsts
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_RSTS+=lclstrconsts
++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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -1382,9 +1440,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ 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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ 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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -1430,9 +1485,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ 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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -1442,10 +1494,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ 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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ 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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ 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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1496,6 +1548,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ 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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ 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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -1517,6 +1572,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ 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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),x86_64-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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),x86_64-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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -1526,6 +1584,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ 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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -1604,9 +1665,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++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 ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard widgetset/*$(OEXT)) $(wildcard widgetset/*$(PPUEXT)) $(wildcard widgetset/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
+ endif
+@@ -1634,9 +1707,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
+ endif
+@@ -1682,9 +1752,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
+ endif
+@@ -1694,10 +1761,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1748,6 +1815,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
+ endif
+@@ -1769,6 +1839,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
+ endif
+@@ -1778,6 +1851,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
+ endif
+@@ -1856,9 +1932,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_OPTIONS+=-gl -Sic $(LCL_DISABLE_CHECKS) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_INCLUDEDIR+=include
+ endif
+@@ -1886,9 +1974,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_INCLUDEDIR+=include
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_INCLUDEDIR+=include
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_INCLUDEDIR+=include
+ endif
+@@ -1934,9 +2019,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_INCLUDEDIR+=include
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_INCLUDEDIR+=include
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_INCLUDEDIR+=include
+ endif
+@@ -1946,10 +2028,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_INCLUDEDIR+=include
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_INCLUDEDIR+=include
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_INCLUDEDIR+=include
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -2000,6 +2082,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_INCLUDEDIR+=include
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_INCLUDEDIR+=include
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_INCLUDEDIR+=include
+ endif
+@@ -2021,6 +2106,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_INCLUDEDIR+=include
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_INCLUDEDIR+=include
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_INCLUDEDIR+=include
+ endif
+@@ -2030,6 +2118,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_INCLUDEDIR+=include
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_INCLUDEDIR+=include
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_INCLUDEDIR+=include
+ endif
+@@ -2108,9 +2199,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=include
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=include
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=include
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_INCLUDEDIR+=include
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_INCLUDEDIR+=include
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_INCLUDEDIR+=include
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
+ endif
+@@ -2138,9 +2241,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
+ endif
+@@ -2186,9 +2286,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
+ endif
+@@ -2198,10 +2295,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -2252,6 +2349,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
+ endif
+@@ -2273,6 +2373,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
+ endif
+@@ -2282,6 +2385,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
+ endif
+@@ -2360,9 +2466,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITDIR+=../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . $(NONWIN32) forms widgetset
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -2390,9 +2508,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -2438,9 +2553,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -2450,10 +2562,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -2504,6 +2616,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -2525,6 +2640,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -2534,6 +2652,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -2612,9 +2733,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)-$(OS_TARGET)
++endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2989,6 +3122,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -3307,9 +3441,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -3355,9 +3486,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -3367,10 +3495,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -3421,6 +3549,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -3442,6 +3573,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -3451,6 +3585,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -3529,9 +3666,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++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),)
+@@ -3830,7 +3979,11 @@ ifdef INSTALL_BUILDUNIT
+ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+ endif
+ ifdef INSTALLPPUFILES
++ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
+ 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)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
++endif
+ ifneq ($(UNITTARGETDIRPREFIX),)
+ override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+ override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+@@ -4018,7 +4171,7 @@ ifdef LIB_NAME
+ -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+ endif
+ -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
++ -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ fpc_cleanall: $(CLEANTARGET)
+ ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+@@ -4038,13 +4191,14 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+ endif
+ -$(DELTREE) *$(SMARTEXT)
+ -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *_ppas$(BATCHEXT)
++ -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ ifdef AOUTEXT
+ -$(DEL) *$(AOUTEXT)
+ endif
+@@ -4190,9 +4344,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ TARGET_DIRS_INTERFACES=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-TARGET_DIRS_INTERFACES=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ TARGET_DIRS_INTERFACES=1
+ endif
+@@ -4238,9 +4389,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ TARGET_DIRS_INTERFACES=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-TARGET_DIRS_INTERFACES=1
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ TARGET_DIRS_INTERFACES=1
+ endif
+@@ -4250,10 +4398,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ TARGET_DIRS_INTERFACES=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ TARGET_DIRS_INTERFACES=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ TARGET_DIRS_INTERFACES=1
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -4304,6 +4452,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ TARGET_DIRS_INTERFACES=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++TARGET_DIRS_INTERFACES=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ TARGET_DIRS_INTERFACES=1
+ endif
+@@ -4325,6 +4476,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ TARGET_DIRS_INTERFACES=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++TARGET_DIRS_INTERFACES=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ TARGET_DIRS_INTERFACES=1
+ endif
+@@ -4334,6 +4488,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ TARGET_DIRS_INTERFACES=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++TARGET_DIRS_INTERFACES=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ TARGET_DIRS_INTERFACES=1
+ endif
+@@ -4412,7 +4569,19 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ TARGET_DIRS_INTERFACES=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++TARGET_DIRS_INTERFACES=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
++TARGET_DIRS_INTERFACES=1
++endif
++ifeq ($(FULL_TARGET),aarch64-android)
++TARGET_DIRS_INTERFACES=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++TARGET_DIRS_INTERFACES=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
+ TARGET_DIRS_INTERFACES=1
+ endif
+ ifdef TARGET_DIRS_INTERFACES
+diff -durp lazarus/lcl/interfaces/Makefile lazarus.tx1/lcl/interfaces/Makefile
+--- lcl/interfaces/Makefile 2017-01-15 19:11:58.000000000 +0100
++++ lcl/interfaces/Makefile 2021-01-08 14:15:53.691071000 +0100
+@@ -1,11 +1,11 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805]
++# 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-qnx 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-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android wasm-wasm sparc64-linux
+ BSDs = freebsd netbsd openbsd darwin dragonfly
+ UNIXs = linux $(BSDs) solaris qnx haiku aix
+-LIMIT83fs = go32v2 os2 emx watcom msdos win16
++LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
+ OSNeedsComspecToRunBatch = go32v2 watcom
+ FORCE:
+ .PHONY: FORCE
+@@ -231,7 +231,7 @@ endif
+ export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ ifdef FPCDIR
+ override FPCDIR:=$(subst \,/,$(FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ else
+@@ -240,7 +240,7 @@ endif
+ ifdef DEFAULT_FPCDIR
+ ifeq ($(FPCDIR),wrong)
+ override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ endif
+@@ -254,11 +254,11 @@ endif
+ else
+ override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(BASEDIR)
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=c:/pp
+ endif
+ endif
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -305,7 +303,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ ifeq ($(UNITSDIR),)
+ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+ endif
+-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
++PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+ ifndef FPCFPMAKE
+ ifdef CROSSCOMPILE
+ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+@@ -380,9 +378,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
+ endif
+@@ -428,9 +423,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
+ endif
+@@ -440,10 +432,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -494,6 +486,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
+ endif
+@@ -515,6 +510,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
+ endif
+@@ -524,6 +522,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
+ endif
+@@ -602,9 +603,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui
++endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -979,6 +992,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -1296,9 +1310,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -1344,9 +1355,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -1356,10 +1364,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1410,6 +1418,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -1431,6 +1442,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -1440,6 +1454,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -1518,9 +1535,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++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),)
+@@ -1736,7 +1765,11 @@ ifdef INSTALL_BUILDUNIT
+ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+ endif
+ ifdef INSTALLPPUFILES
++ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
+ 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)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
++endif
+ ifneq ($(UNITTARGETDIRPREFIX),)
+ override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+ override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+@@ -1838,7 +1871,7 @@ ifdef LIB_NAME
+ -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+ endif
+ -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
++ -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ fpc_cleanall: $(CLEANTARGET)
+ ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+@@ -1858,13 +1891,14 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+ endif
+ -$(DELTREE) *$(SMARTEXT)
+ -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *_ppas$(BATCHEXT)
++ -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ ifdef AOUTEXT
+ -$(DEL) *$(AOUTEXT)
+ endif
+@@ -2118,21 +2152,6 @@ TARGET_DIRS_COCOA=1
+ TARGET_DIRS_CUSTOMDRAWN=1
+ TARGET_DIRS_MUI=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-TARGET_DIRS_GTK=1
+-TARGET_DIRS_GTK2=1
+-TARGET_DIRS_GTK3=1
+-TARGET_DIRS_WIN32=1
+-TARGET_DIRS_WINCE=1
+-TARGET_DIRS_QT=1
+-TARGET_DIRS_QT5=1
+-TARGET_DIRS_CARBON=1
+-TARGET_DIRS_FPGUI=1
+-TARGET_DIRS_NOGUI=1
+-TARGET_DIRS_COCOA=1
+-TARGET_DIRS_CUSTOMDRAWN=1
+-TARGET_DIRS_MUI=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ TARGET_DIRS_GTK=1
+ TARGET_DIRS_GTK2=1
+@@ -2358,21 +2377,6 @@ TARGET_DIRS_COCOA=1
+ TARGET_DIRS_CUSTOMDRAWN=1
+ TARGET_DIRS_MUI=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-TARGET_DIRS_GTK=1
+-TARGET_DIRS_GTK2=1
+-TARGET_DIRS_GTK3=1
+-TARGET_DIRS_WIN32=1
+-TARGET_DIRS_WINCE=1
+-TARGET_DIRS_QT=1
+-TARGET_DIRS_QT5=1
+-TARGET_DIRS_CARBON=1
+-TARGET_DIRS_FPGUI=1
+-TARGET_DIRS_NOGUI=1
+-TARGET_DIRS_COCOA=1
+-TARGET_DIRS_CUSTOMDRAWN=1
+-TARGET_DIRS_MUI=1
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ TARGET_DIRS_GTK=1
+ TARGET_DIRS_GTK2=1
+@@ -2418,7 +2422,7 @@ TARGET_DIRS_COCOA=1
+ TARGET_DIRS_CUSTOMDRAWN=1
+ TARGET_DIRS_MUI=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ TARGET_DIRS_GTK=1
+ TARGET_DIRS_GTK2=1
+ TARGET_DIRS_GTK3=1
+@@ -2433,7 +2437,7 @@ TARGET_DIRS_COCOA=1
+ TARGET_DIRS_CUSTOMDRAWN=1
+ TARGET_DIRS_MUI=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ TARGET_DIRS_GTK=1
+ TARGET_DIRS_GTK2=1
+ TARGET_DIRS_GTK3=1
+@@ -2688,6 +2692,21 @@ TARGET_DIRS_COCOA=1
+ TARGET_DIRS_CUSTOMDRAWN=1
+ TARGET_DIRS_MUI=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++TARGET_DIRS_GTK=1
++TARGET_DIRS_GTK2=1
++TARGET_DIRS_GTK3=1
++TARGET_DIRS_WIN32=1
++TARGET_DIRS_WINCE=1
++TARGET_DIRS_QT=1
++TARGET_DIRS_QT5=1
++TARGET_DIRS_CARBON=1
++TARGET_DIRS_FPGUI=1
++TARGET_DIRS_NOGUI=1
++TARGET_DIRS_COCOA=1
++TARGET_DIRS_CUSTOMDRAWN=1
++TARGET_DIRS_MUI=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ TARGET_DIRS_GTK=1
+ TARGET_DIRS_GTK2=1
+@@ -2793,6 +2812,21 @@ TARGET_DIRS_COCOA=1
+ TARGET_DIRS_CUSTOMDRAWN=1
+ TARGET_DIRS_MUI=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++TARGET_DIRS_GTK=1
++TARGET_DIRS_GTK2=1
++TARGET_DIRS_GTK3=1
++TARGET_DIRS_WIN32=1
++TARGET_DIRS_WINCE=1
++TARGET_DIRS_QT=1
++TARGET_DIRS_QT5=1
++TARGET_DIRS_CARBON=1
++TARGET_DIRS_FPGUI=1
++TARGET_DIRS_NOGUI=1
++TARGET_DIRS_COCOA=1
++TARGET_DIRS_CUSTOMDRAWN=1
++TARGET_DIRS_MUI=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ TARGET_DIRS_GTK=1
+ TARGET_DIRS_GTK2=1
+@@ -2838,6 +2872,21 @@ TARGET_DIRS_COCOA=1
+ TARGET_DIRS_CUSTOMDRAWN=1
+ TARGET_DIRS_MUI=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++TARGET_DIRS_GTK=1
++TARGET_DIRS_GTK2=1
++TARGET_DIRS_GTK3=1
++TARGET_DIRS_WIN32=1
++TARGET_DIRS_WINCE=1
++TARGET_DIRS_QT=1
++TARGET_DIRS_QT5=1
++TARGET_DIRS_CARBON=1
++TARGET_DIRS_FPGUI=1
++TARGET_DIRS_NOGUI=1
++TARGET_DIRS_COCOA=1
++TARGET_DIRS_CUSTOMDRAWN=1
++TARGET_DIRS_MUI=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ TARGET_DIRS_GTK=1
+ TARGET_DIRS_GTK2=1
+@@ -3228,7 +3277,67 @@ TARGET_DIRS_COCOA=1
+ TARGET_DIRS_CUSTOMDRAWN=1
+ TARGET_DIRS_MUI=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++TARGET_DIRS_GTK=1
++TARGET_DIRS_GTK2=1
++TARGET_DIRS_GTK3=1
++TARGET_DIRS_WIN32=1
++TARGET_DIRS_WINCE=1
++TARGET_DIRS_QT=1
++TARGET_DIRS_QT5=1
++TARGET_DIRS_CARBON=1
++TARGET_DIRS_FPGUI=1
++TARGET_DIRS_NOGUI=1
++TARGET_DIRS_COCOA=1
++TARGET_DIRS_CUSTOMDRAWN=1
++TARGET_DIRS_MUI=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
++TARGET_DIRS_GTK=1
++TARGET_DIRS_GTK2=1
++TARGET_DIRS_GTK3=1
++TARGET_DIRS_WIN32=1
++TARGET_DIRS_WINCE=1
++TARGET_DIRS_QT=1
++TARGET_DIRS_QT5=1
++TARGET_DIRS_CARBON=1
++TARGET_DIRS_FPGUI=1
++TARGET_DIRS_NOGUI=1
++TARGET_DIRS_COCOA=1
++TARGET_DIRS_CUSTOMDRAWN=1
++TARGET_DIRS_MUI=1
++endif
++ifeq ($(FULL_TARGET),aarch64-android)
++TARGET_DIRS_GTK=1
++TARGET_DIRS_GTK2=1
++TARGET_DIRS_GTK3=1
++TARGET_DIRS_WIN32=1
++TARGET_DIRS_WINCE=1
++TARGET_DIRS_QT=1
++TARGET_DIRS_QT5=1
++TARGET_DIRS_CARBON=1
++TARGET_DIRS_FPGUI=1
++TARGET_DIRS_NOGUI=1
++TARGET_DIRS_COCOA=1
++TARGET_DIRS_CUSTOMDRAWN=1
++TARGET_DIRS_MUI=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++TARGET_DIRS_GTK=1
++TARGET_DIRS_GTK2=1
++TARGET_DIRS_GTK3=1
++TARGET_DIRS_WIN32=1
++TARGET_DIRS_WINCE=1
++TARGET_DIRS_QT=1
++TARGET_DIRS_QT5=1
++TARGET_DIRS_CARBON=1
++TARGET_DIRS_FPGUI=1
++TARGET_DIRS_NOGUI=1
++TARGET_DIRS_COCOA=1
++TARGET_DIRS_CUSTOMDRAWN=1
++TARGET_DIRS_MUI=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
+ TARGET_DIRS_GTK=1
+ TARGET_DIRS_GTK2=1
+ TARGET_DIRS_GTK3=1
+diff -durp lazarus/lcl/interfaces/carbon/Makefile lazarus.tx1/lcl/interfaces/carbon/Makefile
+--- lcl/interfaces/carbon/Makefile 2016-03-20 14:05:51.000000000 +0100
++++ lcl/interfaces/carbon/Makefile 2021-01-08 14:16:00.350149000 +0100
+@@ -1,11 +1,11 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-09-05 rev 31523]
++# 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-qnx 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-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android 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-msdos i8086-win16 aarch64-linux aarch64-darwin
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android wasm-wasm sparc64-linux
+ BSDs = freebsd netbsd openbsd darwin dragonfly
+ UNIXs = linux $(BSDs) solaris qnx haiku aix
+-LIMIT83fs = go32v2 os2 emx watcom msdos win16
++LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
+ OSNeedsComspecToRunBatch = go32v2 watcom
+ FORCE:
+ .PHONY: FORCE
+@@ -231,7 +231,7 @@ endif
+ export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ ifdef FPCDIR
+ override FPCDIR:=$(subst \,/,$(FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ else
+@@ -240,7 +240,7 @@ endif
+ ifdef DEFAULT_FPCDIR
+ ifeq ($(FPCDIR),wrong)
+ override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ endif
+@@ -254,11 +254,11 @@ endif
+ else
+ override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(BASEDIR)
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=c:/pp
+ endif
+ endif
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -305,7 +303,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ ifeq ($(UNITSDIR),)
+ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+ endif
+-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
++PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+ ifndef FPCFPMAKE
+ ifdef CROSSCOMPILE
+ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+@@ -359,9 +357,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -407,9 +402,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -419,10 +411,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -473,6 +465,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -494,6 +489,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -503,6 +501,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -527,6 +528,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -566,6 +570,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -575,9 +582,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_UNITS+=lcl.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
+@@ -605,9 +624,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ 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-qnx)
+-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-netware)
+ 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
+@@ -653,9 +669,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-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),m68k-freebsd)
+-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-netbsd)
+ 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
+@@ -665,10 +678,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ 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-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ 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-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ 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-embedded)
+@@ -719,6 +732,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ 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),x86_64-haiku)
++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),x86_64-netbsd)
+ 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
+@@ -740,6 +756,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ 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),x86_64-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),x86_64-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
+@@ -749,6 +768,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),arm-netbsd)
++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-palmos)
+ 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
+@@ -773,6 +795,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),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),powerpc64-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
+@@ -812,6 +837,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-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),i8086-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),i8086-msdos)
+ 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
+@@ -821,9 +849,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-freebsd)
++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-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-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),wasm-wasm)
++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),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),i386-linux)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
+@@ -851,9 +891,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_OPTIONS+=-gw -gl -dcarbon
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
+@@ -899,9 +936,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_OPTIONS+=-gw -gl -dcarbon
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
+@@ -911,10 +945,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -965,6 +999,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_OPTIONS+=-gw -gl -dcarbon
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
+@@ -986,6 +1023,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_OPTIONS+=-gw -gl -dcarbon
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
+@@ -995,6 +1035,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_OPTIONS+=-gw -gl -dcarbon
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
+@@ -1019,6 +1062,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_OPTIONS+=-gw -gl -dcarbon
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
+@@ -1058,6 +1104,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_OPTIONS+=-gw -gl -dcarbon
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
+@@ -1067,9 +1116,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-gw -gl -dcarbon
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-gw -gl -dcarbon
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_OPTIONS+=-gw -gl -dcarbon
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_OPTIONS+=-gw -gl -dcarbon
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_OPTIONS+=-gw -gl -dcarbon
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
+@@ -1097,9 +1158,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
+@@ -1145,9 +1203,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
+@@ -1157,10 +1212,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1211,6 +1266,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
+@@ -1232,6 +1290,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
+@@ -1241,6 +1302,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
+@@ -1265,6 +1329,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
+@@ -1304,6 +1371,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
+@@ -1313,9 +1383,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_INCLUDEDIR+=objc pascocoa/appkit pascocoa/foundation
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
+@@ -1343,9 +1425,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
+@@ -1391,9 +1470,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
+@@ -1403,10 +1479,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1457,6 +1533,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
+@@ -1478,6 +1557,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
+@@ -1487,6 +1569,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
+@@ -1511,6 +1596,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
+@@ -1550,6 +1638,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
+@@ -1559,9 +1650,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) objc pascocoa/appkit pascocoa/foundation .. .
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
+@@ -1589,9 +1692,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
+@@ -1637,9 +1737,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
+@@ -1649,10 +1746,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1703,6 +1800,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
+@@ -1724,6 +1824,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
+@@ -1733,6 +1836,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
+@@ -1757,6 +1863,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
+@@ -1796,6 +1905,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
+@@ -1805,9 +1917,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/carbon
++endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2182,6 +2306,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -2204,7 +2329,12 @@ STATICLIBEXT=.a
+ SHORTSUFFIX=d16
+ endif
+ ifeq ($(OS_TARGET),embedded)
++ifeq ($(CPU_TARGET),i8086)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++else
+ EXEEXT=.bin
++endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2495,9 +2625,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2543,9 +2670,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2555,10 +2679,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -2609,6 +2733,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2630,6 +2757,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2639,6 +2769,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2663,6 +2796,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2702,6 +2838,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2711,9 +2850,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++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),)
+@@ -3012,7 +3163,11 @@ ifdef INSTALL_BUILDUNIT
+ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+ endif
+ ifdef INSTALLPPUFILES
++ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
+ 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)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
++endif
+ ifneq ($(UNITTARGETDIRPREFIX),)
+ override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+ override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+@@ -3114,7 +3269,7 @@ ifdef LIB_NAME
+ -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+ endif
+ -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
++ -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ fpc_cleanall: $(CLEANTARGET)
+ ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+@@ -3134,13 +3289,14 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+ endif
+ -$(DELTREE) *$(SMARTEXT)
+ -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *_ppas$(BATCHEXT)
++ -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ ifdef AOUTEXT
+ -$(DEL) *$(AOUTEXT)
+ endif
+diff -durp lazarus/lcl/interfaces/cocoa/Makefile lazarus.tx1/lcl/interfaces/cocoa/Makefile
+--- lcl/interfaces/cocoa/Makefile 2016-03-20 14:05:51.000000000 +0100
++++ lcl/interfaces/cocoa/Makefile 2021-01-08 14:16:00.827320000 +0100
+@@ -1,11 +1,11 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-09-05 rev 31523]
++# 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-qnx 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-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android 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-msdos i8086-win16 aarch64-linux aarch64-darwin
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android wasm-wasm sparc64-linux
+ BSDs = freebsd netbsd openbsd darwin dragonfly
+ UNIXs = linux $(BSDs) solaris qnx haiku aix
+-LIMIT83fs = go32v2 os2 emx watcom msdos win16
++LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
+ OSNeedsComspecToRunBatch = go32v2 watcom
+ FORCE:
+ .PHONY: FORCE
+@@ -231,7 +231,7 @@ endif
+ export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ ifdef FPCDIR
+ override FPCDIR:=$(subst \,/,$(FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ else
+@@ -240,7 +240,7 @@ endif
+ ifdef DEFAULT_FPCDIR
+ ifeq ($(FPCDIR),wrong)
+ override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ endif
+@@ -254,11 +254,11 @@ endif
+ else
+ override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(BASEDIR)
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=c:/pp
+ endif
+ endif
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -305,7 +303,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ ifeq ($(UNITSDIR),)
+ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+ endif
+-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
++PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+ ifndef FPCFPMAKE
+ ifdef CROSSCOMPILE
+ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+@@ -359,9 +357,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -407,9 +402,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -419,10 +411,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -473,6 +465,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -494,6 +489,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -503,6 +501,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -527,6 +528,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -566,6 +570,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -575,9 +582,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_UNITS+=lcl.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
+@@ -605,9 +624,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ 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-qnx)
+-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-netware)
+ 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
+@@ -653,9 +669,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-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),m68k-freebsd)
+-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-netbsd)
+ 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
+@@ -665,10 +678,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ 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-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ 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-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ 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-embedded)
+@@ -719,6 +732,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ 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),x86_64-haiku)
++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),x86_64-netbsd)
+ 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
+@@ -740,6 +756,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ 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),x86_64-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),x86_64-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
+@@ -749,6 +768,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),arm-netbsd)
++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-palmos)
+ 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
+@@ -773,6 +795,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),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),powerpc64-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
+@@ -812,6 +837,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-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),i8086-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),i8086-msdos)
+ 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
+@@ -821,9 +849,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-freebsd)
++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-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-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),wasm-wasm)
++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),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),i386-linux)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
+@@ -851,9 +891,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_OPTIONS+=-gw -gl -dcocoa
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
+@@ -899,9 +936,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_OPTIONS+=-gw -gl -dcocoa
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
+@@ -911,10 +945,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -965,6 +999,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_OPTIONS+=-gw -gl -dcocoa
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
+@@ -986,6 +1023,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_OPTIONS+=-gw -gl -dcocoa
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
+@@ -995,6 +1035,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_OPTIONS+=-gw -gl -dcocoa
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
+@@ -1019,6 +1062,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_OPTIONS+=-gw -gl -dcocoa
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
+@@ -1058,6 +1104,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_OPTIONS+=-gw -gl -dcocoa
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
+@@ -1067,9 +1116,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-gw -gl -dcocoa
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-gw -gl -dcocoa
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_OPTIONS+=-gw -gl -dcocoa
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_OPTIONS+=-gw -gl -dcocoa
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_OPTIONS+=-gw -gl -dcocoa
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1097,9 +1158,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1145,9 +1203,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1157,10 +1212,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1211,6 +1266,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1232,6 +1290,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1241,6 +1302,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1265,6 +1329,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1304,6 +1371,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1313,9 +1383,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
+@@ -1343,9 +1425,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
+@@ -1391,9 +1470,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
+@@ -1403,10 +1479,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1457,6 +1533,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
+@@ -1478,6 +1557,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
+@@ -1487,6 +1569,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
+@@ -1511,6 +1596,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
+@@ -1550,6 +1638,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
+@@ -1559,9 +1650,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/cocoa
++endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -1936,6 +2039,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -1958,7 +2062,12 @@ STATICLIBEXT=.a
+ SHORTSUFFIX=d16
+ endif
+ ifeq ($(OS_TARGET),embedded)
++ifeq ($(CPU_TARGET),i8086)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++else
+ EXEEXT=.bin
++endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2249,9 +2358,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2297,9 +2403,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2309,10 +2412,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -2363,6 +2466,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2384,6 +2490,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2393,6 +2502,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2417,6 +2529,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2456,6 +2571,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2465,9 +2583,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++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),)
+@@ -2766,7 +2896,11 @@ ifdef INSTALL_BUILDUNIT
+ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+ endif
+ ifdef INSTALLPPUFILES
++ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
+ 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)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
++endif
+ ifneq ($(UNITTARGETDIRPREFIX),)
+ override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+ override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+@@ -2868,7 +3002,7 @@ ifdef LIB_NAME
+ -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+ endif
+ -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
++ -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ fpc_cleanall: $(CLEANTARGET)
+ ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+@@ -2888,13 +3022,14 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+ endif
+ -$(DELTREE) *$(SMARTEXT)
+ -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *_ppas$(BATCHEXT)
++ -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ ifdef AOUTEXT
+ -$(DEL) *$(AOUTEXT)
+ endif
+diff -durp lazarus/lcl/interfaces/customdrawn/Makefile lazarus.tx1/lcl/interfaces/customdrawn/Makefile
+--- lcl/interfaces/customdrawn/Makefile 2016-03-20 14:05:51.000000000 +0100
++++ lcl/interfaces/customdrawn/Makefile 2021-01-08 14:16:02.736170000 +0100
+@@ -1,11 +1,11 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-09-05 rev 31523]
++# 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-qnx 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-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android 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-msdos i8086-win16 aarch64-linux aarch64-darwin
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android wasm-wasm sparc64-linux
+ BSDs = freebsd netbsd openbsd darwin dragonfly
+ UNIXs = linux $(BSDs) solaris qnx haiku aix
+-LIMIT83fs = go32v2 os2 emx watcom msdos win16
++LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
+ OSNeedsComspecToRunBatch = go32v2 watcom
+ FORCE:
+ .PHONY: FORCE
+@@ -231,7 +231,7 @@ endif
+ export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ ifdef FPCDIR
+ override FPCDIR:=$(subst \,/,$(FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ else
+@@ -240,7 +240,7 @@ endif
+ ifdef DEFAULT_FPCDIR
+ ifeq ($(FPCDIR),wrong)
+ override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ endif
+@@ -254,11 +254,11 @@ endif
+ else
+ override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(BASEDIR)
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=c:/pp
+ endif
+ endif
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -305,7 +303,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ ifeq ($(UNITSDIR),)
+ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+ endif
+-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
++PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+ ifndef FPCFPMAKE
+ ifdef CROSSCOMPILE
+ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+@@ -364,9 +362,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -412,9 +407,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -424,10 +416,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -478,6 +470,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -499,6 +494,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -508,6 +506,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -532,6 +533,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -571,6 +575,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -580,9 +587,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_UNITS+=lcl.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
+@@ -610,9 +629,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ 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-qnx)
+-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-netware)
+ 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
+@@ -658,9 +674,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-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),m68k-freebsd)
+-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-netbsd)
+ 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
+@@ -670,10 +683,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ 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-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ 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-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ 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-embedded)
+@@ -724,6 +737,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ 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),x86_64-haiku)
++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),x86_64-netbsd)
+ 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
+@@ -745,6 +761,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ 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),x86_64-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),x86_64-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
+@@ -754,6 +773,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),arm-netbsd)
++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-palmos)
+ 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
+@@ -778,6 +800,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),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),powerpc64-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
+@@ -817,6 +842,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-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),i8086-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),i8086-msdos)
+ 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
+@@ -826,9 +854,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-freebsd)
++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-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-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),wasm-wasm)
++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),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),i386-linux)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
+@@ -856,9 +896,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
+@@ -904,9 +941,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
+@@ -916,10 +950,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -970,6 +1004,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
+@@ -991,6 +1028,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
+@@ -1000,6 +1040,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
+@@ -1024,6 +1067,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
+@@ -1063,6 +1109,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
+@@ -1072,9 +1121,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_OPTIONS+=-gl $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1102,9 +1163,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1150,9 +1208,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1162,10 +1217,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1216,6 +1271,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1237,6 +1295,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1246,6 +1307,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1270,6 +1334,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1309,6 +1376,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1318,9 +1388,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
+@@ -1348,9 +1430,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
+@@ -1396,9 +1475,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
+@@ -1408,10 +1484,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1462,6 +1538,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
+@@ -1483,6 +1562,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
+@@ -1492,6 +1574,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
+@@ -1516,6 +1601,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
+@@ -1555,6 +1643,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
+@@ -1564,9 +1655,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/customdrawn
++endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -1941,6 +2044,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -1963,7 +2067,12 @@ STATICLIBEXT=.a
+ SHORTSUFFIX=d16
+ endif
+ ifeq ($(OS_TARGET),embedded)
++ifeq ($(CPU_TARGET),i8086)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++else
+ EXEEXT=.bin
++endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2254,9 +2363,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2302,9 +2408,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2314,10 +2417,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -2368,6 +2471,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2389,6 +2495,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2398,6 +2507,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2422,6 +2534,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2461,6 +2576,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2470,9 +2588,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++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),)
+@@ -2771,7 +2901,11 @@ ifdef INSTALL_BUILDUNIT
+ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+ endif
+ ifdef INSTALLPPUFILES
++ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
+ 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)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
++endif
+ ifneq ($(UNITTARGETDIRPREFIX),)
+ override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+ override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+@@ -2873,7 +3007,7 @@ ifdef LIB_NAME
+ -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+ endif
+ -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
++ -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ fpc_cleanall: $(CLEANTARGET)
+ ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+@@ -2893,13 +3027,14 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+ endif
+ -$(DELTREE) *$(SMARTEXT)
+ -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *_ppas$(BATCHEXT)
++ -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ ifdef AOUTEXT
+ -$(DEL) *$(AOUTEXT)
+ endif
+diff -durp lazarus/lcl/interfaces/fpgui/Makefile lazarus.tx1/lcl/interfaces/fpgui/Makefile
+--- lcl/interfaces/fpgui/Makefile 2016-03-20 14:05:51.000000000 +0100
++++ lcl/interfaces/fpgui/Makefile 2021-01-08 14:15:57.966645000 +0100
+@@ -1,11 +1,11 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-09-05 rev 31523]
++# 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-qnx 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-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android 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-msdos i8086-win16 aarch64-linux aarch64-darwin
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android wasm-wasm sparc64-linux
+ BSDs = freebsd netbsd openbsd darwin dragonfly
+ UNIXs = linux $(BSDs) solaris qnx haiku aix
+-LIMIT83fs = go32v2 os2 emx watcom msdos win16
++LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
+ OSNeedsComspecToRunBatch = go32v2 watcom
+ FORCE:
+ .PHONY: FORCE
+@@ -231,7 +231,7 @@ endif
+ export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ ifdef FPCDIR
+ override FPCDIR:=$(subst \,/,$(FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ else
+@@ -240,7 +240,7 @@ endif
+ ifdef DEFAULT_FPCDIR
+ ifeq ($(FPCDIR),wrong)
+ override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ endif
+@@ -254,11 +254,11 @@ endif
+ else
+ override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(BASEDIR)
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=c:/pp
+ endif
+ endif
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -305,7 +303,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ ifeq ($(UNITSDIR),)
+ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+ endif
+-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
++PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+ ifndef FPCFPMAKE
+ ifdef CROSSCOMPILE
+ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+@@ -371,9 +369,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -419,9 +414,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -431,10 +423,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -485,6 +477,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -506,6 +501,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -515,6 +513,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -539,6 +540,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -578,6 +582,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -587,9 +594,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_UNITS+=lcl.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
+@@ -617,9 +636,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ 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-qnx)
+-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-netware)
+ 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
+@@ -665,9 +681,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-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),m68k-freebsd)
+-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-netbsd)
+ 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
+@@ -677,10 +690,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ 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-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ 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-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ 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-embedded)
+@@ -731,6 +744,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ 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),x86_64-haiku)
++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),x86_64-netbsd)
+ 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
+@@ -752,6 +768,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ 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),x86_64-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),x86_64-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
+@@ -761,6 +780,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),arm-netbsd)
++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-palmos)
+ 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
+@@ -785,6 +807,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),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),powerpc64-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
+@@ -824,6 +849,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-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),i8086-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),i8086-msdos)
+ 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
+@@ -833,9 +861,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-freebsd)
++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-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-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),wasm-wasm)
++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),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),i386-linux)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
+@@ -863,9 +903,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_OPTIONS+=-gl -dfpgui
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
+@@ -911,9 +948,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_OPTIONS+=-gl -dfpgui
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
+@@ -923,10 +957,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -977,6 +1011,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_OPTIONS+=-gl -dfpgui
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
+@@ -998,6 +1035,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_OPTIONS+=-gl -dfpgui
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
+@@ -1007,6 +1047,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_OPTIONS+=-gl -dfpgui
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
+@@ -1031,6 +1074,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_OPTIONS+=-gl -dfpgui
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
+@@ -1070,6 +1116,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_OPTIONS+=-gl -dfpgui
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
+@@ -1079,9 +1128,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-gl -dfpgui
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-gl -dfpgui
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_OPTIONS+=-gl -dfpgui
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_OPTIONS+=-gl -dfpgui
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_OPTIONS+=-gl -dfpgui
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
+@@ -1109,9 +1170,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
+@@ -1157,9 +1215,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
+@@ -1169,10 +1224,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1223,6 +1278,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
+@@ -1244,6 +1302,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
+@@ -1253,6 +1314,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
+@@ -1277,6 +1341,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
+@@ -1316,6 +1383,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
+@@ -1325,9 +1395,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_INCLUDEDIR+=corelib corelib/$(fpGUIPlatform)
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
+@@ -1355,9 +1437,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
+@@ -1403,9 +1482,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
+@@ -1415,10 +1491,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1469,6 +1545,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
+@@ -1490,6 +1569,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
+@@ -1499,6 +1581,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
+@@ -1523,6 +1608,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
+@@ -1562,6 +1650,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
+@@ -1571,9 +1662,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) corelib gui corelib/$(fpGUIPlatform) .. .
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
+@@ -1601,9 +1704,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
+@@ -1649,9 +1749,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
+@@ -1661,10 +1758,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1715,6 +1812,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
+@@ -1736,6 +1836,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
+@@ -1745,6 +1848,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
+@@ -1769,6 +1875,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
+@@ -1808,6 +1917,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
+@@ -1817,9 +1929,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/fpgui
++endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2194,6 +2318,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -2216,7 +2341,12 @@ STATICLIBEXT=.a
+ SHORTSUFFIX=d16
+ endif
+ ifeq ($(OS_TARGET),embedded)
++ifeq ($(CPU_TARGET),i8086)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++else
+ EXEEXT=.bin
++endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2507,9 +2637,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2555,9 +2682,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2567,10 +2691,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -2621,6 +2745,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2642,6 +2769,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2651,6 +2781,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2675,6 +2808,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2714,6 +2850,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2723,9 +2862,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++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),)
+@@ -3024,7 +3175,11 @@ ifdef INSTALL_BUILDUNIT
+ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+ endif
+ ifdef INSTALLPPUFILES
++ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
+ 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)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
++endif
+ ifneq ($(UNITTARGETDIRPREFIX),)
+ override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+ override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+@@ -3126,7 +3281,7 @@ ifdef LIB_NAME
+ -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+ endif
+ -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
++ -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ fpc_cleanall: $(CLEANTARGET)
+ ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+@@ -3146,13 +3301,14 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+ endif
+ -$(DELTREE) *$(SMARTEXT)
+ -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *_ppas$(BATCHEXT)
++ -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ ifdef AOUTEXT
+ -$(DEL) *$(AOUTEXT)
+ endif
+diff -durp lazarus/lcl/interfaces/gtk/Makefile lazarus.tx1/lcl/interfaces/gtk/Makefile
+--- lcl/interfaces/gtk/Makefile 2016-03-20 14:05:51.000000000 +0100
++++ lcl/interfaces/gtk/Makefile 2021-01-08 14:16:03.700623000 +0100
+@@ -1,11 +1,11 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-09-05 rev 31523]
++# 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-qnx 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-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android 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-msdos i8086-win16 aarch64-linux aarch64-darwin
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android wasm-wasm sparc64-linux
+ BSDs = freebsd netbsd openbsd darwin dragonfly
+ UNIXs = linux $(BSDs) solaris qnx haiku aix
+-LIMIT83fs = go32v2 os2 emx watcom msdos win16
++LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
+ OSNeedsComspecToRunBatch = go32v2 watcom
+ FORCE:
+ .PHONY: FORCE
+@@ -231,7 +231,7 @@ endif
+ export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ ifdef FPCDIR
+ override FPCDIR:=$(subst \,/,$(FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ else
+@@ -240,7 +240,7 @@ endif
+ ifdef DEFAULT_FPCDIR
+ ifeq ($(FPCDIR),wrong)
+ override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ endif
+@@ -254,11 +254,11 @@ endif
+ else
+ override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(BASEDIR)
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=c:/pp
+ endif
+ endif
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -305,7 +303,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ ifeq ($(UNITSDIR),)
+ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+ endif
+-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
++PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+ ifndef FPCFPMAKE
+ ifdef CROSSCOMPILE
+ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+@@ -363,9 +361,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -411,9 +406,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -423,10 +415,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -477,6 +469,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -498,6 +493,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -507,6 +505,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -531,6 +532,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -570,6 +574,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -579,9 +586,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_UNITS+=lcl.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
+@@ -609,9 +628,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ 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-qnx)
+-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-netware)
+ 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
+@@ -657,9 +673,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-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),m68k-freebsd)
+-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-netbsd)
+ 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
+@@ -669,10 +682,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ 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-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ 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-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ 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-embedded)
+@@ -723,6 +736,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ 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),x86_64-haiku)
++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),x86_64-netbsd)
+ 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
+@@ -744,6 +760,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ 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),x86_64-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),x86_64-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
+@@ -753,6 +772,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),arm-netbsd)
++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-palmos)
+ 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
+@@ -777,6 +799,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),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),powerpc64-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
+@@ -816,6 +841,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-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),i8086-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),i8086-msdos)
+ 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
+@@ -825,9 +853,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-freebsd)
++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-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-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),wasm-wasm)
++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),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),i386-linux)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
+@@ -855,9 +895,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
+@@ -903,9 +940,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
+@@ -915,10 +949,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -969,6 +1003,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
+@@ -990,6 +1027,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
+@@ -999,6 +1039,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
+@@ -1023,6 +1066,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
+@@ -1062,6 +1108,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
+@@ -1071,9 +1120,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_OPTIONS+=-gl -dgtk1 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1101,9 +1162,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1149,9 +1207,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1161,10 +1216,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1215,6 +1270,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1236,6 +1294,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1245,6 +1306,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1269,6 +1333,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1308,6 +1375,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1317,9 +1387,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
+@@ -1347,9 +1429,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
+@@ -1395,9 +1474,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
+@@ -1407,10 +1483,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1461,6 +1537,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
+@@ -1482,6 +1561,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
+@@ -1491,6 +1573,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
+@@ -1515,6 +1600,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
+@@ -1554,6 +1642,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
+@@ -1563,9 +1654,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk
++endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -1940,6 +2043,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -1962,7 +2066,12 @@ STATICLIBEXT=.a
+ SHORTSUFFIX=d16
+ endif
+ ifeq ($(OS_TARGET),embedded)
++ifeq ($(CPU_TARGET),i8086)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++else
+ EXEEXT=.bin
++endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2253,9 +2362,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2301,9 +2407,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2313,10 +2416,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -2367,6 +2470,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2388,6 +2494,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2397,6 +2506,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2421,6 +2533,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2460,6 +2575,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2469,9 +2587,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++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),)
+@@ -2770,7 +2900,11 @@ ifdef INSTALL_BUILDUNIT
+ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+ endif
+ ifdef INSTALLPPUFILES
++ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
+ 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)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
++endif
+ ifneq ($(UNITTARGETDIRPREFIX),)
+ override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+ override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+@@ -2872,7 +3006,7 @@ ifdef LIB_NAME
+ -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+ endif
+ -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
++ -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ fpc_cleanall: $(CLEANTARGET)
+ ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+@@ -2892,13 +3026,14 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+ endif
+ -$(DELTREE) *$(SMARTEXT)
+ -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *_ppas$(BATCHEXT)
++ -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ ifdef AOUTEXT
+ -$(DEL) *$(AOUTEXT)
+ endif
+diff -durp lazarus/lcl/interfaces/gtk2/Makefile lazarus.tx1/lcl/interfaces/gtk2/Makefile
+--- lcl/interfaces/gtk2/Makefile 2016-03-20 14:05:51.000000000 +0100
++++ lcl/interfaces/gtk2/Makefile 2021-01-08 14:16:03.221950000 +0100
+@@ -1,11 +1,11 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-09-05 rev 31523]
++# 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-qnx 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-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android 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-msdos i8086-win16 aarch64-linux aarch64-darwin
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android wasm-wasm sparc64-linux
+ BSDs = freebsd netbsd openbsd darwin dragonfly
+ UNIXs = linux $(BSDs) solaris qnx haiku aix
+-LIMIT83fs = go32v2 os2 emx watcom msdos win16
++LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
+ OSNeedsComspecToRunBatch = go32v2 watcom
+ FORCE:
+ .PHONY: FORCE
+@@ -231,7 +231,7 @@ endif
+ export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ ifdef FPCDIR
+ override FPCDIR:=$(subst \,/,$(FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ else
+@@ -240,7 +240,7 @@ endif
+ ifdef DEFAULT_FPCDIR
+ ifeq ($(FPCDIR),wrong)
+ override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ endif
+@@ -254,11 +254,11 @@ endif
+ else
+ override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(BASEDIR)
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=c:/pp
+ endif
+ endif
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -305,7 +303,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ ifeq ($(UNITSDIR),)
+ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+ endif
+-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
++PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+ ifndef FPCFPMAKE
+ ifdef CROSSCOMPILE
+ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+@@ -363,9 +361,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -411,9 +406,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -423,10 +415,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -477,6 +469,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -498,6 +493,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -507,6 +505,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -531,6 +532,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -570,6 +574,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -579,9 +586,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_UNITS+=lcl.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
+@@ -609,9 +628,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ 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-qnx)
+-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-netware)
+ 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
+@@ -657,9 +673,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-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),m68k-freebsd)
+-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-netbsd)
+ 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
+@@ -669,10 +682,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ 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-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ 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-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ 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-embedded)
+@@ -723,6 +736,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ 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),x86_64-haiku)
++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),x86_64-netbsd)
+ 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
+@@ -744,6 +760,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ 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),x86_64-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),x86_64-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
+@@ -753,6 +772,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),arm-netbsd)
++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-palmos)
+ 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
+@@ -777,6 +799,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),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),powerpc64-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
+@@ -816,6 +841,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-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),i8086-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),i8086-msdos)
+ 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
+@@ -825,9 +853,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-freebsd)
++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-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-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),wasm-wasm)
++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),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),i386-linux)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
+@@ -855,9 +895,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
+@@ -903,9 +940,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
+@@ -915,10 +949,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -969,6 +1003,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
+@@ -990,6 +1027,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
+@@ -999,6 +1039,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
+@@ -1023,6 +1066,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
+@@ -1062,6 +1108,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
+@@ -1071,9 +1120,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_OPTIONS+=-gl -dgtk2 -Sci $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+@@ -1101,9 +1162,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_INCLUDEDIR+=.
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+@@ -1149,9 +1207,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_INCLUDEDIR+=.
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+@@ -1161,10 +1216,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1215,6 +1270,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_INCLUDEDIR+=.
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_INCLUDEDIR+=.
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+@@ -1236,6 +1294,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_INCLUDEDIR+=.
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_INCLUDEDIR+=.
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+@@ -1245,6 +1306,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_INCLUDEDIR+=.
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_INCLUDEDIR+=.
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+@@ -1269,6 +1333,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_INCLUDEDIR+=.
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_INCLUDEDIR+=.
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+@@ -1308,6 +1375,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_INCLUDEDIR+=.
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_INCLUDEDIR+=.
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+@@ -1317,9 +1387,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=.
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=.
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=.
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_INCLUDEDIR+=.
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_INCLUDEDIR+=.
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_INCLUDEDIR+=.
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1347,9 +1429,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1395,9 +1474,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1407,10 +1483,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1461,6 +1537,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1482,6 +1561,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1491,6 +1573,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1515,6 +1600,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1554,6 +1642,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1563,9 +1654,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
+@@ -1593,9 +1696,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
+@@ -1641,9 +1741,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
+@@ -1653,10 +1750,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1707,6 +1804,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
+@@ -1728,6 +1828,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
+@@ -1737,6 +1840,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
+@@ -1761,6 +1867,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
+@@ -1800,6 +1909,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
+@@ -1809,9 +1921,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk2
++endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2186,6 +2310,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -2208,7 +2333,12 @@ STATICLIBEXT=.a
+ SHORTSUFFIX=d16
+ endif
+ ifeq ($(OS_TARGET),embedded)
++ifeq ($(CPU_TARGET),i8086)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++else
+ EXEEXT=.bin
++endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2499,9 +2629,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2547,9 +2674,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2559,10 +2683,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -2613,6 +2737,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2634,6 +2761,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2643,6 +2773,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2667,6 +2800,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2706,6 +2842,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2715,9 +2854,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++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),)
+@@ -3016,7 +3167,11 @@ ifdef INSTALL_BUILDUNIT
+ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+ endif
+ ifdef INSTALLPPUFILES
++ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
+ 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)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
++endif
+ ifneq ($(UNITTARGETDIRPREFIX),)
+ override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+ override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+@@ -3118,7 +3273,7 @@ ifdef LIB_NAME
+ -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+ endif
+ -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
++ -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ fpc_cleanall: $(CLEANTARGET)
+ ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+@@ -3138,13 +3293,14 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+ endif
+ -$(DELTREE) *$(SMARTEXT)
+ -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *_ppas$(BATCHEXT)
++ -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ ifdef AOUTEXT
+ -$(DEL) *$(AOUTEXT)
+ endif
+diff -durp lazarus/lcl/interfaces/gtk3/Makefile lazarus.tx1/lcl/interfaces/gtk3/Makefile
+--- lcl/interfaces/gtk3/Makefile 2016-03-20 14:05:51.000000000 +0100
++++ lcl/interfaces/gtk3/Makefile 2021-01-08 14:15:55.118192000 +0100
+@@ -1,11 +1,11 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-09-05 rev 31523]
++# 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-qnx 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-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android 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-msdos i8086-win16 aarch64-linux aarch64-darwin
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android wasm-wasm sparc64-linux
+ BSDs = freebsd netbsd openbsd darwin dragonfly
+ UNIXs = linux $(BSDs) solaris qnx haiku aix
+-LIMIT83fs = go32v2 os2 emx watcom msdos win16
++LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
+ OSNeedsComspecToRunBatch = go32v2 watcom
+ FORCE:
+ .PHONY: FORCE
+@@ -231,7 +231,7 @@ endif
+ export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ ifdef FPCDIR
+ override FPCDIR:=$(subst \,/,$(FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ else
+@@ -240,7 +240,7 @@ endif
+ ifdef DEFAULT_FPCDIR
+ ifeq ($(FPCDIR),wrong)
+ override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ endif
+@@ -254,11 +254,11 @@ endif
+ else
+ override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(BASEDIR)
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=c:/pp
+ endif
+ endif
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -305,7 +303,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ ifeq ($(UNITSDIR),)
+ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+ endif
+-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
++PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+ ifndef FPCFPMAKE
+ ifdef CROSSCOMPILE
+ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+@@ -363,9 +361,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -411,9 +406,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -423,10 +415,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -477,6 +469,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -498,6 +493,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -507,6 +505,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -531,6 +532,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -570,6 +574,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -579,9 +586,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_UNITS+=lcl.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
+@@ -609,9 +628,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ 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-qnx)
+-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-netware)
+ 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
+@@ -657,9 +673,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-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),m68k-freebsd)
+-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-netbsd)
+ 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
+@@ -669,10 +682,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ 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-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ 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-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ 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-embedded)
+@@ -723,6 +736,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ 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),x86_64-haiku)
++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),x86_64-netbsd)
+ 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
+@@ -744,6 +760,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ 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),x86_64-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),x86_64-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
+@@ -753,6 +772,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),arm-netbsd)
++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-palmos)
+ 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
+@@ -777,6 +799,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),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),powerpc64-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
+@@ -816,6 +841,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-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),i8086-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),i8086-msdos)
+ 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
+@@ -825,9 +853,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-freebsd)
++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-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-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),wasm-wasm)
++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),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),i386-linux)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
+@@ -855,9 +895,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
+@@ -903,9 +940,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
+@@ -915,10 +949,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -969,6 +1003,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
+@@ -990,6 +1027,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
+@@ -999,6 +1039,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
+@@ -1023,6 +1066,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
+@@ -1062,6 +1108,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
+@@ -1071,9 +1120,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_OPTIONS+=-gl -dgtk3 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+@@ -1101,9 +1162,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_INCLUDEDIR+=.
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+@@ -1149,9 +1207,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_INCLUDEDIR+=.
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+@@ -1161,10 +1216,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1215,6 +1270,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_INCLUDEDIR+=.
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_INCLUDEDIR+=.
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+@@ -1236,6 +1294,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_INCLUDEDIR+=.
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_INCLUDEDIR+=.
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+@@ -1245,6 +1306,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_INCLUDEDIR+=.
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_INCLUDEDIR+=.
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+@@ -1269,6 +1333,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_INCLUDEDIR+=.
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_INCLUDEDIR+=.
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+@@ -1308,6 +1375,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_INCLUDEDIR+=.
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_INCLUDEDIR+=.
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_INCLUDEDIR+=.
+ endif
+@@ -1317,9 +1387,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=.
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=.
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=.
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_INCLUDEDIR+=.
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_INCLUDEDIR+=.
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_INCLUDEDIR+=.
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
+@@ -1347,9 +1429,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
+@@ -1395,9 +1474,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
+@@ -1407,10 +1483,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1461,6 +1537,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
+@@ -1482,6 +1561,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
+@@ -1491,6 +1573,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
+@@ -1515,6 +1600,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
+@@ -1554,6 +1642,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
+@@ -1563,9 +1654,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) gtk3bindings .. .
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
+@@ -1593,9 +1696,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
+@@ -1641,9 +1741,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
+@@ -1653,10 +1750,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1707,6 +1804,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
+@@ -1728,6 +1828,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
+@@ -1737,6 +1840,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
+@@ -1761,6 +1867,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
+@@ -1800,6 +1909,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
+@@ -1809,9 +1921,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/gtk3
++endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2186,6 +2310,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -2208,7 +2333,12 @@ STATICLIBEXT=.a
+ SHORTSUFFIX=d16
+ endif
+ ifeq ($(OS_TARGET),embedded)
++ifeq ($(CPU_TARGET),i8086)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++else
+ EXEEXT=.bin
++endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2499,9 +2629,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2547,9 +2674,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2559,10 +2683,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -2613,6 +2737,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2634,6 +2761,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2643,6 +2773,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2667,6 +2800,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2706,6 +2842,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2715,9 +2854,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++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),)
+@@ -3016,7 +3167,11 @@ ifdef INSTALL_BUILDUNIT
+ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+ endif
+ ifdef INSTALLPPUFILES
++ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
+ 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)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
++endif
+ ifneq ($(UNITTARGETDIRPREFIX),)
+ override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+ override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+@@ -3118,7 +3273,7 @@ ifdef LIB_NAME
+ -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+ endif
+ -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
++ -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ fpc_cleanall: $(CLEANTARGET)
+ ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+@@ -3138,13 +3293,14 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+ endif
+ -$(DELTREE) *$(SMARTEXT)
+ -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *_ppas$(BATCHEXT)
++ -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ ifdef AOUTEXT
+ -$(DEL) *$(AOUTEXT)
+ endif
+diff -durp lazarus/lcl/interfaces/mui/Makefile lazarus.tx1/lcl/interfaces/mui/Makefile
+--- lcl/interfaces/mui/Makefile 2017-01-14 10:55:59.000000000 +0100
++++ lcl/interfaces/mui/Makefile 2021-01-08 14:15:59.861609000 +0100
+@@ -1,11 +1,11 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016/11/07]
++# 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-qnx 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-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android wasm-wasm sparc64-linux
+ BSDs = freebsd netbsd openbsd darwin dragonfly
+ UNIXs = linux $(BSDs) solaris qnx haiku aix
+-LIMIT83fs = go32v2 os2 emx watcom msdos win16
++LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
+ OSNeedsComspecToRunBatch = go32v2 watcom
+ FORCE:
+ .PHONY: FORCE
+@@ -231,7 +231,7 @@ endif
+ export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ ifdef FPCDIR
+ override FPCDIR:=$(subst \,/,$(FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ else
+@@ -240,7 +240,7 @@ endif
+ ifdef DEFAULT_FPCDIR
+ ifeq ($(FPCDIR),wrong)
+ override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ endif
+@@ -254,11 +254,11 @@ endif
+ else
+ override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(BASEDIR)
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=c:/pp
+ endif
+ endif
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -305,7 +303,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ ifeq ($(UNITSDIR),)
+ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+ endif
+-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
++PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+ ifndef FPCFPMAKE
+ ifdef CROSSCOMPILE
+ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+@@ -359,9 +357,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_UNITS+=interfaces
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_UNITS+=interfaces
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_UNITS+=interfaces
+ endif
+@@ -407,9 +402,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_UNITS+=interfaces
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_UNITS+=interfaces
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_UNITS+=interfaces
+ endif
+@@ -419,10 +411,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_UNITS+=interfaces
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_UNITS+=interfaces
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_UNITS+=interfaces
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -473,6 +465,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_UNITS+=interfaces
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_UNITS+=interfaces
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_UNITS+=interfaces
+ endif
+@@ -494,6 +489,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_UNITS+=interfaces
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_UNITS+=interfaces
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_UNITS+=interfaces
+ endif
+@@ -503,6 +501,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_UNITS+=interfaces
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_UNITS+=interfaces
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_UNITS+=interfaces
+ endif
+@@ -581,9 +582,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=interfaces
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=interfaces
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=interfaces
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_UNITS+=interfaces
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_UNITS+=interfaces
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_UNITS+=interfaces
++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
+@@ -611,9 +624,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ 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-qnx)
+-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-netware)
+ 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
+@@ -659,9 +669,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-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),m68k-freebsd)
+-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-netbsd)
+ 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
+@@ -671,10 +678,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ 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-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ 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-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ 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-embedded)
+@@ -725,6 +732,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ 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),x86_64-haiku)
++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),x86_64-netbsd)
+ 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
+@@ -746,6 +756,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ 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),x86_64-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),x86_64-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
+@@ -755,6 +768,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),arm-netbsd)
++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-palmos)
+ 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
+@@ -833,9 +849,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-freebsd)
++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-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-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),wasm-wasm)
++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),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),i386-linux)
+ override COMPILER_OPTIONS+=-gl -dnogui
+ endif
+@@ -863,9 +891,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_OPTIONS+=-gl -dnogui
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_OPTIONS+=-gl -dnogui
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_OPTIONS+=-gl -dnogui
+ endif
+@@ -911,9 +936,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_OPTIONS+=-gl -dnogui
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_OPTIONS+=-gl -dnogui
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_OPTIONS+=-gl -dnogui
+ endif
+@@ -923,10 +945,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_OPTIONS+=-gl -dnogui
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_OPTIONS+=-gl -dnogui
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_OPTIONS+=-gl -dnogui
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -977,6 +999,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_OPTIONS+=-gl -dnogui
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_OPTIONS+=-gl -dnogui
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_OPTIONS+=-gl -dnogui
+ endif
+@@ -998,6 +1023,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_OPTIONS+=-gl -dnogui
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_OPTIONS+=-gl -dnogui
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_OPTIONS+=-gl -dnogui
+ endif
+@@ -1007,6 +1035,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_OPTIONS+=-gl -dnogui
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_OPTIONS+=-gl -dnogui
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_OPTIONS+=-gl -dnogui
+ endif
+@@ -1085,9 +1116,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-gl -dnogui
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-gl -dnogui
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-gl -dnogui
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_OPTIONS+=-gl -dnogui
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_OPTIONS+=-gl -dnogui
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_OPTIONS+=-gl -dnogui
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1115,9 +1158,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1163,9 +1203,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1175,10 +1212,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1229,6 +1266,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1250,6 +1290,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1259,6 +1302,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
+@@ -1337,9 +1383,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) .
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
+ endif
+@@ -1367,9 +1425,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
+ endif
+@@ -1415,9 +1470,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
+ endif
+@@ -1427,10 +1479,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1481,6 +1533,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
+ endif
+@@ -1502,6 +1557,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
+ endif
+@@ -1511,6 +1569,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
+ endif
+@@ -1589,9 +1650,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/mui
++endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -1966,6 +2039,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -2284,9 +2358,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2332,9 +2403,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2344,10 +2412,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -2398,6 +2466,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2419,6 +2490,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2428,6 +2502,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2506,9 +2583,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++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),)
+@@ -2807,7 +2896,11 @@ ifdef INSTALL_BUILDUNIT
+ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+ endif
+ ifdef INSTALLPPUFILES
++ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
+ 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)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
++endif
+ ifneq ($(UNITTARGETDIRPREFIX),)
+ override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+ override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+@@ -2909,7 +3002,7 @@ ifdef LIB_NAME
+ -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+ endif
+ -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
++ -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ fpc_cleanall: $(CLEANTARGET)
+ ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+@@ -2929,13 +3022,14 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+ endif
+ -$(DELTREE) *$(SMARTEXT)
+ -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *_ppas$(BATCHEXT)
++ -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ ifdef AOUTEXT
+ -$(DEL) *$(AOUTEXT)
+ endif
+diff -durp lazarus/lcl/interfaces/nogui/Makefile lazarus.tx1/lcl/interfaces/nogui/Makefile
+--- lcl/interfaces/nogui/Makefile 2016-03-20 14:05:51.000000000 +0100
++++ lcl/interfaces/nogui/Makefile 2021-01-08 14:16:01.780611000 +0100
+@@ -1,11 +1,11 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-09-05 rev 31523]
++# 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-qnx 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-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android 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-msdos i8086-win16 aarch64-linux aarch64-darwin
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android wasm-wasm sparc64-linux
+ BSDs = freebsd netbsd openbsd darwin dragonfly
+ UNIXs = linux $(BSDs) solaris qnx haiku aix
+-LIMIT83fs = go32v2 os2 emx watcom msdos win16
++LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
+ OSNeedsComspecToRunBatch = go32v2 watcom
+ FORCE:
+ .PHONY: FORCE
+@@ -231,7 +231,7 @@ endif
+ export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ ifdef FPCDIR
+ override FPCDIR:=$(subst \,/,$(FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ else
+@@ -240,7 +240,7 @@ endif
+ ifdef DEFAULT_FPCDIR
+ ifeq ($(FPCDIR),wrong)
+ override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ endif
+@@ -254,11 +254,11 @@ endif
+ else
+ override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(BASEDIR)
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=c:/pp
+ endif
+ endif
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -305,7 +303,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ ifeq ($(UNITSDIR),)
+ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+ endif
+-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
++PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+ ifndef FPCFPMAKE
+ ifdef CROSSCOMPILE
+ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+@@ -363,9 +361,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -411,9 +406,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -423,10 +415,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -477,6 +469,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -498,6 +493,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -507,6 +505,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -531,6 +532,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -570,6 +574,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -579,9 +586,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_UNITS+=lcl.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
+@@ -609,9 +628,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ 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-qnx)
+-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-netware)
+ 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
+@@ -657,9 +673,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-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),m68k-freebsd)
+-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-netbsd)
+ 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
+@@ -669,10 +682,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ 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-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ 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-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ 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-embedded)
+@@ -723,6 +736,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ 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),x86_64-haiku)
++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),x86_64-netbsd)
+ 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
+@@ -744,6 +760,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ 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),x86_64-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),x86_64-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
+@@ -753,6 +772,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),arm-netbsd)
++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-palmos)
+ 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
+@@ -777,6 +799,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),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),powerpc64-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
+@@ -816,6 +841,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-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),i8086-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),i8086-msdos)
+ 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
+@@ -825,9 +853,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-freebsd)
++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-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-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),wasm-wasm)
++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),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),i386-linux)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
+@@ -855,9 +895,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
+@@ -903,9 +940,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
+@@ -915,10 +949,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -969,6 +1003,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
+@@ -990,6 +1027,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
+@@ -999,6 +1039,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
+@@ -1023,6 +1066,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
+@@ -1062,6 +1108,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
+@@ -1071,9 +1120,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_OPTIONS+=-gl -dnogui $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1101,9 +1162,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1149,9 +1207,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1161,10 +1216,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1215,6 +1270,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1236,6 +1294,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1245,6 +1306,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1269,6 +1333,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1308,6 +1375,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1317,9 +1387,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+@@ -1347,9 +1429,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+@@ -1395,9 +1474,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+@@ -1407,10 +1483,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1461,6 +1537,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+@@ -1482,6 +1561,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+@@ -1491,6 +1573,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+@@ -1515,6 +1600,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+@@ -1554,6 +1642,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+@@ -1563,9 +1654,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/nogui
++endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -1940,6 +2043,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -1962,7 +2066,12 @@ STATICLIBEXT=.a
+ SHORTSUFFIX=d16
+ endif
+ ifeq ($(OS_TARGET),embedded)
++ifeq ($(CPU_TARGET),i8086)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++else
+ EXEEXT=.bin
++endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2253,9 +2362,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2301,9 +2407,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2313,10 +2416,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -2367,6 +2470,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2388,6 +2494,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2397,6 +2506,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2421,6 +2533,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2460,6 +2575,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2469,9 +2587,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++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),)
+@@ -2770,7 +2900,11 @@ ifdef INSTALL_BUILDUNIT
+ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+ endif
+ ifdef INSTALLPPUFILES
++ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
+ 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)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
++endif
+ ifneq ($(UNITTARGETDIRPREFIX),)
+ override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+ override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+@@ -2872,7 +3006,7 @@ ifdef LIB_NAME
+ -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+ endif
+ -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
++ -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ fpc_cleanall: $(CLEANTARGET)
+ ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+@@ -2892,13 +3026,14 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+ endif
+ -$(DELTREE) *$(SMARTEXT)
+ -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *_ppas$(BATCHEXT)
++ -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ ifdef AOUTEXT
+ -$(DEL) *$(AOUTEXT)
+ endif
+diff -durp lazarus/lcl/interfaces/qt/Makefile lazarus.tx1/lcl/interfaces/qt/Makefile
+--- lcl/interfaces/qt/Makefile 2015-10-01 20:40:54.000000000 +0200
++++ lcl/interfaces/qt/Makefile 2021-01-08 14:15:56.526074000 +0100
+@@ -1,11 +1,11 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-08-12 rev 31317]
++# 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-qnx 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-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android 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-msdos aarch64-linux aarch64-darwin
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android wasm-wasm sparc64-linux
+ BSDs = freebsd netbsd openbsd darwin dragonfly
+ UNIXs = linux $(BSDs) solaris qnx haiku aix
+-LIMIT83fs = go32v2 os2 emx watcom msdos
++LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
+ OSNeedsComspecToRunBatch = go32v2 watcom
+ FORCE:
+ .PHONY: FORCE
+@@ -231,7 +231,7 @@ endif
+ export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ ifdef FPCDIR
+ override FPCDIR:=$(subst \,/,$(FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ else
+@@ -240,7 +240,7 @@ endif
+ ifdef DEFAULT_FPCDIR
+ ifeq ($(FPCDIR),wrong)
+ override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ endif
+@@ -254,11 +254,11 @@ endif
+ else
+ override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(BASEDIR)
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=c:/pp
+ endif
+ endif
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -305,7 +303,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ ifeq ($(UNITSDIR),)
+ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+ endif
+-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
++PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+ ifndef FPCFPMAKE
+ ifdef CROSSCOMPILE
+ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+@@ -363,9 +361,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -411,9 +406,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -423,10 +415,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -477,6 +469,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -498,6 +493,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -507,6 +505,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -531,6 +532,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -570,15 +574,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_UNITS+=lcl.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
+@@ -606,9 +628,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ 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-qnx)
+-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-netware)
+ 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
+@@ -654,9 +673,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-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),m68k-freebsd)
+-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-netbsd)
+ 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
+@@ -666,10 +682,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ 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-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ 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-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ 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-embedded)
+@@ -720,6 +736,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ 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),x86_64-haiku)
++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),x86_64-netbsd)
+ 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
+@@ -741,6 +760,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ 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),x86_64-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),x86_64-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
+@@ -750,6 +772,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),arm-netbsd)
++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-palmos)
+ 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
+@@ -774,6 +799,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),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),powerpc64-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
+@@ -813,15 +841,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-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),i8086-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),i8086-msdos)
+ 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),i8086-win16)
++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-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),aarch64-freebsd)
++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-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-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),wasm-wasm)
++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),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),i386-linux)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
+@@ -849,9 +895,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
+@@ -897,9 +940,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
+@@ -909,10 +949,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -963,6 +1003,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
+@@ -984,6 +1027,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
+@@ -993,6 +1039,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
+@@ -1017,6 +1066,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
+@@ -1056,15 +1108,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_OPTIONS+=-gl -dqt $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1092,9 +1162,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1140,9 +1207,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1152,10 +1216,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1206,6 +1270,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1227,6 +1294,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1236,6 +1306,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1260,6 +1333,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1299,15 +1375,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
+@@ -1335,9 +1429,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
+@@ -1383,9 +1474,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
+@@ -1395,10 +1483,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1449,6 +1537,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
+@@ -1470,6 +1561,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
+@@ -1479,6 +1573,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
+@@ -1503,6 +1600,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
+@@ -1542,15 +1642,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt
++endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -1925,6 +2043,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -1947,9 +2066,20 @@ STATICLIBEXT=.a
+ SHORTSUFFIX=d16
+ endif
+ ifeq ($(OS_TARGET),embedded)
++ifeq ($(CPU_TARGET),i8086)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++else
+ EXEEXT=.bin
++endif
+ SHORTSUFFIX=emb
+ endif
++ifeq ($(OS_TARGET),win16)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++SHAREDLIBEXT=.dll
++SHORTSUFFIX=w16
++endif
+ ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+ FPCMADE=fpcmade.$(SHORTSUFFIX)
+ ZIPSUFFIX=$(SHORTSUFFIX)
+@@ -2232,9 +2362,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2280,9 +2407,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2292,10 +2416,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -2346,6 +2470,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2367,6 +2494,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2376,6 +2506,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2400,6 +2533,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2439,15 +2575,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++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),)
+@@ -2746,7 +2900,11 @@ ifdef INSTALL_BUILDUNIT
+ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+ endif
+ ifdef INSTALLPPUFILES
++ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
+ 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)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
++endif
+ ifneq ($(UNITTARGETDIRPREFIX),)
+ override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+ override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+@@ -2848,7 +3006,7 @@ ifdef LIB_NAME
+ -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+ endif
+ -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
++ -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ fpc_cleanall: $(CLEANTARGET)
+ ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+@@ -2868,13 +3026,14 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+ endif
+ -$(DELTREE) *$(SMARTEXT)
+ -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *_ppas$(BATCHEXT)
++ -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ ifdef AOUTEXT
+ -$(DEL) *$(AOUTEXT)
+ endif
+diff -durp lazarus/lcl/interfaces/qt5/Makefile lazarus.tx1/lcl/interfaces/qt5/Makefile
+--- lcl/interfaces/qt5/Makefile 2016-12-30 16:03:51.000000000 +0100
++++ lcl/interfaces/qt5/Makefile 2021-01-08 14:16:02.260213000 +0100
+@@ -1,11 +1,11 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-08-12 rev 31317]
++# 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-qnx 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-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android 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-msdos aarch64-linux aarch64-darwin
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android wasm-wasm sparc64-linux
+ BSDs = freebsd netbsd openbsd darwin dragonfly
+ UNIXs = linux $(BSDs) solaris qnx haiku aix
+-LIMIT83fs = go32v2 os2 emx watcom msdos
++LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
+ OSNeedsComspecToRunBatch = go32v2 watcom
+ FORCE:
+ .PHONY: FORCE
+@@ -231,7 +231,7 @@ endif
+ export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ ifdef FPCDIR
+ override FPCDIR:=$(subst \,/,$(FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ else
+@@ -240,7 +240,7 @@ endif
+ ifdef DEFAULT_FPCDIR
+ ifeq ($(FPCDIR),wrong)
+ override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ endif
+@@ -254,11 +254,11 @@ endif
+ else
+ override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(BASEDIR)
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=c:/pp
+ endif
+ endif
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -305,7 +303,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ ifeq ($(UNITSDIR),)
+ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+ endif
+-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
++PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+ ifndef FPCFPMAKE
+ ifdef CROSSCOMPILE
+ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+@@ -363,9 +361,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -411,9 +406,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -423,10 +415,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -477,6 +469,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -498,6 +493,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -507,6 +505,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -531,6 +532,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -570,15 +574,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_UNITS+=lcl.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
+@@ -606,9 +628,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ 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-qnx)
+-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-netware)
+ 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
+@@ -654,9 +673,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-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),m68k-freebsd)
+-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-netbsd)
+ 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
+@@ -666,10 +682,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ 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-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ 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-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ 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-embedded)
+@@ -720,6 +736,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ 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),x86_64-haiku)
++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),x86_64-netbsd)
+ 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
+@@ -741,6 +760,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ 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),x86_64-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),x86_64-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
+@@ -750,6 +772,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),arm-netbsd)
++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-palmos)
+ 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
+@@ -774,6 +799,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-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),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),powerpc64-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
+@@ -813,15 +841,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-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),i8086-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),i8086-msdos)
+ 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),i8086-win16)
++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-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),aarch64-freebsd)
++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-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-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),wasm-wasm)
++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),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),i386-linux)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
+@@ -849,9 +895,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
+@@ -897,9 +940,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
+@@ -909,10 +949,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -963,6 +1003,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
+@@ -984,6 +1027,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
+@@ -993,6 +1039,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
+@@ -1017,6 +1066,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
+@@ -1056,15 +1108,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_OPTIONS+=-gl -dqt5 $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1092,9 +1162,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1140,9 +1207,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1152,10 +1216,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1206,6 +1270,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1227,6 +1294,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1236,6 +1306,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1260,6 +1333,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1299,15 +1375,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
+@@ -1335,9 +1429,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
+@@ -1383,9 +1474,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
+@@ -1395,10 +1483,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1449,6 +1537,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
+@@ -1470,6 +1561,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
+@@ -1479,6 +1573,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
+@@ -1503,6 +1600,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
+@@ -1542,15 +1642,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/qt5
++endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -1925,6 +2043,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -1947,9 +2066,20 @@ STATICLIBEXT=.a
+ SHORTSUFFIX=d16
+ endif
+ ifeq ($(OS_TARGET),embedded)
++ifeq ($(CPU_TARGET),i8086)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++else
+ EXEEXT=.bin
++endif
+ SHORTSUFFIX=emb
+ endif
++ifeq ($(OS_TARGET),win16)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++SHAREDLIBEXT=.dll
++SHORTSUFFIX=w16
++endif
+ ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+ FPCMADE=fpcmade.$(SHORTSUFFIX)
+ ZIPSUFFIX=$(SHORTSUFFIX)
+@@ -2232,9 +2362,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2280,9 +2407,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2292,10 +2416,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -2346,6 +2470,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2367,6 +2494,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2376,6 +2506,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2400,6 +2533,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2439,15 +2575,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++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),)
+@@ -2746,7 +2900,11 @@ ifdef INSTALL_BUILDUNIT
+ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+ endif
+ ifdef INSTALLPPUFILES
++ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
+ 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)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
++endif
+ ifneq ($(UNITTARGETDIRPREFIX),)
+ override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+ override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+@@ -2848,7 +3006,7 @@ ifdef LIB_NAME
+ -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+ endif
+ -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
++ -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ fpc_cleanall: $(CLEANTARGET)
+ ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+@@ -2868,13 +3026,14 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+ endif
+ -$(DELTREE) *$(SMARTEXT)
+ -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *_ppas$(BATCHEXT)
++ -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ ifdef AOUTEXT
+ -$(DEL) *$(AOUTEXT)
+ endif
+diff -durp lazarus/lcl/interfaces/win32/Makefile lazarus.tx1/lcl/interfaces/win32/Makefile
+--- lcl/interfaces/win32/Makefile 2016-03-20 14:05:51.000000000 +0100
++++ lcl/interfaces/win32/Makefile 2021-01-08 14:15:55.586816000 +0100
+@@ -1,11 +1,11 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-09-05 rev 31523]
++# 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-qnx 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-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android 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-msdos i8086-win16 aarch64-linux aarch64-darwin
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android wasm-wasm sparc64-linux
+ BSDs = freebsd netbsd openbsd darwin dragonfly
+ UNIXs = linux $(BSDs) solaris qnx haiku aix
+-LIMIT83fs = go32v2 os2 emx watcom msdos win16
++LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
+ OSNeedsComspecToRunBatch = go32v2 watcom
+ FORCE:
+ .PHONY: FORCE
+@@ -231,7 +231,7 @@ endif
+ export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ ifdef FPCDIR
+ override FPCDIR:=$(subst \,/,$(FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ else
+@@ -240,7 +240,7 @@ endif
+ ifdef DEFAULT_FPCDIR
+ ifeq ($(FPCDIR),wrong)
+ override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ endif
+@@ -254,11 +254,11 @@ endif
+ else
+ override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(BASEDIR)
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=c:/pp
+ endif
+ endif
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -305,7 +303,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ ifeq ($(UNITSDIR),)
+ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+ endif
+-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
++PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+ ifndef FPCFPMAKE
+ ifdef CROSSCOMPILE
+ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+@@ -359,9 +357,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -407,9 +402,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -419,10 +411,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -473,6 +465,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -494,6 +489,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -503,6 +501,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -527,6 +528,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -566,6 +570,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -575,9 +582,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -605,9 +624,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-qnx)
+-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-netware)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -653,9 +669,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-freebsd)
+-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-netbsd)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -665,10 +678,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-embedded)
+@@ -719,6 +732,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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),x86_64-haiku)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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),x86_64-netbsd)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -740,6 +756,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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),x86_64-android)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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),x86_64-aros)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -749,6 +768,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-netbsd)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-palmos)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -773,6 +795,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-aros)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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),powerpc64-linux)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -812,6 +837,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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),i8086-embedded)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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),i8086-msdos)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -821,9 +849,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-freebsd)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-darwin)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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)/*$(STATICLIBEXT)) $(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),wasm-wasm)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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),sparc64-linux)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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+=-gl -Sc
+ endif
+@@ -851,9 +891,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_OPTIONS+=-gl -Sc
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_OPTIONS+=-gl -Sc
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_OPTIONS+=-gl -Sc
+ endif
+@@ -899,9 +936,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_OPTIONS+=-gl -Sc
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_OPTIONS+=-gl -Sc
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_OPTIONS+=-gl -Sc
+ endif
+@@ -911,10 +945,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_OPTIONS+=-gl -Sc
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_OPTIONS+=-gl -Sc
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_OPTIONS+=-gl -Sc
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -965,6 +999,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_OPTIONS+=-gl -Sc
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_OPTIONS+=-gl -Sc
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_OPTIONS+=-gl -Sc
+ endif
+@@ -986,6 +1023,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_OPTIONS+=-gl -Sc
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_OPTIONS+=-gl -Sc
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_OPTIONS+=-gl -Sc
+ endif
+@@ -995,6 +1035,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_OPTIONS+=-gl -Sc
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_OPTIONS+=-gl -Sc
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_OPTIONS+=-gl -Sc
+ endif
+@@ -1019,6 +1062,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_OPTIONS+=-gl -Sc
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_OPTIONS+=-gl -Sc
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-gl -Sc
+ endif
+@@ -1058,6 +1104,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_OPTIONS+=-gl -Sc
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_OPTIONS+=-gl -Sc
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_OPTIONS+=-gl -Sc
+ endif
+@@ -1067,9 +1116,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-gl -Sc
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-gl -Sc
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-gl -Sc
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_OPTIONS+=-gl -Sc
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_OPTIONS+=-gl -Sc
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_OPTIONS+=-gl -Sc
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1097,9 +1158,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1145,9 +1203,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1157,10 +1212,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1211,6 +1266,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1232,6 +1290,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1241,6 +1302,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1265,6 +1329,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1304,6 +1371,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1313,9 +1383,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
+@@ -1343,9 +1425,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
+@@ -1391,9 +1470,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
+@@ -1403,10 +1479,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1457,6 +1533,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
+@@ -1478,6 +1557,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
+@@ -1487,6 +1569,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
+@@ -1511,6 +1596,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
+@@ -1550,6 +1638,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
+@@ -1559,9 +1650,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/win32
++endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -1936,6 +2039,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -1958,7 +2062,12 @@ STATICLIBEXT=.a
+ SHORTSUFFIX=d16
+ endif
+ ifeq ($(OS_TARGET),embedded)
++ifeq ($(CPU_TARGET),i8086)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++else
+ EXEEXT=.bin
++endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2249,9 +2358,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2297,9 +2403,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2309,10 +2412,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -2363,6 +2466,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2384,6 +2490,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2393,6 +2502,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2417,6 +2529,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2456,6 +2571,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2465,9 +2583,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++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),)
+@@ -2766,7 +2896,11 @@ ifdef INSTALL_BUILDUNIT
+ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+ endif
+ ifdef INSTALLPPUFILES
++ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
+ 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)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
++endif
+ ifneq ($(UNITTARGETDIRPREFIX),)
+ override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+ override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+@@ -2868,7 +3002,7 @@ ifdef LIB_NAME
+ -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+ endif
+ -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
++ -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ fpc_cleanall: $(CLEANTARGET)
+ ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+@@ -2888,13 +3022,14 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+ endif
+ -$(DELTREE) *$(SMARTEXT)
+ -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *_ppas$(BATCHEXT)
++ -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ ifdef AOUTEXT
+ -$(DEL) *$(AOUTEXT)
+ endif
+diff -durp lazarus/lcl/interfaces/wince/Makefile lazarus.tx1/lcl/interfaces/wince/Makefile
+--- lcl/interfaces/wince/Makefile 2016-03-20 14:05:51.000000000 +0100
++++ lcl/interfaces/wince/Makefile 2021-01-08 14:16:01.303834000 +0100
+@@ -1,11 +1,11 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-09-05 rev 31523]
++# 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-qnx 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-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android 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-msdos i8086-win16 aarch64-linux aarch64-darwin
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android wasm-wasm sparc64-linux
+ BSDs = freebsd netbsd openbsd darwin dragonfly
+ UNIXs = linux $(BSDs) solaris qnx haiku aix
+-LIMIT83fs = go32v2 os2 emx watcom msdos win16
++LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
+ OSNeedsComspecToRunBatch = go32v2 watcom
+ FORCE:
+ .PHONY: FORCE
+@@ -231,7 +231,7 @@ endif
+ export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ ifdef FPCDIR
+ override FPCDIR:=$(subst \,/,$(FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ else
+@@ -240,7 +240,7 @@ endif
+ ifdef DEFAULT_FPCDIR
+ ifeq ($(FPCDIR),wrong)
+ override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ endif
+@@ -254,11 +254,11 @@ endif
+ else
+ override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(BASEDIR)
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=c:/pp
+ endif
+ endif
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -305,7 +303,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ ifeq ($(UNITSDIR),)
+ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+ endif
+-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
++PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+ ifndef FPCFPMAKE
+ ifdef CROSSCOMPILE
+ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+@@ -359,9 +357,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -407,9 +402,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_UNITS+=lcl.pas
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -419,10 +411,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -473,6 +465,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -494,6 +489,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -503,6 +501,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -527,6 +528,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -566,6 +570,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override TARGET_UNITS+=lcl.pas
+ endif
+@@ -575,9 +582,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=lcl.pas
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_UNITS+=lcl.pas
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_UNITS+=lcl.pas
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -605,9 +624,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-qnx)
+-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-netware)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -653,9 +669,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-freebsd)
+-override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-netbsd)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -665,10 +678,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-embedded)
+@@ -719,6 +732,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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),x86_64-haiku)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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),x86_64-netbsd)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -740,6 +756,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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),x86_64-android)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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),x86_64-aros)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -749,6 +768,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-netbsd)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-palmos)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -773,6 +795,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-aros)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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),powerpc64-linux)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -812,6 +837,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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),i8086-embedded)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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),i8086-msdos)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+ endif
+@@ -821,9 +849,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-freebsd)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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-darwin)
+ override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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)/*$(STATICLIBEXT)) $(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),wasm-wasm)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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),sparc64-linux)
++override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(STATICLIBEXT)) $(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+=-gl
+ endif
+@@ -851,9 +891,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_OPTIONS+=-gl
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_OPTIONS+=-gl
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_OPTIONS+=-gl
+ endif
+@@ -899,9 +936,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_OPTIONS+=-gl
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_OPTIONS+=-gl
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_OPTIONS+=-gl
+ endif
+@@ -911,10 +945,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_OPTIONS+=-gl
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_OPTIONS+=-gl
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_OPTIONS+=-gl
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -965,6 +999,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_OPTIONS+=-gl
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_OPTIONS+=-gl
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_OPTIONS+=-gl
+ endif
+@@ -986,6 +1023,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_OPTIONS+=-gl
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_OPTIONS+=-gl
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_OPTIONS+=-gl
+ endif
+@@ -995,6 +1035,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_OPTIONS+=-gl
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_OPTIONS+=-gl
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_OPTIONS+=-gl
+ endif
+@@ -1019,6 +1062,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_OPTIONS+=-gl
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_OPTIONS+=-gl
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-gl
+ endif
+@@ -1058,6 +1104,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_OPTIONS+=-gl
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_OPTIONS+=-gl
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_OPTIONS+=-gl
+ endif
+@@ -1067,9 +1116,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-gl
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-gl
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-gl
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_OPTIONS+=-gl
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_OPTIONS+=-gl
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_OPTIONS+=-gl
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1097,9 +1158,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1145,9 +1203,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1157,10 +1212,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1211,6 +1266,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1232,6 +1290,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1241,6 +1302,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1265,6 +1329,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1304,6 +1371,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
+@@ -1313,9 +1383,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET) ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../../../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) .. .
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
+@@ -1343,9 +1425,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
+@@ -1391,9 +1470,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
+@@ -1403,10 +1479,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1457,6 +1533,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
+@@ -1478,6 +1557,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
+@@ -1487,6 +1569,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
+@@ -1511,6 +1596,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
+@@ -1550,6 +1638,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
+@@ -1559,9 +1650,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITTARGETDIR+=../../units/$(CPU_TARGET)-$(OS_TARGET)/wince
++endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -1936,6 +2039,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -1958,7 +2062,12 @@ STATICLIBEXT=.a
+ SHORTSUFFIX=d16
+ endif
+ ifeq ($(OS_TARGET),embedded)
++ifeq ($(CPU_TARGET),i8086)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++else
+ EXEEXT=.bin
++endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2249,9 +2358,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2297,9 +2403,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2309,10 +2412,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -2363,6 +2466,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2384,6 +2490,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2393,6 +2502,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2417,6 +2529,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2456,6 +2571,9 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2465,9 +2583,21 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++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),)
+@@ -2766,7 +2896,11 @@ ifdef INSTALL_BUILDUNIT
+ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+ endif
+ ifdef INSTALLPPUFILES
++ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
+ 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)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
++endif
+ ifneq ($(UNITTARGETDIRPREFIX),)
+ override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+ override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+@@ -2868,7 +3002,7 @@ ifdef LIB_NAME
+ -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+ endif
+ -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
++ -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ fpc_cleanall: $(CLEANTARGET)
+ ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+@@ -2888,13 +3022,14 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+ endif
+ -$(DELTREE) *$(SMARTEXT)
+ -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *_ppas$(BATCHEXT)
++ -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ ifdef AOUTEXT
+ -$(DEL) *$(AOUTEXT)
+ endif
+diff -durp lazarus/packager/registration/Makefile lazarus.tx1/packager/registration/Makefile
+--- packager/registration/Makefile 2020-07-03 23:44:57.000000000 +0200
++++ packager/registration/Makefile 2021-01-08 14:16:05.155735000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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-arch
+ 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)
+@@ -569,9 +551,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override TARGET_UNITS+=fcllaz.pas
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override TARGET_UNITS+=fcllaz.pas
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_UNITS+=fcllaz.pas
+ endif
+@@ -605,9 +584,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override TARGET_UNITS+=fcllaz.pas
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override TARGET_UNITS+=fcllaz.pas
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override TARGET_UNITS+=fcllaz.pas
+ endif
+@@ -626,10 +602,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=fcllaz.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override TARGET_UNITS+=fcllaz.pas
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=fcllaz.pas
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -641,36 +617,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override TARGET_UNITS+=fcllaz.pas
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override TARGET_UNITS+=fcllaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override TARGET_UNITS+=fcllaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override TARGET_UNITS+=fcllaz.pas
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override TARGET_UNITS+=fcllaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override TARGET_UNITS+=fcllaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override TARGET_UNITS+=fcllaz.pas
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override TARGET_UNITS+=fcllaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override TARGET_UNITS+=fcllaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override TARGET_UNITS+=fcllaz.pas
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override TARGET_UNITS+=fcllaz.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
+@@ -872,9 +818,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),powerpc64-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
+@@ -908,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
+@@ -929,10 +869,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-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),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ 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)
++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-android)
+@@ -944,36 +884,6 @@ 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),i386-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1175,9 +1085,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1211,9 +1118,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+@@ -1232,10 +1136,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1247,36 +1151,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=.
+ endif
+@@ -1478,9 +1352,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITDIR+=.
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=.
+ endif
+@@ -1514,9 +1385,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITDIR+=.
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITDIR+=.
+ endif
+@@ -1535,10 +1403,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=.
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1550,36 +1418,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITDIR+=.
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITDIR+=.
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITDIR+=.
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITDIR+=.
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITDIR+=.
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITDIR+=.
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITDIR+=.
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITDIR+=.
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITDIR+=.
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITDIR+=.
+-endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1781,9 +1619,6 @@ endif
+ ifeq ($(FULL_TARGET),arm-aros)
+ override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),arm-freertos)
+-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1817,9 +1652,6 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-android)
+ override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),mips64el-linux)
+-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+ ifeq ($(FULL_TARGET),jvm-java)
+ override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -1838,10 +1670,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -1853,36 +1685,6 @@ endif
+ ifeq ($(FULL_TARGET),sparc64-linux)
+ override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+-ifeq ($(FULL_TARGET),riscv32-linux)
+-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+-ifeq ($(FULL_TARGET),riscv32-embedded)
+-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-linux)
+-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+-ifeq ($(FULL_TARGET),riscv64-embedded)
+-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-linux)
+-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-embedded)
+-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+-ifeq ($(FULL_TARGET),xtensa-freertos)
+-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+-ifeq ($(FULL_TARGET),z80-embedded)
+-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+-ifeq ($(FULL_TARGET),z80-zxspectrum)
+-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+-ifeq ($(FULL_TARGET),z80-msxdos)
+-override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+-endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -2079,63 +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),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
+-CROSSGCCOPT=-m32
+-endif
+-endif
+-endif
+-endif
+-ifdef FPCFPMAKE
+-FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)
+-ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))
+-FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)
+-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
+@@ -2330,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=
+@@ -2342,9 +2088,6 @@ STATICLIBEXT=.a
+ else
+ EXEEXT=.bin
+ endif
+-ifeq ($(CPU_TARGET),z80)
+-OEXT=.rel
+-endif
+ SHORTSUFFIX=emb
+ endif
+ ifeq ($(OS_TARGET),win16)
+@@ -2353,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)
+@@ -2812,9 +2552,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),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2848,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
+@@ -2869,10 +2603,10 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-darwin)
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),aarch64-win64)
++ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-android)
+@@ -2884,36 +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
+ ifdef REQUIRE_PACKAGES_RTL
+ PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
+ ifneq ($(PACKAGEDIR_RTL),)
+@@ -3003,7 +2707,16 @@ override FPCOPT+=-gl
+ override FPCOPTDEF+=DEBUG
+ endif
+ ifdef RELEASE
++ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
++ifeq ($(CPU_TARGET),i386)
++FPCCPUOPT:=-OG2p3
++endif
++ifeq ($(CPU_TARGET),powerpc)
++FPCCPUOPT:=-O1r
++endif
++else
+ FPCCPUOPT:=-O2
++endif
+ override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
+ override FPCOPTDEF+=RELEASE
+ endif
+@@ -3065,17 +2778,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
+@@ -3142,7 +2844,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):
+@@ -3173,7 +2875,6 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDI
+ 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
+@@ -3194,7 +2895,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
+@@ -3216,15 +2917,13 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILD
+ 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
+@@ -3379,14 +3078,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
+@@ -3410,9 +3107,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)
+@@ -3433,14 +3129,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 -durp lazarus/tools/Makefile lazarus.tx1/tools/Makefile
+--- tools/Makefile 2016-07-17 00:40:44.000000000 +0200
++++ tools/Makefile 2021-01-08 14:16:04.674658000 +0100
+@@ -1,11 +1,11 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2015-08-12 rev 31317]
++# 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-qnx 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-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android 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-msdos aarch64-linux aarch64-darwin
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android wasm-wasm sparc64-linux
+ BSDs = freebsd netbsd openbsd darwin dragonfly
+ UNIXs = linux $(BSDs) solaris qnx haiku aix
+-LIMIT83fs = go32v2 os2 emx watcom msdos
++LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
+ OSNeedsComspecToRunBatch = go32v2 watcom
+ FORCE:
+ .PHONY: FORCE
+@@ -231,7 +231,7 @@ endif
+ export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ ifdef FPCDIR
+ override FPCDIR:=$(subst \,/,$(FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ else
+@@ -240,7 +240,7 @@ endif
+ ifdef DEFAULT_FPCDIR
+ ifeq ($(FPCDIR),wrong)
+ override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ endif
+@@ -254,11 +254,11 @@ endif
+ else
+ override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(BASEDIR)
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=c:/pp
+ endif
+ endif
+@@ -287,14 +287,12 @@ else
+ ifeq ($(CPU_TARGET),i386)
+ BINUTILSPREFIX=i686-linux-android-
+ else
+-ifeq ($(CPU_TARGET),mipsel)
+-BINUTILSPREFIX=mipsel-linux-android-
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
+ endif
+-endif
+ else
+ BINUTILSPREFIX=$(OS_TARGET)-
+ endif
+@@ -305,7 +303,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ ifeq ($(UNITSDIR),)
+ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+ endif
+-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
++PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+ ifndef FPCFPMAKE
+ ifdef CROSSCOMPILE
+ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+@@ -364,9 +362,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+ endif
+@@ -412,9 +407,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+ endif
+@@ -424,10 +416,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -478,6 +470,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+ endif
+@@ -499,6 +494,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+ endif
+@@ -508,6 +506,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+ endif
+@@ -532,6 +533,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+ endif
+@@ -571,15 +575,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_PROGRAMS+=lazres svn2revisioninc updatepofiles lrstolfm
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
+@@ -607,9 +629,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
+@@ -655,9 +674,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
+@@ -667,10 +683,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -721,6 +737,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
+@@ -742,6 +761,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
+@@ -751,6 +773,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
+@@ -775,6 +800,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
+@@ -814,15 +842,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS) $(DBG_OPTIONS)
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+@@ -850,9 +896,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+@@ -898,9 +941,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+@@ -910,10 +950,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -964,6 +1004,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+@@ -985,6 +1028,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+@@ -994,6 +1040,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+@@ -1018,6 +1067,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
+@@ -1057,15 +1109,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITDIR+=. $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/nogui
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1093,9 +1163,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_TARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_TARGETDIR+=.
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1141,9 +1208,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_TARGETDIR+=.
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1153,10 +1217,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_TARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_TARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_TARGETDIR+=.
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1207,6 +1271,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1228,6 +1295,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1237,6 +1307,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1261,6 +1334,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1300,15 +1376,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+@@ -1336,9 +1430,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITTARGETDIR+=.
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+@@ -1384,9 +1475,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-override COMPILER_UNITTARGETDIR+=.
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+@@ -1396,10 +1484,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1450,6 +1538,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITTARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+@@ -1471,6 +1562,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITTARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+@@ -1480,6 +1574,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITTARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+@@ -1504,6 +1601,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITTARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+@@ -1543,15 +1643,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITTARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override COMPILER_UNITTARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITTARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITTARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITTARGETDIR+=.
++endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -1957,6 +2075,7 @@ endif
+ ifeq ($(OS_TARGET),aix)
+ BATCHEXT=.sh
+ EXEEXT=
++SHAREDLIBEXT=.a
+ SHORTSUFFIX=aix
+ endif
+ ifeq ($(OS_TARGET),java)
+@@ -1979,9 +2098,20 @@ STATICLIBEXT=.a
+ SHORTSUFFIX=d16
+ endif
+ ifeq ($(OS_TARGET),embedded)
++ifeq ($(CPU_TARGET),i8086)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++else
+ EXEEXT=.bin
++endif
+ SHORTSUFFIX=emb
+ endif
++ifeq ($(OS_TARGET),win16)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++SHAREDLIBEXT=.dll
++SHORTSUFFIX=w16
++endif
+ ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+ FPCMADE=fpcmade.$(SHORTSUFFIX)
+ ZIPSUFFIX=$(SHORTSUFFIX)
+@@ -2264,9 +2394,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2312,9 +2439,6 @@ endif
+ ifeq ($(FULL_TARGET),m68k-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2324,10 +2448,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -2378,6 +2502,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2399,6 +2526,9 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-iphonesim)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-aros)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2408,6 +2538,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2432,6 +2565,9 @@ endif
+ ifeq ($(FULL_TARGET),arm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-aros)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2471,15 +2607,33 @@ endif
+ ifeq ($(FULL_TARGET),jvm-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),i8086-msdos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),i8086-win16)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++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),)
+@@ -2794,7 +2948,11 @@ ifdef INSTALL_BUILDUNIT
+ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+ endif
+ ifdef INSTALLPPUFILES
++ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
+ 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)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
++endif
+ ifneq ($(UNITTARGETDIRPREFIX),)
+ override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+ override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+@@ -2982,7 +3140,7 @@ ifdef LIB_NAME
+ -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+ endif
+ -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
++ -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ fpc_cleanall: $(CLEANTARGET)
+ ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+@@ -3002,13 +3160,14 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+ endif
+ -$(DELTREE) *$(SMARTEXT)
+ -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *_ppas$(BATCHEXT)
++ -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ ifdef AOUTEXT
+ -$(DEL) *$(AOUTEXT)
+ endif
+diff -durp lazarus/tools/apiwizz/Makefile lazarus.tx1/tools/apiwizz/Makefile
+--- tools/apiwizz/Makefile 2012-04-09 15:41:22.000000000 +0200
++++ tools/apiwizz/Makefile 2021-01-08 14:16:04.198623000 +0100
+@@ -1,11 +1,11 @@
+ #
+-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/09]
++# 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-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux
+-BSDs = freebsd netbsd openbsd darwin
+-UNIXs = linux $(BSDs) solaris qnx haiku
+-LIMIT83fs = go32v2 os2 emx watcom
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+ OSNeedsComspecToRunBatch = go32v2 watcom
+ FORCE:
+ .PHONY: FORCE
+@@ -183,6 +183,18 @@ $(error When compiling for arm-embedded, a sub-archite
+ endif
+ override FPCOPT+=-Cp$(SUBARCH)
+ endif
++ifeq ($(FULL_TARGET),avr-embedded)
++ifeq ($(SUBARCH),)
++$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined)
++endif
++override FPCOPT+=-Cp$(SUBARCH)
++endif
++ifeq ($(FULL_TARGET),mipsel-embedded)
++ifeq ($(SUBARCH),)
++$(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined)
++endif
++override FPCOPT+=-Cp$(SUBARCH)
++endif
+ ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+ TARGETSUFFIX=$(OS_TARGET)
+ SOURCESUFFIX=$(OS_SOURCE)
+@@ -208,10 +220,18 @@ endif
+ ifeq ($(OS_TARGET),linux)
+ linuxHier=1
+ endif
++ifndef CROSSCOMPILE
++BUILDFULLNATIVE=1
++export BUILDFULLNATIVE
++endif
++ifdef BUILDFULLNATIVE
++BUILDNATIVE=1
++export BUILDNATIVE
++endif
+ export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE
+ ifdef FPCDIR
+ override FPCDIR:=$(subst \,/,$(FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ else
+@@ -220,7 +240,7 @@ endif
+ ifdef DEFAULT_FPCDIR
+ ifeq ($(FPCDIR),wrong)
+ override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=wrong
+ endif
+ endif
+@@ -234,11 +254,11 @@ endif
+ else
+ override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))))
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(FPCDIR)/..
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR:=$(BASEDIR)
+-ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
++ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)
+ override FPCDIR=c:/pp
+ endif
+ endif
+@@ -256,17 +276,34 @@ endif
+ ifndef BINUTILSPREFIX
+ ifndef CROSSBINDIR
+ ifdef CROSSCOMPILE
++ifneq ($(OS_TARGET),msdos)
+ ifndef DARWIN2DARWIN
++ifneq ($(CPU_TARGET),jvm)
+ BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-
++ifeq ($(OS_TARGET),android)
++ifeq ($(CPU_TARGET),arm)
++BINUTILSPREFIX=arm-linux-androideabi-
++else
++ifeq ($(CPU_TARGET),i386)
++BINUTILSPREFIX=i686-linux-android-
++else
++BINUTILSPREFIX=$(CPU_TARGET)-linux-android-
+ endif
+ endif
+ endif
+ endif
++endif
++else
++BINUTILSPREFIX=$(OS_TARGET)-
++endif
++endif
++endif
++endif
+ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))
+ ifeq ($(UNITSDIR),)
+ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
+ endif
+-PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
++PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
+ ifndef FPCFPMAKE
+ ifdef CROSSCOMPILE
+ ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
+@@ -338,9 +375,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override TARGET_PROGRAMS+=apiwizz
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
+@@ -377,12 +411,15 @@ endif
+ ifeq ($(FULL_TARGET),i386-iphonesim)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
+-ifeq ($(FULL_TARGET),m68k-linux)
++ifeq ($(FULL_TARGET),i386-android)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
++ifeq ($(FULL_TARGET),i386-aros)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
++ifeq ($(FULL_TARGET),m68k-linux)
++override TARGET_PROGRAMS+=apiwizz
++endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
+@@ -392,10 +429,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -425,6 +462,9 @@ endif
+ ifeq ($(FULL_TARGET),powerpc-wii)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
++ifeq ($(FULL_TARGET),powerpc-aix)
++override TARGET_PROGRAMS+=apiwizz
++endif
+ ifeq ($(FULL_TARGET),sparc-linux)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
+@@ -443,6 +483,12 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override TARGET_PROGRAMS+=apiwizz
++endif
++ifeq ($(FULL_TARGET),x86_64-netbsd)
++override TARGET_PROGRAMS+=apiwizz
++endif
+ ifeq ($(FULL_TARGET),x86_64-solaris)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
+@@ -458,9 +504,24 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-embedded)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
++ifeq ($(FULL_TARGET),x86_64-iphonesim)
++override TARGET_PROGRAMS+=apiwizz
++endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override TARGET_PROGRAMS+=apiwizz
++endif
++ifeq ($(FULL_TARGET),x86_64-aros)
++override TARGET_PROGRAMS+=apiwizz
++endif
++ifeq ($(FULL_TARGET),x86_64-dragonfly)
++override TARGET_PROGRAMS+=apiwizz
++endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override TARGET_PROGRAMS+=apiwizz
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
+@@ -482,6 +543,12 @@ endif
+ ifeq ($(FULL_TARGET),arm-symbian)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
++ifeq ($(FULL_TARGET),arm-android)
++override TARGET_PROGRAMS+=apiwizz
++endif
++ifeq ($(FULL_TARGET),arm-aros)
++override TARGET_PROGRAMS+=apiwizz
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
+@@ -491,6 +558,9 @@ endif
+ ifeq ($(FULL_TARGET),powerpc64-embedded)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
++ifeq ($(FULL_TARGET),powerpc64-aix)
++override TARGET_PROGRAMS+=apiwizz
++endif
+ ifeq ($(FULL_TARGET),avr-embedded)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
+@@ -506,6 +576,45 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-linux)
+ override TARGET_PROGRAMS+=apiwizz
+ endif
++ifeq ($(FULL_TARGET),mipsel-embedded)
++override TARGET_PROGRAMS+=apiwizz
++endif
++ifeq ($(FULL_TARGET),mipsel-android)
++override TARGET_PROGRAMS+=apiwizz
++endif
++ifeq ($(FULL_TARGET),jvm-java)
++override TARGET_PROGRAMS+=apiwizz
++endif
++ifeq ($(FULL_TARGET),jvm-android)
++override TARGET_PROGRAMS+=apiwizz
++endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override TARGET_PROGRAMS+=apiwizz
++endif
++ifeq ($(FULL_TARGET),i8086-msdos)
++override TARGET_PROGRAMS+=apiwizz
++endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override TARGET_PROGRAMS+=apiwizz
++endif
++ifeq ($(FULL_TARGET),aarch64-linux)
++override TARGET_PROGRAMS+=apiwizz
++endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=apiwizz
++endif
++ifeq ($(FULL_TARGET),aarch64-darwin)
++override TARGET_PROGRAMS+=apiwizz
++endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override TARGET_PROGRAMS+=apiwizz
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override TARGET_PROGRAMS+=apiwizz
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override TARGET_PROGRAMS+=apiwizz
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override CLEAN_UNITS+=apiwizard
+ endif
+@@ -533,9 +642,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override CLEAN_UNITS+=apiwizard
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override CLEAN_UNITS+=apiwizard
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override CLEAN_UNITS+=apiwizard
+ endif
+@@ -572,12 +678,15 @@ endif
+ ifeq ($(FULL_TARGET),i386-iphonesim)
+ override CLEAN_UNITS+=apiwizard
+ endif
+-ifeq ($(FULL_TARGET),m68k-linux)
++ifeq ($(FULL_TARGET),i386-android)
+ override CLEAN_UNITS+=apiwizard
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
++ifeq ($(FULL_TARGET),i386-aros)
+ override CLEAN_UNITS+=apiwizard
+ endif
++ifeq ($(FULL_TARGET),m68k-linux)
++override CLEAN_UNITS+=apiwizard
++endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override CLEAN_UNITS+=apiwizard
+ endif
+@@ -587,10 +696,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override CLEAN_UNITS+=apiwizard
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override CLEAN_UNITS+=apiwizard
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override CLEAN_UNITS+=apiwizard
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -620,6 +729,9 @@ endif
+ ifeq ($(FULL_TARGET),powerpc-wii)
+ override CLEAN_UNITS+=apiwizard
+ endif
++ifeq ($(FULL_TARGET),powerpc-aix)
++override CLEAN_UNITS+=apiwizard
++endif
+ ifeq ($(FULL_TARGET),sparc-linux)
+ override CLEAN_UNITS+=apiwizard
+ endif
+@@ -638,6 +750,12 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override CLEAN_UNITS+=apiwizard
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override CLEAN_UNITS+=apiwizard
++endif
++ifeq ($(FULL_TARGET),x86_64-netbsd)
++override CLEAN_UNITS+=apiwizard
++endif
+ ifeq ($(FULL_TARGET),x86_64-solaris)
+ override CLEAN_UNITS+=apiwizard
+ endif
+@@ -653,9 +771,24 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-embedded)
+ override CLEAN_UNITS+=apiwizard
+ endif
++ifeq ($(FULL_TARGET),x86_64-iphonesim)
++override CLEAN_UNITS+=apiwizard
++endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override CLEAN_UNITS+=apiwizard
++endif
++ifeq ($(FULL_TARGET),x86_64-aros)
++override CLEAN_UNITS+=apiwizard
++endif
++ifeq ($(FULL_TARGET),x86_64-dragonfly)
++override CLEAN_UNITS+=apiwizard
++endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override CLEAN_UNITS+=apiwizard
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override CLEAN_UNITS+=apiwizard
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override CLEAN_UNITS+=apiwizard
+ endif
+@@ -677,6 +810,12 @@ endif
+ ifeq ($(FULL_TARGET),arm-symbian)
+ override CLEAN_UNITS+=apiwizard
+ endif
++ifeq ($(FULL_TARGET),arm-android)
++override CLEAN_UNITS+=apiwizard
++endif
++ifeq ($(FULL_TARGET),arm-aros)
++override CLEAN_UNITS+=apiwizard
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override CLEAN_UNITS+=apiwizard
+ endif
+@@ -686,6 +825,9 @@ endif
+ ifeq ($(FULL_TARGET),powerpc64-embedded)
+ override CLEAN_UNITS+=apiwizard
+ endif
++ifeq ($(FULL_TARGET),powerpc64-aix)
++override CLEAN_UNITS+=apiwizard
++endif
+ ifeq ($(FULL_TARGET),avr-embedded)
+ override CLEAN_UNITS+=apiwizard
+ endif
+@@ -701,6 +843,45 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-linux)
+ override CLEAN_UNITS+=apiwizard
+ endif
++ifeq ($(FULL_TARGET),mipsel-embedded)
++override CLEAN_UNITS+=apiwizard
++endif
++ifeq ($(FULL_TARGET),mipsel-android)
++override CLEAN_UNITS+=apiwizard
++endif
++ifeq ($(FULL_TARGET),jvm-java)
++override CLEAN_UNITS+=apiwizard
++endif
++ifeq ($(FULL_TARGET),jvm-android)
++override CLEAN_UNITS+=apiwizard
++endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override CLEAN_UNITS+=apiwizard
++endif
++ifeq ($(FULL_TARGET),i8086-msdos)
++override CLEAN_UNITS+=apiwizard
++endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override CLEAN_UNITS+=apiwizard
++endif
++ifeq ($(FULL_TARGET),aarch64-linux)
++override CLEAN_UNITS+=apiwizard
++endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override CLEAN_UNITS+=apiwizard
++endif
++ifeq ($(FULL_TARGET),aarch64-darwin)
++override CLEAN_UNITS+=apiwizard
++endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override CLEAN_UNITS+=apiwizard
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override CLEAN_UNITS+=apiwizard
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override CLEAN_UNITS+=apiwizard
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override CLEAN_FILES+=*.or
+ endif
+@@ -728,9 +909,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override CLEAN_FILES+=*.or
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override CLEAN_FILES+=*.or
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override CLEAN_FILES+=*.or
+ endif
+@@ -767,12 +945,15 @@ endif
+ ifeq ($(FULL_TARGET),i386-iphonesim)
+ override CLEAN_FILES+=*.or
+ endif
+-ifeq ($(FULL_TARGET),m68k-linux)
++ifeq ($(FULL_TARGET),i386-android)
+ override CLEAN_FILES+=*.or
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
++ifeq ($(FULL_TARGET),i386-aros)
+ override CLEAN_FILES+=*.or
+ endif
++ifeq ($(FULL_TARGET),m68k-linux)
++override CLEAN_FILES+=*.or
++endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override CLEAN_FILES+=*.or
+ endif
+@@ -782,10 +963,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override CLEAN_FILES+=*.or
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override CLEAN_FILES+=*.or
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override CLEAN_FILES+=*.or
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -815,6 +996,9 @@ endif
+ ifeq ($(FULL_TARGET),powerpc-wii)
+ override CLEAN_FILES+=*.or
+ endif
++ifeq ($(FULL_TARGET),powerpc-aix)
++override CLEAN_FILES+=*.or
++endif
+ ifeq ($(FULL_TARGET),sparc-linux)
+ override CLEAN_FILES+=*.or
+ endif
+@@ -833,6 +1017,12 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override CLEAN_FILES+=*.or
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override CLEAN_FILES+=*.or
++endif
++ifeq ($(FULL_TARGET),x86_64-netbsd)
++override CLEAN_FILES+=*.or
++endif
+ ifeq ($(FULL_TARGET),x86_64-solaris)
+ override CLEAN_FILES+=*.or
+ endif
+@@ -848,9 +1038,24 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-embedded)
+ override CLEAN_FILES+=*.or
+ endif
++ifeq ($(FULL_TARGET),x86_64-iphonesim)
++override CLEAN_FILES+=*.or
++endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override CLEAN_FILES+=*.or
++endif
++ifeq ($(FULL_TARGET),x86_64-aros)
++override CLEAN_FILES+=*.or
++endif
++ifeq ($(FULL_TARGET),x86_64-dragonfly)
++override CLEAN_FILES+=*.or
++endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override CLEAN_FILES+=*.or
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override CLEAN_FILES+=*.or
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override CLEAN_FILES+=*.or
+ endif
+@@ -872,6 +1077,12 @@ endif
+ ifeq ($(FULL_TARGET),arm-symbian)
+ override CLEAN_FILES+=*.or
+ endif
++ifeq ($(FULL_TARGET),arm-android)
++override CLEAN_FILES+=*.or
++endif
++ifeq ($(FULL_TARGET),arm-aros)
++override CLEAN_FILES+=*.or
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override CLEAN_FILES+=*.or
+ endif
+@@ -881,6 +1092,9 @@ endif
+ ifeq ($(FULL_TARGET),powerpc64-embedded)
+ override CLEAN_FILES+=*.or
+ endif
++ifeq ($(FULL_TARGET),powerpc64-aix)
++override CLEAN_FILES+=*.or
++endif
+ ifeq ($(FULL_TARGET),avr-embedded)
+ override CLEAN_FILES+=*.or
+ endif
+@@ -896,6 +1110,45 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-linux)
+ override CLEAN_FILES+=*.or
+ endif
++ifeq ($(FULL_TARGET),mipsel-embedded)
++override CLEAN_FILES+=*.or
++endif
++ifeq ($(FULL_TARGET),mipsel-android)
++override CLEAN_FILES+=*.or
++endif
++ifeq ($(FULL_TARGET),jvm-java)
++override CLEAN_FILES+=*.or
++endif
++ifeq ($(FULL_TARGET),jvm-android)
++override CLEAN_FILES+=*.or
++endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override CLEAN_FILES+=*.or
++endif
++ifeq ($(FULL_TARGET),i8086-msdos)
++override CLEAN_FILES+=*.or
++endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override CLEAN_FILES+=*.or
++endif
++ifeq ($(FULL_TARGET),aarch64-linux)
++override CLEAN_FILES+=*.or
++endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override CLEAN_FILES+=*.or
++endif
++ifeq ($(FULL_TARGET),aarch64-darwin)
++override CLEAN_FILES+=*.or
++endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override CLEAN_FILES+=*.or
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override CLEAN_FILES+=*.or
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override CLEAN_FILES+=*.or
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
+@@ -923,9 +1176,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
+@@ -962,12 +1212,15 @@ endif
+ ifeq ($(FULL_TARGET),i386-iphonesim)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-linux)
++ifeq ($(FULL_TARGET),i386-android)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
++ifeq ($(FULL_TARGET),i386-aros)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
++ifeq ($(FULL_TARGET),m68k-linux)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
+@@ -977,10 +1230,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1010,6 +1263,9 @@ endif
+ ifeq ($(FULL_TARGET),powerpc-wii)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
++ifeq ($(FULL_TARGET),powerpc-aix)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
+ ifeq ($(FULL_TARGET),sparc-linux)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
+@@ -1028,6 +1284,12 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
++ifeq ($(FULL_TARGET),x86_64-netbsd)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
+ ifeq ($(FULL_TARGET),x86_64-solaris)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
+@@ -1043,9 +1305,24 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-embedded)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
++ifeq ($(FULL_TARGET),x86_64-iphonesim)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
++ifeq ($(FULL_TARGET),x86_64-aros)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
++ifeq ($(FULL_TARGET),x86_64-dragonfly)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
+@@ -1067,6 +1344,12 @@ endif
+ ifeq ($(FULL_TARGET),arm-symbian)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
++ifeq ($(FULL_TARGET),arm-android)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
+@@ -1076,6 +1359,9 @@ endif
+ ifeq ($(FULL_TARGET),powerpc64-embedded)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
++ifeq ($(FULL_TARGET),powerpc64-aix)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
+ ifeq ($(FULL_TARGET),avr-embedded)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
+@@ -1091,6 +1377,45 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-linux)
+ override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
+ endif
++ifeq ($(FULL_TARGET),mipsel-embedded)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
++ifeq ($(FULL_TARGET),mipsel-android)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
++ifeq ($(FULL_TARGET),jvm-java)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
++ifeq ($(FULL_TARGET),jvm-android)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
++ifeq ($(FULL_TARGET),i8086-msdos)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
++ifeq ($(FULL_TARGET),aarch64-linux)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
++ifeq ($(FULL_TARGET),aarch64-darwin)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_OPTIONS+=-gl $(LAZARUS_LIBPATHS)
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1118,9 +1443,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1157,12 +1479,15 @@ endif
+ ifeq ($(FULL_TARGET),i386-iphonesim)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),m68k-linux)
++ifeq ($(FULL_TARGET),i386-android)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
++ifeq ($(FULL_TARGET),i386-aros)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),m68k-linux)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1172,10 +1497,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1205,6 +1530,9 @@ endif
+ ifeq ($(FULL_TARGET),powerpc-wii)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),powerpc-aix)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),sparc-linux)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1223,6 +1551,12 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
++ifeq ($(FULL_TARGET),x86_64-netbsd)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),x86_64-solaris)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1238,9 +1572,24 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-embedded)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),x86_64-iphonesim)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
++ifeq ($(FULL_TARGET),x86_64-aros)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
++ifeq ($(FULL_TARGET),x86_64-dragonfly)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1262,6 +1611,12 @@ endif
+ ifeq ($(FULL_TARGET),arm-symbian)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),arm-android)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1271,6 +1626,9 @@ endif
+ ifeq ($(FULL_TARGET),powerpc64-embedded)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),powerpc64-aix)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),avr-embedded)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
+@@ -1286,6 +1644,45 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-linux)
+ override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
+ endif
++ifeq ($(FULL_TARGET),mipsel-embedded)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
++ifeq ($(FULL_TARGET),mipsel-android)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
++ifeq ($(FULL_TARGET),jvm-java)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
++ifeq ($(FULL_TARGET),jvm-android)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
++ifeq ($(FULL_TARGET),i8086-msdos)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
++ifeq ($(FULL_TARGET),aarch64-linux)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
++ifeq ($(FULL_TARGET),aarch64-darwin)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITDIR+=. $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1313,9 +1710,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_TARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_TARGETDIR+=.
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1352,12 +1746,15 @@ endif
+ ifeq ($(FULL_TARGET),i386-iphonesim)
+ override COMPILER_TARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-linux)
++ifeq ($(FULL_TARGET),i386-android)
+ override COMPILER_TARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
++ifeq ($(FULL_TARGET),i386-aros)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),m68k-linux)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1367,10 +1764,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_TARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_TARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_TARGETDIR+=.
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1400,6 +1797,9 @@ endif
+ ifeq ($(FULL_TARGET),powerpc-wii)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),powerpc-aix)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),sparc-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1418,6 +1818,12 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),x86_64-netbsd)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),x86_64-solaris)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1433,9 +1839,24 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-embedded)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),x86_64-iphonesim)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),x86_64-aros)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),x86_64-dragonfly)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1457,6 +1878,12 @@ endif
+ ifeq ($(FULL_TARGET),arm-symbian)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),arm-android)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1466,6 +1893,9 @@ endif
+ ifeq ($(FULL_TARGET),powerpc64-embedded)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),powerpc64-aix)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),avr-embedded)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1481,6 +1911,45 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),mipsel-embedded)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),mipsel-android)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),jvm-java)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),jvm-android)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),i8086-msdos)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),aarch64-linux)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),aarch64-darwin)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_TARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),i386-linux)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+@@ -1508,9 +1977,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-override COMPILER_UNITTARGETDIR+=.
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+@@ -1547,12 +2013,15 @@ endif
+ ifeq ($(FULL_TARGET),i386-iphonesim)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-linux)
++ifeq ($(FULL_TARGET),i386-android)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
++ifeq ($(FULL_TARGET),i386-aros)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),m68k-linux)
++override COMPILER_UNITTARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+@@ -1562,10 +2031,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -1595,6 +2064,9 @@ endif
+ ifeq ($(FULL_TARGET),powerpc-wii)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),powerpc-aix)
++override COMPILER_UNITTARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),sparc-linux)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+@@ -1613,6 +2085,12 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++override COMPILER_UNITTARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),x86_64-netbsd)
++override COMPILER_UNITTARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),x86_64-solaris)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+@@ -1628,9 +2106,24 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-embedded)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),x86_64-iphonesim)
++override COMPILER_UNITTARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),x86_64-android)
++override COMPILER_UNITTARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),x86_64-aros)
++override COMPILER_UNITTARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),x86_64-dragonfly)
++override COMPILER_UNITTARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++override COMPILER_UNITTARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+@@ -1652,6 +2145,12 @@ endif
+ ifeq ($(FULL_TARGET),arm-symbian)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),arm-android)
++override COMPILER_UNITTARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),arm-aros)
++override COMPILER_UNITTARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+@@ -1661,6 +2160,9 @@ endif
+ ifeq ($(FULL_TARGET),powerpc64-embedded)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),powerpc64-aix)
++override COMPILER_UNITTARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),avr-embedded)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
+@@ -1676,6 +2178,45 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-linux)
+ override COMPILER_UNITTARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),mipsel-embedded)
++override COMPILER_UNITTARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),mipsel-android)
++override COMPILER_UNITTARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),jvm-java)
++override COMPILER_UNITTARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),jvm-android)
++override COMPILER_UNITTARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++override COMPILER_UNITTARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),i8086-msdos)
++override COMPILER_UNITTARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),i8086-win16)
++override COMPILER_UNITTARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),aarch64-linux)
++override COMPILER_UNITTARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),aarch64-darwin)
++override COMPILER_UNITTARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),aarch64-android)
++override COMPILER_UNITTARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++override COMPILER_UNITTARGETDIR+=.
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++override COMPILER_UNITTARGETDIR+=.
++endif
+ ifdef REQUIRE_UNITSDIR
+ override UNITSDIR+=$(REQUIRE_UNITSDIR)
+ endif
+@@ -1904,12 +2445,26 @@ SHAREDLIBEXT=.dll
+ SHORTSUFFIX=wat
+ IMPORTLIBPREFIX=
+ endif
++ifneq ($(CPU_TARGET),jvm)
++ifeq ($(OS_TARGET),android)
++BATCHEXT=.sh
++EXEEXT=
++HASSHAREDLIB=1
++SHORTSUFFIX=lnx
++endif
++endif
+ ifeq ($(OS_TARGET),linux)
+ BATCHEXT=.sh
+ EXEEXT=
+ HASSHAREDLIB=1
+ SHORTSUFFIX=lnx
+ endif
++ifeq ($(OS_TARGET),dragonfly)
++BATCHEXT=.sh
++EXEEXT=
++HASSHAREDLIB=1
++SHORTSUFFIX=df
++endif
+ ifeq ($(OS_TARGET),freebsd)
+ BATCHEXT=.sh
+ EXEEXT=
+@@ -1955,6 +2510,11 @@ EXEEXT=
+ SHAREDLIBEXT=.library
+ SHORTSUFFIX=amg
+ endif
++ifeq ($(OS_TARGET),aros)
++EXEEXT=
++SHAREDLIBEXT=.library
++SHORTSUFFIX=aros
++endif
+ ifeq ($(OS_TARGET),morphos)
+ EXEEXT=
+ SHAREDLIBEXT=.library
+@@ -2028,6 +2588,46 @@ EXEEXT=.dol
+ SHAREDLIBEXT=.so
+ SHORTSUFFIX=wii
+ endif
++ifeq ($(OS_TARGET),aix)
++BATCHEXT=.sh
++EXEEXT=
++SHAREDLIBEXT=.a
++SHORTSUFFIX=aix
++endif
++ifeq ($(OS_TARGET),java)
++OEXT=.class
++ASMEXT=.j
++SHAREDLIBEXT=.jar
++SHORTSUFFIX=java
++endif
++ifeq ($(CPU_TARGET),jvm)
++ifeq ($(OS_TARGET),android)
++OEXT=.class
++ASMEXT=.j
++SHAREDLIBEXT=.jar
++SHORTSUFFIX=android
++endif
++endif
++ifeq ($(OS_TARGET),msdos)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++SHORTSUFFIX=d16
++endif
++ifeq ($(OS_TARGET),embedded)
++ifeq ($(CPU_TARGET),i8086)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++else
++EXEEXT=.bin
++endif
++SHORTSUFFIX=emb
++endif
++ifeq ($(OS_TARGET),win16)
++STATICLIBPREFIX=
++STATICLIBEXT=.a
++SHAREDLIBEXT=.dll
++SHORTSUFFIX=w16
++endif
+ ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+ FPCMADE=fpcmade.$(SHORTSUFFIX)
+ ZIPSUFFIX=$(SHORTSUFFIX)
+@@ -2217,6 +2817,7 @@ ASNAME=$(BINUTILSPREFIX)as
+ LDNAME=$(BINUTILSPREFIX)ld
+ ARNAME=$(BINUTILSPREFIX)ar
+ RCNAME=$(BINUTILSPREFIX)rc
++NASMNAME=$(BINUTILSPREFIX)nasm
+ ifndef ASPROG
+ ifdef CROSSBINDIR
+ ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
+@@ -2245,11 +2846,23 @@ else
+ ARPROG=$(ARNAME)
+ endif
+ endif
++ifndef NASMPROG
++ifdef CROSSBINDIR
++NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT)
++else
++NASMPROG=$(NASMNAME)
++endif
++endif
+ AS=$(ASPROG)
+ LD=$(LDPROG)
+ RC=$(RCPROG)
+ AR=$(ARPROG)
++NASM=$(NASMPROG)
++ifdef inUnix
++PPAS=./ppas$(SRCBATCHEXT)
++else
+ PPAS=ppas$(SRCBATCHEXT)
++endif
+ ifdef inUnix
+ LDCONFIG=ldconfig
+ else
+@@ -2297,9 +2910,6 @@ endif
+ ifeq ($(FULL_TARGET),i386-solaris)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),i386-qnx)
+-REQUIRE_PACKAGES_RTL=1
+-endif
+ ifeq ($(FULL_TARGET),i386-netware)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2336,12 +2946,15 @@ endif
+ ifeq ($(FULL_TARGET),i386-iphonesim)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-linux)
++ifeq ($(FULL_TARGET),i386-android)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-freebsd)
++ifeq ($(FULL_TARGET),i386-aros)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),m68k-linux)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),m68k-netbsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2351,10 +2964,10 @@ endif
+ ifeq ($(FULL_TARGET),m68k-atari)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-openbsd)
++ifeq ($(FULL_TARGET),m68k-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+-ifeq ($(FULL_TARGET),m68k-palmos)
++ifeq ($(FULL_TARGET),m68k-macos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+ ifeq ($(FULL_TARGET),m68k-embedded)
+@@ -2384,6 +2997,9 @@ endif
+ ifeq ($(FULL_TARGET),powerpc-wii)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),powerpc-aix)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),sparc-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2402,6 +3018,12 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-haiku)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),x86_64-netbsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),x86_64-solaris)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2417,9 +3039,24 @@ endif
+ ifeq ($(FULL_TARGET),x86_64-embedded)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),x86_64-iphonesim)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),x86_64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),x86_64-aros)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),x86_64-dragonfly)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),arm-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-netbsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),arm-palmos)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2441,6 +3078,12 @@ endif
+ ifeq ($(FULL_TARGET),arm-symbian)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),arm-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),arm-aros)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),powerpc64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2450,6 +3093,9 @@ endif
+ ifeq ($(FULL_TARGET),powerpc64-embedded)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),powerpc64-aix)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),avr-embedded)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -2465,6 +3111,45 @@ endif
+ ifeq ($(FULL_TARGET),mipsel-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),mipsel-embedded)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),mipsel-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),jvm-java)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),jvm-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),i8086-embedded)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),i8086-msdos)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),i8086-win16)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),aarch64-linux)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),aarch64-darwin)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),aarch64-android)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),wasm-wasm)
++REQUIRE_PACKAGES_RTL=1
++endif
++ifeq ($(FULL_TARGET),sparc64-linux)
++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),)
+@@ -2515,6 +3200,7 @@ endif
+ ifeq ($(OS_SOURCE),openbsd)
+ override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
+ override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)
++override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH)
+ endif
+ ifndef CROSSBOOTSTRAP
+ ifneq ($(BINUTILSPREFIX),)
+@@ -2527,6 +3213,7 @@ endif
+ ifndef CROSSCOMPILE
+ ifneq ($(BINUTILSPREFIX),)
+ override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
++override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX)
+ endif
+ endif
+ ifdef UNITDIR
+@@ -2615,22 +3302,20 @@ endif
+ endif
+ ifdef CREATESHARED
+ override FPCOPT+=-Cg
+-ifeq ($(CPU_TARGET),i386)
+-override FPCOPT+=-Aas
+ endif
+-endif
+-ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
+-ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),)
+-ifeq ($(CPU_TARGET),x86_64)
++ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),)
++ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel),)
+ override FPCOPT+=-Cg
+ endif
+ endif
+-endif
+ ifdef LINKSHARED
+ endif
+ ifdef OPT
+ override FPCOPT+=$(OPT)
+ endif
++ifdef FPMAKEBUILDOPT
++override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT)
++endif
+ ifdef FPCOPTDEF
+ override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))
+ endif
+@@ -2650,18 +3335,24 @@ endif
+ ifdef ACROSSCOMPILE
+ override FPCOPT+=$(CROSSOPT)
+ endif
+-override COMPILER:=$(FPC) $(FPCOPT)
+-ifeq (,$(findstring -s ,$(COMPILER)))
++override COMPILER:=$(strip $(FPC) $(FPCOPT))
++ifneq (,$(findstring -sh ,$(COMPILER)))
++UseEXECPPAS=1
++endif
++ifneq (,$(findstring -s ,$(COMPILER)))
++ifeq ($(FULL_SOURCE),$(FULL_TARGET))
++UseEXECPPAS=1
++endif
++endif
++ifneq ($(UseEXECPPAS),1)
+ EXECPPAS=
+ else
+-ifeq ($(FULL_SOURCE),$(FULL_TARGET))
+ ifdef RUNBATCH
+ EXECPPAS:=@$(RUNBATCH) $(PPAS)
+ else
+ EXECPPAS:=@$(PPAS)
+ endif
+ endif
+-endif
+ .PHONY: fpc_exes
+ ifndef CROSSINSTALL
+ ifneq ($(TARGET_PROGRAMS),)
+@@ -2767,7 +3458,11 @@ ifdef INSTALL_BUILDUNIT
+ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+ endif
+ ifdef INSTALLPPUFILES
++ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT))
+ 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)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
++endif
+ ifneq ($(UNITTARGETDIRPREFIX),)
+ override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
+ override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
+@@ -2816,7 +3511,7 @@ endif
+ fpc_sourceinstall: distclean
+ $(MKDIR) $(INSTALL_SOURCEDIR)
+ $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
+-fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
++fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
+ ifdef HASEXAMPLES
+ $(MKDIR) $(INSTALL_EXAMPLEDIR)
+ endif
+@@ -2955,7 +3650,7 @@ ifdef LIB_NAME
+ -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
+ endif
+ -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
++ -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ fpc_cleanall: $(CLEANTARGET)
+ ifdef CLEANEXEFILES
+ -$(DEL) $(CLEANEXEFILES)
+@@ -2975,18 +3670,23 @@ ifdef CLEAN_FILES
+ -$(DEL) $(CLEAN_FILES)
+ endif
+ -$(DELTREE) units
++ -$(DELTREE) bin
+ -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
+ ifneq ($(PPUEXT),.ppu)
+ -$(DEL) *.o *.ppu *.a
+ endif
+ -$(DELTREE) *$(SMARTEXT)
+ -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
+- -$(DEL) *_ppas$(BATCHEXT)
++ -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
+ ifdef AOUTEXT
+ -$(DEL) *$(AOUTEXT)
+ endif
+ ifdef DEBUGSYMEXT
+ -$(DEL) *$(DEBUGSYMEXT)
++endif
++ifdef LOCALFPMAKEBIN
++ -$(DEL) $(LOCALFPMAKEBIN)
++ -$(DEL) $(FPMAKEBINOBJ)
+ endif
+ fpc_distclean: cleanall
+ .PHONY: fpc_baseinfo
Index: ftp/fpc-libcurl/files/patch-Makefile-aarch64
===================================================================
--- ftp/fpc-libcurl/files/patch-Makefile-aarch64
+++ ftp/fpc-libcurl/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/libcurl/Makefile b/packages/libcurl/Makefile
+index b5b6ecd7..a2241a8f 100644
+--- packages/libcurl/Makefile
++++ packages/libcurl/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/libcurl/examples/Makefile b/packages/libcurl/examples/Makefile
+index 78041fb7..7cd7daae 100644
+--- packages/libcurl/examples/Makefile
++++ packages/libcurl/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=testcurl teststream
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=testcurl teststream
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=testcurl teststream
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_LIBCURL=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_LIBCURL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: graphics/fpc-cairo/files/patch-Makefile-aarch64
===================================================================
--- graphics/fpc-cairo/files/patch-Makefile-aarch64
+++ graphics/fpc-cairo/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/cairo/Makefile b/packages/cairo/Makefile
+index 32a54d0e..c0c7821d 100644
+--- packages/cairo/Makefile
++++ packages/cairo/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: graphics/fpc-graph/Makefile
===================================================================
--- graphics/fpc-graph/Makefile
+++ graphics/fpc-graph/Makefile
@@ -5,6 +5,9 @@
COMMENT= Free Pascal interface to graphical applications
+NOT_FOR_ARCHS= aarch64
+NOT_FOR_ARCHS_REASON_aarch64= Skipped package graph which has been disabled for target aarch64-freebsd
+
USES= fpc
USE_FPC= sdl x11 ${ARCH:Mi386:S/i386/pthreads/}
Index: graphics/fpc-hermes/files/patch-Makefile-aarch64
===================================================================
--- graphics/fpc-hermes/files/patch-Makefile-aarch64
+++ graphics/fpc-hermes/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/hermes/Makefile b/packages/hermes/Makefile
+index 4e1a9eb4..d2a75330 100644
+--- packages/hermes/Makefile
++++ packages/hermes/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: graphics/fpc-imagemagick/files/patch-Makefile-aarch64
===================================================================
--- graphics/fpc-imagemagick/files/patch-Makefile-aarch64
+++ graphics/fpc-imagemagick/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/imagemagick/Makefile b/packages/imagemagick/Makefile
+index dd951910..c2f23935 100644
+--- packages/imagemagick/Makefile
++++ packages/imagemagick/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: graphics/fpc-libgd/files/patch-Makefile-aarch64
===================================================================
--- graphics/fpc-libgd/files/patch-Makefile-aarch64
+++ graphics/fpc-libgd/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/libgd/Makefile b/packages/libgd/Makefile
+index 9829f3c8..98f95b6b 100644
+--- packages/libgd/Makefile
++++ packages/libgd/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/libgd/examples/Makefile b/packages/libgd/examples/Makefile
+index 2a7dcaa3..9574c335 100644
+--- packages/libgd/examples/Makefile
++++ packages/libgd/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=gdtest gdtestcgi
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=gdtest gdtestcgi
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=gdtest gdtestcgi
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_LIBGD=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_LIBGD=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: graphics/fpc-libpng/files/patch-Makefile-aarch64
===================================================================
--- graphics/fpc-libpng/files/patch-Makefile-aarch64
+++ graphics/fpc-libpng/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/libpng/Makefile b/packages/libpng/Makefile
+index 26fff96f..8a3b60ac 100644
+--- packages/libpng/Makefile
++++ packages/libpng/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: graphics/fpc-ncurses/files/patch-Makefile-aarch64
===================================================================
--- graphics/fpc-ncurses/files/patch-Makefile-aarch64
+++ graphics/fpc-ncurses/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/ncurses/Makefile b/packages/ncurses/Makefile
+index 0b0ad350..e12b4622 100644
+--- packages/ncurses/Makefile
++++ packages/ncurses/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/ncurses/examples/Makefile b/packages/ncurses/examples/Makefile
+index dbb8db86..200ae202 100644
+--- packages/ncurses/examples/Makefile
++++ packages/ncurses/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=firework testn ocrt_demo edit_demo db_demo screen_demo t1form t1menu t1panel t2form t2menu t2panel t3form tbackground tclock tevent tmouse tnlshello tpad twindow
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_NCURSES=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_NCURSES=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: graphics/fpc-opengl/files/patch-Makefile-aarch64
===================================================================
--- graphics/fpc-opengl/files/patch-Makefile-aarch64
+++ graphics/fpc-opengl/files/patch-Makefile-aarch64
@@ -0,0 +1,78 @@
+// @generated
+diff --git a/packages/opengl/Makefile b/packages/opengl/Makefile
+index 683a8247..e0033918 100644
+--- packages/opengl/Makefile
++++ packages/opengl/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/opengl/examples/Makefile b/packages/opengl/examples/Makefile
+index b6151fe7..decb8377 100644
+--- packages/opengl/examples/Makefile
++++ packages/opengl/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur glutdemova freeglutdemo glxtest
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur glutdemova freeglutdemo glxtest
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur glutdemova freeglutdemo glxtest
+ endif
+@@ -846,6 +849,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-S2h
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-S2h
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-S2h
+ endif
+@@ -2280,6 +2286,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_OPENGL=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_OPENGL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: graphics/fpc-pasjpeg/files/patch-Makefile-aarch64
===================================================================
--- graphics/fpc-pasjpeg/files/patch-Makefile-aarch64
+++ graphics/fpc-pasjpeg/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/pasjpeg/Makefile b/packages/pasjpeg/Makefile
+index d804198a..0ea935ef 100644
+--- packages/pasjpeg/Makefile
++++ packages/pasjpeg/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: graphics/fpc-proj4/files/patch-Makefile-aarch64
===================================================================
--- graphics/fpc-proj4/files/patch-Makefile-aarch64
+++ graphics/fpc-proj4/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/proj4/Makefile b/packages/proj4/Makefile
+index 60b0fe89..ff977752 100644
+--- packages/proj4/Makefile
++++ packages/proj4/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: graphics/fpc-rsvg/files/patch-Makefile-aarch64
===================================================================
--- graphics/fpc-rsvg/files/patch-Makefile-aarch64
+++ graphics/fpc-rsvg/files/patch-Makefile-aarch64
@@ -0,0 +1,27 @@
+// @generated
+--- packages/librsvg/Makefile.bak 2020-05-04 18:58:27.000000000 +0200
++++ packages/librsvg/Makefile 2021-01-23 20:55:29.400316000 +0100
+@@ -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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1671,6 +1671,14 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
++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
++endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+ REQUIRE_PACKAGES_FCL-PROCESS=1
Index: graphics/fpc-svgalib/files/patch-Makefile-aarch64
===================================================================
--- graphics/fpc-svgalib/files/patch-Makefile-aarch64
+++ graphics/fpc-svgalib/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/svgalib/Makefile b/packages/svgalib/Makefile
+index cd2044d6..5e438583 100644
+--- packages/svgalib/Makefile
++++ packages/svgalib/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/svgalib/examples/Makefile b/packages/svgalib/examples/Makefile
+index 9275d23f..7524e90d 100644
+--- packages/svgalib/examples/Makefile
++++ packages/svgalib/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=testvga vgatest
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=testvga vgatest
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=testvga vgatest
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_SVGALIB=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_SVGALIB=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: graphics/fpc-vcl-compat/files/patch-Makefile-aarch64
===================================================================
--- graphics/fpc-vcl-compat/files/patch-Makefile-aarch64
+++ graphics/fpc-vcl-compat/files/patch-Makefile-aarch64
@@ -0,0 +1,32 @@
+// @generated
+diff --git a/packages/vcl-compat/Makefile b/packages/vcl-compat/Makefile
+index 98071049..f8b55062 100644
+--- packages/vcl-compat/Makefile
++++ packages/vcl-compat/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1930,6 +1930,17 @@ REQUIRE_PACKAGES_FCL-BASE=1
+ REQUIRE_PACKAGES_FCL-WEB=1
+ REQUIRE_PACKAGES_FCL-XML=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_FCL-BASE=1
++REQUIRE_PACKAGES_FCL-WEB=1
++REQUIRE_PACKAGES_FCL-XML=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: lang/fpc-docs/Makefile
===================================================================
--- lang/fpc-docs/Makefile
+++ lang/fpc-docs/Makefile
@@ -13,7 +13,7 @@
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal compiler Adobe Acrobat(tm) documentation
-ONLY_FOR_ARCHS= i386 amd64
+ONLY_FOR_ARCHS= aarch64 i386 amd64
NO_BUILD= yes
DOCSDIR= ${PREFIX}/share/doc/fpdocs-${PORTVERSION}
Index: lang/fpc-lua/files/patch-Makefile-aarch64
===================================================================
--- lang/fpc-lua/files/patch-Makefile-aarch64
+++ lang/fpc-lua/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/lua/Makefile b/packages/lua/Makefile
+index d761e194..34e2677c 100644
+--- packages/lua/Makefile
++++ packages/lua/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: lang/fpc-pastojs/files/patch-Makefile-aarch64
===================================================================
--- lang/fpc-pastojs/files/patch-Makefile-aarch64
+++ lang/fpc-pastojs/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/pastojs/Makefile b/packages/pastojs/Makefile
+index 1f63ee4a..cd4d306d 100644
+--- packages/pastojs/Makefile
++++ packages/pastojs/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: lang/fpc-rexx/files/patch-Makefile-aarch64
===================================================================
--- lang/fpc-rexx/files/patch-Makefile-aarch64
+++ lang/fpc-rexx/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/rexx/Makefile b/packages/rexx/Makefile
+index f7f11473..473fbc8b 100644
+--- packages/rexx/Makefile
++++ packages/rexx/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/rexx/examples/Makefile b/packages/rexx/examples/Makefile
+index 26a9af11..e19bb196 100644
+--- packages/rexx/examples/Makefile
++++ packages/rexx/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=callrexx
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=callrexx
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=callrexx
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_REXX=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_REXX=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: lang/fpc-rtl-console/files/patch-Makefile-aarch64
===================================================================
--- lang/fpc-rtl-console/files/patch-Makefile-aarch64
+++ lang/fpc-rtl-console/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/rtl-console/Makefile b/packages/rtl-console/Makefile
+index 67fd2d13..d14266f5 100644
+--- packages/rtl-console/Makefile
++++ packages/rtl-console/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: lang/fpc-rtl-extra/files/patch-Makefile-aarch64
===================================================================
--- lang/fpc-rtl-extra/files/patch-Makefile-aarch64
+++ lang/fpc-rtl-extra/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/rtl-extra/Makefile b/packages/rtl-extra/Makefile
+index 1b392180..37ea16c9 100644
+--- packages/rtl-extra/Makefile
++++ packages/rtl-extra/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: lang/fpc-rtl-generics/files/patch-Makefile-aarch64
===================================================================
--- lang/fpc-rtl-generics/files/patch-Makefile-aarch64
+++ lang/fpc-rtl-generics/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/rtl-generics/Makefile b/packages/rtl-generics/Makefile
+index 70425c9d..255e6cce 100644
+--- packages/rtl-generics/Makefile
++++ packages/rtl-generics/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: lang/fpc-rtl-objpas/files/patch-Makefile-aarch64
===================================================================
--- lang/fpc-rtl-objpas/files/patch-Makefile-aarch64
+++ lang/fpc-rtl-objpas/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/rtl-objpas/Makefile b/packages/rtl-objpas/Makefile
+index 711e9d47..346903d0 100644
+--- packages/rtl-objpas/Makefile
++++ packages/rtl-objpas/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: lang/fpc-rtl-unicode/files/patch-Makefile-aarch64
===================================================================
--- lang/fpc-rtl-unicode/files/patch-Makefile-aarch64
+++ lang/fpc-rtl-unicode/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/rtl-unicode/Makefile b/packages/rtl-unicode/Makefile
+index 96f9e495..33718688 100644
+--- packages/rtl-unicode/Makefile
++++ packages/rtl-unicode/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: lang/fpc-source/Makefile
===================================================================
--- lang/fpc-source/Makefile
+++ lang/fpc-source/Makefile
@@ -17,7 +17,7 @@
MAINTAINER= acm@FreeBSD.org
COMMENT= Free Pascal compiler with Turbo and Delphi (source)
-ONLY_FOR_ARCHS= amd64 i386
+ONLY_FOR_ARCHS= aarch64 amd64 i386
NO_BUILD= yes
PORTDATA= *
Index: lang/fpc-units/Makefile
===================================================================
--- lang/fpc-units/Makefile
+++ lang/fpc-units/Makefile
@@ -9,7 +9,7 @@
MAINTAINER= acm@FreeBSD.org
COMMENT= Meta port to install Free Pascal units
-ONLY_FOR_ARCHS= i386 amd64
+ONLY_FOR_ARCHS= aarch64 amd64 aarch64
USES= fpc:run metaport
BUILDNAME= ${ARCH}-${OPSYS:tl}
Index: lang/fpc-utils/files/patch-Makefile-aarch64
===================================================================
--- lang/fpc-utils/files/patch-Makefile-aarch64
+++ lang/fpc-utils/files/patch-Makefile-aarch64
@@ -0,0 +1,838 @@
+// @generated
+diff --git a/utils/Makefile b/utils/Makefile
+index b481d3b7..a4b953ad 100644
+--- utils/Makefile
++++ utils/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1771,6 +1771,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-JSON=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_FCL-JSON=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/debugsvr/Makefile b/utils/debugsvr/Makefile
+index e97e54ee..9f24826d 100644
+--- utils/debugsvr/Makefile
++++ utils/debugsvr/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/debugsvr/console/Makefile b/utils/debugsvr/console/Makefile
+index 3ce0500c..556b6efe 100644
+--- utils/debugsvr/console/Makefile
++++ utils/debugsvr/console/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=debugserver
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=debugserver
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=debugserver
+ endif
+@@ -845,6 +848,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=debugserver
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=debugserver
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=debugserver
+ endif
+@@ -1110,6 +1116,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=..
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=..
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=..
+ endif
+@@ -2040,6 +2049,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+diff --git a/utils/debugsvr/gtk/Makefile b/utils/debugsvr/gtk/Makefile
+index 84e7cb06..7743aaea 100644
+--- utils/debugsvr/gtk/Makefile
++++ utils/debugsvr/gtk/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=debugserver
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=debugserver
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=debugserver
+ endif
+@@ -845,6 +848,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=frmabout frmmain bitmapdata
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=frmabout frmmain bitmapdata
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=frmabout frmmain bitmapdata
+ endif
+@@ -1109,6 +1115,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=frmabout frmmain
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=frmabout frmmain
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=frmabout frmmain
+ endif
+@@ -1374,6 +1383,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=..
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=..
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=..
+ endif
+@@ -2304,6 +2316,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+diff --git a/utils/dxegen/Makefile b/utils/dxegen/Makefile
+index 39e04ecc..40dfd394 100644
+--- utils/dxegen/Makefile
++++ utils/dxegen/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/fpcm/Makefile b/utils/fpcm/Makefile
+index 6e633417..cd9bcdbb 100644
+--- utils/fpcm/Makefile
++++ utils/fpcm/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1679,6 +1679,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/fpcm/fpcmmain.pp b/utils/fpcm/fpcmmain.pp
+index 3a327817..fd24407e 100644
+--- utils/fpcm/fpcmmain.pp
++++ utils/fpcm/fpcmmain.pp
+@@ -120,7 +120,7 @@ interface
+ { go32v2 } ( true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false),
+ { win32 } ( true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false),
+ { os2 } ( true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false),
+- { freebsd } ( true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false),
++ { freebsd } ( true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, true, false, false),
+ { beos } ( true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false),
+ { haiku } ( true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false),
+ { netbsd } ( true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false),
+diff --git a/utils/fpcmkcfg/Makefile b/utils/fpcmkcfg/Makefile
+index 8d310d8c..502f1193 100644
+--- utils/fpcmkcfg/Makefile
++++ utils/fpcmkcfg/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/fpcres/Makefile b/utils/fpcres/Makefile
+index 16cc27d4..7bc4c8f1 100644
+--- utils/fpcres/Makefile
++++ utils/fpcres/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/fpcreslipo/Makefile b/utils/fpcreslipo/Makefile
+index f7ae4ccc..8479b3c0 100644
+--- utils/fpcreslipo/Makefile
++++ utils/fpcreslipo/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/fpdoc/Makefile b/utils/fpdoc/Makefile
+index 0fc27373..73c0687f 100644
+--- utils/fpdoc/Makefile
++++ utils/fpdoc/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/fpdoc/fpde/Makefile b/utils/fpdoc/fpde/Makefile
+index b9676b3e..3b799c8b 100644
+--- utils/fpdoc/fpde/Makefile
++++ utils/fpdoc/fpde/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=fpde
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=fpde
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=fpde
+ endif
+@@ -847,6 +850,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override CLEAN_UNITS+=fpdeopts frmlink frmmakeskel frmoptions pgeditor fpdemsg frmabout frmmain frmnewnode frmtable xpms
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override CLEAN_UNITS+=fpdeopts frmlink frmmakeskel frmoptions pgeditor fpdemsg frmabout frmmain frmnewnode frmtable xpms
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override CLEAN_UNITS+=fpdeopts frmlink frmmakeskel frmoptions pgeditor fpdemsg frmabout frmmain frmnewnode frmtable xpms
+ endif
+@@ -1111,6 +1117,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override CLEAN_FILES+=fpdemsg.rst frmmakeskel.rst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override CLEAN_FILES+=fpdemsg.rst frmmakeskel.rst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override CLEAN_FILES+=fpdemsg.rst frmmakeskel.rst
+ endif
+@@ -2798,6 +2807,18 @@ REQUIRE_PACKAGES_FCL-XML=1
+ REQUIRE_PACKAGES_FCL-PASSRC=1
+ REQUIRE_PACKAGES_FPGTK=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_FCL-BASE=1
++REQUIRE_PACKAGES_FCL-XML=1
++REQUIRE_PACKAGES_FCL-PASSRC=1
++REQUIRE_PACKAGES_FPGTK=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/fpmc/Makefile b/utils/fpmc/Makefile
+index 098e9301..93ab811a 100644
+--- utils/fpmc/Makefile
++++ utils/fpmc/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/fppkg/Makefile b/utils/fppkg/Makefile
+index fdf24118..04aeb23f 100644
+--- utils/fppkg/Makefile
++++ utils/fppkg/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/fprcp/Makefile b/utils/fprcp/Makefile
+index b5ec21e4..f10eb6d6 100644
+--- utils/fprcp/Makefile
++++ utils/fprcp/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/h2pas/Makefile b/utils/h2pas/Makefile
+index 71831adf..17e7a73b 100644
+--- utils/h2pas/Makefile
++++ utils/h2pas/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/importtl/Makefile b/utils/importtl/Makefile
+index a48e7b78..c882e96a 100644
+--- utils/importtl/Makefile
++++ utils/importtl/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/instantfpc/Makefile b/utils/instantfpc/Makefile
+index d80bdb3e..68577ac5 100644
+--- utils/instantfpc/Makefile
++++ utils/instantfpc/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/json2pas/Makefile b/utils/json2pas/Makefile
+index b0e9fea7..8387374a 100644
+--- utils/json2pas/Makefile
++++ utils/json2pas/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1762,6 +1762,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-JSON=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_FCL-JSON=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/mksymbian/Makefile b/utils/mksymbian/Makefile
+index 3f2f31be..2f9f9737 100644
+--- utils/mksymbian/Makefile
++++ utils/mksymbian/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/pas2fpm/Makefile b/utils/pas2fpm/Makefile
+index 8874324f..f701a898 100644
+--- utils/pas2fpm/Makefile
++++ utils/pas2fpm/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/pas2jni/Makefile b/utils/pas2jni/Makefile
+index 62b5011a..f61fc423 100644
+--- utils/pas2jni/Makefile
++++ utils/pas2jni/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/pas2js/Makefile b/utils/pas2js/Makefile
+index 3356b7d4..45146b41 100644
+--- utils/pas2js/Makefile
++++ utils/pas2js/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/pas2ut/Makefile b/utils/pas2ut/Makefile
+index 2234e74e..e8a20a2c 100644
+--- utils/pas2ut/Makefile
++++ utils/pas2ut/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/rmwait/Makefile b/utils/rmwait/Makefile
+index d3a564b3..1c1286f0 100644
+--- utils/rmwait/Makefile
++++ utils/rmwait/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/tply/Makefile b/utils/tply/Makefile
+index 7178b851..066614f7 100644
+--- utils/tply/Makefile
++++ utils/tply/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/unicode/Makefile b/utils/unicode/Makefile
+index 7021aede..df42f06f 100644
+--- utils/unicode/Makefile
++++ utils/unicode/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: lang/fpc/Makefile
===================================================================
--- lang/fpc/Makefile
+++ lang/fpc/Makefile
@@ -14,6 +14,7 @@
SF/freepascal/Source/${PORTVERSION}:source \
http://leaf.dragonflybsd.org/~marino/dports-src/:DragonFlybootstrap \
LOCAL/acm/freepascal/:bootstrap \
+ LOCAL/mikael/freepascal/:bootstrap \
LOCAL/acm/freepascal/:man
DISTFILES= ${DISTNAME:S/$/.source/}${EXTRACT_SUFX}:source
DIST_SUBDIR= freepascal
@@ -23,7 +24,7 @@
RUN_DEPENDS?= ${LOCALBASE}/bin/as:devel/binutils
-ONLY_FOR_ARCHS= amd64 i386
+ONLY_FOR_ARCHS= aarch64 amd64 i386
USES+= gmake iconv
USE_BINUTILS= yes
@@ -43,13 +44,19 @@
PPNAME= ppc386
FPC_ARCH= i386
PLIST_SUB+= FPC_I386="" \
- FPC_AMD64="@comment "
+ FPC_X86=""
.elif ${ARCH} == "amd64"
PPNAME= ppcx64
FPC_ARCH= x86_64
PLIST_SUB+= FPC_I386="@comment " \
- FPC_AMD64=""
+ FPC_X86=""
+.elif ${ARCH} == "aarch64"
+PPNAME= ppca64
+FPC_ARCH= aarch64
+PLIST_SUB+= FPC_I386="@comment " \
+ FPC_X86="@comment "
.endif
+PLIST_SUB+= PPNAME=${PPNAME}
.if ${OPSYS} == FreeBSD
PLIST_SUB+= FREEBSD=""
Index: lang/fpc/distinfo
===================================================================
--- lang/fpc/distinfo
+++ lang/fpc/distinfo
@@ -1,9 +1,11 @@
-TIMESTAMP = 1606173579
+TIMESTAMP = 1608889345
SHA256 (freepascal/fpc-3.2.0.source.tar.gz) = d595b72de7ed9e53299694ee15534e5046a62efa57908314efa02d5cc3b1cf75
SIZE (freepascal/fpc-3.2.0.source.tar.gz) = 52028183
SHA256 (freepascal/ppc386-3.0.4-freebsd.tar.gz) = 3f5fa4b24abde00a1dcfe7e28938e8b7bf908c7d6633182521916e2191ae867d
SIZE (freepascal/ppc386-3.0.4-freebsd.tar.gz) = 1121653
SHA256 (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = fb57c418ec374ed99cd7914a4daa5fc6afccfbf41595a886c361e3fef8bbdbb3
SIZE (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = 1198576
+SHA256 (freepascal/ppca64-3.0.4-freebsd.tar.gz) = c5d48b6a1b50910ab3055bd84b96cfcbcae22d5eeeac187359722e87a3d024e1
+SIZE (freepascal/ppca64-3.0.4-freebsd.tar.gz) = 5220581
SHA256 (freepascal/fpc-3.2.0.man.tar.gz) = d510a75642cfb87ed18c3e4d533ffcc3b9c5e7219ca914ebe7cdab47eefb3398
SIZE (freepascal/fpc-3.2.0.man.tar.gz) = 47338
Index: lang/fpc/files/patch-Makefile-aarch64
===================================================================
--- lang/fpc/files/patch-Makefile-aarch64
+++ lang/fpc/files/patch-Makefile-aarch64
@@ -0,0 +1,3071 @@
+// @generated
+diff --git a/compiler/Makefile b/compiler/Makefile
+index bb2fb32b..98677a19 100644
+--- compiler/Makefile
++++ compiler/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -829,6 +829,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_DIRS+=utils
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_DIRS+=utils
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_DIRS+=utils
+ endif
+@@ -1093,6 +1096,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=pp
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=pp
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=pp
+ endif
+@@ -1358,6 +1364,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(CPC_TARGET)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(CPC_TARGET)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(CPC_TARGET)
+ endif
+@@ -1622,6 +1631,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
+ endif
+@@ -1886,6 +1898,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -2150,6 +2165,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
+ endif
+@@ -3080,6 +3098,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+@@ -3990,6 +4011,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ TARGET_DIRS_UTILS=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++TARGET_DIRS_UTILS=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ TARGET_DIRS_UTILS=1
+ endif
+diff --git a/compiler/utils/Makefile b/compiler/utils/Makefile
+index dfd2ed6d..87e115ed 100644
+--- compiler/utils/Makefile
++++ compiler/utils/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove mka64ins mkarmins mkx86ins
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove mka64ins mkarmins mkx86ins
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove mka64ins mkarmins mkx86ins
+ endif
+@@ -845,6 +848,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override CLEAN_UNITS+=ppu crc
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override CLEAN_UNITS+=ppu crc
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override CLEAN_UNITS+=ppu crc
+ endif
+@@ -1110,6 +1116,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=..
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=..
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=..
+ endif
+@@ -1374,6 +1383,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=..
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=..
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=..
+ endif
+@@ -2306,6 +2318,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+diff --git a/packages/fcl-base/Makefile b/packages/fcl-base/Makefile
+index 955428fe..b93ddeb4 100644
+--- packages/fcl-base/Makefile
++++ packages/fcl-base/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-base/examples/Makefile b/packages/fcl-base/examples/Makefile
+index d8a971b9..e5c65eaf 100644
+--- packages/fcl-base/examples/Makefile
++++ packages/fcl-base/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=stringl dparser fstream mstream list threads testrtf cfgtest xmldump htdump testez tidea b64test b64test2 b64enc b64dec restest testz testz2 istream doecho testol testcont txmlreg testreg tstelcmd testapp testcgi testbs testbf cachetest poolmm1 poolmm2 tarmakercons tarmakerconsgzip avltreetest testmime decodeascii85 encodeascii85 sockcli isockcli dsockcli socksvr isocksvr dsocksvr testhres testnres testsres testrhre testrnre testrsre testur ipcserver ipcclient debugtest dbugsrv asiotest testtimer
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=stringl dparser fstream mstream list threads testrtf cfgtest xmldump htdump testez tidea b64test b64test2 b64enc b64dec restest testz testz2 istream doecho testol testcont txmlreg testreg tstelcmd testapp testcgi testbs testbf cachetest poolmm1 poolmm2 tarmakercons tarmakerconsgzip avltreetest testmime decodeascii85 encodeascii85 sockcli isockcli dsockcli socksvr isocksvr dsocksvr testhres testnres testsres testrhre testrnre testrsre testur ipcserver ipcclient debugtest dbugsrv asiotest testtimer
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=stringl dparser fstream mstream list threads testrtf cfgtest xmldump htdump testez tidea b64test b64test2 b64enc b64dec restest testz testz2 istream doecho testol testcont txmlreg testreg tstelcmd testapp testcgi testbs testbf cachetest poolmm1 poolmm2 tarmakercons tarmakerconsgzip avltreetest testmime decodeascii85 encodeascii85 sockcli isockcli dsockcli socksvr isocksvr dsocksvr testhres testnres testsres testrhre testrnre testrsre testur ipcserver ipcclient debugtest dbugsrv asiotest testtimer
+ endif
+@@ -2688,6 +2691,23 @@ REQUIRE_PACKAGES_FCL-REGISTRY=1
+ REQUIRE_PACKAGES_FCL-WEB=1
+ REQUIRE_PACKAGES_FCL-XML=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_FCL-BASE=1
++REQUIRE_PACKAGES_FCL-DB=1
++REQUIRE_PACKAGES_FCL-FPCUNIT=1
++REQUIRE_PACKAGES_FCL-IMAGE=1
++REQUIRE_PACKAGES_FCL-NET=1
++REQUIRE_PACKAGES_FCL-PASSRC=1
++REQUIRE_PACKAGES_FCL-REGISTRY=1
++REQUIRE_PACKAGES_FCL-WEB=1
++REQUIRE_PACKAGES_FCL-XML=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fcl-process/Makefile b/packages/fcl-process/Makefile
+index ab777538..13e1ba6f 100644
+--- packages/fcl-process/Makefile
++++ packages/fcl-process/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1282,6 +1282,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+diff --git a/packages/fcl-res/Makefile b/packages/fcl-res/Makefile
+index c40aca4c..8c2e1710 100644
+--- packages/fcl-res/Makefile
++++ packages/fcl-res/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/fpmkunit/Makefile b/packages/fpmkunit/Makefile
+index 15000f5e..2b00c89d 100644
+--- packages/fpmkunit/Makefile
++++ packages/fpmkunit/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1634,6 +1634,13 @@ REQUIRE_PACKAGES_FCL-PROCESS=1
+ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/hash/Makefile b/packages/hash/Makefile
+index 3e451d41..48a08a9e 100644
+--- packages/hash/Makefile
++++ packages/hash/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1282,6 +1282,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+diff --git a/packages/hash/examples/Makefile b/packages/hash/examples/Makefile
+index a64aef5f..a146eac3 100644
+--- packages/hash/examples/Makefile
++++ packages/hash/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=mdtest crctest sha1test md5performancetest sha1performancetest
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=mdtest crctest sha1test md5performancetest sha1performancetest
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=mdtest crctest sha1test md5performancetest sha1performancetest
+ endif
+@@ -2100,6 +2103,16 @@ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_RTL-EXTRA=1
+ REQUIRE_PACKAGES_RTL-OBJPAS=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++REQUIRE_PACKAGES_HASH=1
++REQUIRE_PACKAGES_PASZLIB=1
++REQUIRE_PACKAGES_FCL-PROCESS=1
++REQUIRE_PACKAGES_LIBTAR=1
++REQUIRE_PACKAGES_FPMKUNIT=1
++REQUIRE_PACKAGES_RTL-EXTRA=1
++REQUIRE_PACKAGES_RTL-OBJPAS=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_HASH=1
+diff --git a/packages/libtar/Makefile b/packages/libtar/Makefile
+index 9196f07b..e816da73 100644
+--- packages/libtar/Makefile
++++ packages/libtar/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1282,6 +1282,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+diff --git a/packages/paszlib/Makefile b/packages/paszlib/Makefile
+index 0836d190..34625968 100644
+--- packages/paszlib/Makefile
++++ packages/paszlib/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1282,6 +1282,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
+diff --git a/packages/paszlib/examples/Makefile b/packages/paszlib/examples/Makefile
+index d641773e..16e62b8b 100644
+--- packages/paszlib/examples/Makefile
++++ packages/paszlib/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=minigzip example minizip miniunz example2
+ endif
+@@ -1596,6 +1599,10 @@ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++REQUIRE_PACKAGES_PASZLIB=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/rtl-objpas/Makefile b/packages/rtl-objpas/Makefile
+index 711e9d47..346903d0 100644
+--- packages/rtl-objpas/Makefile
++++ packages/rtl-objpas/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/rtl/Makefile b/rtl/Makefile
+index 1e4bfef4..3830a17e 100644
+--- rtl/Makefile
++++ rtl/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_DIRS+=linux
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_DIRS+=freebsd
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_DIRS+=darwin
+ endif
+@@ -2026,6 +2029,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ TARGET_DIRS_LINUX=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++TARGET_DIRS_FREEBSD=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ TARGET_DIRS_DARWIN=1
+ endif
+diff --git a/rtl/aix/Makefile b/rtl/aix/Makefile
+index e545dd14..038002fb 100644
+--- rtl/aix/Makefile
++++ rtl/aix/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -609,6 +609,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes strings objpas iso7185 extpas macpas heaptrc baseunix unixutil termio unix initc cmem lnfogdb sysutils typinfo math fgl classes charset cpall character unixcp getopts errors dl dynlibs types sysconst rtlconsts cthreads dos cwstring fpwidestring fpintres $(CPU_UNITS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes strings objpas iso7185 extpas macpas heaptrc baseunix unixutil termio unix initc cmem lnfogdb sysutils typinfo math fgl classes charset cpall character unixcp getopts errors dl dynlibs types sysconst rtlconsts cthreads dos cwstring fpwidestring fpintres $(CPU_UNITS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes strings objpas iso7185 extpas macpas heaptrc baseunix unixutil termio unix initc cmem lnfogdb sysutils typinfo math fgl classes charset cpall character unixcp getopts errors dl dynlibs types sysconst rtlconsts cthreads dos cwstring fpwidestring fpintres $(CPU_UNITS)
+ endif
+@@ -873,6 +876,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
+@@ -1137,6 +1143,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo classes sysconst rtlconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo classes sysconst rtlconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo classes sysconst rtlconst
+ endif
+@@ -1402,6 +1411,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) # $(OSPROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) # $(OSPROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) # $(OSPROCINC)
+ endif
+@@ -1666,6 +1678,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON)
+ endif
+diff --git a/rtl/amiga/Makefile b/rtl/amiga/Makefile
+index 093f394c..e0dbd221 100644
+--- rtl/amiga/Makefile
++++ rtl/amiga/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -607,6 +607,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) $(RESUNIT) uuchar objpas macpas iso7185 extpas buildrtl cpall
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) $(RESUNIT) uuchar objpas macpas iso7185 extpas buildrtl cpall
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) $(RESUNIT) uuchar objpas macpas iso7185 extpas buildrtl cpall
+ endif
+@@ -871,6 +874,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=$(SYSINITUNITS) athreads dos sysutils ctypes strings rtlconsts sysconst math types typinfo fgl classes charset character getopts cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=$(SYSINITUNITS) athreads dos sysutils ctypes strings rtlconsts sysconst math types typinfo fgl classes charset character getopts cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=$(SYSINITUNITS) athreads dos sysutils ctypes strings rtlconsts sysconst math types typinfo fgl classes charset character getopts cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
+@@ -1135,6 +1141,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=$(LOADERS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
+@@ -1399,6 +1408,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math rtlconsts typinfo classes sysconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math rtlconsts typinfo classes sysconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math rtlconsts typinfo classes sysconst
+ endif
+@@ -1664,6 +1676,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(AMIINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(AMIINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(AMIINC)
+ endif
+@@ -1928,6 +1943,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(AMIINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(AMIINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(AMIINC) $(COMMON)
+ endif
+diff --git a/rtl/android/Makefile b/rtl/android/Makefile
+index 8a79b51e..160f8aa4 100644
+--- rtl/android/Makefile
++++ rtl/android/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -606,6 +606,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) uuchar unixtype ctypes baseunix strings objpas macpas iso7185 extpas syscall unixutil fpintres heaptrc lineinfo lnfodwrf termio unix linux initc cmem linuxvcs sysutils typinfo math charset cpall character getopts errors dl dynlibs types sysconst cthreads classes fgl rtlconsts dos cwstring fpcylix unixcp fpwidestring
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) uuchar unixtype ctypes baseunix strings objpas macpas iso7185 extpas syscall unixutil fpintres heaptrc lineinfo lnfodwrf termio unix linux initc cmem linuxvcs sysutils typinfo math charset cpall character getopts errors dl dynlibs types sysconst cthreads classes fgl rtlconsts dos cwstring fpcylix unixcp fpwidestring
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) uuchar unixtype ctypes baseunix strings objpas macpas iso7185 extpas syscall unixutil fpintres heaptrc lineinfo lnfodwrf termio unix linux initc cmem linuxvcs sysutils typinfo math charset cpall character getopts errors dl dynlibs types sysconst cthreads classes fgl rtlconsts dos cwstring fpcylix unixcp fpwidestring
+ endif
+@@ -870,6 +873,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
+@@ -1134,6 +1140,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=$(LOADERS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
+@@ -1398,6 +1407,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo sysconst rtlconsts
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo sysconst rtlconsts
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo sysconst rtlconsts
+ endif
+@@ -1662,6 +1674,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override CLEAN_UNITS+=syslinux linux
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override CLEAN_UNITS+=syslinux linux
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override CLEAN_UNITS+=syslinux linux
+ endif
+@@ -1927,6 +1942,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) $(LINUXINC) $(OSPROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) $(LINUXINC) $(OSPROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) $(LINUXINC) $(OSPROCINC)
+ endif
+@@ -2191,6 +2209,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) $(COMMON) $(LINUXINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) $(COMMON) $(LINUXINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) $(COMMON) $(LINUXINC)
+ endif
+@@ -2455,6 +2476,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_TARGETDIR+=.
+ endif
+diff --git a/rtl/android/jvm/Makefile b/rtl/android/jvm/Makefile
+index 5ffd4ad2..43662582 100644
+--- rtl/android/jvm/Makefile
++++ rtl/android/jvm/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -595,6 +595,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas androidr14
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas androidr14
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas androidr14
+ endif
+@@ -860,6 +863,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
+@@ -1124,6 +1130,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(ARCH)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(ARCH)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(ARCH)
+ endif
+diff --git a/rtl/aros/Makefile b/rtl/aros/Makefile
+index ad2f67a2..48c84f6c 100644
+--- rtl/aros/Makefile
++++ rtl/aros/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -598,6 +598,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) heaptrc uuchar objpas macpas iso7185 extpas lineinfo buildrtl cpall
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) heaptrc uuchar objpas macpas iso7185 extpas lineinfo buildrtl cpall
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) heaptrc uuchar objpas macpas iso7185 extpas lineinfo buildrtl cpall
+ endif
+@@ -862,6 +865,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=$(SYSINITUNITS) athreads dos sysutils ctypes strings rtlconsts sysconst math types typinfo fgl classes charset character getopts fpintres exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=$(SYSINITUNITS) athreads dos sysutils ctypes strings rtlconsts sysconst math types typinfo fgl classes charset character getopts fpintres exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=$(SYSINITUNITS) athreads dos sysutils ctypes strings rtlconsts sysconst math types typinfo fgl classes charset character getopts fpintres exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
+@@ -1126,6 +1132,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=$(LOADERS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
+@@ -1390,6 +1399,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math rtlconsts typinfo classes sysconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math rtlconsts typinfo classes sysconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math rtlconsts typinfo classes sysconst
+ endif
+@@ -1656,6 +1668,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(AMIINC) i386
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(AMIINC) i386
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(AMIINC) i386
+ endif
+@@ -1920,6 +1935,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(AMIINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(AMIINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(AMIINC) $(COMMON)
+ endif
+diff --git a/rtl/atari/Makefile b/rtl/atari/Makefile
+index 79a7bd31..5e6d3526 100644
+--- rtl/atari/Makefile
++++ rtl/atari/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -596,6 +596,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) fpextres uuchar objpas macpas iso7185 buildrtl cpall
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) fpextres uuchar objpas macpas iso7185 buildrtl cpall
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) fpextres uuchar objpas macpas iso7185 buildrtl cpall
+ endif
+@@ -860,6 +863,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=si_prc sysutils dos ctypes strings rtlconsts sysconst math types typinfo fgl classes charset character getopts cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=si_prc sysutils dos ctypes strings rtlconsts sysconst math types typinfo fgl classes charset character getopts cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=si_prc sysutils dos ctypes strings rtlconsts sysconst math types typinfo fgl classes charset character getopts cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
+@@ -1124,6 +1130,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=$(LOADERS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
+@@ -1388,6 +1397,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math rtlconsts typinfo classes sysconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math rtlconsts typinfo classes sysconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math rtlconsts typinfo classes sysconst
+ endif
+@@ -1653,6 +1665,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(CPU_TARGET)
+ endif
+@@ -1917,6 +1932,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(CPU_TARGET) $(COMMON)
+ endif
+diff --git a/rtl/beos/Makefile b/rtl/beos/Makefile
+index eaa3fe45..8e71f135 100644
+--- rtl/beos/Makefile
++++ rtl/beos/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -596,6 +596,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=system uuchar baseunix unixtype ctypes objpas macpas iso7185 extpas strings errors dos dl cthreads sysconst sysutils types charset cpall typinfo classes fgl math cpu mmx getopts heaptrc lineinfo lnfodwrf rtlconsts syscall unix unixutil termio initc character fpwidestring unicodedata unicodenumtable cmem dynlibs cwstring unixcp
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=system uuchar baseunix unixtype ctypes objpas macpas iso7185 extpas strings errors dos dl cthreads sysconst sysutils types charset cpall typinfo classes fgl math cpu mmx getopts heaptrc lineinfo lnfodwrf rtlconsts syscall unix unixutil termio initc character fpwidestring unicodedata unicodenumtable cmem dynlibs cwstring unixcp
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=system uuchar baseunix unixtype ctypes objpas macpas iso7185 extpas strings errors dos dl cthreads sysconst sysutils types charset cpall typinfo classes fgl math cpu mmx getopts heaptrc lineinfo lnfodwrf rtlconsts syscall unix unixutil termio initc character fpwidestring unicodedata unicodenumtable cmem dynlibs cwstring unixcp
+ endif
+@@ -860,6 +863,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
+@@ -1124,6 +1130,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=prt0 cprt0 func dllprt
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=prt0 cprt0 func dllprt
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=prt0 cprt0 func dllprt
+ endif
+@@ -1388,6 +1397,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo sysconst rtlconsts
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo sysconst rtlconsts
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo sysconst rtlconsts
+ endif
+@@ -1653,6 +1665,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC)
+ endif
+@@ -1917,6 +1932,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET)
+ endif
+@@ -2181,6 +2199,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_TARGETDIR+=.
+ endif
+diff --git a/rtl/darwin/Makefile b/rtl/darwin/Makefile
+index b0a1c4cf..156bcf31 100644
+--- rtl/darwin/Makefile
++++ rtl/darwin/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -613,6 +613,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) sysinit uuchar unixtype ctypes objpas macpas iso7185 extpas strings sysctl baseunix unixutil unix initc cmem dynlibs $(CPU_UNITS) dos dl blockrtl sysutils typinfo fgl classes math types charset cpall character getopts heaptrc lineinfo lnfodwrf lnfogdb errors termio sysconst cthreads rtlconsts cwstring bsd fpwidestring fpintres fpextres objc objcbase unixcp
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) sysinit uuchar unixtype ctypes objpas macpas iso7185 extpas strings sysctl baseunix unixutil unix initc cmem dynlibs $(CPU_UNITS) dos dl blockrtl sysutils typinfo fgl classes math types charset cpall character getopts heaptrc lineinfo lnfodwrf lnfogdb errors termio sysconst cthreads rtlconsts cwstring bsd fpwidestring fpintres fpextres objc objcbase unixcp
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) sysinit uuchar unixtype ctypes objpas macpas iso7185 extpas strings sysctl baseunix unixutil unix initc cmem dynlibs $(CPU_UNITS) dos dl blockrtl sysutils typinfo fgl classes math types charset cpall character getopts heaptrc lineinfo lnfodwrf lnfogdb errors termio sysconst cthreads rtlconsts cwstring bsd fpwidestring fpintres fpextres objc objcbase unixcp
+ endif
+@@ -877,6 +880,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
+@@ -1141,6 +1147,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo classes sysconst rtlconsts
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo classes sysconst rtlconsts
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo classes sysconst rtlconsts
+ endif
+@@ -1406,6 +1415,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC)
+ endif
+@@ -1670,6 +1682,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON)
+ endif
+diff --git a/rtl/dragonfly/Makefile b/rtl/dragonfly/Makefile
+index f3ac3a30..d74070f9 100644
+--- rtl/dragonfly/Makefile
++++ rtl/dragonfly/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -608,6 +608,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes objpas macpas iso7185 extpas strings syscall sysctl baseunix unixutil character unix rtlconsts initc cmem dl termio sysutils math typinfo types classes fgl dynlibs $(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo errors bsd console sysconst cthreads dos cwstring fpintres unixcp fpwidestring
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes objpas macpas iso7185 extpas strings syscall sysctl baseunix unixutil character unix rtlconsts initc cmem dl termio sysutils math typinfo types classes fgl dynlibs $(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo errors bsd console sysconst cthreads dos cwstring fpintres unixcp fpwidestring
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes objpas macpas iso7185 extpas strings syscall sysctl baseunix unixutil character unix rtlconsts initc cmem dl termio sysutils math typinfo types classes fgl dynlibs $(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo errors bsd console sysconst cthreads dos cwstring fpintres unixcp fpwidestring
+ endif
+@@ -872,6 +875,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
+@@ -1136,6 +1142,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=prt0 cprt0 gprt0 dllprt0
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=prt0 cprt0 gprt0 dllprt0
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=prt0 cprt0 gprt0 dllprt0
+ endif
+@@ -1400,6 +1409,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo classes sysconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo classes sysconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo classes sysconst
+ endif
+@@ -1665,6 +1677,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC)
+ endif
+@@ -1929,6 +1944,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON)
+ endif
+diff --git a/rtl/embedded/Makefile b/rtl/embedded/Makefile
+index 3f6f601a..0083bfa1 100644
+--- rtl/embedded/Makefile
++++ rtl/embedded/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -706,6 +706,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) $(CPU_UNITS) uuchar objpas iso7185 extpas strings heapmgr consoleio $(CPU_SPECIFIC_COMMON_UNITS) dos ctypes charset cpall sysconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) $(CPU_UNITS) uuchar objpas iso7185 extpas strings heapmgr consoleio $(CPU_SPECIFIC_COMMON_UNITS) dos ctypes charset cpall sysconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) $(CPU_UNITS) uuchar objpas iso7185 extpas strings heapmgr consoleio $(CPU_SPECIFIC_COMMON_UNITS) dos ctypes charset cpall sysconst
+ endif
+@@ -970,6 +973,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=$(LOADERS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
+@@ -1235,6 +1241,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
+@@ -1499,6 +1508,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(ARCH)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(ARCH)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(ARCH)
+ endif
+diff --git a/rtl/emx/Makefile b/rtl/emx/Makefile
+index 135ef1bc..f536c879 100644
+--- rtl/emx/Makefile
++++ rtl/emx/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -600,6 +600,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 extpas strings ports os2def doscalls doscall2 moncalls kbdcalls moucalls viocalls so32dll pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos unicodedata unicodenumtable character sysutils classes fgl math typinfo charset cpall cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs types rtlconst sysconst ctypes
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 extpas strings ports os2def doscalls doscall2 moncalls kbdcalls moucalls viocalls so32dll pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos unicodedata unicodenumtable character sysutils classes fgl math typinfo charset cpall cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs types rtlconst sysconst ctypes
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 extpas strings ports os2def doscalls doscall2 moncalls kbdcalls moucalls viocalls so32dll pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos unicodedata unicodenumtable character sysutils classes fgl math typinfo charset cpall cpu mmx getopts heaptrc lnfodwrf lineinfo dynlibs types rtlconst sysconst ctypes
+ endif
+@@ -864,6 +867,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
+@@ -1128,6 +1134,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=prt0 prt1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=prt0 prt1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=prt0 prt1
+ endif
+@@ -1392,6 +1401,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo pmhelp classes sysconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo pmhelp classes sysconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo pmhelp classes sysconst
+ endif
+@@ -1657,6 +1669,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(OS2INC)
+ endif
+@@ -1921,6 +1936,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(OS2INC)
+ endif
+diff --git a/rtl/freebsd/Makefile b/rtl/freebsd/Makefile
+index 0584c2c7..d601cde0 100644
+--- rtl/freebsd/Makefile
++++ rtl/freebsd/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -613,6 +613,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes objpas macpas iso7185 extpas strings syscall sysctl baseunix unixutil character unix rtlconsts initc cmem dl termio sysutils math typinfo types classes fgl dynlibs $(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo errors bsd freebsd console sysconst cthreads dos cwstring fpintres unixcp fpwidestring
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes objpas macpas iso7185 extpas strings syscall sysctl baseunix unixutil character unix rtlconsts initc cmem dl termio sysutils math typinfo types classes fgl dynlibs $(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo errors bsd freebsd console sysconst cthreads dos cwstring fpintres unixcp fpwidestring
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes objpas macpas iso7185 extpas strings syscall sysctl baseunix unixutil character unix rtlconsts initc cmem dl termio sysutils math typinfo types classes fgl dynlibs $(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo errors bsd freebsd console sysconst cthreads dos cwstring fpintres unixcp fpwidestring
+ endif
+@@ -877,6 +880,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
+@@ -1141,6 +1147,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=prt0 cprt0 gprt0 dllprt0
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=prt0 cprt0 gprt0 dllprt0
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=prt0 cprt0 gprt0 dllprt0
+ endif
+@@ -1405,6 +1414,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo classes sysconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo classes sysconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo classes sysconst
+ endif
+@@ -1670,6 +1682,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC)
+ endif
+@@ -1934,6 +1949,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON)
+ endif
+diff --git a/rtl/gba/Makefile b/rtl/gba/Makefile
+index ce54cf3a..4cd96d95 100644
+--- rtl/gba/Makefile
++++ rtl/gba/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -597,6 +597,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 extpas strings sysutils classes math typinfo ctypes charset cpall getopts character fpwidestring unicodedata unicodenumtable types rtlconsts sysconst lineinfo fgl
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 extpas strings sysutils classes math typinfo ctypes charset cpall getopts character fpwidestring unicodedata unicodenumtable types rtlconsts sysconst lineinfo fgl
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 extpas strings sysutils classes math typinfo ctypes charset cpall getopts character fpwidestring unicodedata unicodenumtable types rtlconsts sysconst lineinfo fgl
+ endif
+@@ -861,6 +864,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
+@@ -1125,6 +1131,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=$(LOADERS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
+@@ -1390,6 +1399,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
+@@ -1654,6 +1666,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
+diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile
+index bf728d21..5e9ade2c 100644
+--- rtl/go32v2/Makefile
++++ rtl/go32v2/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -601,6 +601,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=system uuchar objpas macpas iso7185 extpas strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos cmem sysutils classes math typinfo cpu mmx getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset cpall character fpwidestring unicodedata unicodenumtable types sysconst rtlconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=system uuchar objpas macpas iso7185 extpas strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos cmem sysutils classes math typinfo cpu mmx getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset cpall character fpwidestring unicodedata unicodenumtable types sysconst rtlconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=system uuchar objpas macpas iso7185 extpas strings go32 dpmiexcp initc ports profile dxetype dxeload emu387 dos cmem sysutils classes math typinfo cpu mmx getopts heaptrc lineinfo lnfodwrf ctypes fgl msmouse charset cpall character fpwidestring unicodedata unicodenumtable types sysconst rtlconst
+ endif
+@@ -865,6 +868,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
+@@ -1129,6 +1135,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=prt0 exceptn fpu
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=prt0 exceptn fpu
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=prt0 exceptn fpu
+ endif
+@@ -1393,6 +1402,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo classes sysconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo classes sysconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo classes sysconst
+ endif
+@@ -1658,6 +1670,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
+@@ -1922,6 +1937,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
+diff --git a/rtl/haiku/Makefile b/rtl/haiku/Makefile
+index daff4e29..9387f8d1 100644
+--- rtl/haiku/Makefile
++++ rtl/haiku/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -604,6 +604,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=system $(SYSINITUNITS) uuchar baseunix unixtype ctypes objpas macpas iso7185 extpas strings errors dos dl sysconst sysutils types charset cpall character typinfo classes fgl math cpu $(CPUUNITS) getopts heaptrc lineinfo lnfodwrf rtlconsts unix unixutil termio initc cmem dynlibs cwstring cthreads fpintres unixcp fpwidestring
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=system $(SYSINITUNITS) uuchar baseunix unixtype ctypes objpas macpas iso7185 extpas strings errors dos dl sysconst sysutils types charset cpall character typinfo classes fgl math cpu $(CPUUNITS) getopts heaptrc lineinfo lnfodwrf rtlconsts unix unixutil termio initc cmem dynlibs cwstring cthreads fpintres unixcp fpwidestring
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=system $(SYSINITUNITS) uuchar baseunix unixtype ctypes objpas macpas iso7185 extpas strings errors dos dl sysconst sysutils types charset cpall character typinfo classes fgl math cpu $(CPUUNITS) getopts heaptrc lineinfo lnfodwrf rtlconsts unix unixutil termio initc cmem dynlibs cwstring cthreads fpintres unixcp fpwidestring
+ endif
+@@ -868,6 +871,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
+@@ -1132,6 +1138,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=$(LOADERS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
+@@ -1396,6 +1405,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo sysconst rtlconsts
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo sysconst rtlconsts
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo sysconst rtlconsts
+ endif
+@@ -1661,6 +1673,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) $(HAIKUINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) $(HAIKUINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(OSPROCINC) $(HAIKUINC)
+ endif
+@@ -1925,6 +1940,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(HAIKUINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(HAIKUINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET) $(HAIKUINC)
+ endif
+@@ -2189,6 +2207,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_TARGETDIR+=.
+ endif
+diff --git a/rtl/java/Makefile b/rtl/java/Makefile
+index ca54ac9b..2834736a 100644
+--- rtl/java/Makefile
++++ rtl/java/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -599,6 +599,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas jdk15
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas jdk15
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas jdk15
+ endif
+@@ -864,6 +867,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
+@@ -1128,6 +1134,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(ARCH)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(ARCH)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(ARCH)
+ endif
+diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile
+index 396f65a2..150ec333 100644
+--- rtl/linux/Makefile
++++ rtl/linux/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -628,6 +628,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) fpintres $(SYSINIT_UNITS) uuchar unixtype ctypes baseunix strings objpas macpas iso7185 extpas syscall unixutil heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) linuxvcs sysutils typinfo math charset cpall character unixcp getopts errors dl dynlibs types sysconst fpwidestring cthreads classes fgl rtlconsts dos cwstring fpcylix softfpu sfpux80 ufloatx80 sfpu128 ufloat128
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) fpintres $(SYSINIT_UNITS) uuchar unixtype ctypes baseunix strings objpas macpas iso7185 extpas syscall unixutil heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) linuxvcs sysutils typinfo math charset cpall character unixcp getopts errors dl dynlibs types sysconst fpwidestring cthreads classes fgl rtlconsts dos cwstring fpcylix softfpu sfpux80 ufloatx80 sfpu128 ufloat128
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) fpintres $(SYSINIT_UNITS) uuchar unixtype ctypes baseunix strings objpas macpas iso7185 extpas syscall unixutil heaptrc lineinfo lnfodwrf termio unix linux initc cmem $(CPU_UNITS) linuxvcs sysutils typinfo math charset cpall character unixcp getopts errors dl dynlibs types sysconst fpwidestring cthreads classes fgl rtlconsts dos cwstring fpcylix softfpu sfpux80 ufloatx80 sfpu128 ufloat128
+ endif
+@@ -892,6 +895,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
+@@ -1156,6 +1162,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=$(LOADERS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
+@@ -1420,6 +1429,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo sysconst rtlconsts
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo sysconst rtlconsts
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo sysconst rtlconsts
+ endif
+@@ -1684,6 +1696,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override CLEAN_UNITS+=syslinux linux
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override CLEAN_UNITS+=syslinux linux
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override CLEAN_UNITS+=syslinux linux
+ endif
+@@ -1949,6 +1964,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH)
+ endif
+@@ -2213,6 +2231,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) $(COMMON)
+ endif
+@@ -2477,6 +2498,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_TARGETDIR+=.
+ endif
+diff --git a/rtl/macos/Makefile b/rtl/macos/Makefile
+index 32a8d507..b0bd8f3d 100644
+--- rtl/macos/Makefile
++++ rtl/macos/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -600,6 +600,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils
+ endif
+@@ -864,6 +867,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
+@@ -1128,6 +1134,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=sysconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=sysconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=sysconst
+ endif
+@@ -1393,6 +1402,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
+@@ -1657,6 +1669,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
+diff --git a/rtl/morphos/Makefile b/rtl/morphos/Makefile
+index 4dd527e7..c0d4f8e2 100644
+--- rtl/morphos/Makefile
++++ rtl/morphos/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -597,6 +597,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) heaptrc lineinfo uuchar objpas macpas iso7185 extpas buildrtl cpall
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) heaptrc lineinfo uuchar objpas macpas iso7185 extpas buildrtl cpall
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) heaptrc lineinfo uuchar objpas macpas iso7185 extpas buildrtl cpall
+ endif
+@@ -861,6 +864,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=$(SYSINITUNITS) athreads dos sysutils ctypes strings rtlconsts sysconst math types typinfo fgl classes charset character getopts fpintres exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=$(SYSINITUNITS) athreads dos sysutils ctypes strings rtlconsts sysconst math types typinfo fgl classes charset character getopts fpintres exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=$(SYSINITUNITS) athreads dos sysutils ctypes strings rtlconsts sysconst math types typinfo fgl classes charset character getopts fpintres exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
+@@ -1125,6 +1131,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math rtlconsts typinfo classes sysconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math rtlconsts typinfo classes sysconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math rtlconsts typinfo classes sysconst
+ endif
+@@ -1391,6 +1400,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(AMIINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(AMIINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(AMIINC)
+ endif
+@@ -1655,6 +1667,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(AMIINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(AMIINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(AMIINC) $(COMMON)
+ endif
+diff --git a/rtl/msdos/Makefile b/rtl/msdos/Makefile
+index e2389faf..74dae09d 100644
+--- rtl/msdos/Makefile
++++ rtl/msdos/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -598,6 +598,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=system uuchar objpas strings dos heaptrc lnfodwrf sysconst sysutils math macpas iso7185 extpas rtlconsts typinfo cpu types getopts fgl classes msmouse ports charset cpall ctypes fpwidestring character unicodedata unicodenumtable
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=system uuchar objpas strings dos heaptrc lnfodwrf sysconst sysutils math macpas iso7185 extpas rtlconsts typinfo cpu types getopts fgl classes msmouse ports charset cpall ctypes fpwidestring character unicodedata unicodenumtable
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=system uuchar objpas strings dos heaptrc lnfodwrf sysconst sysutils math macpas iso7185 extpas rtlconsts typinfo cpu types getopts fgl classes msmouse ports charset cpall ctypes fpwidestring character unicodedata unicodenumtable
+ endif
+@@ -862,6 +865,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
+@@ -1126,6 +1132,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=prt0s prt0t prt0m prt0c prt0l prt0h # exceptn fpu
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=prt0s prt0t prt0m prt0c prt0l prt0h # exceptn fpu
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=prt0s prt0t prt0m prt0c prt0l prt0h # exceptn fpu
+ endif
+@@ -1391,6 +1400,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
+@@ -1655,6 +1667,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
+diff --git a/rtl/nativent/Makefile b/rtl/nativent/Makefile
+index 94dc7eb5..8854fb5f 100644
+--- rtl/nativent/Makefile
++++ rtl/nativent/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -606,6 +606,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=system uuchar objpas iso7185 extpas cpall buildrtl
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=system uuchar objpas iso7185 extpas cpall buildrtl
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=system uuchar objpas iso7185 extpas cpall buildrtl
+ endif
+@@ -870,6 +873,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=ndk ndkutils ddk ctypes strings dos rtlconsts sysconst sysutils math types typinfo fgl classes $(CPU_UNITS) charset getopts cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=ndk ndkutils ddk ctypes strings dos rtlconsts sysconst sysutils math types typinfo fgl classes $(CPU_UNITS) charset getopts cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=ndk ndkutils ddk ctypes strings dos rtlconsts sysconst sysutils math types typinfo fgl classes $(CPU_UNITS) charset getopts cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
+@@ -1134,6 +1140,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo classes sysconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo classes sysconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo classes sysconst
+ endif
+@@ -1399,6 +1408,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(DDKINC) $(NDKINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(DDKINC) $(NDKINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(DDKINC) $(NDKINC)
+ endif
+@@ -1663,6 +1675,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
+diff --git a/rtl/nds/Makefile b/rtl/nds/Makefile
+index 2e7fad73..a5a07950 100644
+--- rtl/nds/Makefile
++++ rtl/nds/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -597,6 +597,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 extpas strings sysutils classes math typinfo ctypes charset cpall getopts character fpwidestring unicodedata unicodenumtable types rtlconsts sysconst lineinfo fgl
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 extpas strings sysutils classes math typinfo ctypes charset cpall getopts character fpwidestring unicodedata unicodenumtable types rtlconsts sysconst lineinfo fgl
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 extpas strings sysutils classes math typinfo ctypes charset cpall getopts character fpwidestring unicodedata unicodenumtable types rtlconsts sysconst lineinfo fgl
+ endif
+@@ -861,6 +864,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
+@@ -1125,6 +1131,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=$(LOADERS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
+@@ -1390,6 +1399,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
+@@ -1654,6 +1666,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
+diff --git a/rtl/netbsd/Makefile b/rtl/netbsd/Makefile
+index fe21e6ff..2957002f 100644
+--- rtl/netbsd/Makefile
++++ rtl/netbsd/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -610,6 +610,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes objpas macpas iso7185 extpas strings syscall sysctl baseunix unixutil character unix rtlconsts initc cmem dl termio sysutils math typinfo types classes fgl dynlibs $(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo errors bsd sysconst cthreads dos cwstring fpintres unixcp fpwidestring
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes objpas macpas iso7185 extpas strings syscall sysctl baseunix unixutil character unix rtlconsts initc cmem dl termio sysutils math typinfo types classes fgl dynlibs $(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo errors bsd sysconst cthreads dos cwstring fpintres unixcp fpwidestring
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes objpas macpas iso7185 extpas strings syscall sysctl baseunix unixutil character unix rtlconsts initc cmem dl termio sysutils math typinfo types classes fgl dynlibs $(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo errors bsd sysconst cthreads dos cwstring fpintres unixcp fpwidestring
+ endif
+@@ -874,6 +877,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
+@@ -1138,6 +1144,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=prt0 cprt0 dllprt0
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=prt0 cprt0 dllprt0
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=prt0 cprt0 dllprt0
+ endif
+@@ -1402,6 +1411,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo classes sysconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo classes sysconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo classes sysconst
+ endif
+@@ -1667,6 +1679,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC)
+ endif
+@@ -1931,6 +1946,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC)
+ endif
+diff --git a/rtl/netware/Makefile b/rtl/netware/Makefile
+index 75a535f1..cf2f98e8 100644
+--- rtl/netware/Makefile
++++ rtl/netware/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -604,6 +604,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 extpas strings lineinfo lnfodwrf heaptrc dos sysconst initc sysutils types typinfo fgl classes cpu mmx getopts charset cpall character fpwidestring unicodedata unicodenumtable rtlconsts math cmem dynlibs aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes nwpre
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 extpas strings lineinfo lnfodwrf heaptrc dos sysconst initc sysutils types typinfo fgl classes cpu mmx getopts charset cpall character fpwidestring unicodedata unicodenumtable rtlconsts math cmem dynlibs aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes nwpre
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 extpas strings lineinfo lnfodwrf heaptrc dos sysconst initc sysutils types typinfo fgl classes cpu mmx getopts charset cpall character fpwidestring unicodedata unicodenumtable rtlconsts math cmem dynlibs aio nwsnut nwserv nwnit nwprot netware nwcalls ctypes nwpre
+ endif
+@@ -868,6 +871,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
+@@ -1132,6 +1138,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=nwpre prelude
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=nwpre prelude
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=nwpre prelude
+ endif
+@@ -1396,6 +1405,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo classes sysconst rtlconsts
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo classes sysconst rtlconsts
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo classes sysconst rtlconsts
+ endif
+@@ -1661,6 +1673,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
+@@ -1925,6 +1940,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
+diff --git a/rtl/netwlibc/Makefile b/rtl/netwlibc/Makefile
+index 8f92547f..317f8d88 100644
+--- rtl/netwlibc/Makefile
++++ rtl/netwlibc/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -597,6 +597,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 extpas strings lineinfo lnfodwrf heaptrc nwsnut libc dos sysconst initc sysutils types typinfo fgl classes cpu mmx getopts charset cpall rtlconsts math dynlibs cmem ctypes
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 extpas strings lineinfo lnfodwrf heaptrc nwsnut libc dos sysconst initc sysutils types typinfo fgl classes cpu mmx getopts charset cpall rtlconsts math dynlibs cmem ctypes
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 extpas strings lineinfo lnfodwrf heaptrc nwsnut libc dos sysconst initc sysutils types typinfo fgl classes cpu mmx getopts charset cpall rtlconsts math dynlibs cmem ctypes
+ endif
+@@ -861,6 +864,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
+@@ -1125,6 +1131,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle
+ endif
+@@ -1389,6 +1398,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo classes sysconst rtlconsts system
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo classes sysconst rtlconsts system
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo classes sysconst rtlconsts system
+ endif
+@@ -1654,6 +1666,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
+@@ -1918,6 +1933,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
+diff --git a/rtl/openbsd/Makefile b/rtl/openbsd/Makefile
+index 972e4fbd..0deda892 100644
+--- rtl/openbsd/Makefile
++++ rtl/openbsd/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -612,6 +612,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc uuchar objpas macpas iso7185 extpas strings syscall baseunix $(LINUXUNIT) unixtype unixutil unix ctypes bsd $(CPU_UNITS) dos rtlconsts sysutils fgl classes typinfo math charset cpall character getopts heaptrc lineinfo lnfodwrf errors types sysctl sysconst fpintres dynlibs cwstring cmem dl termio cthreads unixcp fpwidestring
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc uuchar objpas macpas iso7185 extpas strings syscall baseunix $(LINUXUNIT) unixtype unixutil unix ctypes bsd $(CPU_UNITS) dos rtlconsts sysutils fgl classes typinfo math charset cpall character getopts heaptrc lineinfo lnfodwrf errors types sysctl sysconst fpintres dynlibs cwstring cmem dl termio cthreads unixcp fpwidestring
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc uuchar objpas macpas iso7185 extpas strings syscall baseunix $(LINUXUNIT) unixtype unixutil unix ctypes bsd $(CPU_UNITS) dos rtlconsts sysutils fgl classes typinfo math charset cpall character getopts heaptrc lineinfo lnfodwrf errors types sysctl sysconst fpintres dynlibs cwstring cmem dl termio cthreads unixcp fpwidestring
+ endif
+@@ -876,6 +879,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
+@@ -1140,6 +1146,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=$(LOADERS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
+@@ -1404,6 +1413,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo classes sysconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo classes sysconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo classes sysconst
+ endif
+@@ -1669,6 +1681,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC)
+ endif
+@@ -1933,6 +1948,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC)
+ endif
+diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile
+index ec3b2a8f..33e81ca7 100644
+--- rtl/os2/Makefile
++++ rtl/os2/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -600,6 +600,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar ctypes objpas macpas iso7185 extpas strings ports os2def doscalls doscall2 moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos sysutils fgl classes math typinfo charset cpall cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs types rtlconst sysconst so32dll fpwidestring character unicodedata unicodenumtable
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) uuchar ctypes objpas macpas iso7185 extpas strings ports os2def doscalls doscall2 moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos sysutils fgl classes math typinfo charset cpall cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs types rtlconst sysconst so32dll fpwidestring character unicodedata unicodenumtable
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar ctypes objpas macpas iso7185 extpas strings ports os2def doscalls doscall2 moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi pmstddlg pmhelp pmdev pmspl pmshl pmwp pmwsock pmbidi dos sysutils fgl classes math typinfo charset cpall cpu mmx getopts heaptrc lineinfo lnfodwrf dynlibs types rtlconst sysconst so32dll fpwidestring character unicodedata unicodenumtable
+ endif
+@@ -864,6 +867,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
+@@ -1128,6 +1134,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=prt0
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=prt0
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=prt0
+ endif
+@@ -1392,6 +1401,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo pmhelp classes sysconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo pmhelp classes sysconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo pmhelp classes sysconst
+ endif
+@@ -1657,6 +1669,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
+@@ -1921,6 +1936,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
+diff --git a/rtl/palmos/Makefile b/rtl/palmos/Makefile
+index 585ca6af..d9d95a5d 100644
+--- rtl/palmos/Makefile
++++ rtl/palmos/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -596,6 +596,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) si_prc uuchar objpas iso7185 strings ctypes charset cpall sysconst systraps pilot
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) si_prc uuchar objpas iso7185 strings ctypes charset cpall sysconst systraps pilot
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) si_prc uuchar objpas iso7185 strings ctypes charset cpall sysconst systraps pilot
+ endif
+@@ -860,6 +863,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
+@@ -1124,6 +1130,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=prt0
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=prt0
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=prt0
+ endif
+@@ -1389,6 +1398,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/palmos
+ endif
+@@ -1653,6 +1665,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(OBJPAS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(OBJPAS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(OBJPAS)
+ endif
+diff --git a/rtl/qnx/Makefile b/rtl/qnx/Makefile
+index 361ef517..2221ab50 100644
+--- rtl/qnx/Makefile
++++ rtl/qnx/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -601,6 +601,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=system uuchar dos objpas objects strings sysutils typinfo math cpu mmx getopts heaptrc lineinfo posix
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=system uuchar dos objpas objects strings sysutils typinfo math cpu mmx getopts heaptrc lineinfo posix
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=system uuchar dos objpas objects strings sysutils typinfo math cpu mmx getopts heaptrc lineinfo posix
+ endif
+@@ -865,6 +868,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=cprt0 crti crtn
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=cprt0 crti crtn
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=cprt0 crti crtn
+ endif
+@@ -1129,6 +1135,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo
+ endif
+@@ -1394,6 +1403,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(POSIXINC) $(SYSCALLINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(POSIXINC) $(SYSCALLINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(POSIXINC) $(SYSCALLINC)
+ endif
+@@ -1658,6 +1670,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(POSIXINC) $(SYSCALLINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(POSIXINC) $(SYSCALLINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(POSIXINC) $(SYSCALLINC)
+ endif
+@@ -1922,6 +1937,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_TARGETDIR+=.
+ endif
+diff --git a/rtl/solaris/Makefile b/rtl/solaris/Makefile
+index 78d149bf..64551540 100644
+--- rtl/solaris/Makefile
++++ rtl/solaris/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -609,6 +609,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes strings objpas iso7185 extpas macpas heaptrc lineinfo lnfodwrf baseunix unixutil unixcp termio unix initc cmem sysutils typinfo math fgl classes charset cpall getopts errors dl dynlibs types sysconst character rtlconsts cthreads dos fpwidestring cwstring fpintres $(CPU_UNITS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes strings objpas iso7185 extpas macpas heaptrc lineinfo lnfodwrf baseunix unixutil unixcp termio unix initc cmem sysutils typinfo math fgl classes charset cpall getopts errors dl dynlibs types sysconst character rtlconsts cthreads dos fpwidestring cwstring fpintres $(CPU_UNITS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes strings objpas iso7185 extpas macpas heaptrc lineinfo lnfodwrf baseunix unixutil unixcp termio unix initc cmem sysutils typinfo math fgl classes charset cpall getopts errors dl dynlibs types sysconst character rtlconsts cthreads dos fpwidestring cwstring fpintres $(CPU_UNITS)
+ endif
+@@ -873,6 +876,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
+@@ -1137,6 +1143,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo classes sysconst rtlconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo classes sysconst rtlconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo classes sysconst rtlconst
+ endif
+@@ -1402,6 +1411,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(OSPROCINC)
+ endif
+@@ -1666,6 +1678,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(COMMON)
+ endif
+diff --git a/rtl/symbian/Makefile b/rtl/symbian/Makefile
+index f28609a6..9f59fd44 100644
+--- rtl/symbian/Makefile
++++ rtl/symbian/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -594,6 +594,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=system uuchar objpas sysconst sysutils math rtlconsts character fpwidestring unicodedata unicodenumtable dos iso7185 extpas typinfo types classes macpas buildrtl
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=system uuchar objpas sysconst sysutils math rtlconsts character fpwidestring unicodedata unicodenumtable dos iso7185 extpas typinfo types classes macpas buildrtl
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=system uuchar objpas sysconst sysutils math rtlconsts character fpwidestring unicodedata unicodenumtable dos iso7185 extpas typinfo types classes macpas buildrtl
+ endif
+@@ -858,6 +861,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=ctypes strings symbian
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=ctypes strings symbian
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=ctypes strings symbian
+ endif
+@@ -1123,6 +1129,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
+@@ -1387,6 +1396,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
+diff --git a/rtl/watcom/Makefile b/rtl/watcom/Makefile
+index e83026c3..088c28d3 100644
+--- rtl/watcom/Makefile
++++ rtl/watcom/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -599,6 +599,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=system uuchar objpas macpas iso7185 extpas strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx classes sysutils
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=system uuchar objpas macpas iso7185 extpas strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx classes sysutils
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=system uuchar objpas macpas iso7185 extpas strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx classes sysutils
+ endif
+@@ -863,6 +866,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
+@@ -1127,6 +1133,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=prt0
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=prt0
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=prt0
+ endif
+@@ -1391,6 +1400,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo classes sysconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo classes sysconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo classes sysconst
+ endif
+@@ -1656,6 +1668,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
+@@ -1920,6 +1935,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC)
+ endif
+diff --git a/rtl/wii/Makefile b/rtl/wii/Makefile
+index 3c46dc96..515ca1e9 100644
+--- rtl/wii/Makefile
++++ rtl/wii/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -597,6 +597,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 extpas strings dos sysutils classes math typinfo ctypes charset cpall getopts character fpwidestring unicodedata unicodenumtable types rtlconsts sysconst lineinfo fgl cmem
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 extpas strings dos sysutils classes math typinfo ctypes charset cpall getopts character fpwidestring unicodedata unicodenumtable types rtlconsts sysconst lineinfo fgl cmem
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar objpas macpas iso7185 extpas strings dos sysutils classes math typinfo ctypes charset cpall getopts character fpwidestring unicodedata unicodenumtable types rtlconsts sysconst lineinfo fgl cmem
+ endif
+@@ -861,6 +864,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
+@@ -1126,6 +1132,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
+@@ -1390,6 +1399,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
+diff --git a/rtl/win16/Makefile b/rtl/win16/Makefile
+index e5a233ef..db5926ae 100644
+--- rtl/win16/Makefile
++++ rtl/win16/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -598,6 +598,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=system uuchar objpas strings iso7185 extpas dos wintypes winprocs win31 ports dynlibs sysconst rtlconst sysutils math types typinfo fgl classes
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=system uuchar objpas strings iso7185 extpas dos wintypes winprocs win31 ports dynlibs sysconst rtlconst sysutils math types typinfo fgl classes
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=system uuchar objpas strings iso7185 extpas dos wintypes winprocs win31 ports dynlibs sysconst rtlconst sysutils math types typinfo fgl classes
+ endif
+@@ -862,6 +865,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=prt0s prt0m prt0c prt0l prt0h
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=prt0s prt0m prt0c prt0l prt0h
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=prt0s prt0m prt0c prt0l prt0h
+ endif
+@@ -1127,6 +1133,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
+@@ -1391,6 +1400,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
+diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile
+index 70c54735..417a7759 100644
+--- rtl/win32/Makefile
++++ rtl/win32/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -596,6 +596,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl cpall lineinfo lnfodwrf
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl cpall lineinfo lnfodwrf
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl cpall lineinfo lnfodwrf
+ endif
+@@ -860,6 +863,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof extpas ctypes strings heaptrc windows initc cmem dynlibs signals dos messages rtlconsts sysconst sysutils math types typinfo fgl classes cpu mmx charset character getopts fpwidestring winsysut sharemem exeinfo fpintres windirs cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof extpas ctypes strings heaptrc windows initc cmem dynlibs signals dos messages rtlconsts sysconst sysutils math types typinfo fgl classes cpu mmx charset character getopts fpwidestring winsysut sharemem exeinfo fpintres windirs cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof extpas ctypes strings heaptrc windows initc cmem dynlibs signals dos messages rtlconsts sysconst sysutils math types typinfo fgl classes cpu mmx charset character getopts fpwidestring winsysut sharemem exeinfo fpintres windirs cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable
+ endif
+@@ -1124,6 +1130,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=$(LOADERS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
+@@ -1388,6 +1397,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo classes sysconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo classes sysconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo classes sysconst
+ endif
+@@ -1654,6 +1666,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
+ endif
+@@ -1918,6 +1933,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR)
+ endif
+diff --git a/rtl/win64/Makefile b/rtl/win64/Makefile
+index 0e6a029b..a02baac2 100644
+--- rtl/win64/Makefile
++++ rtl/win64/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -597,6 +597,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl cpall lineinfo lnfodwrf
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl cpall lineinfo lnfodwrf
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=system uuchar objpas macpas iso7185 buildrtl cpall lineinfo lnfodwrf
+ endif
+@@ -861,6 +864,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=sysinit ctypes strings extpas heaptrc dos messages windows cmem dynlibs rtlconsts sysconst sysutils math types typinfo fgl classes getopts charset character fpwidestring sharemem exeinfo fpintres windirs cpu signals cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable sfpux80
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=sysinit ctypes strings extpas heaptrc dos messages windows cmem dynlibs rtlconsts sysconst sysutils math types typinfo fgl classes getopts charset character fpwidestring sharemem exeinfo fpintres windirs cpu signals cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable sfpux80
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=sysinit ctypes strings extpas heaptrc dos messages windows cmem dynlibs rtlconsts sysconst sysutils math types typinfo fgl classes getopts charset character fpwidestring sharemem exeinfo fpintres windirs cpu signals cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u unicodedata unicodenumtable sfpux80
+ endif
+@@ -1125,6 +1131,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_LOADERS+=$(LOADERS)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_LOADERS+=$(LOADERS)
+ endif
+@@ -1389,6 +1398,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_RSTS+=math typinfo classes sysconst
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_RSTS+=math typinfo classes sysconst
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_RSTS+=math typinfo classes sysconst
+ endif
+@@ -1655,6 +1667,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
+ endif
+@@ -1919,6 +1934,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR)
+ endif
+diff --git a/rtl/wince/Makefile b/rtl/wince/Makefile
+index 52144f23..9105758f 100644
+--- rtl/wince/Makefile
++++ rtl/wince/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -600,6 +600,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar fpintres ctypes objpas macpas iso7185 extpas strings lineinfo heaptrc windows messages dynlibs dos rtlconsts sysconst sysutils typinfo types fgl classes math fpwidestring charset cpall getopts unicodedata unicodenumtable character cmem sharemem
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=$(SYSTEMUNIT) uuchar fpintres ctypes objpas macpas iso7185 extpas strings lineinfo heaptrc windows messages dynlibs dos rtlconsts sysconst sysutils typinfo types fgl classes math fpwidestring charset cpall getopts unicodedata unicodenumtable character cmem sharemem
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=$(SYSTEMUNIT) uuchar fpintres ctypes objpas macpas iso7185 extpas strings lineinfo heaptrc windows messages dynlibs dos rtlconsts sysconst sysutils typinfo types fgl classes math fpwidestring charset cpall getopts unicodedata unicodenumtable character cmem sharemem
+ endif
+@@ -864,6 +867,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u
+ endif
+@@ -1129,6 +1135,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(RTL)/win
+ endif
+@@ -1393,6 +1402,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
+ endif
+diff --git a/utils/fpcm/Makefile b/utils/fpcm/Makefile
+index 6e633417..cd9bcdbb 100644
+--- utils/fpcm/Makefile
++++ utils/fpcm/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1679,6 +1679,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/utils/fpcmkcfg/Makefile b/utils/fpcmkcfg/Makefile
+index 8d310d8c..502f1193 100644
+--- utils/fpcmkcfg/Makefile
++++ utils/fpcmkcfg/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: lang/fpc/files/patch-compiler_aarch64_a64att.inc
===================================================================
--- lang/fpc/files/patch-compiler_aarch64_a64att.inc
+++ lang/fpc/files/patch-compiler_aarch64_a64att.inc
@@ -0,0 +1,12 @@
+diff --git a/compiler/aarch64/a64att.inc b/compiler/aarch64/a64att.inc
+index 35971906..3a6d52ae 100644
+--- compiler/aarch64/a64att.inc
++++ compiler/aarch64/a64att.inc
+@@ -2,6 +2,7 @@
+ (
+ 'none',
+ 'b',
++'bcc',
+ 'cbz',
+ 'cbnz',
+ 'tbz',
Index: lang/fpc/files/patch-compiler_aarch64_a64atts.inc
===================================================================
--- lang/fpc/files/patch-compiler_aarch64_a64atts.inc
+++ lang/fpc/files/patch-compiler_aarch64_a64atts.inc
@@ -0,0 +1,11 @@
+diff --git a/compiler/aarch64/a64atts.inc b/compiler/aarch64/a64atts.inc
+index 560b3cbb..1c73de2c 100644
+--- compiler/aarch64/a64atts.inc
++++ compiler/aarch64/a64atts.inc
+@@ -187,5 +187,6 @@ attsufNONE,
+ attsufNONE,
+ attsufNONE,
+ attsufNONE,
++attsufNONE,
+ attsufNONE
+ );
Index: lang/fpc/files/patch-compiler_aarch64_a64ins.dat
===================================================================
--- lang/fpc/files/patch-compiler_aarch64_a64ins.dat
+++ lang/fpc/files/patch-compiler_aarch64_a64ins.dat
@@ -0,0 +1,13 @@
+diff --git a/compiler/aarch64/a64ins.dat b/compiler/aarch64/a64ins.dat
+index 8032befc..62ab3637 100644
+--- compiler/aarch64/a64ins.dat
++++ compiler/aarch64/a64ins.dat
+@@ -3,6 +3,8 @@
+
+ [B]
+
++[BCC]
++
+ [CBZ]
+
+ [CBNZ]
Index: lang/fpc/files/patch-compiler_aarch64_a64op.inc
===================================================================
--- lang/fpc/files/patch-compiler_aarch64_a64op.inc
+++ lang/fpc/files/patch-compiler_aarch64_a64op.inc
@@ -0,0 +1,12 @@
+diff --git a/compiler/aarch64/a64op.inc b/compiler/aarch64/a64op.inc
+index 244c232d..f042dcfb 100644
+--- compiler/aarch64/a64op.inc
++++ compiler/aarch64/a64op.inc
+@@ -2,6 +2,7 @@
+ (
+ A_NONE,
+ A_B,
++A_BCC,
+ A_CBZ,
+ A_CBNZ,
+ A_TBZ,
Index: lang/fpc/files/patch-compiler_aarch64_agcpugas.pas
===================================================================
--- lang/fpc/files/patch-compiler_aarch64_agcpugas.pas
+++ lang/fpc/files/patch-compiler_aarch64_agcpugas.pas
@@ -0,0 +1,22 @@
+diff --git a/compiler/aarch64/agcpugas.pas b/compiler/aarch64/agcpugas.pas
+index da9f4ce9..2638ad9a 100644
+--- compiler/aarch64/agcpugas.pas
++++ compiler/aarch64/agcpugas.pas
+@@ -276,7 +276,7 @@ unit agcpugas;
+ idtxt : 'AS';
+ asmbin : 'as';
+ asmcmd : '-o $OBJ $EXTRAOPT $ASM';
+- supported_targets : [system_aarch64_linux,system_aarch64_android];
++ supported_targets : [system_aarch64_freebsd,system_aarch64_linux,system_aarch64_android];
+ flags : [af_needar,af_smartlink_sections];
+ labelprefix : '.L';
+ comment : '// ';
+@@ -289,7 +289,7 @@ unit agcpugas;
+ idtxt : 'CLANG';
+ asmbin : 'clang';
+ asmcmd : '-c -o $OBJ $EXTRAOPT -arch arm64 $DARWINVERSION -x assembler $ASM';
+- supported_targets : [system_aarch64_darwin];
++ supported_targets : [system_aarch64_darwin,system_aarch64_freebsd];
+ flags : [af_needar,af_smartlink_sections,af_supports_dwarf];
+ labelprefix : 'L';
+ comment : '# ';
Index: lang/fpc/files/patch-compiler_aarch64_cpubase.pas
===================================================================
--- lang/fpc/files/patch-compiler_aarch64_cpubase.pas
+++ lang/fpc/files/patch-compiler_aarch64_cpubase.pas
@@ -0,0 +1,13 @@
+diff --git a/compiler/aarch64/cpubase.pas b/compiler/aarch64/cpubase.pas
+index da40529a..94e844bd 100644
+--- compiler/aarch64/cpubase.pas
++++ compiler/aarch64/cpubase.pas
+@@ -411,7 +411,7 @@ unit cpubase;
+
+ function is_calljmp(o:tasmop):boolean;{$ifdef USEINLINE}inline;{$endif USEINLINE}
+ begin
+- is_calljmp:=o in [A_B,A_BL,A_BLR,A_RET,A_CBNZ,A_CBZ,A_TBNZ,A_TBZ];
++ is_calljmp:=o in [A_B,A_BCC,A_BL,A_BLR,A_RET,A_CBNZ,A_CBZ,A_TBNZ,A_TBZ];
+ end;
+
+
Index: lang/fpc/files/patch-compiler_systems.inc
===================================================================
--- lang/fpc/files/patch-compiler_systems.inc
+++ lang/fpc/files/patch-compiler_systems.inc
@@ -0,0 +1,14 @@
+diff --git a/compiler/systems.inc b/compiler/systems.inc
+index 284c121e..bfc0ef99 100644
+--- compiler/systems.inc
++++ compiler/systems.inc
+@@ -186,7 +186,8 @@
+ system_riscv32_embedded, { 99 }
+ system_aarch64_android, { 100 }
+ system_x86_64_android, { 101 }
+- system_x86_64_haiku { 102 }
++ system_x86_64_haiku, { 102 }
++ system_aarch64_freebsd { 103 }
+ );
+
+ type
Index: lang/fpc/files/patch-compiler_systems.pas
===================================================================
--- lang/fpc/files/patch-compiler_systems.pas
+++ lang/fpc/files/patch-compiler_systems.pas
@@ -0,0 +1,34 @@
+diff --git a/compiler/systems.pas b/compiler/systems.pas
+index 4b700e9b..299c7d24 100644
+--- compiler/systems.pas
++++ compiler/systems.pas
+@@ -234,7 +234,8 @@ interface
+ system_arm_linux,system_sparc_linux,system_sparc64_linux,system_m68k_linux,
+ system_x86_6432_linux,system_mipseb_linux,system_mipsel_linux,system_aarch64_linux];
+ systems_dragonfly = [system_x86_64_dragonfly];
+- systems_freebsd = [system_i386_freebsd,
++ systems_freebsd = [system_aarch64_freebsd,
++ system_i386_freebsd,
+ system_x86_64_freebsd];
+ systems_netbsd = [system_i386_netbsd,
+ system_m68k_netbsd,
+@@ -383,7 +384,7 @@ interface
+
+ { all systems where a value parameter passed by reference must be copied
+ on the caller side rather than on the callee side }
+- systems_caller_copy_addr_value_para = [system_aarch64_darwin,system_aarch64_linux];
++ systems_caller_copy_addr_value_para = [system_aarch64_darwin,system_aarch64_freebsd,system_aarch64_linux];
+
+ { pointer checking (requires special code in FPC_CHECKPOINTER,
+ and can never work for libc-based targets or any other program
+@@ -1033,6 +1035,10 @@ begin
+ {$define default_target_set}
+ default_target(system_aarch64_darwin);
+ {$endif darwin}
++ {$ifdef freebsd}
++ {$define default_target_set}
++ default_target(system_aarch64_freebsd);
++ {$endif freebsd}
+ {$ifdef android}
+ {$define default_target_set}
+ default_target(system_aarch64_android);
Index: lang/fpc/files/patch-compiler_systems_i_bsd.pas
===================================================================
--- lang/fpc/files/patch-compiler_systems_i_bsd.pas
+++ lang/fpc/files/patch-compiler_systems_i_bsd.pas
@@ -0,0 +1,88 @@
+diff --git a/compiler/systems/i_bsd.pas b/compiler/systems/i_bsd.pas
+index 9d182a1f..2aaf36d6 100644
+--- compiler/systems/i_bsd.pas
++++ compiler/systems/i_bsd.pas
+@@ -54,6 +54,73 @@ unit i_bsd;
+ resflags : [res_external_file,res_arch_in_file_name];
+ );
+
++ system_aarch64_freebsd_info : tsysteminfo =
++ (
++ system : system_aarch64_freebsd;
++ name : 'FreeBSD for aarch64';
++ shortname : 'FreeBSD';
++ flags : [tf_needs_symbol_size,tf_needs_dwarf_cfi,tf_library_needs_pic,tf_needs_symbol_type,
++ tf_files_case_sensitive,
++ tf_dwarf_only_local_labels,
++ {tf_pic_uses_got,}tf_smartlink_sections,tf_has_winlike_resources];
++ cpu : cpu_aarch64;
++ unit_env : 'BSDUNITS';
++ extradefines : 'UNIX;HASUNIX;BSD';
++ exeext : '';
++ defext : '.def';
++ scriptext : '.sh';
++ smartext : '.sl';
++ unitext : '.ppu';
++ unitlibext : '.ppl';
++ asmext : '.s';
++ objext : '.o';
++ resext : '.res';
++ resobjext : '.or';
++ sharedlibext : '.so';
++ staticlibext : '.a';
++ staticlibprefix : 'libp';
++ sharedlibprefix : 'lib';
++ sharedClibext : '.so';
++ staticClibext : '.a';
++ staticClibprefix : 'lib';
++ sharedClibprefix : 'lib';
++ importlibprefix : 'libimp';
++ importlibext : '.a';
++ Cprefix : '';
++ newline : #10;
++ dirsep : '/';
++ assem : as_gas;
++ assemextern : as_gas;
++ link : ld_none;
++ linkextern : ld_bsd;
++ ar : ar_gnu_ar;
++ res : res_elf;
++ dbg : dbg_dwarf2; //dbg_stabs;
++ script : script_unix;
++ endian : endian_little;
++ alignment :
++ (
++ procalign : 8;
++ loopalign : 4;
++ jumpalign : 0;
++ constalignmin : 0;
++ constalignmax : 16;
++ varalignmin : 0;
++ varalignmax : 16;
++ localalignmin : 4;
++ localalignmax : 16;
++ recordalignmin : 0;
++ recordalignmax : 16;
++ maxCrecordalign : 16
++ );
++ first_parm_offset : 16;
++ stacksize : 8*1024*1024;
++ stackalign : 16;
++ abi : abi_default;
++ llvmdatalayout : 'e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128'
++ );
++
++
+ system_i386_freebsd_info : tsysteminfo =
+ (
+ system : system_i386_FreeBSD;
+@@ -1287,6 +1354,9 @@ initialization
+ {$endif}
+ {$endif cpuarm}
+ {$ifdef cpuaarch64}
++ {$ifdef FreeBSD}
++ set_source_info(system_aarch64_freebsd_info);
++ {$endif FreeBSD}
+ {$ifdef Darwin}
+ set_source_info(system_aarch64_darwin_info);
+ {$endif Darwin}
Index: lang/fpc/files/patch-compiler_systems_t__bsd_aarch64.pas
===================================================================
--- lang/fpc/files/patch-compiler_systems_t__bsd_aarch64.pas
+++ lang/fpc/files/patch-compiler_systems_t__bsd_aarch64.pas
@@ -0,0 +1,14 @@
+diff --git a/compiler/systems/t_bsd.pas b/compiler/systems/t_bsd.pas
+index 5694b671..f63e5851 100644
+--- compiler/systems/t_bsd.pas
++++ compiler/systems/t_bsd.pas
+@@ -1168,6 +1177,9 @@ initialization
+ RegisterImport(system_aarch64_darwin,timportlibdarwin);
+ RegisterExport(system_aarch64_darwin,texportlibdarwin);
+ RegisterTarget(system_aarch64_darwin_info);
++ RegisterImport(system_aarch64_freebsd,timportlibbsd);
++ RegisterExport(system_aarch64_freebsd,texportlibbsd);
++ RegisterTarget(system_aarch64_freebsd_info);
+ {$endif aarch64}
+
+ RegisterRes(res_elf_info,TWinLikeResourceFile);
Index: lang/fpc/files/patch-compiler_utils_ppuutils_ppudump.pp
===================================================================
--- lang/fpc/files/patch-compiler_utils_ppuutils_ppudump.pp
+++ lang/fpc/files/patch-compiler_utils_ppuutils_ppudump.pp
@@ -0,0 +1,14 @@
+diff --git a/compiler/utils/ppuutils/ppudump.pp b/compiler/utils/ppuutils/ppudump.pp
+index 6f4c9f0b..dfb66b29 100644
+--- compiler/utils/ppuutils/ppudump.pp
++++ compiler/utils/ppuutils/ppudump.pp
+@@ -214,7 +214,8 @@ const
+ { 99 } 'Embedded-RiscV64',
+ { 100 } 'Android-AArch64',
+ { 101 } 'Android-x86-64',
+- { 102 } 'Haiku-x86-64'
++ { 102 } 'Haiku-x86-64',
++ { 103 } 'FreeBSD-AArch64'
+ );
+
+ const
Index: lang/fpc/files/patch-rtl_bsd_aarch64
===================================================================
--- lang/fpc/files/patch-rtl_bsd_aarch64
+++ lang/fpc/files/patch-rtl_bsd_aarch64
@@ -0,0 +1,190 @@
+diff --git a/rtl/bsd/aarch64/syscall.inc b/rtl/bsd/aarch64/syscall.inc
+new file mode 100644
+index 00000000..b4af7e66
+--- /dev/null
++++ rtl/bsd/aarch64/syscall.inc
+@@ -0,0 +1,140 @@
++{
++ This file is part of the Free Pascal run time library.
++
++ Perform syscall with 0..6 arguments.
++ If syscall return value is negative, negate it, set errno, and return -1.
++
++ Written by Edmund Grimley Evans in 2015 and released into the public domain.
++}
++
++function FpSysCall(sysnr:TSysParam):TSysResult;
++assembler; nostackframe; [public,alias:'FPC_DOSYS0'];
++asm
++ mov w8,w0
++ svc #0
++ bcc .Ldone
++ str x30,[sp,#-16]!
++ bl seterrno
++ ldr x30,[sp],#16
++ mov x0,#-1
++.Ldone:
++end;
++
++function FpSysCall(sysnr,param1:TSysParam):TSysResult;
++assembler; nostackframe; [public,alias:'FPC_DOSYS1'];
++asm
++ mov w8,w0
++ mov x0,x1
++ svc #0
++ bcc .Ldone
++ str x30,[sp,#-16]!
++ bl seterrno
++ ldr x30,[sp],#16
++ mov x0,#-1
++.Ldone:
++end;
++
++function FpSysCall(sysnr,param1,param2:TSysParam):TSysResult;
++assembler; nostackframe; [public,alias:'FPC_DOSYS2'];
++asm
++ mov w8,w0
++ mov x0,x1
++ mov x1,x2
++ svc #0
++ bcc .Ldone
++ str x30,[sp,#-16]!
++ bl seterrno
++ ldr x30,[sp],#16
++ mov x0,#-1
++.Ldone:
++end;
++
++function FpSysCall(sysnr,param1,param2,param3:TSysParam):TSysResult;
++assembler; nostackframe; [public,alias:'FPC_DOSYS3'];
++asm
++ mov w8,w0
++ mov x0,x1
++ mov x1,x2
++ mov x2,x3
++ svc #0
++ bcc .Ldone
++ str x30,[sp,#-16]!
++ bl seterrno
++ ldr x30,[sp],#16
++ mov x0,#-1
++.Ldone:
++end;
++
++function FpSysCall(sysnr,param1,param2,param3,param4:TSysParam):TSysResult;
++assembler; nostackframe; [public,alias:'FPC_DOSYS4'];
++asm
++ mov w8,w0
++ mov x0,x1
++ mov x1,x2
++ mov x2,x3
++ mov x3,x4
++ svc #0
++ bcc .Ldone
++ str x30,[sp,#-16]!
++ bl seterrno
++ ldr x30,[sp],#16
++ mov x0,#-1
++.Ldone:
++end;
++
++function FpSysCall(sysnr,param1,param2,param3,param4,param5:TSysParam):TSysResult;
++assembler; nostackframe; [public,alias:'FPC_DOSYS5'];
++asm
++ mov w8,w0
++ mov x0,x1
++ mov x1,x2
++ mov x2,x3
++ mov x3,x4
++ mov x4,x5
++ svc #0
++ bcc .Ldone
++ str x30,[sp,#-16]!
++ bl seterrno
++ ldr x30,[sp],#16
++ mov x0,#-1
++.Ldone:
++end;
++
++function FpSysCall(sysnr,param1,param2,param3,param4,param5,param6:TSysParam):TSysResult;
++assembler; nostackframe; [public,alias:'FPC_DOSYS6'];
++asm
++ mov w8,w0
++ mov x0,x1
++ mov x1,x2
++ mov x2,x3
++ mov x3,x4
++ mov x4,x5
++ mov x5,x6
++ svc #0
++ bcc .Ldone
++ str x30,[sp,#-16]!
++ bl seterrno
++ ldr x30,[sp],#16
++ mov x0,#-1
++.Ldone:
++end;
++
++function FpSysCall(sysnr,param1,param2,param3,param4,param5,param6,param7:TSysParam):TSysResult;
++assembler; nostackframe; [public,alias:'FPC_DOSYS7'];
++asm
++ mov w8,w0
++ mov x0,x1
++ mov x1,x2
++ mov x2,x3
++ mov x3,x4
++ mov x4,x5
++ mov x5,x6
++ mov x6,x7
++ svc #0
++ bcc .Ldone
++ str x30,[sp,#-16]!
++ bl seterrno
++ ldr x30,[sp],#16
++ mov x0,#-1
++.Ldone:
++end;
+diff --git a/rtl/bsd/aarch64/syscallh.inc b/rtl/bsd/aarch64/syscallh.inc
+new file mode 100644
+index 00000000..de84a02f
+--- /dev/null
++++ rtl/bsd/aarch64/syscallh.inc
+@@ -0,0 +1,38 @@
++{
++ This file is part of the Free Pascal run time library.
++ Copyright (c) 2002 Marco van de Voort
++ member of the Free Pascal development team.
++
++ aarch64 syscall headers for *BSD
++
++ See the file COPYING.FPC, included in this distribution,
++ for details about the copyright.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++ **********************************************************************}
++
++{$ifdef FPC_USE_SYSCALL}
++
++Type
++
++ TSysResult = int64; // all platforms, cint=32-bit.
++ // On platforms with off_t =64-bit, people should
++ // use int64, and typecast all calls that don't
++ // return off_t to cint.
++
++ TSysParam = int64;
++
++function do_sysCall(sysnr:TSysParam):TSysResult; external name 'FPC_DOSYS0';
++function do_sysCall(sysnr,param1:TSysParam):TSysResult; external name 'FPC_DOSYS1';
++function do_sysCall(sysnr,param1,param2:TSysParam):TSysResult; external name 'FPC_DOSYS2';
++function do_sysCall(sysnr,param1,param2,param3:TSysParam):TSysResult; external name 'FPC_DOSYS3';
++function do_sysCall(sysnr,param1,param2,param3,param4:TSysParam):TSysResult; external name 'FPC_DOSYS4';
++function do_sysCall(sysnr,param1,param2,param3,param4,param5:TSysParam):TSysResult; external name 'FPC_DOSYS5';
++function do_sysCall(sysnr,param1,param2,param3,param4,param5,param6:TSysParam):int64; external name 'FPC_DOSYS6';
++function do_sysCall(sysnr,param1,param2,param3,param4,param5,param6,param7:TSysParam):int64; external name 'FPC_DOSYS7';
++
++{$endif}
++
Index: lang/fpc/files/patch-rtl_freebsd_aarch64_cprt0.as
===================================================================
--- lang/fpc/files/patch-rtl_freebsd_aarch64_cprt0.as
+++ lang/fpc/files/patch-rtl_freebsd_aarch64_cprt0.as
@@ -0,0 +1,160 @@
+--- rtl/freebsd/aarch64/cprt0.as.orig 2021-01-23 09:02:42.904499000 +0100
++++ rtl/freebsd/aarch64/cprt0.as 2021-01-23 09:04:37.360978000 +0100
+@@ -0,0 +1,157 @@
++/*
++ Start-up code for Free Pascal Compiler when linking with C library.
++
++*/
++
++ .text
++ .align 2
++#APP
++ .ident "FreePascal 2.6.x/2.7.x series dynlinked to libc"
++#NO_APP
++ .section .note.ABI-tag,"a",@progbits
++ .p2align 2
++ .type abitag, @object
++ .size abitag, 24
++abitag:
++ .long 8
++ .long 4
++ .long 1
++ .string "FreeBSD"
++ .long 120000
++.globl __progname
++ .section .rodata
++
++.LC0:
++ .string ""
++ .data
++ .p2align 3
++ .type __progname, @object
++ .size __progname, 8
++__progname:
++ .quad .LC0
++ .text
++ .p2align 4,,15
++
++ .globl _start
++ .type _start,#function
++_start:
++ /* Initialise FP to zero */
++ mov x29,#0
++
++ /* Get argc, argv, envp */
++ ldr x1,[x0]
++ add x2,x0,#8
++ add x3,x1,#1
++ add x3,x2,x3,lsl #3
++
++ /* Save argc, argv, envp, environ, __progname and initial stack pointer */
++ adrp x10,:got:operatingsystem_parameter_argc
++ ldr x10,[x10,#:got_lo12:operatingsystem_parameter_argc]
++ str x1,[x10]
++ adrp x10,:got:operatingsystem_parameter_argv
++ ldr x10,[x10,#:got_lo12:operatingsystem_parameter_argv]
++ str x2,[x10]
++ adrp x10,:got:operatingsystem_parameter_envp
++ ldr x10,[x10,#:got_lo12:operatingsystem_parameter_envp]
++ str x3,[x10]
++
++ /* save environ */
++ adrp x10,environ
++ ldr x10,[x10,:lo12:environ]
++ cbnz x10,.LBB0_2
++ ldr x10,=environ
++ str x3,[x10]
++.LBB0_2:
++ /* save __progname */
++ ldr w8,=operatingsystem_parameter_argc
++ cmp w8,#0
++ cset w8,le
++ tbnz w8,#0,.LBB0_9
++// %bb.1:
++ adrp x8,operatingsystem_parameter_argv
++ ldr x8,[x8,:lo12:operatingsystem_parameter_argv]
++ cbz x8,.LBB0_9
++// %bb.2:
++ ldr x2,[x2]
++ adrp x9,__progname
++ adrp x10,__progname
++ add x10,x10,:lo12:__progname
++ str x2,[x10]
++ ldr x8,[x9,:lo12:__progname]
++ adrp x9,s
++ add x9,x9,:lo12:s
++ str x8,[x9]
++.LBB0_3:
++ adrp x8,s
++ ldr x8,[x8,:lo12:s]
++ ldrb w9,[x8]
++ cbz w9,.LBB0_8
++// %bb.4:
++ adrp x8,s
++ ldr x8,[x8, :lo12:s]
++ ldrb w9,[x8]
++ cmp w9,#47
++ b.ne .LBB0_6
++// %bb.5:
++ adrp x8,s
++ ldr x8,[x8,:lo12:s]
++ add x8,x8,#1
++ adrp x9,__progname
++ add x9,x9,:lo12:__progname
++ str x8,[x9]
++.LBB0_6:
++// %bb.7:
++ adrp x8,s
++ adrp x9,s
++ add x9,x9,:lo12:s
++ ldr x8,[x8,:lo12:s]
++ add x8,x8,#1
++ str x8,[x9]
++ b .LBB0_3
++.LBB0_8:
++.LBB0_9:
++ /* save stack pointer */
++ adrp x10,:got:__stkptr
++ ldr x10,[x10,#:got_lo12:__stkptr]
++ mov x6,sp
++ str x6,[x10]
++
++ bl PASCALMAIN
++
++ /* This should never happen */
++ b abort
++
++ .globl _haltproc
++ .type _haltproc,#function
++_haltproc:
++ adrp x0,:got:operatingsystem_result
++ ldr x0,[x0,#:got_lo12:operatingsystem_result]
++ ldr w0,[x0]
++ mov w8,#1 // SYS_exit
++ svc #0
++ b _haltproc
++
++ /* Define a symbol for the first piece of initialized data. */
++ .data
++ .align 3
++ .globl __data_start
++__data_start:
++ .long 0
++ .weak data_start
++ data_start = __data_start
++
++ .bss
++ .align 3
++
++ .comm __stkptr,8
++
++ .comm operatingsystem_parameter_envp,8
++ .comm operatingsystem_parameter_argc,8
++ .comm operatingsystem_parameter_argv,8
++ .comm environ,8,8
++
++s:
++ .xword 0
++ .size s, 8
++
++ .section .note.GNU-stack,"",%progbits
Index: lang/fpc/files/patch-rtl_freebsd_aarch64_dllprt0.as
===================================================================
--- lang/fpc/files/patch-rtl_freebsd_aarch64_dllprt0.as
+++ lang/fpc/files/patch-rtl_freebsd_aarch64_dllprt0.as
@@ -0,0 +1,141 @@
+--- rtl/freebsd/aarch64/dllprt0.as.orig 2021-01-23 09:02:42.904794000 +0100
++++ rtl/freebsd/aarch64/dllprt0.as 2021-01-23 09:04:37.613558000 +0100
+@@ -0,0 +1,138 @@
++/*
++ Start-up code for Free Pascal Compiler in a shared library,
++ not linking with C library.
++
++*/
++
++ .text
++ .align 2
++
++ .globl _startlib
++ .type _startlib,#function
++_startlib:
++ .globl FPC_SHARED_LIB_START
++ .type FPC_SHARED_LIB_START,#function
++FPC_SHARED_LIB_START:
++ stp x29,x30,[sp,#-16]!
++
++ /* Get argc, argv, envp */
++ ldr x1,[x0]
++ add x2,x0,#8
++ add x3,x1,#1
++ add x3,x2,x3,lsl #3
++
++ /* Save argc, argv and envp */
++ adrp x9,:got:operatingsystem_parameter_argc
++ ldr x9,[x9,#:got_lo12:operatingsystem_parameter_argc]
++ str x1,[x9]
++ adrp x9,:got:operatingsystem_parameter_argv
++ ldr x9,[x9,#:got_lo12:operatingsystem_parameter_argv]
++ str x2,[x9]
++ adrp x9,:got:operatingsystem_parameter_envp
++ ldr x9,[x9,#:got_lo12:operatingsystem_parameter_envp]
++ str x3,[x9]
++
++ /* save environ */
++ adrp x10,environ
++ ldr x10,[x10,:lo12:environ]
++ cbnz x10,.LBB0_2
++ adrp x10,environ
++ add x10,x9,:lo12:environ
++ str x3,[x10]
++.LBB0_2:
++ /* save __progname */
++ adrp x8,:got:operatingsystem_parameter_argc
++ ldr x8,[x8,#:got_lo12:operatingsystem_parameter_argc]
++ cmp x8,#0
++ cset x8,le
++ tbnz x8,#0,.LBB0_9
++// %bb.1:
++ adrp x8,operatingsystem_parameter_argv
++ ldr x8,[x8,:got_lo12:operatingsystem_parameter_argv]
++ cbz x8,.LBB0_9
++// %bb.2:
++ ldr x2,[x2]
++ adrp x9,:got:__progname
++ adrp x10,:got:__progname
++ add x10,x10,:lo12:__progname
++ str x2,[x10]
++ ldr x8,[x9,:got_lo12:__progname]
++ adrp x9,s
++ add x9,x9,:lo12:s
++ str x8,[x9]
++.LBB0_3:
++ adrp x8,s
++ ldr x8,[x8,:lo12:s]
++ ldrb w9,[x8]
++ cbz w9,.LBB0_8
++// %bb.4:
++ adrp x8,s
++ ldr x8,[x8, :lo12:s]
++ ldrb w9,[x8]
++ cmp w9,#47
++ b.ne .LBB0_6
++// %bb.5:
++ adrp x8,s
++ ldr x8,[x8,:lo12:s]
++ add x8,x8,#1
++ adrp x9,:got:__progname
++ add x9,x9,:lo12:__progname
++ str x8,[x9]
++.LBB0_6:
++// %bb.7:
++ adrp x8,s
++ adrp x9,s
++ add x9,x9,:lo12:s
++ ldr x8,[x8,:lo12:s]
++ add x8,x8,#1
++ str x8,[x9]
++ b .LBB0_3
++.LBB0_8:
++.LBB0_9:
++ /* Save initial stackpointer */
++ adrp x9,:got:__stkptr
++ ldr x9,[x9,#:got_lo12:__stkptr]
++ mov x10,sp
++ str x10,[x9]
++
++ /* Call main */
++ bl PASCALMAIN
++
++ /* Return */
++ ldp x29,x30,[sp],#16
++ ret
++
++ .globl _haltproc
++ .type _haltproc,#function
++_haltproc:
++ adrp x0,:got:operatingsystem_result
++ ldr x0,[x0,#:got_lo12:operatingsystem_result]
++ ldr w0,[x0]
++ mov w8,#1 // SYS_exit
++ svc #0
++ b _haltproc
++
++ /* Define a symbol for the first piece of initialized data. */
++ .data
++ .align 3
++ .globl __data_start
++__data_start:
++ .long 0
++ .weak data_start
++ data_start = __data_start
++
++ .bss
++ .align 3
++
++ .comm __stkptr,8
++
++ .comm operatingsystem_parameter_envp,8
++ .comm operatingsystem_parameter_argc,8
++ .comm operatingsystem_parameter_argv,8
++ .comm environ,8,8
++
++s:
++ .xword 0
++ .size s, 8
++
++ .section .note.GNU-stack,"",%progbits
Index: lang/fpc/files/patch-rtl_freebsd_aarch64_gprt0.as
===================================================================
--- lang/fpc/files/patch-rtl_freebsd_aarch64_gprt0.as
+++ lang/fpc/files/patch-rtl_freebsd_aarch64_gprt0.as
@@ -0,0 +1,169 @@
+--- rtl/freebsd/aarch64/gprt0.as.orig 2021-01-23 09:02:42.905003000 +0100
++++ rtl/freebsd/aarch64/gprt0.as 2021-01-23 09:04:37.806236000 +0100
+@@ -0,0 +1,166 @@
++/*
++ Start-up code for Free Pascal Compiler when linking with C library
++ with profiling support.
++*/
++
++ .text
++ .align 2
++
++ .globl _start
++ .type _start,#function
++_start:
++ /* Initialise FP to zero */
++ mov x29,#0
++
++ /* Get argc, argv, envp */
++ ldr x1,[x0]
++ add x2,x0,#8
++ add x11,x1,#1
++ add x11,x2,x11,lsl #3
++
++ /* Save argc, argv, envp, and initial stack pointer */
++ adrp x10,:got:operatingsystem_parameter_argc
++ ldr x10,[x10,#:got_lo12:operatingsystem_parameter_argc]
++ str x1,[x10]
++ adrp x10,:got:operatingsystem_parameter_argv
++ ldr x10,[x10,#:got_lo12:operatingsystem_parameter_argv]
++ str x2,[x10]
++ adrp x10,:got:operatingsystem_parameter_envp
++ ldr x10,[x10,#:got_lo12:operatingsystem_parameter_envp]
++ str x3,[x10]
++
++ /* save environ */
++ adrp x10,environ
++ ldr x10,[x10,:lo12:environ]
++ cbnz x10,.LBB0_2
++ ldr x10,=environ
++ str x3,[x10]
++.LBB0_2:
++ /* save __progname */
++ ldr w8,=operatingsystem_parameter_argc
++ cmp w8,#0
++ cset w8,le
++ tbnz w8,#0,.LBB0_9
++// %bb.1:
++ adrp x8,operatingsystem_parameter_argv
++ ldr x8,[x8,:lo12:operatingsystem_parameter_argv]
++ cbz x8,.LBB0_9
++// %bb.2:
++ ldr x2,[x2]
++ adrp x9,__progname
++ adrp x10,__progname
++ add x10,x10,:lo12:__progname
++ str x2,[x10]
++ ldr x8,[x9,:lo12:__progname]
++ adrp x9,s
++ add x9,x9,:lo12:s
++ str x8,[x9]
++.LBB0_3:
++ adrp x8,s
++ ldr x8,[x8,:lo12:s]
++ ldrb w9,[x8]
++ cbz w9,.LBB0_8
++// %bb.4:
++ adrp x8,s
++ ldr x8,[x8, :lo12:s]
++ ldrb w9,[x8]
++ cmp w9,#47
++ b.ne .LBB0_6
++// %bb.5:
++ adrp x8,s
++ ldr x8,[x8,:lo12:s]
++ add x8,x8,#1
++ adrp x9,__progname
++ add x9,x9,:lo12:__progname
++ str x8,[x9]
++.LBB0_6:
++// %bb.7:
++ adrp x8,s
++ adrp x9,s
++ add x9,x9,:lo12:s
++ ldr x8,[x8,:lo12:s]
++ add x8,x8,#1
++ str x8,[x9]
++ b .LBB0_3
++.LBB0_8:
++.LBB0_9:
++ adrp x10,:got:__stkptr
++ ldr x10,[x10,#:got_lo12:__stkptr]
++ mov x6,sp
++ str x6,[x10]
++
++ bl main
++
++ /* This should never happen */
++ b abort
++
++ .globl _init_dummy
++ .type _init_dummy,#function
++_init_dummy:
++ ret
++
++ .globl _fini_dummy
++ .type _fini_dummy,#function
++_fini_dummy:
++ ret
++
++ .globl main_stub
++ .type main_stub,#function
++main_stub:
++ stp x29,x30,[sp,#-16]!
++
++ /* Save initial stackpointer */
++ mov x0,sp
++ adrp x1,:got:__stkptr
++ ldr x1,[x1,#:got_lo12:__stkptr]
++ str x0,[x1]
++
++ /* Initialize gmon */
++ adrp x0,:got:_start
++ ldr x0,[x0,#:got_lo12:_start]
++ adrp x1,:got:_etext
++ ldr x1,[x1,#:got_lo12:_etext]
++ bl __monstartup
++ adrp x0,:got:_mcleanup
++ ldr x0,[x0,#:got_lo12:_mcleanup]
++ bl atexit
++
++ /* Start the program */
++ bl PASCALMAIN
++ b abort
++
++ .globl _haltproc
++ .type _haltproc,#function
++_haltproc:
++ /* Return to libc */
++ adrp x1,:got:__stkptr
++ ldr x1,[x1,#:got_lo12:__stkptr]
++ ldr x1,[x1]
++ mov sp,x1
++ ldp x29,x30,[sp],#16
++ ret
++
++ /* Define a symbol for the first piece of initialized data. */
++ .data
++ .align 3
++ .globl __data_start
++__data_start:
++ .long 0
++ .weak data_start
++ data_start = __data_start
++
++ .bss
++ .align 3
++
++ .comm __stkptr,8
++
++ .comm operatingsystem_parameter_envp,8
++ .comm operatingsystem_parameter_argc,8
++ .comm operatingsystem_parameter_argv,8
++ .comm environ,8,8
++
++s:
++ .xword 0
++ .size s, 8
++
++ .section .note.GNU-stack,"",%progbits
Index: lang/fpc/files/patch-rtl_freebsd_aarch64_prt0.as
===================================================================
--- lang/fpc/files/patch-rtl_freebsd_aarch64_prt0.as
+++ lang/fpc/files/patch-rtl_freebsd_aarch64_prt0.as
@@ -0,0 +1,150 @@
+--- rtl/freebsd/aarch64/prt0.as.orig 2021-01-23 09:02:42.905496000 +0100
++++ rtl/freebsd/aarch64/prt0.as 2021-01-23 09:04:38.054919000 +0100
+@@ -0,0 +1,147 @@
++/*
++ Start-up code for Free Pascal Compiler, not in a shared library,
++ not linking with C library.
++*/
++
++ .text
++ .align 2
++
++#APP
++ .ident "FreeBSD"
++#NO_APP
++ .section .note.ABI-tag,"a",@progbits
++ .p2align 2
++ .type abitag, @object
++ .size abitag, 24
++abitag:
++ .long 8
++ .long 4
++ .long 1
++ .string "FreeBSD"
++ .long 120000
++
++ .section .rodata
++.LC0:
++ .string ""
++.globl __progname
++ .data
++ .p2align 3
++ .type __progname, @object
++ .size __progname, 8
++__progname:
++ .quad .LC0
++ .text
++ .p2align 2,,3
++
++ .globl _start
++ .type _start,#function
++_start:
++ /* Initialise FP to zero */
++ mov x29,#0
++
++ /* Get argc, argv, envp */
++ ldr x1,[x0]
++ add x2,x0,#8
++ add x11,x1,#1
++ add x11,x2,x11,lsl #3
++
++ /* Save argc, argv, envp, environ, __progname and initial stack pointer */
++ ldr x10,=operatingsystem_parameter_argc
++ str x1,[x10]
++ ldr x10,=operatingsystem_parameter_argv
++ str x2,[x10]
++ ldr x10,=operatingsystem_parameter_envp
++ str x11,[x10]
++
++ /* save environ */
++ adrp x10,environ
++ ldr x10,[x10,:lo12:environ]
++ cbnz x10,.LBB0_2
++ ldr x10,=environ
++ str x11,[x10]
++.LBB0_2:
++ /* save __progname */
++ ldr w8,=operatingsystem_parameter_argc
++ cmp w8,#0
++ cset w8,le
++ tbnz w8,#0,.LBB0_9
++// %bb.1:
++ adrp x8,operatingsystem_parameter_argv
++ ldr x8,[x8,:lo12:operatingsystem_parameter_argv]
++ cbz x8,.LBB0_9
++// %bb.2:
++ ldr x2,[x2]
++ adrp x9,__progname
++ adrp x10,__progname
++ add x10,x10,:lo12:__progname
++ str x2,[x10]
++ ldr x8,[x9,:lo12:__progname]
++ adrp x9,s
++ add x9,x9,:lo12:s
++ str x8,[x9]
++.LBB0_3:
++ adrp x8,s
++ ldr x8,[x8,:lo12:s]
++ ldrb w9,[x8]
++ cbz w9,.LBB0_8
++// %bb.4:
++ adrp x8,s
++ ldr x8,[x8, :lo12:s]
++ ldrb w9,[x8]
++ cmp w9,#47
++ b.ne .LBB0_6
++// %bb.5:
++ adrp x8,s
++ ldr x8,[x8,:lo12:s]
++ add x8,x8,#1
++ adrp x9,__progname
++ add x9,x9,:lo12:__progname
++ str x8,[x9]
++.LBB0_6:
++// %bb.7:
++ adrp x8,s
++ adrp x9,s
++ add x9,x9,:lo12:s
++ ldr x8,[x8,:lo12:s]
++ add x8,x8,#1
++ str x8,[x9]
++ b .LBB0_3
++.LBB0_8:
++.LBB0_9:
++ /* save stack pointer */
++ ldr x10,=__stkptr
++ mov x6,sp
++ str x6,[x10]
++
++ /* Call main */
++ bl PASCALMAIN
++
++ ldr x10,=operatingsystem_result
++ ldr w0,[x10]
++ mov w8,#1 // SYS_exit
++ svc #0
++
++ /* Define a symbol for the first piece of initialized data. */
++ .data
++ .align 3
++ .globl __data_start
++__data_start:
++ .long 0
++ .weak data_start
++ data_start = __data_start
++
++ .bss
++ .align 3
++
++ .comm __stkptr,8
++
++ .comm operatingsystem_parameter_envp,8
++ .comm operatingsystem_parameter_argc,8
++ .comm operatingsystem_parameter_argv,8
++ .comm environ,8,8
++
++s:
++ .xword 0
++ .size s, 8
++
++ .section .note.GNU-stack,"",%progbits
Index: lang/fpc/files/patch-rtl_freebsd_aarch64_signal
===================================================================
--- lang/fpc/files/patch-rtl_freebsd_aarch64_signal
+++ lang/fpc/files/patch-rtl_freebsd_aarch64_signal
@@ -0,0 +1,151 @@
+diff --git a/rtl/freebsd/aarch64/bsyscall.inc b/rtl/freebsd/aarch64/bsyscall.inc
+new file mode 100644
+index 00000000..c690ebeb
+--- /dev/null
++++ rtl/freebsd/aarch64/bsyscall.inc
+@@ -0,0 +1 @@
++{ nothing }
+diff --git a/rtl/freebsd/aarch64/si_c.inc b/rtl/freebsd/aarch64/si_c.inc
+new file mode 100644
+index 00000000..f629e50a
+--- /dev/null
++++ rtl/freebsd/aarch64/si_c.inc
+@@ -0,0 +1,89 @@
++
++Type
++ TCleanup = procedure; cdecl;
++
++var
++ environ : ppchar; cvar; public name '__environ';
++ progname: pchar = #0#0; cvar; public name '__progname';
++ dynamic : pchar; external name '_DYNAMIC'; // #pragma weak
++
++procedure atexit(prc:TCleanup); cdecl external name 'atexit';
++procedure cleanup(prc:TCleanup); cdecl external name 'cleanup';
++procedure init_tls; cdecl; external name 'init_tls';
++procedure fini; cdecl; external name '_fini';
++procedure init; cdecl; external name '_init';
++procedure libc_exit(exitcode:longint);cdecl; external name 'exit';
++function main(nrarg:longint;pp:ppchar;env:ppchar):longint; cdecl; external name 'main';
++
++{$ifdef gcrt}
++ procedure cmcleanup; cdecl; external name '_mcleanup';
++ procedure monstratup(p,p2:pointer); cdecl; external name 'monstartup';
++
++var
++ eprol:longint; external name 'eprol';
++ etext:longint; external name 'etext';
++{$endif}
++
++procedure start(ap:ppchar;cleanup:TCleanup);
++
++var argc: longint;
++ argv: ppchar;
++ env : ppchar;
++ s : pchar;
++begin
++ argc:=plongint(ap)^;
++ argv:=ppchar(ap[1]);
++ env:= ppchar(ap[2+argc]);
++ environ:=env;
++ if (argc>0) and (argv[0]<>#0) Then
++ begin
++ progname:=argv[0];
++ s:=progname;
++ while s^<>#0 do
++ begin
++ if s^='/' then
++ progname:=@s[1];
++ inc(s);
++ end;
++ end;
++ if assigned(pchar(@dynamic)) then // I suspect this is a trick to find
++ // out runtime if we are shared
++ // linking, so the same code can be used
++ // for static and shared linking
++ atexit(cleanup)
++ else
++ init_tls;
++ {$ifdef GCRT}
++ atexit(@_mcleanup);
++ {$endif}
++ atexit(@fini);
++ {$ifdef GCRT}
++ monstartup(@eprol,@etext);
++ asm
++ eprol:
++ end;
++ {$endif}
++ init;
++ libc_exit(main(argc,argv,env)); // doesn't return
++ asm
++ { We need this stuff to make gdb behave itself, otherwise
++ gdb will chokes with SIGILL when trying to debug apps.
++ }
++ .section ".note.ABI-tag", "a"
++ .align 4
++ .long 8
++ .long 4
++ .long 1
++ .asciz "FreeBSD"
++ .align 4
++ .long 900044
++ .align 4
++ .section .note.GNU-stack,"",@progbits
++ end;
++end;
++
++
++
++begin
++end.
++
+diff --git a/rtl/freebsd/aarch64/sighnd.inc b/rtl/freebsd/aarch64/sighnd.inc
+new file mode 100644
+index 00000000..cd4f5e55
+--- /dev/null
++++ rtl/freebsd/aarch64/sighnd.inc
+@@ -0,0 +1,43 @@
++{
++ This file is part of the Free Pascal run time library.
++ Copyright (c) 1999-2000 by Michael Van Canneyt,
++ member of the Free Pascal development team.
++
++ Signal handler is arch dependant due to processor to language
++ exception conversion.
++
++ See the file COPYING.FPC, included in this distribution,
++ for details about the copyright.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++ **********************************************************************}
++
++{ procedure SignalToRunerror(Sig: longint; SigInfo: PSigInfo; UContext: PUContext); public name '_FPC_DEFAULTSIGHANDLER'; cdecl; }
++procedure SignalToRunerror(Sig: cint; info : psiginfo; SigContext:PSigContext); public name '_FPC_DEFAULTSIGHANDLER'; cdecl;
++
++var
++ res : word;
++begin
++ res:=0;
++ case sig of
++ SIGFPE:
++ res:=207;
++ SIGILL:
++ res:=216;
++ SIGSEGV :
++ res:=216;
++ SIGBUS:
++ res:=214;
++ SIGINT:
++ res:=217;
++ SIGQUIT:
++ res:=233;
++ end;
++ reenable_signal(sig);
++ { give runtime error at the position where the signal was raised }
++ if res<>0 then
++ HandleError(res);
++end;
Index: lang/fpc/files/patch-rtl_freebsd_bunxsysc.inc
===================================================================
--- lang/fpc/files/patch-rtl_freebsd_bunxsysc.inc
+++ lang/fpc/files/patch-rtl_freebsd_bunxsysc.inc
@@ -0,0 +1,11 @@
+--- rtl/bsd/bunxsysc.inc.orig 2020-12-25 11:42:18.179832000 +0100
++++ rtl/bsd/bunxsysc.inc 2020-12-25 11:42:41.205447000 +0100
+@@ -376,7 +376,7 @@ end;
+
+ function __pipe_call(sysnr:TSysParam):TSysResult; {$ifdef cpui386}oldfpccall{$endif} external name 'FPC_DOSYS0';
+
+-{$if defined(freebsd) or defined (dragonfly)}
++{$if (defined(freebsd) or defined (dragonfly)) and (defined(CPUi386) or defined(CPUX86_64))}
+ {$define PIPE_RESULT_IN_EAX_AND_EDX}
+ {$endif}
+ Function FPpipe(var fildes : tfildes; flags:cint):cint;
Index: lang/fpc/files/patch-rtl_freebsd_signal.inc
===================================================================
--- lang/fpc/files/patch-rtl_freebsd_signal.inc
+++ lang/fpc/files/patch-rtl_freebsd_signal.inc
@@ -0,0 +1,27 @@
+diff --git a/rtl/freebsd/signal.inc b/rtl/freebsd/signal.inc
+index a978ea5f..766c958d 100644
+--- rtl/freebsd/signal.inc
++++ rtl/freebsd/signal.inc
+@@ -80,6 +80,7 @@ type sigset_t = array[0..3] of Longint;
+
+ psigcontext = ^sigcontextrec;
+ PSigContextRec = ^SigContextRec;
++{$if (defined(CPUi386) or defined(CPUX86_64))}
+ SigContextRec = record
+ sc_mask : sigset_t; { signal mask to restore }
+ sc_onstack : longint; { sigstack state to restore }
+@@ -120,8 +121,13 @@ type sigset_t = array[0..3] of Longint;
+ fpr_ex_sw : cardinal;
+ fpr_pad : array[0..63] of char;
+ end;
++{$endif def x86_64}
+
+-
++{$ifdef CPUAARCH64}
++ SigContextRec = record
++ _dummy : cint;
++ end;
++{$endif cpuaarch64}
+
+ Sigval = Record
+ Case Boolean OF
Index: lang/fpc/files/patch-rtl_freebsd_ucontexth.inc
===================================================================
--- lang/fpc/files/patch-rtl_freebsd_ucontexth.inc
+++ lang/fpc/files/patch-rtl_freebsd_ucontexth.inc
@@ -0,0 +1,47 @@
+diff --git a/rtl/freebsd/ucontexth.inc b/rtl/freebsd/ucontexth.inc
+index aec4d8c6..05cb11bc 100644
+--- rtl/freebsd/ucontexth.inc
++++ rtl/freebsd/ucontexth.inc
+@@ -20,6 +20,7 @@ type
+ end;
+ {$packrecords C}
+
++{$if (defined(CPUi386) or defined(CPUX86_64))}
+ mcontext_t = record
+ {*
+ * The first 20 fields must match the definition of
+@@ -53,7 +54,34 @@ type
+ mc_fpstate: TMCFPStateArray;
+ mc_spare2: array[0..7] of cInt;
+ end;
++{$endif def x86}
+
++{$ifdef CPUAARCH64}
++ gpregs = record
++ gp_x: array[0..30] of cInt; { __register_t gp_x[30]; }
++ gp_lr: cInt;
++ gp_sp: cInt;
++ gp_elr: cInt;
++ gp_spsr: cuint32;
++ gp_pad: cInt;
++ end;
++
++ fpregs = record
++ fp_q: array[0..64] of cInt; { __uint128_t fp_q[32] }
++ fp_sr: cuint32;
++ fp_cr: cuint32;
++ fp_flags: cInt;
++ fp_pad: cInt;
++ end;
++
++ mcontext_t = record
++ mc_gpregs: gpregs;
++ mc_fpregs: fpregs;
++ mc_flags: cint32;
++ mc_pad: cint32;
++ mc_spare: array[0..8] of cInt;
++ end;
++{$endif cpuaarch64}
+
+ pucontext_t = ^ucontext_t;
+ ucontext_t = record // required for kse threads
Index: lang/fpc/files/patch-rtl_freebsd_unxfunc.inc
===================================================================
--- lang/fpc/files/patch-rtl_freebsd_unxfunc.inc
+++ lang/fpc/files/patch-rtl_freebsd_unxfunc.inc
@@ -0,0 +1,11 @@
+--- rtl/freebsd/unxfunc.inc.orig 2020-12-25 11:46:06.153079000 +0100
++++ rtl/freebsd/unxfunc.inc 2020-12-25 11:46:14.992489000 +0100
+@@ -51,7 +51,7 @@ var
+ pip : tfildes;
+ flags : cint;
+ begin
+- assignPipe:=fppipe(pip, flags);
++ assignPipe:=fppipe(pip, 0);
+ pipe_in:=pip[0];
+ pipe_out:=pip[1];
+ end;
Index: lang/fpc/files/patch-utils_fpcm_fpcmmain.pp
===================================================================
--- lang/fpc/files/patch-utils_fpcm_fpcmmain.pp
+++ lang/fpc/files/patch-utils_fpcm_fpcmmain.pp
@@ -0,0 +1,13 @@
+diff --git a/utils/fpcm/fpcmmain.pp b/utils/fpcm/fpcmmain.pp
+index 3a327817..fd24407e 100644
+--- utils/fpcm/fpcmmain.pp
++++ utils/fpcm/fpcmmain.pp
+@@ -120,7 +120,7 @@ interface
+ { go32v2 } ( true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false),
+ { win32 } ( true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false),
+ { os2 } ( true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false),
+- { freebsd } ( true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false),
++ { freebsd } ( true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, true, false, false),
+ { beos } ( true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false),
+ { haiku } ( true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false),
+ { netbsd } ( true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false),
Index: lang/fpc/pkg-plist
===================================================================
--- lang/fpc/pkg-plist
+++ lang/fpc/pkg-plist
@@ -4,8 +4,7 @@
bin/mka64ins
bin/mkarmins
bin/mkx86ins
-%%FPC_I386%%bin/ppc386
-%%FPC_AMD64%%bin/ppcx64
+bin/%%PPNAME%%
bin/ppudump
bin/ppufiles
bin/ppumove
@@ -35,8 +34,7 @@
lib/fpc/%%PORTVERSION%%/msg/errorr.msg
lib/fpc/%%PORTVERSION%%/msg/errorru.msg
lib/fpc/%%PORTVERSION%%/msg/errorues.msg
-%%FPC_I386%%lib/fpc/%%PORTVERSION%%/ppc386
-%%FPC_AMD64%%lib/fpc/%%PORTVERSION%%/ppcx64
+lib/fpc/%%PORTVERSION%%/%%PPNAME%%
lib/fpc/%%PORTVERSION%%/samplecfg
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugintf.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugintf.ppu
@@ -220,8 +218,8 @@
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpkoi8_u.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpkoi8_u.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cprt0.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpu.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpu.ppu
+%%FPC_X86%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpu.o
+%%FPC_X86%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cpu.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cthreads.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/cthreads.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ctypes.o
@@ -270,8 +268,8 @@
%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/mmx.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/objpas.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/objpas.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ports.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ports.ppu
+%%FPC_X86%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ports.o
+%%FPC_X86%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/ports.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/prt0.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/rtlconsts.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/rtlconsts.ppu
@@ -306,8 +304,8 @@
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/unixutil.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/uuchar.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/uuchar.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/x86.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/x86.ppu
+%%FPC_X86%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/x86.o
+%%FPC_X86%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/x86.ppu
man/man1/bin2obj.1.gz
man/man1/chmcmd.1.gz
man/man1/chmls.1.gz
Index: math/fpc-fftw/files/patch-Makefile-aarch64
===================================================================
--- math/fpc-fftw/files/patch-Makefile-aarch64
+++ math/fpc-fftw/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/fftw/Makefile b/packages/fftw/Makefile
+index c4379d7e..f0add49d 100644
+--- packages/fftw/Makefile
++++ packages/fftw/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: math/fpc-gmp/files/patch-Makefile-aarch64
===================================================================
--- math/fpc-gmp/files/patch-Makefile-aarch64
+++ math/fpc-gmp/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/gmp/Makefile b/packages/gmp/Makefile
+index 5eff6355..068cb848 100644
+--- packages/gmp/Makefile
++++ packages/gmp/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/gmp/examples/Makefile b/packages/gmp/examples/Makefile
+index d8db1388..e33228e8 100644
+--- packages/gmp/examples/Makefile
++++ packages/gmp/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=gmp_accept_test gmp_testcase pidigits_example pidigits_example2 printf_example printf_example2 scanf_example scanf_example2
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=gmp_accept_test gmp_testcase pidigits_example pidigits_example2 printf_example printf_example2 scanf_example scanf_example2
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=gmp_accept_test gmp_testcase pidigits_example pidigits_example2 printf_example printf_example2 scanf_example scanf_example2
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_GMP=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_GMP=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: math/fpc-numlib/files/patch-Makefile-aarch64
===================================================================
--- math/fpc-numlib/files/patch-Makefile-aarch64
+++ math/fpc-numlib/files/patch-Makefile-aarch64
@@ -0,0 +1,112 @@
+// @generated
+diff --git a/packages/numlib/Makefile b/packages/numlib/Makefile
+index 7725b1b5..178611e6 100644
+--- packages/numlib/Makefile
++++ packages/numlib/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/numlib/examples/Makefile b/packages/numlib/examples/Makefile
+index 29a1c1bd..f2908e62 100644
+--- packages/numlib/examples/Makefile
++++ packages/numlib/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -583,6 +583,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=invgenex invgpdex invgsyex iomremex iomrevex iomrewrsex iomwrmex iomwrvex
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=invgenex invgpdex invgsyex iomremex iomrevex iomrewrsex iomwrmex iomwrvex
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=invgenex invgpdex invgsyex iomremex iomrevex iomrewrsex iomwrmex iomwrvex
+ endif
+@@ -847,6 +850,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override CLEAN_FILES+=$(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT))
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override CLEAN_FILES+=$(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT))
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override CLEAN_FILES+=$(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(OEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(PPUEXT)) $(wildcard ../units/$(CPU_TARGET)-$(OS_TARGET)/*$(RSTEXT))
+ endif
+@@ -1111,6 +1117,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_OPTIONS+=-gl
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_OPTIONS+=-gl
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_OPTIONS+=-gl
+ endif
+@@ -1375,6 +1384,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITDIR+=..
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITDIR+=..
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITDIR+=..
+ endif
+@@ -1639,6 +1651,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_TARGETDIR+=.
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_TARGETDIR+=.
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_TARGETDIR+=.
+ endif
+@@ -1903,6 +1918,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override COMPILER_UNITTARGETDIR+=../units/$(CPU_TARGET)-$(OS_TARGET)
+ endif
+@@ -2833,6 +2851,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ REQUIRE_PACKAGES_RTL=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++REQUIRE_PACKAGES_RTL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ endif
Index: misc/fpc-chm/files/patch-Makefile-aarch64
===================================================================
--- misc/fpc-chm/files/patch-Makefile-aarch64
+++ misc/fpc-chm/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/chm/Makefile b/packages/chm/Makefile
+index fac3802c..26a27a50 100644
+--- packages/chm/Makefile
++++ packages/chm/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: multimedia/fpc-dts/files/patch-Makefile-aarch64
===================================================================
--- multimedia/fpc-dts/files/patch-Makefile-aarch64
+++ multimedia/fpc-dts/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/dts/Makefile b/packages/dts/Makefile
+index c9b871ea..72b9718b 100644
+--- packages/dts/Makefile
++++ packages/dts/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: multimedia/fpc-libvlc/files/patch-Makefile-aarch64
===================================================================
--- multimedia/fpc-libvlc/files/patch-Makefile-aarch64
+++ multimedia/fpc-libvlc/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/libvlc/Makefile b/packages/libvlc/Makefile
+index 8bfe3e08..61b3bffc 100644
+--- packages/libvlc/Makefile
++++ packages/libvlc/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: net/fpc-ldap/files/patch-Makefile-aarch64
===================================================================
--- net/fpc-ldap/files/patch-Makefile-aarch64
+++ net/fpc-ldap/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/ldap/Makefile b/packages/ldap/Makefile
+index dade777c..616a823d 100644
+--- packages/ldap/Makefile
++++ packages/ldap/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: net/fpc-libenet/files/patch-Makefile-aarch64
===================================================================
--- net/fpc-libenet/files/patch-Makefile-aarch64
+++ net/fpc-libenet/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/libenet/Makefile b/packages/libenet/Makefile
+index 58f62364..d2e457c6 100644
+--- packages/libenet/Makefile
++++ packages/libenet/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: net/fpc-pcap/files/patch-Makefile-aarch64
===================================================================
--- net/fpc-pcap/files/patch-Makefile-aarch64
+++ net/fpc-pcap/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/pcap/Makefile b/packages/pcap/Makefile
+index f4e481f4..44e57bb5 100644
+--- packages/pcap/Makefile
++++ packages/pcap/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: print/fpc-libcups/files/patch-Makefile-aarch64
===================================================================
--- print/fpc-libcups/files/patch-Makefile-aarch64
+++ print/fpc-libcups/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/libcups/Makefile b/packages/libcups/Makefile
+index 83f4fd44..11e88973 100644
+--- packages/libcups/Makefile
++++ packages/libcups/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: security/fpc-gnutls/files/patch-Makefile-aarch64
===================================================================
--- security/fpc-gnutls/files/patch-Makefile-aarch64
+++ security/fpc-gnutls/files/patch-Makefile-aarch64
@@ -0,0 +1,30 @@
+// @generated
+diff --git a/packages/gnutls/Makefile b/packages/gnutls/Makefile
+index c1fbad6c..ded4ff4e 100644
+--- packages/gnutls/Makefile
++++ packages/gnutls/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1762,6 +1762,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_FCL-NET=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_FCL-NET=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: security/fpc-openssl/files/patch-Makefile-aarch64
===================================================================
--- security/fpc-openssl/files/patch-Makefile-aarch64
+++ security/fpc-openssl/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/openssl/Makefile b/packages/openssl/Makefile
+index 330efd89..d38db9c6 100644
+--- packages/openssl/Makefile
++++ packages/openssl/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: sysutils/fpc-syslog/files/patch-Makefile-aarch64
===================================================================
--- sysutils/fpc-syslog/files/patch-Makefile-aarch64
+++ sysutils/fpc-syslog/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/syslog/Makefile b/packages/syslog/Makefile
+index 1091edd8..e186e2f6 100644
+--- packages/syslog/Makefile
++++ packages/syslog/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/syslog/examples/Makefile b/packages/syslog/examples/Makefile
+index 2d70f70c..15ff4011 100644
+--- packages/syslog/examples/Makefile
++++ packages/syslog/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=testlog
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=testlog
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=testlog
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_SYSLOG=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_SYSLOG=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: sysutils/fpc-users/files/patch-Makefile-aarch64
===================================================================
--- sysutils/fpc-users/files/patch-Makefile-aarch64
+++ sysutils/fpc-users/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/users/Makefile b/packages/users/Makefile
+index 098323f4..6a5d80e4 100644
+--- packages/users/Makefile
++++ packages/users/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/users/examples/Makefile b/packages/users/examples/Makefile
+index 37b3ef54..d48ed00a 100644
+--- packages/users/examples/Makefile
++++ packages/users/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=testuser testpass2 testpass
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=testuser testpass2
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=testuser testpass2
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_USERS=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_USERS=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: sysutils/fpc-utmp/files/patch-Makefile-aarch64
===================================================================
--- sysutils/fpc-utmp/files/patch-Makefile-aarch64
+++ sysutils/fpc-utmp/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/utmp/Makefile b/packages/utmp/Makefile
+index d00f8046..08da9326 100644
+--- packages/utmp/Makefile
++++ packages/utmp/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/utmp/examples/Makefile b/packages/utmp/examples/Makefile
+index d235dafc..b69869bd 100644
+--- packages/utmp/examples/Makefile
++++ packages/utmp/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=testutmp
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=testutmp
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=testutmp
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_UTMP=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_UTMP=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: sysutils/fpc-uuid/files/patch-Makefile-aarch64
===================================================================
--- sysutils/fpc-uuid/files/patch-Makefile-aarch64
+++ sysutils/fpc-uuid/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/uuid/Makefile b/packages/uuid/Makefile
+index 23241ab3..461f9ecb 100644
+--- packages/uuid/Makefile
++++ packages/uuid/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/uuid/examples/Makefile b/packages/uuid/examples/Makefile
+index a4fc6d6b..68652b63 100644
+--- packages/uuid/examples/Makefile
++++ packages/uuid/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=testuid testlibuid
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=testuid testlibuid
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=testuid testlibuid
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_UUID=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_UUID=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: textproc/fpc-aspell/files/patch-Makefile-aarch64
===================================================================
--- textproc/fpc-aspell/files/patch-Makefile-aarch64
+++ textproc/fpc-aspell/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/aspell/Makefile b/packages/aspell/Makefile
+index fd666445..0b835fde 100644
+--- packages/aspell/Makefile
++++ packages/aspell/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: textproc/fpc-libxml2/files/patch-Makefile-aarch64
===================================================================
--- textproc/fpc-libxml2/files/patch-Makefile-aarch64
+++ textproc/fpc-libxml2/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/libxml/Makefile b/packages/libxml/Makefile
+index 158e69cc..d761796b 100644
+--- packages/libxml/Makefile
++++ packages/libxml/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: www/fpc-fastcgi/files/patch-Makefile-aarch64
===================================================================
--- www/fpc-fastcgi/files/patch-Makefile-aarch64
+++ www/fpc-fastcgi/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/fastcgi/Makefile b/packages/fastcgi/Makefile
+index 09513a77..6f28f478 100644
+--- packages/fastcgi/Makefile
++++ packages/fastcgi/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: www/fpc-googleapi/files/patch-Makefile-aarch64
===================================================================
--- www/fpc-googleapi/files/patch-Makefile-aarch64
+++ www/fpc-googleapi/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/googleapi/Makefile b/packages/googleapi/Makefile
+index 70425c9d..255e6cce 100644
+--- packages/googleapi/Makefile
++++ packages/googleapi/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: www/fpc-httpd22/files/patch-Makefile-aarch64
===================================================================
--- www/fpc-httpd22/files/patch-Makefile-aarch64
+++ www/fpc-httpd22/files/patch-Makefile-aarch64
@@ -0,0 +1,78 @@
+// @generated
+diff --git a/packages/httpd22/Makefile b/packages/httpd22/Makefile
+index 8bf9af00..475b366f 100644
+--- packages/httpd22/Makefile
++++ packages/httpd22/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/httpd22/examples/Makefile b/packages/httpd22/examples/Makefile
+index 6dd00af6..c3f2c255 100644
+--- packages/httpd22/examples/Makefile
++++ packages/httpd22/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=mod_example mod_hello mod_spelling testmodule
+ endif
+@@ -845,6 +848,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=minimain
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=minimain
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=minimain
+ endif
+@@ -2280,6 +2286,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_HTTPD22=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_HTTPD22=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: www/fpc-httpd24/files/patch-Makefile-aarch64
===================================================================
--- www/fpc-httpd24/files/patch-Makefile-aarch64
+++ www/fpc-httpd24/files/patch-Makefile-aarch64
@@ -0,0 +1,78 @@
+// @generated
+diff --git a/packages/httpd24/Makefile b/packages/httpd24/Makefile
+index bf18bae9..2ff769a8 100644
+--- packages/httpd24/Makefile
++++ packages/httpd24/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/httpd24/examples/Makefile b/packages/httpd24/examples/Makefile
+index 1c762277..9cc42cab 100644
+--- packages/httpd24/examples/Makefile
++++ packages/httpd24/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=mod_hello
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=mod_hello
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=mod_hello
+ endif
+@@ -845,6 +848,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_UNITS+=minimain
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_UNITS+=minimain
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_UNITS+=minimain
+ endif
+@@ -2280,6 +2286,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_HTTPD24=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_HTTPD24=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: www/fpc-libmicrohttpd/files/patch-Makefile-aarch64
===================================================================
--- www/fpc-libmicrohttpd/files/patch-Makefile-aarch64
+++ www/fpc-libmicrohttpd/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/libmicrohttpd/Makefile b/packages/libmicrohttpd/Makefile
+index 983bbc59..5aeef589 100644
+--- packages/libmicrohttpd/Makefile
++++ packages/libmicrohttpd/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: www/fpc-webidl/files/patch-Makefile-aarch64
===================================================================
--- www/fpc-webidl/files/patch-Makefile-aarch64
+++ www/fpc-webidl/files/patch-Makefile-aarch64
@@ -0,0 +1,31 @@
+// @generated
+diff --git a/packages/webidl/Makefile b/packages/webidl/Makefile
+index d1287270..893abc56 100644
+--- packages/webidl/Makefile
++++ packages/webidl/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1846,6 +1846,16 @@ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_RTL-OBJPAS=1
+ REQUIRE_PACKAGES_FCL-BASE=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_RTL-OBJPAS=1
++REQUIRE_PACKAGES_FCL-BASE=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: x11-fm/doublecmd/Makefile
===================================================================
--- x11-fm/doublecmd/Makefile
+++ x11-fm/doublecmd/Makefile
@@ -15,7 +15,7 @@
LICENSE= GPLv2
-ONLY_FOR_ARCHS= amd64 i386
+ONLY_FOR_ARCHS= aarch64 amd64 i386
gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5
qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2
Index: x11-fonts/fpc-libfontconfig/files/patch-Makefile-aarch64
===================================================================
--- x11-fonts/fpc-libfontconfig/files/patch-Makefile-aarch64
+++ x11-fonts/fpc-libfontconfig/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/libfontconfig/Makefile b/packages/libfontconfig/Makefile
+index f288c92b..490d2787 100644
+--- packages/libfontconfig/Makefile
++++ packages/libfontconfig/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: x11-toolkits/fpc-gtk2/files/patch-Makefile-aarch64
===================================================================
--- x11-toolkits/fpc-gtk2/files/patch-Makefile-aarch64
+++ x11-toolkits/fpc-gtk2/files/patch-Makefile-aarch64
@@ -0,0 +1,398 @@
+// @generated
+diff --git a/packages/gtk2/Makefile b/packages/gtk2/Makefile
+index 294f3291..de4a6931 100644
+--- packages/gtk2/Makefile
++++ packages/gtk2/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/gtk2/examples/Makefile b/packages/gtk2/examples/Makefile
+index 07a1cb0b..70a3fd5e 100644
+--- packages/gtk2/examples/Makefile
++++ packages/gtk2/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_DIRS+=helloworld helloworld2 gtk_demo gettingstarted plugins scribble_simple gtkglext
+ endif
+@@ -2100,6 +2103,16 @@ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_GTK2=1
+ REQUIRE_PACKAGES_OPENGL=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_GTK2=1
++REQUIRE_PACKAGES_OPENGL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+@@ -3558,6 +3571,15 @@ TARGET_DIRS_PLUGINS=1
+ TARGET_DIRS_SCRIBBLE_SIMPLE=1
+ TARGET_DIRS_GTKGLEXT=1
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++TARGET_DIRS_HELLOWORLD=1
++TARGET_DIRS_HELLOWORLD2=1
++TARGET_DIRS_GTK_DEMO=1
++TARGET_DIRS_GETTINGSTARTED=1
++TARGET_DIRS_PLUGINS=1
++TARGET_DIRS_SCRIBBLE_SIMPLE=1
++TARGET_DIRS_GTKGLEXT=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ TARGET_DIRS_HELLOWORLD=1
+ TARGET_DIRS_HELLOWORLD2=1
+diff --git a/packages/gtk2/examples/filechooser/Makefile b/packages/gtk2/examples/filechooser/Makefile
+index 7c65c708..d6df7e0c 100644
+--- packages/gtk2/examples/filechooser/Makefile
++++ packages/gtk2/examples/filechooser/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=simple glade
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=simple glade
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=simple glade
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_GTK2=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_GTK2=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/gtk2/examples/gettingstarted/Makefile b/packages/gtk2/examples/gettingstarted/Makefile
+index 270d0203..f03e5aa7 100644
+--- packages/gtk2/examples/gettingstarted/Makefile
++++ packages/gtk2/examples/gettingstarted/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=gettingstarted
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=gettingstarted
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=gettingstarted
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_GTK2=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_GTK2=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/gtk2/examples/gtk_demo/Makefile b/packages/gtk2/examples/gtk_demo/Makefile
+index 7d5bd50c..9e2dccc3 100644
+--- packages/gtk2/examples/gtk_demo/Makefile
++++ packages/gtk2/examples/gtk_demo/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=gtk_demo
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=gtk_demo
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=gtk_demo
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_GTK2=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_GTK2=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/gtk2/examples/gtkglext/Makefile b/packages/gtk2/examples/gtkglext/Makefile
+index 6fa351bc..5989642d 100644
+--- packages/gtk2/examples/gtkglext/Makefile
++++ packages/gtk2/examples/gtkglext/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=gears
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=gears
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=gears
+ endif
+@@ -2100,6 +2103,16 @@ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_GTK2=1
+ REQUIRE_PACKAGES_OPENGL=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_GTK2=1
++REQUIRE_PACKAGES_OPENGL=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/gtk2/examples/helloworld/Makefile b/packages/gtk2/examples/helloworld/Makefile
+index 926f1314..b998e6ac 100644
+--- packages/gtk2/examples/helloworld/Makefile
++++ packages/gtk2/examples/helloworld/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=helloworld
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=helloworld
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=helloworld
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_GTK2=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_GTK2=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/gtk2/examples/helloworld2/Makefile b/packages/gtk2/examples/helloworld2/Makefile
+index 2aada46c..68be7843 100644
+--- packages/gtk2/examples/helloworld2/Makefile
++++ packages/gtk2/examples/helloworld2/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=helloworld2
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=helloworld2
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=helloworld2
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_GTK2=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_GTK2=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/gtk2/examples/plugins/Makefile b/packages/gtk2/examples/plugins/Makefile
+index 2ebd7d44..bf2de24c 100644
+--- packages/gtk2/examples/plugins/Makefile
++++ packages/gtk2/examples/plugins/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=plugin main
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=plugin main
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=plugin main
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_GTK2=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_GTK2=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/gtk2/examples/scribble_simple/Makefile b/packages/gtk2/examples/scribble_simple/Makefile
+index 783e05fa..b2b7c3c5 100644
+--- packages/gtk2/examples/scribble_simple/Makefile
++++ packages/gtk2/examples/scribble_simple/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=scribble_simple
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=scribble_simple
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=scribble_simple
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_GTK2=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_GTK2=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: x11-toolkits/fpc-xforms/files/patch-Makefile-aarch64
===================================================================
--- x11-toolkits/fpc-xforms/files/patch-Makefile-aarch64
+++ x11-toolkits/fpc-xforms/files/patch-Makefile-aarch64
@@ -0,0 +1,68 @@
+// @generated
+diff --git a/packages/xforms/Makefile b/packages/xforms/Makefile
+index f583609f..e625a1f2 100644
+--- packages/xforms/Makefile
++++ packages/xforms/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
+diff --git a/packages/xforms/examples/Makefile b/packages/xforms/examples/Makefile
+index 95752a19..c106b941 100644
+--- packages/xforms/examples/Makefile
++++ packages/xforms/examples/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -581,6 +581,9 @@ endif
+ ifeq ($(FULL_TARGET),aarch64-linux)
+ override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn
+ endif
++ifeq ($(FULL_TARGET),aarch64-freebsd)
++override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn
+ endif
+@@ -2016,6 +2019,15 @@ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=1
+ REQUIRE_PACKAGES_XFORMS=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_XFORMS=1
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1
Index: x11/fpc-x11/files/patch-Makefile-aarch64
===================================================================
--- x11/fpc-x11/files/patch-Makefile-aarch64
+++ x11/fpc-x11/files/patch-Makefile-aarch64
@@ -0,0 +1,29 @@
+// @generated
+diff --git a/packages/x11/Makefile b/packages/x11/Makefile
+index ad0d4e87..78297f5c 100644
+--- packages/x11/Makefile
++++ packages/x11/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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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 wasm-wasm sparc64-linux
++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-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros 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-freebsd aarch64-darwin aarch64-android 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
+@@ -1678,6 +1678,14 @@ REQUIRE_PACKAGES_HASH=1
+ REQUIRE_PACKAGES_LIBTAR=1
+ REQUIRE_PACKAGES_FPMKUNIT=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
++endif
+ ifeq ($(FULL_TARGET),aarch64-darwin)
+ REQUIRE_PACKAGES_RTL=1
+ REQUIRE_PACKAGES_PASZLIB=1

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 8, 10:37 PM (4 h, 37 m)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
a5/45/7724aa0f8867aedc62bd84d2b2c7
Default Alt Text
D28484.1775687857.diff (3 MB)

Event Timeline