--- Merging r20338 into '.':

U    rtl/bsd/ipcbsd.inc
--- Merging r20339 into '.':
U    rtl/netbsd/ptypes.inc
--- Merging r20340 into '.':
U    rtl/netbsd/Makefile.fpc
--- Merging r20341 into '.':
C    rtl/netbsd/Makefile
--- Merging r20342 into '.':
C    rtl/netbsd/Makefile.fpc
--- Merging r20343 into '.':
C    rtl/netbsd/Makefile
Summary of conflicts:
  Text conflicts: 3

# revisions: 20338,20339,20340,20341,20342,20343
------------------------------------------------------------------------
r20338 | pierre | 2012-02-13 17:44:23 +0100 (Mon, 13 Feb 2012) | 1 line
Changed paths:
   M /trunk/rtl/bsd/ipcbsd.inc

 NetBSD code added
------------------------------------------------------------------------
------------------------------------------------------------------------
r20339 | pierre | 2012-02-13 17:45:15 +0100 (Mon, 13 Feb 2012) | 1 line
Changed paths:
   M /trunk/rtl/netbsd/ptypes.inc

 Wide char and mbstate_t types added 
------------------------------------------------------------------------
------------------------------------------------------------------------
r20340 | pierre | 2012-02-13 17:45:47 +0100 (Mon, 13 Feb 2012) | 1 line
Changed paths:
   M /trunk/rtl/netbsd/Makefile.fpc

 Add more missing units to NetBSD
------------------------------------------------------------------------
------------------------------------------------------------------------
r20341 | pierre | 2012-02-13 17:46:20 +0100 (Mon, 13 Feb 2012) | 1 line
Changed paths:
   M /trunk/rtl/netbsd/Makefile

 Regenerate Makefile
------------------------------------------------------------------------
------------------------------------------------------------------------
r20342 | pierre | 2012-02-13 17:56:30 +0100 (Mon, 13 Feb 2012) | 1 line
Changed paths:
   M /trunk/rtl/netbsd/Makefile.fpc

 Add explicit rule for variants unit compilation for correct dependencies
------------------------------------------------------------------------
------------------------------------------------------------------------
r20343 | pierre | 2012-02-13 17:57:03 +0100 (Mon, 13 Feb 2012) | 1 line
Changed paths:
   M /trunk/rtl/netbsd/Makefile

 Regenerate Makefile
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_6@20350 -

rtl/bsd/ipcbsd.inc

@@ -28,7 +28,7 @@ end;
 function shmget(key:key_t;size:size_t;flag:cint):cint;
 begin
 {$ifdef NetBSD}
-  shmget:=do_syscall(syscall_nr_shmget,3, key, size, flag);
+  shmget:=do_syscall(syscall_nr_shmget, key, size, flag);
 {$else NetBSD}
   shmget:=do_syscall(syscall_nr_shmsys,3, key, size, flag);
 {$endif NetBSD}
@@ -36,14 +36,18 @@ end;
 
 Function shmat (shmid:cint; shmaddr:pointer; shmflg:cint):pointer;
 begin
+{$ifdef NetBSD}
+  shmat:=pointer(do_syscall(syscall_nr_shmat, shmid, TSysParam(shmaddr), shmflg));
+{$else NetBSD}
   shmat:=pointer(do_syscall(syscall_nr_shmsys,0, shmid, TSysParam(shmaddr), shmflg));
+{$endif NetBSD}
 end;
 
 Function shmdt (shmaddr:pointer):cint;
 
 begin
 {$ifdef NetBSD}
-  shmdt:=do_syscall(syscall_nr_shmdt,2, TSysParam(shmaddr));
+  shmdt:=do_syscall(syscall_nr_shmdt, TSysParam(shmaddr));
 {$else NetBSD}
   shmdt:=do_syscall(syscall_nr_shmsys,2, TSysParam(shmaddr));
 {$endif NetBSD}
