Regenerate compiler and compiler/utils Makefile's after merge of MR1211

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-macosclassic m68k-embedded m68k-sinclairql m68k-human68k powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix powerpc64-freebsd avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android mipsel-ps1 mips64-linux mips64el-linux jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-freebsd aarch64-darwin aarch64-win64 aarch64-embedded aarch64-iphonesim aarch64-android aarch64-ios wasm32-embedded wasm32-wasip1 wasm32-wasip1threads wasm32-wasip2 sparc64-linux riscv32-linux riscv32-embedded riscv32-freertos riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos z80-amstradcpc loongarch64-linux
+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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded m68k-sinclairql m68k-human68k powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos arm-ios powerpc64-linux powerpc64-freebsd powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android mipsel-ps1 mips64-linux mips64el-linux jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-freebsd aarch64-darwin aarch64-win64 aarch64-embedded aarch64-iphonesim aarch64-android aarch64-ios wasm32-embedded wasm32-wasip1 wasm32-wasip1threads wasm32-wasip2 sparc64-linux riscv32-linux riscv32-embedded riscv32-freertos riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos z80-amstradcpc loongarch64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari human68k
@@ -655,7 +655,7 @@ ifdef LLVM
 ifeq ($(findstring $(PPC_TARGET),x86_64 aarch64 arm),)
 $(error The $(PPC_TARGET) architecture is not (yet) supported by the FPC/LLVM code generator)
 endif
-ifeq ($(findstring $(OS_TARGET),darwin iphonesim linux),)
+ifeq ($(findstring $(OS_TARGET),darwin iphonesim linux openbsd),)
 $(error The $(OS_TARGET) target OS is not (yet) supported by the FPC/LLVM code generator)
 endif
 override LOCALOPT+=-dllvm -Fullvm
@@ -757,6 +757,9 @@ endif
 ifeq ($(CPU_OS_TARGET),i386-solaris)
 override TARGET_DIRS+=utils
 endif
+ifeq ($(CPU_OS_TARGET),i386-qnx)
+override TARGET_DIRS+=utils
+endif
 ifeq ($(CPU_OS_TARGET),i386-netware)
 override TARGET_DIRS+=utils
 endif
@@ -943,6 +946,9 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-linux)
 override TARGET_DIRS+=utils
 endif
+ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
+override TARGET_DIRS+=utils
+endif
 ifeq ($(CPU_OS_TARGET),powerpc64-darwin)
 override TARGET_DIRS+=utils
 endif
@@ -952,9 +958,6 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-aix)
 override TARGET_DIRS+=utils
 endif
-ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
-override TARGET_DIRS+=utils
-endif
 ifeq ($(CPU_OS_TARGET),avr-embedded)
 override TARGET_DIRS+=utils
 endif
@@ -1105,6 +1108,9 @@ endif
 ifeq ($(CPU_OS_TARGET),i386-solaris)
 override TARGET_PROGRAMS+=pp
 endif
+ifeq ($(CPU_OS_TARGET),i386-qnx)
+override TARGET_PROGRAMS+=pp
+endif
 ifeq ($(CPU_OS_TARGET),i386-netware)
 override TARGET_PROGRAMS+=pp
 endif
@@ -1291,6 +1297,9 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-linux)
 override TARGET_PROGRAMS+=pp
 endif
+ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
+override TARGET_PROGRAMS+=pp
+endif
 ifeq ($(CPU_OS_TARGET),powerpc64-darwin)
 override TARGET_PROGRAMS+=pp
 endif
@@ -1300,9 +1309,6 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-aix)
 override TARGET_PROGRAMS+=pp
 endif
-ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
-override TARGET_PROGRAMS+=pp
-endif
 ifeq ($(CPU_OS_TARGET),avr-embedded)
 override TARGET_PROGRAMS+=pp
 endif
@@ -1454,6 +1460,9 @@ endif
 ifeq ($(CPU_OS_TARGET),i386-solaris)
 override COMPILER_INCLUDEDIR+=$(CPC_TARGET)
 endif
