* Remove unused unixutil in _USES clause of rtl/macos/dos.pp source.

  * Remove unixutil from units list for macosclassic OS target.

  * Remove obsolete local build rule for unixutil unit.

rtl/macos/Makefile

@@ -349,271 +349,271 @@ endif
 OBJPASDIR=$(RTL)/objpas
 GRAPHDIR=$(INC)/graph
 ifeq ($(FULL_TARGET),i386-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-android)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-aros)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),m68k-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),m68k-macosclassic)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),powerpc-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),powerpc-macosclassic)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),powerpc-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),powerpc-aix)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),sparc-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),x86_64-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),x86_64-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),x86_64-haiku)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),x86_64-netbsd)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),x86_64-openbsd)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),x86_64-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),x86_64-iphonesim)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),x86_64-android)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),x86_64-aros)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),x86_64-dragonfly)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),arm-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),arm-netbsd)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),arm-android)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),arm-aros)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),arm-ios)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),powerpc64-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),powerpc64-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),powerpc64-aix)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),armeb-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),mips-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),mipsel-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),mipsel-embedded)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),mipsel-android)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),jvm-java)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),jvm-android)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i8086-embedded)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i8086-msdos)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i8086-win16)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),aarch64-android)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),aarch64-ios)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),wasm-wasm)
-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),sparc64-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 sfpux80 ufloatx80 sfpu128 ufloat128
+override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils dos extpas cmem charset cpall ctypes sysconst softfpu macpas classes fgl types sysutils sfpux80 ufloatx80 sfpu128 ufloat128
 endif
 ifeq ($(FULL_TARGET),i386-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
@@ -2925,7 +2925,7 @@ types$(PPUEXT) : $(OBJPASDIR)/types.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) $(OBJPASDIR)/types.pp
 macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT)
 	$(COMPILER) $(INC)/macpas.pp $(REDIR)
-dos$(PPUEXT) : $(DOSDEPS) unixutil$(PPUEXT) system$(PPUEXT)
+dos$(PPUEXT) : $(DOSDEPS) system$(PPUEXT)
 	$(COMPILER) dos $(REDIR)
 iso7185$(PPUEXT) : $(INC)/iso7185.pp heaptrc$(PPUEXT)
 	$(COMPILER) $(INC)/iso7185.pp
@@ -2935,8 +2935,6 @@ getopts$(PPUEXT) : $(INC)/getopts.pp strings$(PPUEXT) system$(PPUEXT)
 	$(COMPILER) $(INC)/getopts.pp $(REDIR)
 heaptrc$(PPUEXT) : $(INC)/heaptrc.pp system$(PPUEXT)
 	$(COMPILER) $(INC)/heaptrc.pp $(REDIR)
-unixutil$(PPUEXT) : ../unix/unixutil.pp
-	$(COMPILER) ../unix/unixutil.pp $(REDIR)
 charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT)
 	$(COMPILER) $(INC)/charset.pp
 cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)

rtl/macos/Makefile.fpc

@@ -8,7 +8,7 @@ main=rtl
 [target]
 loaders=
 units=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils \
-      unixutil dos extpas cmem charset cpall ctypes sysconst \
+      dos extpas cmem charset cpall ctypes sysconst \
       softfpu macpas classes fgl types sysutils \
       sfpux80 ufloatx80 sfpu128 ufloat128
 #     macpas \
@@ -161,7 +161,7 @@ macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT)
 # TP7 Compatible RTL Units
 #
 
-dos$(PPUEXT) : $(DOSDEPS) unixutil$(PPUEXT) system$(PPUEXT)
+dos$(PPUEXT) : $(DOSDEPS) macostp$(PPUEXT) macutils$(PPUEXT) system$(PPUEXT)
         $(COMPILER) dos $(REDIR)
 
 #crt$(PPUEXT) : crt.pp $(INC)/textrec.inc system$(PPUEXT)
@@ -186,9 +186,6 @@ getopts$(PPUEXT) : $(INC)/getopts.pp strings$(PPUEXT) system$(PPUEXT)
 heaptrc$(PPUEXT) : $(INC)/heaptrc.pp system$(PPUEXT)
         $(COMPILER) $(INC)/heaptrc.pp $(REDIR)
 
-unixutil$(PPUEXT) : ../unix/unixutil.pp
-        $(COMPILER) ../unix/unixutil.pp $(REDIR)
-
 charset$(PPUEXT) : $(INC)/charset.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT)
 	$(COMPILER) $(INC)/charset.pp
 

rtl/macos/dos.pp

@@ -61,8 +61,7 @@ Implementation
  calls must then be weak linked.}
 
 Uses
-  macutils,
-  unixutil {for FNMatch};
+  macutils;
 
 {$UNDEF USE_FEXPAND_INC}
 //{$DEFINE USE_FEXPAND_INC}