@@ -52,41 +56,73 @@ end;
 Function shmctl(shmid:cint; cmd:cint; buf: pshmid_ds): cint;
 
 begin
+{$ifdef NetBSD}
+  shmctl:= do_syscall(syscall_nr___shmctl13, shmid, cmd, TSysParam(buf));
+{$else NetBSD}
   shmctl:= do_syscall(syscall_nr_shmsys,4, shmid, cmd, TSysParam(buf));
+{$endif NetBSD}
 end;
 
 Function semget(key:Tkey; nsems:cint; semflg:cint): cint;
 begin
+{$ifdef NetBSD}
+  semget:=do_syscall(syscall_nr_semget, key, nsems, semflg);
+{$else NetBSD}
   semget:=do_syscall(syscall_nr_semsys,1, key, nsems, semflg);
+{$endif NetBSD}
 end;
 
 Function semop(semid:cint; sops: psembuf; nsops: cuint): cint;
 begin
+{$ifdef NetBSD}
+  semop:=do_syscall(syscall_nr_semop, semid, TSysParam(sops), nsops, 0);
+{$else NetBSD}
   semop:=do_syscall(syscall_nr_semsys,2, semid, TSysParam(sops), nsops, 0);
+{$endif NetBSD}
 end;
 
 Function semctl(semid:cint; semnum:cint; cmd:cint; var arg: tsemun): cint;
 begin
+{$ifdef NetBSD}
+  semctl:=cint(do_syscall(syscall_nr_semconfig, semid, semnum, cmd,TSysParam(@arg)));
+{$else NetBSD}
   semctl:=cint(do_syscall(syscall_nr_semsys, 0, semid, semnum, cmd,TSysParam(@arg)));
+{$endif NetBSD}
 end;
 
 Function msgget(key: TKey; msgflg:cint):cint;
 begin
+{$ifdef NetBSD}
+  msgget:=do_syscall(syscall_nr_msgget, key, msgflg);
+{$else NetBSD}
   msgget:=do_syscall(syscall_nr_msgsys,1, key, msgflg);
+{$endif NetBSD}
 end;
 
 Function msgsnd(msqid:cint; msgp: PMSGBuf; msgsz: size_t; msgflg:cint): cint;
 begin
+{$ifdef NetBSD}
+  msgsnd:=do_syscall(syscall_nr_msgsnd, msqid, TSysParam(msgp), TSysParam(msgsz), msgflg);
+{$else NetBSD}
   msgsnd:=do_syscall(syscall_nr_msgsys,2, msqid, TSysParam(msgp), TSysParam(msgsz), msgflg);
+{$endif NetBSD}
 end;
 
 Function msgrcv(msqid:cint; msgp: PMSGBuf; msgsz: size_t; msgtyp:clong; msgflg:cint):cint;
 begin
+{$ifdef NetBSD}
+  msgrcv:=(do_syscall(syscall_nr_msgrcv, msqid, TSysParam(msgp), msgsz, msgtyp, msgflg));
+{$else NetBSD}
   msgrcv:=(do_syscall(syscall_nr_msgsys,3, msqid, TSysParam(msgp), msgsz, msgtyp, msgflg));
+{$endif NetBSD}
 end;
 
 Function msgctl(msqid:cint; cmd: cint; buf: PMSQid_ds): cint;
 begin
+{$ifdef NetBSD}
+ msgctl:= (do_syscall(syscall_nr___msgctl13, msqid, cmd, tsysparam(buf)));
+{$else NetBSD}
  msgctl:= (do_syscall(syscall_nr_msgsys,0, msqid, cmd, tsysparam(buf)));
+{$endif NetBSD}
 end;
 

rtl/netbsd/Makefile