+ifeq ($(CPU_OS_TARGET),i386-qnx)
+override COMPILER_INCLUDEDIR+=$(CPC_TARGET)
+endif
 ifeq ($(CPU_OS_TARGET),i386-netware)
 override COMPILER_INCLUDEDIR+=$(CPC_TARGET)
 endif
@@ -1640,6 +1649,9 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-linux)
 override COMPILER_INCLUDEDIR+=$(CPC_TARGET)
 endif
+ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
+override COMPILER_INCLUDEDIR+=$(CPC_TARGET)
+endif
 ifeq ($(CPU_OS_TARGET),powerpc64-darwin)
 override COMPILER_INCLUDEDIR+=$(CPC_TARGET)
 endif
@@ -1649,9 +1661,6 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-aix)
 override COMPILER_INCLUDEDIR+=$(CPC_TARGET)
 endif
-ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
-override COMPILER_INCLUDEDIR+=$(CPC_TARGET)
-endif
 ifeq ($(CPU_OS_TARGET),avr-embedded)
 override COMPILER_INCLUDEDIR+=$(CPC_TARGET)
 endif
@@ -1802,6 +1811,9 @@ endif
 ifeq ($(CPU_OS_TARGET),i386-solaris)
 override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
 endif
+ifeq ($(CPU_OS_TARGET),i386-qnx)
+override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
+endif
 ifeq ($(CPU_OS_TARGET),i386-netware)
 override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
 endif
@@ -1988,6 +2000,9 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-linux)
 override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
 endif
+ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
+override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
+endif
 ifeq ($(CPU_OS_TARGET),powerpc64-darwin)
 override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
 endif
@@ -1997,9 +2012,6 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-aix)
 override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
 endif
-ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
-override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
-endif
 ifeq ($(CPU_OS_TARGET),avr-embedded)
 override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
 endif
@@ -2150,6 +2162,9 @@ endif
 ifeq ($(CPU_OS_TARGET),i386-solaris)
 override COMPILER_TARGETDIR+=$(CPU_UNITDIR)/bin/$(FULL_TARGET)
 endif
+ifeq ($(CPU_OS_TARGET),i386-qnx)
+override COMPILER_TARGETDIR+=$(CPU_UNITDIR)/bin/$(FULL_TARGET)
+endif
 ifeq ($(CPU_OS_TARGET),i386-netware)
 override COMPILER_TARGETDIR+=$(CPU_UNITDIR)/bin/$(FULL_TARGET)
 endif
@@ -2336,6 +2351,9 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-linux)
 override COMPILER_TARGETDIR+=$(CPU_UNITDIR)/bin/$(FULL_TARGET)
 endif
+ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
+override COMPILER_TARGETDIR+=$(CPU_UNITDIR)/bin/$(FULL_TARGET)
+endif
 ifeq ($(CPU_OS_TARGET),powerpc64-darwin)
 override COMPILER_TARGETDIR+=$(CPU_UNITDIR)/bin/$(FULL_TARGET)
 endif
@@ -2345,9 +2363,6 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-aix)
 override COMPILER_TARGETDIR+=$(CPU_UNITDIR)/bin/$(FULL_TARGET)
 endif
-ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
-override COMPILER_TARGETDIR+=$(CPU_UNITDIR)/bin/$(FULL_TARGET)
-endif
 ifeq ($(CPU_OS_TARGET),avr-embedded)
 override COMPILER_TARGETDIR+=$(CPU_UNITDIR)/bin/$(FULL_TARGET)
 endif
@@ -2498,6 +2513,9 @@ endif
 ifeq ($(CPU_OS_TARGET),i386-solaris)
 override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
 endif
+ifeq ($(CPU_OS_TARGET),i386-qnx)
+override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
+endif
 ifeq ($(CPU_OS_TARGET),i386-netware)
 override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
 endif
@@ -2684,6 +2702,9 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-linux)
 override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
 endif
+ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
+override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
+endif
 ifeq ($(CPU_OS_TARGET),powerpc64-darwin)
 override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
 endif
