* Initial active version of

   rtl-extra : objects matrix ucomplex
   rtl-objpas: convutil(s) dateutil(s) stdconvs variants varutils
   


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@26398 3ad0048d-3df7-0310-abae-a5850022a9f2

3 files changed, 150 insertions, 188 deletions

diff --git a/rtl/watcom/Makefile b/rtl/watcom/Makefile
index 6bf4419f65..7be2dda655 100644
--- a/rtl/watcom/Makefile
+++ b/rtl/watcom/Makefile
@@ -338,223 +338,223 @@ override FPCOPT+=-dEXCEPTIONS_IN_SYSTEM
 endif
 override FPCOPT+=-dNO_EXCEPTIONS_IN_SYSTEM
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-android)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc-aix)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),x86_64-netbsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),x86_64-openbsd)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),arm-android)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc64-aix)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),mips-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),jvm-java)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),jvm-android)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i8086-msdos)
-override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos  objects cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
+override TARGET_UNITS+=system uuchar objpas macpas iso7185 strings watcom dos cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx sysutils
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp932 cp936 cp949 cp950 cp8859_1 cp8859_5
@@ -995,223 +995,223 @@ ifeq ($(FULL_TARGET),i8086-msdos)
 override TARGET_LOADERS+=prt0
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i386-android)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-aix)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-netbsd)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-openbsd)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),arm-android)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc64-aix)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),mips-linux)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),jvm-java)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),jvm-android)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 ifeq ($(FULL_TARGET),i8086-msdos)
-override TARGET_RSTS+=math varutils typinfo classes variants sysconst
+override TARGET_RSTS+=math typinfo classes sysconst
 endif
 override INSTALL_FPCPACKAGE=y
 ifeq ($(FULL_TARGET),i386-linux)
diff --git a/rtl/watcom/Makefile.fpc b/rtl/watcom/Makefile.fpc
index 88f9859964..f2cb273471 100644
--- a/rtl/watcom/Makefile.fpc
+++ b/rtl/watcom/Makefile.fpc
@@ -8,10 +8,10 @@ main=rtl
 [target]
 loaders=prt0
 #exceptn fpu
-units=system uuchar objpas macpas iso7185 strings watcom dos  objects \
+units=system uuchar objpas macpas iso7185 strings watcom dos \
       cpu charset cpall types getopts heaptrc lnfodwrf lineinfo ctypes fgl \
-      math typinfo mmx ucomplex \
-      varutils variants sysutils
+      math typinfo mmx \
+      sysutils
 implicitunits=exeinfo \
       cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \
       cp437 cp646 cp850 cp856 cp866 cp874 cp932 cp936 cp949 cp950 cp8859_1 cp8859_5
@@ -20,7 +20,7 @@ implicitunits=exeinfo \
 # printer graph classes \
 # msmouse video mouse keyboard vesamode
 
-rsts=math varutils typinfo classes variants sysconst
+rsts=math typinfo classes sysconst
 
 [require]
 nortl=y
diff --git a/rtl/watcom/varutils.pp b/rtl/watcom/varutils.pp
deleted file mode 100644
index ab445f891f..0000000000
--- a/rtl/watcom/varutils.pp
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    This file is part of the Free Pascal run time library.
-    Copyright (c) 1999-2000 by the Free Pascal development team
-
-    Interface and OS-dependent part of variant support
-
-    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.
-
- **********************************************************************}
-
-{$MODE ObjFPC}
-
-Unit varutils;
-
-Interface
-
-Uses sysutils;
-
-// Read definitions.
-
-{$i varutilh.inc}
-
-Implementation
-
-// Code common to all platforms.
-
-{$i cvarutil.inc}
-
-// Code common to non-win32 platforms.
-
-{$i varutils.inc}
-
-end.