@@ -316,193 +316,193 @@ else
 CPU_UNITS=
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix $(LINUXUNIT) unix rtlconsts ctypes bsd initc dos crt objects printer matrix dl dynlibs sysutils types fgl classes typinfo math varutils fmtbcd charset ucomplex getopts heaptrc lineinfo lnfodwrf errors sockets terminfo video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) fpintres cthreads unixtype unixutil strutils dateutils
+override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 strings syscall sysctl  baseunix unixutil character unix rtlconsts initc cmem matrix dl termio  printer sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo errors sockets ipc terminfo bsd video mouse keyboard serial dateutils sysconst cthreads strutils convutils stdconvs dos objects cwstring fpintres clocale
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_IMPLICITUNITS+=exeinfo
@@ -883,193 +883,193 @@ ifeq ($(FULL_TARGET),mipsel-linux)
 override TARGET_LOADERS+=prt0 cprt0
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst fpmkunit
+override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst
 endif
 override INSTALL_FPCPACKAGE=y y
 ifeq ($(FULL_TARGET),i386-linux)
@@ -2634,6 +2634,12 @@ fgl$(PPUEXT) : $(OBJPASDIR)/fgl.pp objpas$(PPUEXT) types$(PPUEXT) system$(PPUEXT
 strutils$(PPUEXT) : $(OBJPASDIR)/strutils.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
 		    sysutils$(PPUEXT)
 	$(COMPILER) $(OBJPASDIR)/strutils.pp
+convutils$(PPUEXT) : $(OBJPASDIR)/convutils.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
+		    sysutils$(PPUEXT)
+	$(COMPILER) $(OBJPASDIR)/convutils.pp
+stdconvs$(PPUEXT) : $(OBJPASDIR)/stdconvs.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
+		    sysutils$(PPUEXT)
+	$(COMPILER) $(OBJPASDIR)/stdconvs.pp
 typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT)
 	$(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp
 math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT)
@@ -2647,6 +2653,8 @@ types$(PPUEXT) : $(OBJPASDIR/types.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) $(OBJPASDIR)/types.pp
 fmtbcd$(PPUEXT) : $(OBJPASDIR)/fmtbcd.pp objpas$(PPUEXT) sysutils$(PPUEXT) variants$(PPUEXT) classes$(PPUEXT) system$(PPUEXT)
 	$(COMPILER) $(OBJPASDIR)/fmtbcd.pp
+character$(PPUEXT): $(OBJPASDIR)/character.pas objpas$(PPUEXT) sysutils$(PPUEXT) rtlconsts$(PPUEXT)
+	$(COMPILER) $(OBJPASDIR)/character.pas
 macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT)
 	$(COMPILER) $(INC)/macpas.pp $(REDIR)
 cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
@@ -2671,6 +2679,8 @@ sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUE
 	$(COMPILER) $(OBJPASDIR)/sysconst.pp
 sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp unixtype$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(SYSTEMUNIT)$(PPUEXT)
-cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT)
+variants$(PPUEXT) : $(INC)/variants.pp sysutils$(PPUEXT) sysconst$(PPUEXT) varutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) math$(PPUEXT)
+	$(COMPILER) -Fi$(INC) $(INC)/variants.pp
+cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) dynlibs$(PPUEXT)
 gpm$(PPUEXT): gpm.pp unix$(PPUEXT) baseunix$(PPUEXT) sockets$(PPUEXT)
 ctypes$(PPUEXT) :  $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT)

rtl/netbsd/Makefile.fpc

@@ -10,19 +10,20 @@ fpcpackage=y
 
 [target]
 loaders=prt0 cprt0