@@ -2693,9 +2714,6 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-aix)
 override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
 endif
-ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
-override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
-endif
 ifeq ($(CPU_OS_TARGET),avr-embedded)
 override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
 endif
@@ -3138,6 +3156,7 @@ STATICLIBPREFIX=libp
 IMPORTLIBPREFIX=libimp
 RSTEXT=.rsj
 EXEDBGEXT=.dbg
+ALL_EXEEXT=.exe
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
 SHORTSUFFIX=v1
@@ -3234,6 +3253,7 @@ ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
 SHORTSUFFIX=ata
 endif
+ALL_EXEEXT+=.ttp
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
@@ -3260,6 +3280,7 @@ STATICLIBPREFIX=
 SHORTSUFFIX=nw
 IMPORTLIBPREFIX=imp
 endif
+ALL_EXEEXT+=.nlm
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
@@ -3285,6 +3306,7 @@ EXEEXT=.gba
 SHAREDLIBEXT=.so
 SHORTSUFFIX=gba
 endif
+ALL_EXEEXT+=.gba
 ifeq ($(OS_TARGET),symbian)
 SHAREDLIBEXT=.dll
 SHORTSUFFIX=symbian
@@ -3298,6 +3320,7 @@ EXEEXT=.dol
 SHAREDLIBEXT=.so
 SHORTSUFFIX=wii
 endif
+ALL_EXEEXT+=.dol
 ifeq ($(OS_TARGET),aix)
 BATCHEXT=.sh
 EXEEXT=
@@ -3340,6 +3363,7 @@ OEXT=.rel
 endif
 SHORTSUFFIX=emb
 endif
+ALL_EXEEXT+=.bin
 ifeq ($(OS_TARGET),win16)
 STATICLIBPREFIX=
 STATICLIBEXT=.a
@@ -3352,6 +3376,7 @@ endif
 ifeq ($(OS_TARGET),wasip1)
 EXEEXT=.wasm
 endif
+ALL_EXEEXT+=.wasm
 ifeq ($(OS_TARGET),wasip1threads)
 EXEEXT=.wasm
 endif
@@ -3640,6 +3665,9 @@ endif
 ifeq ($(CPU_OS_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(CPU_OS_TARGET),i386-qnx)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(CPU_OS_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -3826,6 +3854,9 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(CPU_OS_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -3835,9 +3866,6 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-aix)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(CPU_OS_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -4192,6 +4220,7 @@ endif
 ifndef CROSSINSTALL
 ifneq ($(TARGET_PROGRAMS),)
 override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))
+override ALL_EXEFILES+=$(foreach lEXEEXT,$(ALL_EXEEXT),$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(lEXEEXT), $(EXEFILES))))
 override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffix $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
 override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))
 override ALLTARGET+=fpc_exes
@@ -4321,6 +4350,10 @@ ifdef INSTALL_CREATEPACKAGEFPC
 ifdef FPCMAKE
 ifdef PACKAGE_VERSION
 ifneq ($(wildcard Makefile.fpc),)
+ifdef FPCMAKENEW
+	$(MKDIR) $(INSTALL_UNITDIR)
+	$(FPCMAKENEW) -o $(INSTALL_UNITDIR)/Package.fpc -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc
+else
 	$(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc
 	$(MKDIR) $(INSTALL_UNITDIR)
 	$(INSTALL) Package.fpc $(INSTALL_UNITDIR)
@@ -4328,6 +4361,7 @@ endif
 endif
 endif
 endif
+endif
 ifdef INSTALLPPUFILES
 	$(MKDIR) $(INSTALL_UNITDIR)
 	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
@@ -4452,6 +4486,7 @@ override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDBGFILES))
 endif
 ifdef CLEAN_PROGRAMS
 override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEEXT), $(CLEAN_PROGRAMS)))
+override ALL_CLEANEXEFILES+=$(foreach lEXEEXT,$(ALL_EXEEXT),$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(lEXEEXT), $(CLEAN_PROGRAMS))))
 override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEDBGEXT), $(CLEAN_PROGRAMS)))
 endif
 ifdef CLEAN_UNITS