-units=$(SYSTEMUNIT) objpas macpas iso7185 strings syscall baseunix \
-      $(LINUXUNIT) unix rtlconsts ctypes bsd initc \
-      dos crt objects printer matrix dl dynlibs \
-      sysutils types fgl classes typinfo math varutils fmtbcd \
-      charset ucomplex getopts heaptrc lineinfo lnfodwrf \
-      errors sockets terminfo \
-      video mouse keyboard  serial variants types sysctl sysconst $(CPU_UNITS) \
-      fpintres cthreads unixtype unixutil strutils dateutils
-      # ipc
-
-rsts=math varutils typinfo variants classes sysconst fpmkunit
+units=$(SYSTEMUNIT) unixtype ctypes objpas macpas iso7185 \
+      strings syscall sysctl  baseunix unixutil character \
+      unix rtlconsts initc cmem matrix \
+       dl termio  printer \
+      sysutils varutils math variants typinfo types classes fgl fmtbcd dynlibs \
+      $(CPU_UNITS) charset ucomplex crt getopts heaptrc lnfodwrf lineinfo \
+      errors sockets ipc terminfo bsd \
+      video mouse keyboard serial dateutils \
+      sysconst cthreads strutils convutils stdconvs dos objects cwstring \
+      fpintres clocale
 implicitunits=exeinfo
 
+rsts=math varutils typinfo classes variants dateutils sysconst
+
 [require]
 nortl=y
 
@@ -196,6 +197,14 @@ strutils$(PPUEXT) : $(OBJPASDIR)/strutils.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUE
                     sysutils$(PPUEXT)
         $(COMPILER) $(OBJPASDIR)/strutils.pp
 
+convutils$(PPUEXT) : $(OBJPASDIR)/convutils.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
+                    sysutils$(PPUEXT)
+        $(COMPILER) $(OBJPASDIR)/convutils.pp
+
+stdconvs$(PPUEXT) : $(OBJPASDIR)/stdconvs.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
+                    sysutils$(PPUEXT)
+        $(COMPILER) $(OBJPASDIR)/stdconvs.pp
+
 typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT)
         $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp
 
@@ -215,6 +224,10 @@ types$(PPUEXT) : $(OBJPASDIR/types.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 fmtbcd$(PPUEXT) : $(OBJPASDIR)/fmtbcd.pp objpas$(PPUEXT) sysutils$(PPUEXT) variants$(PPUEXT) classes$(PPUEXT) system$(PPUEXT)
         $(COMPILER) $(OBJPASDIR)/fmtbcd.pp
 
+character$(PPUEXT): $(OBJPASDIR)/character.pas objpas$(PPUEXT) sysutils$(PPUEXT) rtlconsts$(PPUEXT)
+        $(COMPILER) $(OBJPASDIR)/character.pas
+
+
 #
 # Mac Pascal Model
 #
@@ -271,7 +284,10 @@ sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp unixtype$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 
 cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(SYSTEMUNIT)$(PPUEXT)
 
-cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT)
+variants$(PPUEXT) : $(INC)/variants.pp sysutils$(PPUEXT) sysconst$(PPUEXT) varutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) math$(PPUEXT)
+        $(COMPILER) -Fi$(INC) $(INC)/variants.pp
+
+cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) dynlibs$(PPUEXT)
 
 gpm$(PPUEXT): gpm.pp unix$(PPUEXT) baseunix$(PPUEXT) sockets$(PPUEXT)
 

rtl/netbsd/ptypes.inc

@@ -75,6 +75,10 @@ type
     TUid     = Uid_t;
     pUid     = ^Uid_t;
 
+    wint_t    = cint32;
+    wchar_t   = cint32;
+    pwchar_t  = ^wchar_t;
+    
     clock_t  = culong;
     TClock   = clock_t;
     pClock   = ^clock_t;
@@ -136,6 +140,13 @@ type
   ptimespec= ^timespec;
   Ttimespec= timespec;
 
+   mbstate_t = record
+      case byte of
+        0: (__mbstate8: array[0..127] of char);
+        1: (_mbstateL: cint64); { for alignment }
+    end;
+   pmbstate_t = ^mbstate_t;
+  
    pthread_t            = pointer;
    pthread_attr_t       = pointer;
    pthread_mutex_t      = {$i pmutext.inc}