@@ -4490,12 +4525,15 @@ 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) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res symbol_order*.fpc
 	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
 endif
+ifdef ALL_CLEANEXEFILES
+	-$(DEL) $(ALL_CLEANEXEFILES)
+endif
 ifdef COMPILER_UNITTARGETDIR
 ifdef CLEANPPUFILES
 	-$(DEL) $(CLEANPPUFILES)
@@ -4517,8 +4555,8 @@ 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) fpcmade.* Package*.fpc *.fpm
+	-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res symbol_order*.fpc
 	-$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
@@ -4665,6 +4703,9 @@ endif
 ifeq ($(CPU_OS_TARGET),i386-solaris)
 TARGET_DIRS_UTILS=1
 endif
+ifeq ($(CPU_OS_TARGET),i386-qnx)
+TARGET_DIRS_UTILS=1
+endif
 ifeq ($(CPU_OS_TARGET),i386-netware)
 TARGET_DIRS_UTILS=1
 endif
@@ -4851,6 +4892,9 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-linux)
 TARGET_DIRS_UTILS=1
 endif
+ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
+TARGET_DIRS_UTILS=1
+endif
 ifeq ($(CPU_OS_TARGET),powerpc64-darwin)
 TARGET_DIRS_UTILS=1
 endif
@@ -4860,9 +4904,6 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-aix)
 TARGET_DIRS_UTILS=1
 endif
-ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
-TARGET_DIRS_UTILS=1
-endif
 ifeq ($(CPU_OS_TARGET),avr-embedded)
 TARGET_DIRS_UTILS=1
 endif

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-macosclassic m68k-embedded m68k-sinclairql m68k-human68k powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix powerpc64-freebsd avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android mipsel-ps1 mips64-linux mips64el-linux jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-freebsd aarch64-darwin aarch64-win64 aarch64-embedded aarch64-iphonesim aarch64-android aarch64-ios wasm32-embedded wasm32-wasip1 wasm32-wasip1threads wasm32-wasip2 sparc64-linux riscv32-linux riscv32-embedded riscv32-freertos riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos z80-amstradcpc loongarch64-linux
+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-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macosclassic m68k-embedded m68k-sinclairql m68k-human68k powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos arm-ios powerpc64-linux powerpc64-freebsd powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android mipsel-ps1 mips64-linux mips64el-linux jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-freebsd aarch64-darwin aarch64-win64 aarch64-embedded aarch64-iphonesim aarch64-android aarch64-ios wasm32-embedded wasm32-wasip1 wasm32-wasip1threads wasm32-wasip2 sparc64-linux riscv32-linux riscv32-embedded riscv32-freertos riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos z80-amstradcpc loongarch64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari human68k
@@ -396,6 +396,9 @@ endif
 ifeq ($(CPU_OS_TARGET),i386-solaris)
 override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove mka64ins mkarmins mkx86ins msg2inc mkx86inl mkz80ins
 endif
+ifeq ($(CPU_OS_TARGET),i386-qnx)
+override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove mka64ins mkarmins mkx86ins msg2inc mkx86inl mkz80ins
+endif
 ifeq ($(CPU_OS_TARGET),i386-netware)
 override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove mka64ins mkarmins mkx86ins msg2inc mkx86inl mkz80ins
 endif
@@ -582,6 +585,9 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-linux)
 override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove mka64ins mkarmins mkx86ins msg2inc mkx86inl mkz80ins
 endif
+ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
+override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove mka64ins mkarmins mkx86ins msg2inc mkx86inl mkz80ins
+endif
 ifeq ($(CPU_OS_TARGET),powerpc64-darwin)
 override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove mka64ins mkarmins mkx86ins msg2inc mkx86inl mkz80ins
 endif
@@ -591,9 +597,6 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-aix)
 override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove mka64ins mkarmins mkx86ins msg2inc mkx86inl mkz80ins
 endif
-ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
-override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove mka64ins mkarmins mkx86ins msg2inc mkx86inl mkz80ins
-endif
 ifeq ($(CPU_OS_TARGET),avr-embedded)
 override TARGET_PROGRAMS+=fpc ppufiles ppudump ppumove mka64ins mkarmins mkx86ins msg2inc mkx86inl mkz80ins
 endif
@@ -744,6 +747,9 @@ endif
 ifeq ($(CPU_OS_TARGET),i386-solaris)
 override CLEAN_UNITS+=ppu crc
 endif
+ifeq ($(CPU_OS_TARGET),i386-qnx)
+override CLEAN_UNITS+=ppu crc
+endif
 ifeq ($(CPU_OS_TARGET),i386-netware)
 override CLEAN_UNITS+=ppu crc
 endif
@@ -930,6 +936,9 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-linux)
 override CLEAN_UNITS+=ppu crc
 endif
+ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
+override CLEAN_UNITS+=ppu crc
+endif
 ifeq ($(CPU_OS_TARGET),powerpc64-darwin)
 override CLEAN_UNITS+=ppu crc
 endif
@@ -939,9 +948,6 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-aix)
 override CLEAN_UNITS+=ppu crc
 endif
-ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
-override CLEAN_UNITS+=ppu crc
-endif
 ifeq ($(CPU_OS_TARGET),avr-embedded)
 override CLEAN_UNITS+=ppu crc
 endif
@@ -1093,6 +1099,9 @@ endif
 ifeq ($(CPU_OS_TARGET),i386-solaris)
 override COMPILER_UNITDIR+=..
 endif
+ifeq ($(CPU_OS_TARGET),i386-qnx)
+override COMPILER_UNITDIR+=..
+endif
 ifeq ($(CPU_OS_TARGET),i386-netware)
 override COMPILER_UNITDIR+=..
 endif
@@ -1279,6 +1288,9 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-linux)
 override COMPILER_UNITDIR+=..
 endif
+ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
+override COMPILER_UNITDIR+=..
+endif
 ifeq ($(CPU_OS_TARGET),powerpc64-darwin)
 override COMPILER_UNITDIR+=..
 endif
@@ -1288,9 +1300,6 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-aix)
 override COMPILER_UNITDIR+=..
 endif
-ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
-override COMPILER_UNITDIR+=..
-endif
 ifeq ($(CPU_OS_TARGET),avr-embedded)
 override COMPILER_UNITDIR+=..
 endif
@@ -1441,6 +1450,9 @@ endif
 ifeq ($(CPU_OS_TARGET),i386-solaris)
 override COMPILER_SOURCEDIR+=..
 endif
+ifeq ($(CPU_OS_TARGET),i386-qnx)
+override COMPILER_SOURCEDIR+=..
+endif
 ifeq ($(CPU_OS_TARGET),i386-netware)
 override COMPILER_SOURCEDIR+=..
 endif
@@ -1627,6 +1639,9 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-linux)
 override COMPILER_SOURCEDIR+=..
 endif
+ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
+override COMPILER_SOURCEDIR+=..
+endif
 ifeq ($(CPU_OS_TARGET),powerpc64-darwin)
 override COMPILER_SOURCEDIR+=..
 endif
@@ -1636,9 +1651,6 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-aix)
 override COMPILER_SOURCEDIR+=..
 endif
-ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
-override COMPILER_SOURCEDIR+=..
-endif
 ifeq ($(CPU_OS_TARGET),avr-embedded)
 override COMPILER_SOURCEDIR+=..
 endif
@@ -2592,6 +2604,9 @@ endif
 ifeq ($(CPU_OS_TARGET),i386-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(CPU_OS_TARGET),i386-qnx)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(CPU_OS_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -2778,6 +2793,9 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifeq ($(CPU_OS_TARGET),powerpc64-darwin)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -2787,9 +2805,6 @@ endif
 ifeq ($(CPU_OS_TARGET),powerpc64-aix)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(CPU_OS_TARGET),powerpc64-freebsd)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(CPU_OS_TARGET),avr-embedded)
 REQUIRE_PACKAGES_RTL=1
 endif