Merged revisions 8547-8549,8551-8552 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
  r8547 | pierre | 2007-09-18 15:29:55 +0200 (Tue, 18 Sep 2007) | 1 line
  
   * Update watcom system unit
........
  r8548 | pierre | 2007-09-18 15:44:40 +0200 (Tue, 18 Sep 2007) | 1 line
  
   * more watcom rtl fixes
........
  r8549 | pierre | 2007-09-18 15:46:59 +0200 (Tue, 18 Sep 2007) | 1 line
  
   * use prt0.as as loader
........
  r8551 | pierre | 2007-09-18 18:01:33 +0200 (Tue, 18 Sep 2007) | 1 line
  
   * test_int31 needs stdcall modifier
........
  r8552 | pierre | 2007-09-18 18:03:45 +0200 (Tue, 18 Sep 2007) | 1 line
  
   * put prt0.obj in the right directory
........

git-svn-id: branches/fixes_2_2@9001 -

.gitattributes

@@ -5469,8 +5469,14 @@ rtl/watcom/Makefile.fpc svneol=native#text/plain
 rtl/watcom/classes.pp svneol=native#text/plain
 rtl/watcom/crt.pp svneol=native#text/plain
 rtl/watcom/dos.pp svneol=native#text/plain
-rtl/watcom/prt0.asm -text
+rtl/watcom/prt0.as -text
+rtl/watcom/sysdir.inc -text
+rtl/watcom/sysfile.inc -text
+rtl/watcom/sysheap.inc -text
+rtl/watcom/sysos.inc -text
+rtl/watcom/sysosh.inc -text
 rtl/watcom/system.pp svneol=native#text/plain
+rtl/watcom/systhrd.inc -text
 rtl/watcom/sysutils.pp svneol=native#text/plain
 rtl/watcom/varutils.pp svneol=native#text/plain
 rtl/watcom/watcom.pp svneol=native#text/plain

rtl/watcom/Makefile

@@ -1,11 +1,12 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/10/21]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/10/30]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
+OSNeedsComspecToRunBatch = go32v2 watcom
 FORCE:
 .PHONY: FORCE
 override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH)))
@@ -56,6 +57,11 @@ else
 SRCBATCHEXT=.bat
 endif
 endif
+ifdef COMSPEC
+ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),)
+RUNBATCH=$(COMSPEC) /C
+endif
+endif
 ifdef inUnix
 PATHSEP=/
 else
@@ -104,7 +110,11 @@ ifndef FPC
 FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
 ifneq ($(FPCPROG),)
 FPCPROG:=$(firstword $(FPCPROG))
+ifneq ($(CPU_TARGET),)
+FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)
+else
 FPC:=$(shell $(FPCPROG) -PB)
+endif
 ifneq ($(findstring Error,$(FPC)),)
 override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
 endif
@@ -248,160 +258,160 @@ override FPCOPT+=-dEXCEPTIONS_IN_SYSTEM
 endif
 override FPCOPT+=-dNO_EXCEPTIONS_IN_SYSTEM
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
+override TARGET_UNITS+=system objpas macpas strings watcom dos crt objects cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl math typinfo mmx ucomplex varutils variants sysutils
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_LOADERS+=prt0
@@ -1789,7 +1799,7 @@ override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
 endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
-override FPCOPT+=-XP$(BINUTILSPREFIX) 
+override FPCOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
@@ -1921,9 +1931,13 @@ ifeq (,$(findstring -s ,$(COMPILER)))
 EXECPPAS=
 else
 ifeq ($(FULL_SOURCE),$(FULL_TARGET))
+ifdef RUNBATCH
+EXECPPAS:=@$(RUNBATCH) $(PPAS)
+else
 EXECPPAS:=@$(PPAS)
 endif
 endif
+endif
 .PHONY: fpc_loaders
 ifneq ($(TARGET_LOADERS),)
 override ALLTARGET+=fpc_loaders
@@ -2311,8 +2325,9 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
 include $(PROCINC)/makefile.cpu
 SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
 SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
-prt0$(OEXT) : prt0.asm
-	wasm prt0.asm -bt=dos -5s -fp5 -ms -zq
+prt0$(OEXT) : prt0.as
+	wasm prt0.as -bt=dos -5s -fp5 -ms -zq
+	$(COPY) prt0$(OEXT) $(UNITTARGETDIRPREFIX)prt0$(OEXT)
 system$(PPUEXT) : system.pp $(SYSDEPS)
 	$(COMPILER) -Us -Sg system.pp
 objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc system$(PPUEXT)
@@ -2334,11 +2349,6 @@ dos$(PPUEXT) : dos.pp $(INC)/filerec.inc $(INC)/textrec.inc \
 crt$(PPUEXT) : crt.pp $(INC)/textrec.inc watcom$(PPUEXT) system$(PPUEXT)
 objects$(PPUEXT) : $(INC)/objects.pp system$(PPUEXT)
 printer$(PPUEXT) : printer.pp system$(PPUEXT)
-include $(GRAPHDIR)/makefile.inc
-GRAPHINCDEPS=$(addprefix $(GRAPHDIR)/,$(GRAPHINCNAMES))
-graph$(PPUEXT) : graph.pp watcom$(PPUEXT) ports$(PPUEXT) system$(PPUEXT) \
-		 $(GRAPHINCDEPS) vesa.inc vesah.inc dpmi.inc
-	$(COMPILER) -I$(GRAPHDIR) graph.pp
 sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
 		    objpas$(PPUEXT) dos$(PPUEXT) watcom$(PPUEXT) sysconst$(PPUEXT)
 	$(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp
@@ -2356,6 +2366,16 @@ varutils$(PPUEXT) : $(OBJPASDIR)/cvarutil.inc $(OBJPASDIR)/varutils.inc \
 	$(COMPILER) -I$(OBJPASDIR) varutils.pp
 types$(PPUEXT) : $(OBJPASDIR/types.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) $(OBJPASDIR)/types.pp
+rtlconst$(PPUEXT) : $(OBJPASDIR)/rtlconst.pp
+	$(COMPILER) -Fi$(OBJPASDIR) $(OBJPASDIR)/rtlconst.pp
+sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp objpas$(PPUEXT)
+	$(COMPILER) $(OBJPASDIR)/sysconst.pp
+dateutil$(PPUEXT) : $(OBJPASDIR)/dateutil.pp
+	$(COMPILER) -Fi$(OBJPASDIR) $(OBJPASDIR)/dateutil.pp
+convutil$(PPUEXT) : $(OBJPASDIR)/convutil.pp
+	$(COMPILER) -Fi$(OBJPASDIR) $(OBJPASDIR)/convutil.pp
+strutils$(PPUEXT) : $(OBJPASDIR)/strutils.pp
+	$(COMPILER) $(OBJPASDIR)/strutils.pp
 macpas$(PPUEXT) : $(INC)/macpas.pp system$(PPUEXT)
 	$(COMPILER) $(INC)/macpas.pp $(REDIR)
 cpu$(PPUEXT) : $(PROCINC)/cpu.pp system$(PPUEXT)

rtl/watcom/Makefile.fpc

@@ -9,9 +9,9 @@ main=rtl
 loaders=prt0
 #exceptn fpu
 units=system objpas macpas strings watcom dos crt objects \
-      cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl
-#      math typinfo mmx ucomplex \
-#      varutils variants sysutils
+      cpu charset types getopts heaptrc lnfodwrf lineinfo ctypes fgl \
+      math typinfo mmx ucomplex \
+      varutils variants sysutils
 
 # dpmiexcp initc ports profile dxeload emu387 \
 # printer graph classes \
@@ -86,8 +86,9 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
 # Loaders
 #
 
-prt0$(OEXT) : prt0.asm
-        wasm prt0.asm -bt=dos -5s -fp5 -ms -zq
+prt0$(OEXT) : prt0.as
+        wasm prt0.as -bt=dos -5s -fp5 -ms -zq
+        $(COPY) prt0$(OEXT) $(UNITTARGETDIRPREFIX)prt0$(OEXT)
 
 #
 # System Units (System, Objpas, Strings)
@@ -140,12 +141,12 @@ printer$(PPUEXT) : printer.pp system$(PPUEXT)
 # Graph
 #
 
-include $(GRAPHDIR)/makefile.inc
-GRAPHINCDEPS=$(addprefix $(GRAPHDIR)/,$(GRAPHINCNAMES))
+#include $(GRAPHDIR)/makefile.inc
+#GRAPHINCDEPS=$(addprefix $(GRAPHDIR)/,$(GRAPHINCNAMES))
 
-graph$(PPUEXT) : graph.pp watcom$(PPUEXT) ports$(PPUEXT) system$(PPUEXT) \
-                 $(GRAPHINCDEPS) vesa.inc vesah.inc dpmi.inc
-        $(COMPILER) -I$(GRAPHDIR) graph.pp
+#graph$(PPUEXT) : graph.pp watcom$(PPUEXT) ports$(PPUEXT) system$(PPUEXT) \
+#                 $(GRAPHINCDEPS) vesa.inc vesah.inc dpmi.inc
+#        $(COMPILER) -I$(GRAPHDIR) graph.pp
 
 #
 # Delphi Compatible Units
@@ -175,6 +176,16 @@ varutils$(PPUEXT) : $(OBJPASDIR)/cvarutil.inc $(OBJPASDIR)/varutils.inc \
 types$(PPUEXT) : $(OBJPASDIR/types.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
         $(COMPILER) $(OBJPASDIR)/types.pp
 
+rtlconst$(PPUEXT) : $(OBJPASDIR)/rtlconst.pp
+        $(COMPILER) -Fi$(OBJPASDIR) $(OBJPASDIR)/rtlconst.pp
+sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp objpas$(PPUEXT)
+        $(COMPILER) $(OBJPASDIR)/sysconst.pp
+dateutil$(PPUEXT) : $(OBJPASDIR)/dateutil.pp
+        $(COMPILER) -Fi$(OBJPASDIR) $(OBJPASDIR)/dateutil.pp
+convutil$(PPUEXT) : $(OBJPASDIR)/convutil.pp
+        $(COMPILER) -Fi$(OBJPASDIR) $(OBJPASDIR)/convutil.pp
+strutils$(PPUEXT) : $(OBJPASDIR)/strutils.pp
+        $(COMPILER) $(OBJPASDIR)/strutils.pp
 
 #
 # Mac Pascal Model

rtl/watcom/sysdir.inc

@@ -0,0 +1,128 @@
+{*****************************************************************************
+                           Directory Handling
+*****************************************************************************}
+
+procedure DosDir(func:byte;const s:string);
+var
+  buffer : array[0..255] of char;
+  regs   : trealregs;
+begin
+  move(s[1],buffer,length(s));
+  buffer[length(s)]:=#0;
+  AllowSlash(pchar(@buffer));
+  { True DOS does not like backslashes at end
+    Win95 DOS accepts this !!
+    but "\" and "c:\" should still be kept and accepted hopefully PM }
+  if (length(s)>0) and (buffer[length(s)-1]='\') and
+     Not ((length(s)=1) or ((length(s)=3) and (s[2]=':'))) then
+    buffer[length(s)-1]:=#0;
+  syscopytodos(longint(@buffer),length(s)+1);
+  regs.realedx:=tb_offset;
+  regs.realds:=tb_segment;
+  if LFNSupport then
+   regs.realeax:=$7100+func
+  else
+   regs.realeax:=func shl 8;
+  sysrealintr($21,regs);
+  if (regs.realflags and carryflag) <> 0 then
+   GetInOutRes(lo(regs.realeax));
+end;
+
+
+procedure mkdir(const s : string);[IOCheck];
+begin
+  If (s='') or (InOutRes <> 0) then
+   exit;
+  DosDir($39,s);
+end;
+
+
+procedure rmdir(const s : string);[IOCheck];
+begin
+  if (s = '.' ) then
+    InOutRes := 16;
+  If (s='') or (InOutRes <> 0) then
+   exit;
+  DosDir($3a,s);
+end;
+
+
+procedure chdir(const s : string);[IOCheck];
+var
+  regs : trealregs;
+begin
+  If (s='') or (InOutRes <> 0) then
+   exit;
+{ First handle Drive changes }
+  if (length(s)>=2) and (s[2]=':') then
+   begin
+     regs.realedx:=(ord(s[1]) and (not 32))-ord('A');
+     regs.realeax:=$0e00;
+     sysrealintr($21,regs);
+     regs.realeax:=$1900;
+     sysrealintr($21,regs);
+     if byte(regs.realeax)<>byte(regs.realedx) then
+      begin
+        Inoutres:=15;
+        exit;
+      end;
+     { DosDir($3b,'c:') give Path not found error on
+       pure DOS PM }
+     if length(s)=2 then
+       exit;
+   end;
+{ do the normal dos chdir }
+  DosDir($3b,s);
+end;
+
+
+procedure getdir(drivenr : byte;var dir : shortstring);
+var
+  temp : array[0..255] of char;
+  i    : longint;
+  regs : trealregs;
+begin
+  regs.realedx:=drivenr;
+  regs.realesi:=tb_offset;
+  regs.realds:=tb_segment;
+  if LFNSupport then
+   regs.realeax:=$7147
+  else
+   regs.realeax:=$4700;
+  sysrealintr($21,regs);
+  if (regs.realflags and carryflag) <> 0 then
+   Begin
+     GetInOutRes(lo(regs.realeax));
+     Dir := char (DriveNr + 64) + ':\';
+     exit;
+   end
+  else
+   syscopyfromdos(longint(@temp),251);
+{ conversion to Pascal string including slash conversion }
+  i:=0;
+  while (temp[i]<>#0) do
+   begin
+     if temp[i]='/' then
+      temp[i]:='\';
+     dir[i+4]:=temp[i];
+     inc(i);
+   end;
+  dir[2]:=':';
+  dir[3]:='\';
+  dir[0]:=char(i+3);
+{ upcase the string }
+  if not FileNameCaseSensitive then
+   dir:=upcase(dir);
+  if drivenr<>0 then   { Drive was supplied. We know it }
+   dir[1]:=char(65+drivenr-1)
+  else
+   begin
+   { We need to get the current drive from DOS function 19H  }
+   { because the drive was the default, which can be unknown }
+     regs.realeax:=$1900;
+     sysrealintr($21,regs);
+     i:= (regs.realeax and $ff) + ord('A');
+     dir[1]:=chr(i);
+   end;
+end;
+

rtl/watcom/sysfile.inc

@@ -0,0 +1,438 @@
+   { Keep Track of open files }
+   const
+      max_files = 50;
+   var
+      openfiles : array [0..max_files-1] of boolean;
+{$ifdef SYSTEMDEBUG}
+      opennames : array [0..max_files-1] of pchar;
+   const
+      free_closed_names : boolean = true;
+{$endif SYSTEMDEBUG}
+
+{****************************************************************************
+                        Low level File Routines
+ ****************************************************************************}
+
+procedure AllowSlash(p:pchar);
+var
+  i : longint;
+begin
+{ allow slash as backslash }
+  for i:=0 to strlen(p) do
+   if p[i]='/' then p[i]:='\';
+end;
+
+procedure do_close(handle : longint);
+var
+  regs : trealregs;
+begin
+  if Handle<=4 then
+   exit;
+  regs.realebx:=handle;
+  if handle<max_files then
+    begin
+       openfiles[handle]:=false;
+{$ifdef SYSTEMDEBUG}
+       if assigned(opennames[handle]) and free_closed_names then
+         begin
+            sysfreememsize(opennames[handle],strlen(opennames[handle])+1);
+            opennames[handle]:=nil;
+         end;
+{$endif SYSTEMDEBUG}
+    end;
+  regs.realeax:=$3e00;
+  sysrealintr($21,regs);
+  if (regs.realflags and carryflag) <> 0 then
+   GetInOutRes(lo(regs.realeax));
+end;
+
+procedure do_erase(p : pchar);
+var
+  regs : trealregs;
+begin
+  AllowSlash(p);
+  syscopytodos(longint(p),strlen(p)+1);
+  regs.realedx:=tb_offset;
+  regs.realds:=tb_segment;
+  if LFNSupport then
+   regs.realeax:=$7141
+  else
+   regs.realeax:=$4100;
+  regs.realesi:=0;
+  regs.realecx:=0;
+  sysrealintr($21,regs);
+  if (regs.realflags and carryflag) <> 0 then
+   GetInOutRes(lo(regs.realeax));
+end;
+
+procedure do_rename(p1,p2 : pchar);
+var
+  regs : trealregs;
+begin
+  AllowSlash(p1);
+  AllowSlash(p2);
+  if strlen(p1)+strlen(p2)+3>tb_size then
+   HandleError(217);
+  sysseg_move(get_ds,sizeuint(p2),dos_selector,tb,strlen(p2)+1);
+  sysseg_move(get_ds,sizeuint(p1),dos_selector,tb+strlen(p2)+2,strlen(p1)+1);
+  regs.realedi:=tb_offset;
+  regs.realedx:=tb_offset + strlen(p2)+2;
+  regs.realds:=tb_segment;
+  regs.reales:=tb_segment;
+  if LFNSupport then
+   regs.realeax:=$7156
+  else
+   regs.realeax:=$5600;
+  regs.realecx:=$ff;            { attribute problem here ! }
+  sysrealintr($21,regs);
+  if (regs.realflags and carryflag) <> 0 then
+   GetInOutRes(lo(regs.realeax));
+end;
+
+function do_write(h:longint;addr:pointer;len : longint) : longint;
+var
+  regs      : trealregs;
+  size,
+  writesize : longint;
+begin
+  writesize:=0;
+  while len > 0 do
+   begin
+     if len>tb_size then
+      size:=tb_size
+     else
+      size:=len;
+     syscopytodos(ptrint(addr)+writesize,size);
+     regs.realecx:=size;
+     regs.realedx:=tb_offset;
+     regs.realds:=tb_segment;
+     regs.realebx:=h;
+     regs.realeax:=$4000;
+     sysrealintr($21,regs);
+     if (regs.realflags and carryflag) <> 0 then
+      begin
+        GetInOutRes(lo(regs.realeax));
+        exit(writesize);
+      end;
+     inc(writesize,lo(regs.realeax));
+     dec(len,lo(regs.realeax));
+     { stop when not the specified size is written }
+     if lo(regs.realeax)<size then
+      break;
+   end;
+  Do_Write:=WriteSize;
+end;
+
+function do_read(h:longint;addr:pointer;len : longint) : longint;
+var
+  regs     : trealregs;
+  size,
+  readsize : longint;
+begin
+  readsize:=0;
+  while len > 0 do
+   begin
+     if len>tb_size then
+      size:=tb_size
+     else
+      size:=len;
+     regs.realecx:=size;
+     regs.realedx:=tb_offset;
+     regs.realds:=tb_segment;
+     regs.realebx:=h;
+     regs.realeax:=$3f00;
+     sysrealintr($21,regs);
+     if (regs.realflags and carryflag) <> 0 then
+      begin
+        GetInOutRes(lo(regs.realeax));
+        do_read:=0;
+        exit;
+      end;
+     syscopyfromdos(ptrint(addr)+readsize,lo(regs.realeax));
+     inc(readsize,lo(regs.realeax));
+     dec(len,lo(regs.realeax));
+     { stop when not the specified size is read }
+     if lo(regs.realeax)<size then
+      break;
+   end;
+  do_read:=readsize;
+end;
+
+
+function do_filepos(handle : longint) : longint;
+var
+  regs : trealregs;
+begin
+  regs.realebx:=handle;
+  regs.realecx:=0;
+  regs.realedx:=0;
+  regs.realeax:=$4201;
+  sysrealintr($21,regs);
+  if (regs.realflags and carryflag) <> 0 then
+   Begin
+     GetInOutRes(lo(regs.realeax));
+     do_filepos:=0;
+   end
+  else
+   do_filepos:=lo(regs.realedx) shl 16+lo(regs.realeax);
+end;
+
+
+procedure do_seek(handle,pos : longint);
+var
+  regs : trealregs;
+begin
+  regs.realebx:=handle;
+  regs.realecx:=pos shr 16;
+  regs.realedx:=pos and $ffff;
+  regs.realeax:=$4200;
+  sysrealintr($21,regs);
+  if (regs.realflags and carryflag) <> 0 then
+   GetInOutRes(lo(regs.realeax));
+end;
+
+
+
+function do_seekend(handle:longint):longint;
+var
+  regs : trealregs;
+begin
+  regs.realebx:=handle;
+  regs.realecx:=0;
+  regs.realedx:=0;
+  regs.realeax:=$4202;
+  sysrealintr($21,regs);
+  if (regs.realflags and carryflag) <> 0 then
+   Begin
+     GetInOutRes(lo(regs.realeax));
+     do_seekend:=0;
+   end
+  else
+   do_seekend:=lo(regs.realedx) shl 16+lo(regs.realeax);
+end;
+
+
+function do_filesize(handle : longint) : longint;
+var
+  aktfilepos : longint;
+begin
+  aktfilepos:=do_filepos(handle);
+  do_filesize:=do_seekend(handle);
+  do_seek(handle,aktfilepos);
+end;
+
+
+{ truncate at a given position }
+procedure do_truncate (handle,pos:longint);
+var
+  regs : trealregs;
+begin
+  do_seek(handle,pos);
+  regs.realecx:=0;
+  regs.realedx:=tb_offset;
+  regs.realds:=tb_segment;
+  regs.realebx:=handle;
+  regs.realeax:=$4000;
+  sysrealintr($21,regs);
+  if (regs.realflags and carryflag) <> 0 then
+   GetInOutRes(lo(regs.realeax));
+end;
+
+const
+  FileHandleCount : longint = 20;
+
+function Increase_file_handle_count : boolean;
+var
+  regs : trealregs;
+begin
+  Inc(FileHandleCount,10);
+  regs.realebx:=FileHandleCount;
+  regs.realeax:=$6700;
+  sysrealintr($21,regs);
+  if (regs.realflags and carryflag) <> 0 then
+   begin
+    Increase_file_handle_count:=false;
+    Dec (FileHandleCount, 10);
+   end
+  else
+    Increase_file_handle_count:=true;
+end;
+
+
+function dos_version : word;
+var
+  regs   : trealregs;
+begin
+  regs.realeax := $3000;
+  sysrealintr($21,regs);
+  dos_version := regs.realeax
+end;
+
+
+procedure do_open(var f;p:pchar;flags:longint);
+{
+  filerec and textrec have both handle and mode as the first items so
+  they could use the same routine for opening/creating.
+  when (flags and $100)   the file will be append
+  when (flags and $1000)  the file will be truncate/rewritten
+  when (flags and $10000) there is no check for close (needed for textfiles)
+}
+var
+  regs   : trealregs;
+  action : longint;
+  Avoid6c00 : boolean;
+begin
+  AllowSlash(p);
+{ check if Extended Open/Create API is safe to use }
+  Avoid6c00 := lo(dos_version) < 7;
+{ close first if opened }
+  if ((flags and $10000)=0) then
+   begin
+     case filerec(f).mode of
+      fminput,fmoutput,fminout : Do_Close(filerec(f).handle);
+      fmclosed : ;
+     else
+      begin
+        inoutres:=102; {not assigned}
+        exit;
+      end;
+     end;
+   end;
+{ reset file handle }
+  filerec(f).handle:=UnusedHandle;
+  action:=$1;
+{ convert filemode to filerec modes }
+  case (flags and 3) of
+   0 : filerec(f).mode:=fminput;
+   1 : filerec(f).mode:=fmoutput;
+   2 : filerec(f).mode:=fminout;
+  end;
+  if (flags and $1000)<>0 then
+   action:=$12; {create file function}
+{ empty name is special }
+  if p[0]=#0 then
+   begin
+     case FileRec(f).mode of
+       fminput :
+         FileRec(f).Handle:=StdInputHandle;
+       fminout, { this is set by rewrite }
+       fmoutput :
+         FileRec(f).Handle:=StdOutputHandle;
+       fmappend :
+         begin
+           FileRec(f).Handle:=StdOutputHandle;
+           FileRec(f).mode:=fmoutput; {fool fmappend}
+         end;
+     end;
+     exit;
+   end;
+{ real dos call }
+  syscopytodos(longint(p),strlen(p)+1);
+{$ifndef RTLLITE}
+  if LFNSupport then
+   regs.realeax := $716c                           { Use LFN Open/Create API }
+  else
+   regs.realeax:=$6c00;
+{$endif RTLLITE}
+   if Avoid6c00 then
+     regs.realeax := $3d00 + (flags and $ff)      { For now, map to Open API }
+   else
+     regs.realeax := $6c00;                   { Use Extended Open/Create API }
+  if byte(regs.realeax shr 8) = $3d then
+    begin  { Using the older Open or Create API's }
+      if (action and $00f0) <> 0 then
+        regs.realeax := $3c00;                   { Map to Create/Replace API }
+      regs.realds := tb_segment;
+      regs.realedx := tb_offset;
+    end
+  else
+    begin  { Using LFN or Extended Open/Create API }
+      regs.realedx := action;            { action if file does/doesn't exist }
+      regs.realds := tb_segment;
+      regs.realesi := tb_offset;
+      regs.realebx := $2000 + (flags and $ff);              { file open mode }
+    end;
+  regs.realecx := $20;                                     { file attributes }
+  sysrealintr($21,regs);
+{$ifndef RTLLITE}
+  if (regs.realflags and carryflag) <> 0 then
+    if lo(regs.realeax)=4 then
+      if Increase_file_handle_count then
+        begin
+          { Try again }
+          if LFNSupport then
+            regs.realeax := $716c                    {Use LFN Open/Create API}
+          else
+            if Avoid6c00 then
+              regs.realeax := $3d00+(flags and $ff) {For now, map to Open API}
+            else
+              regs.realeax := $6c00;            {Use Extended Open/Create API}
+          if byte(regs.realeax shr 8) = $3d then
+            begin  { Using the older Open or Create API's }
+              if (action and $00f0) <> 0 then
+                regs.realeax := $3c00;             {Map to Create/Replace API}
+              regs.realds := tb_segment;
+              regs.realedx := tb_offset;
+            end
+          else
+            begin  { Using LFN or Extended Open/Create API }
+              regs.realedx := action;      {action if file does/doesn't exist}
+              regs.realds := tb_segment;
+              regs.realesi := tb_offset;
+              regs.realebx := $2000+(flags and $ff);          {file open mode}
+            end;
+          regs.realecx := $20;                               {file attributes}
+          sysrealintr($21,regs);
+        end;
+{$endif RTLLITE}
+  if (regs.realflags and carryflag) <> 0 then
+    begin
+      GetInOutRes(lo(regs.realeax));
+      exit;
+    end
+  else
+    begin
+      filerec(f).handle:=lo(regs.realeax);
+{$ifndef RTLLITE}
+      { for systems that have more then 20 by default ! }
+      if lo(regs.realeax)>FileHandleCount then
+        FileHandleCount:=lo(regs.realeax);
+{$endif RTLLITE}
+    end;
+  if lo(regs.realeax)<max_files then
+    begin
+{$ifdef SYSTEMDEBUG}
+       if openfiles[lo(regs.realeax)] and
+          assigned(opennames[lo(regs.realeax)]) then
+         begin
+            Writeln(stderr,'file ',opennames[lo(regs.realeax)],'(',lo(regs.realeax),') not closed but handle reused!');
+            sysfreememsize(opennames[lo(regs.realeax)],strlen(opennames[lo(regs.realeax)])+1);
+         end;
+{$endif SYSTEMDEBUG}
+       openfiles[lo(regs.realeax)]:=true;
+{$ifdef SYSTEMDEBUG}
+       opennames[lo(regs.realeax)] := sysgetmem(strlen(p)+1);
+       move(p^,opennames[lo(regs.realeax)]^,strlen(p)+1);
+{$endif SYSTEMDEBUG}
+    end;
+{ append mode }
+  if ((flags and $100) <> 0) and
+   (FileRec (F).Handle <> UnusedHandle) then
+   begin
+     do_seekend(filerec(f).handle);
+     filerec(f).mode:=fmoutput; {fool fmappend}
+   end;
+end;
+
+function do_isdevice(handle:THandle):boolean;
+var
+  regs : trealregs;
+begin
+  regs.realebx:=handle;
+  regs.realeax:=$4400;
+  sysrealintr($21,regs);
+  do_isdevice:=(regs.realedx and $80)<>0;
+  if (regs.realflags and carryflag) <> 0 then
+   GetInOutRes(lo(regs.realeax));
+end;
+

rtl/watcom/sysheap.inc

@@ -0,0 +1,30 @@
+{*****************************************************************************
+      OS Memory allocation / deallocation
+ ****************************************************************************}
+
+function ___sbrk(size:longint):pointer;cdecl; external name '___sbrk';
+
+function SysOSAlloc(size: ptrint): pointer;assembler;
+asm
+{$ifdef SYSTEMDEBUG}
+        cmpb    $1,accept_sbrk
+        je      .Lsbrk
+        movl    $0,%eax
+        jmp     .Lsbrk_fail
+      .Lsbrk:
+{$endif}
+        movl    size,%eax
+        pushl   %eax
+        call    ___sbrk
+        addl    $4,%esp
+{$ifdef SYSTEMDEBUG}
+      .Lsbrk_fail:
+{$endif}
+end;
+
+{ define HAS_SYSOSFREE}
+
+procedure SysOSFree(p: pointer; size: ptrint);
+begin
+end;
+

rtl/watcom/sysos.inc

@@ -0,0 +1,157 @@
+{*****************************************************************************
+                             Watcom Helpers
+*****************************************************************************}
+const
+  carryflag = 1;
+
+type
+  tseginfo=packed record
+    offset  : pointer;
+    segment : word;
+  end;
+
+var
+  old_int00 : tseginfo;cvar;
+  old_int75 : tseginfo;cvar;
+
+
+procedure getinoutres(def : word);
+var
+  regs : trealregs;
+begin
+  regs.realeax:=$5900;
+  regs.realebx:=$0;
+  sysrealintr($21,regs);
+  InOutRes:=lo(regs.realeax);
+  case InOutRes of
+   19 : InOutRes:=150;
+   21 : InOutRes:=152;
+   32 : InOutRes:=5;
+  end;
+  if InOutRes=0 then
+    InOutRes:=Def;
+end;
+
+
+function far_strlen(selector : word;linear_address : sizeuint) : longint;assembler;
+asm
+        movl linear_address,%edx
+        movl %edx,%ecx
+        movw selector,%gs
+.Larg19:
+        movb %gs:(%edx),%al
+        testb %al,%al
+        je .Larg20
+        incl %edx
+        jmp .Larg19
+.Larg20:
+        movl %edx,%eax
+        subl %ecx,%eax
+end;
+
+
+function get_ds : word;assembler;
+asm
+        movw    %ds,%ax
+end;
+
+
+function get_cs : word;assembler;
+asm
+        movw    %cs,%ax
+end;
+
+function dos_selector : word; assembler;
+asm
+   movw %ds,%ax  { no separate selector needed }
+end;
+
+procedure alloc_tb; assembler;
+{ allocate 8kB real mode transfer buffer }
+asm
+   pushl %ebx
+   movw $0x100,%ax
+   movw $512,%bx
+   int $0x31
+   movw %ax,tb_segment
+   shll $16,%eax
+   shrl $12,%eax
+   movl %eax,tb
+   popl %ebx
+end;
+
+procedure sysseg_move(sseg : word;source : sizeuint;dseg : word;dest : sizeuint;count : longint);
+begin
+   if count=0 then
+     exit;
+   if (sseg<>dseg) or ((sseg=dseg) and (source>dest)) then
+     asm
+        pushl %esi
+        pushl %edi
+        pushw %es
+        pushw %ds
+        cld
+        movl count,%ecx
+        movl source,%esi
+        movl dest,%edi
+        movw dseg,%ax
+        movw %ax,%es
+        movw sseg,%ax
+        movw %ax,%ds
+        movl %ecx,%eax
+        shrl $2,%ecx
+        rep
+        movsl
+        movl %eax,%ecx
+        andl $3,%ecx
+        rep
+        movsb
+        popw %ds
+        popw %es
+        popl %edi
+        popl %esi
+     end
+   else if (source<dest) then
+     { copy backward for overlapping }
+     asm
+        pushl %esi
+        pushl %edi
+        pushw %es
+        pushw %ds
+        std
+        movl count,%ecx
+        movl source,%esi
+        movl dest,%edi
+        movw dseg,%ax
+        movw %ax,%es
+        movw sseg,%ax
+        movw %ax,%ds
+        addl %ecx,%esi
+        addl %ecx,%edi
+        movl %ecx,%eax
+        andl $3,%ecx
+        orl %ecx,%ecx
+        jz .LSEG_MOVE1
+
+        { calculate esi and edi}
+        decl %esi
+        decl %edi
+        rep
+        movsb
+        incl %esi
+        incl %edi
+     .LSEG_MOVE1:
+        subl $4,%esi
+        subl $4,%edi
+        movl %eax,%ecx
+        shrl $2,%ecx
+        rep
+        movsl
+        cld
+        popw %ds
+        popw %es
+        popl %edi
+        popl %esi
+     end;
+end;
+

rtl/watcom/sysosh.inc

@@ -0,0 +1,29 @@
+{
+    This file is part of the Free Pascal run time library.
+    Copyright (c) 2001 by Free Pascal development team
+
+    This file implements all the base types and limits required
+    for a minimal POSIX compliant subset required to port the compiler
+    to a new OS.
+
+    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.
+
+ **********************************************************************}
+
+{Platform specific information}
+type
+  THandle = Longint;
+  TThreadID = THandle;
+
+   PRTLCriticalSection = ^TRTLCriticalSection;
+   TRTLCriticalSection = record
+     Locked: boolean
+   end;
+
+
+

rtl/watcom/system.pp

@@ -25,16 +25,8 @@ INTERFACE
 
 {$include systemh.inc}
 
-{ include heap support headers }
 
 
-{$include heaph.inc}
-
-{Platform specific information}
-type
-  THandle = Longint;
-  TThreadID = THandle;
-  
 const
  LineEnding = #13#10;
 { LFNSupport is a variable here, defined below!!! }
@@ -44,7 +36,7 @@ const
 { FileNameCaseSensitive is defined separately below!!! }
  maxExitCode = 255;
  MaxPathLen = 256;
- 
+
 const
 { Default filehandles }
   UnusedHandle    = -1;
@@ -66,9 +58,9 @@ const
 
 var
 { Mem[] support }
-  mem  : array[0..$7fffffff] of byte absolute $0:$0;
-  memw : array[0..$7fffffff div sizeof(word)] of word absolute $0:$0;
-  meml : array[0..$7fffffff div sizeof(longint)] of longint absolute $0:$0;
+  mem  : array[0..$7fffffff-1] of byte absolute $0:$0;
+  memw : array[0..($7fffffff div sizeof(word)) -1] of word absolute $0:$0;
+  meml : array[0..($7fffffff div sizeof(longint)) -1] of longint absolute $0:$0;
 { C-compatible arguments and environment }
   argc  : longint;
   argv  : ppchar;
@@ -116,147 +108,8 @@ IMPLEMENTATION
 {$include system.inc}
 
 
-const
-  carryflag = 1;
-
-type
-  tseginfo=packed record
-    offset  : pointer;
-    segment : word;
-  end;
-
-var
-  old_int00 : tseginfo;cvar;
-  old_int75 : tseginfo;cvar;
-
 {$asmmode ATT}
 
-{*****************************************************************************
-                             Watcom Helpers
-*****************************************************************************}
-
-function far_strlen(selector : word;linear_address : sizeuint) : longint;assembler;
-asm
-        movl linear_address,%edx
-        movl %edx,%ecx
-        movw selector,%gs
-.Larg19:
-        movb %gs:(%edx),%al
-        testb %al,%al
-        je .Larg20
-        incl %edx
-        jmp .Larg19
-.Larg20:
-        movl %edx,%eax
-        subl %ecx,%eax
-end;
-
-
-function get_ds : word;assembler;
-asm
-        movw    %ds,%ax
-end;
-
-
-function get_cs : word;assembler;
-asm
-        movw    %cs,%ax
-end;
-
-function dos_selector : word; assembler;
-asm
-   movw %ds,%ax  { no separate selector needed }
-end;
-
-procedure alloc_tb; assembler;
-{ allocate 8kB real mode transfer buffer }
-asm
-   pushl %ebx
-   movw $0x100,%ax
-   movw $512,%bx
-   int $0x31
-   movw %ax,tb_segment
-   shll $16,%eax
-   shrl $12,%eax
-   movl %eax,tb
-   popl %ebx
-end;
-
-procedure sysseg_move(sseg : word;source : sizeuint;dseg : word;dest : sizeuint;count : longint);
-begin
-   if count=0 then
-     exit;
-   if (sseg<>dseg) or ((sseg=dseg) and (source>dest)) then
-     asm
-        pushl %esi
-        pushl %edi
-        pushw %es
-        pushw %ds
-        cld
-        movl count,%ecx
-        movl source,%esi
-        movl dest,%edi
-        movw dseg,%ax
-        movw %ax,%es
-        movw sseg,%ax
-        movw %ax,%ds
-        movl %ecx,%eax
-        shrl $2,%ecx
-        rep
-        movsl
-        movl %eax,%ecx
-        andl $3,%ecx
-        rep
-        movsb
-        popw %ds
-        popw %es
-        popl %edi
-        popl %esi
-     end
-   else if (source<dest) then
-     { copy backward for overlapping }
-     asm
-        pushl %esi
-        pushl %edi
-        pushw %es
-        pushw %ds
-        std
-        movl count,%ecx
-        movl source,%esi
-        movl dest,%edi
-        movw dseg,%ax
-        movw %ax,%es
-        movw sseg,%ax
-        movw %ax,%ds
-        addl %ecx,%esi
-        addl %ecx,%edi
-        movl %ecx,%eax
-        andl $3,%ecx
-        orl %ecx,%ecx
-        jz .LSEG_MOVE1
-
-        { calculate esi and edi}
-        decl %esi
-        decl %edi
-        rep
-        movsb
-        incl %esi
-        incl %edi
-     .LSEG_MOVE1:
-        subl $4,%esi
-        subl $4,%edi
-        movl %eax,%ecx
-        shrl $2,%ecx
-        rep
-        movsl
-        cld
-        popw %ds
-        popw %es
-        popl %edi
-        popl %esi
-     end;
-end;
-
 var psp_selector:word; external name 'PSP_SELECTOR';
 
 procedure setup_arguments;
@@ -713,34 +566,6 @@ begin
 end;
 
 
-procedure getinoutres(def : word);
-var
-  regs : trealregs;
-begin
-  regs.realeax:=$5900;
-  regs.realebx:=$0;
-  sysrealintr($21,regs);
-  InOutRes:=lo(regs.realeax);
-  case InOutRes of
-   19 : InOutRes:=150;
-   21 : InOutRes:=152;
-   32 : InOutRes:=5;
-  end;
-  if InOutRes=0 then
-    InOutRes:=Def;
-end;
-
-
-   { Keep Track of open files }
-   const
-      max_files = 50;
-   var
-      openfiles : array [0..max_files-1] of boolean;
-{$ifdef SYSTEMDEBUG}
-      opennames : array [0..max_files-1] of pchar;
-   const
-      free_closed_names : boolean = true;
-{$endif SYSTEMDEBUG}
 
 {*****************************************************************************
                          System Dependent Exit code
@@ -748,7 +573,6 @@ end;
 
 procedure ___exit(exitcode:longint);cdecl;external name '___exit';
 
-procedure do_close(handle : longint);forward;
 
 Procedure system_exit;
 var
@@ -830,467 +654,11 @@ begin
 end;
 
 
-{*****************************************************************************
-      OS Memory allocation / deallocation
- ****************************************************************************}
-
-function ___sbrk(size:longint):pointer;cdecl; external name '___sbrk';
-
-function SysOSAlloc(size: ptrint): pointer;assembler;
-asm
-{$ifdef SYSTEMDEBUG}
-        cmpb    $1,accept_sbrk
-        je      .Lsbrk
-        movl    $0,%eax
-        jmp     .Lsbrk_fail
-      .Lsbrk:
-{$endif}
-        movl    size,%eax
-        pushl   %eax
-        call    ___sbrk
-        addl    $4,%esp
-{$ifdef SYSTEMDEBUG}
-      .Lsbrk_fail:
-{$endif}
-end;
-
-{ define HAS_SYSOSFREE}
-
-procedure SysOSFree(p: pointer; size: ptrint);
-begin
-end;
-
 { include standard heap management }
-{$include heap.inc}
-
-
-{****************************************************************************
-                        Low level File Routines
- ****************************************************************************}
-
-procedure AllowSlash(p:pchar);
-var
-  i : longint;
-begin
-{ allow slash as backslash }
-  for i:=0 to strlen(p) do
-   if p[i]='/' then p[i]:='\';
-end;
-
-procedure do_close(handle : longint);
-var
-  regs : trealregs;
-begin
-  if Handle<=4 then
-   exit;
-  regs.realebx:=handle;
-  if handle<max_files then
-    begin
-       openfiles[handle]:=false;
-{$ifdef SYSTEMDEBUG}
-       if assigned(opennames[handle]) and free_closed_names then
-         begin
-            sysfreememsize(opennames[handle],strlen(opennames[handle])+1);
-            opennames[handle]:=nil;
-         end;
-{$endif SYSTEMDEBUG}
-    end;
-  regs.realeax:=$3e00;
-  sysrealintr($21,regs);
-  if (regs.realflags and carryflag) <> 0 then
-   GetInOutRes(lo(regs.realeax));
-end;
-
-procedure do_erase(p : pchar);
-var
-  regs : trealregs;
-begin
-  AllowSlash(p);
-  syscopytodos(longint(p),strlen(p)+1);
-  regs.realedx:=tb_offset;
-  regs.realds:=tb_segment;
-  if LFNSupport then
-   regs.realeax:=$7141
-  else
-   regs.realeax:=$4100;
-  regs.realesi:=0;
-  regs.realecx:=0;
-  sysrealintr($21,regs);
-  if (regs.realflags and carryflag) <> 0 then
-   GetInOutRes(lo(regs.realeax));
-end;
-
-procedure do_rename(p1,p2 : pchar);
-var
-  regs : trealregs;
-begin
-  AllowSlash(p1);
-  AllowSlash(p2);
-  if strlen(p1)+strlen(p2)+3>tb_size then
-   HandleError(217);
-  sysseg_move(get_ds,sizeuint(p2),dos_selector,tb,strlen(p2)+1);
-  sysseg_move(get_ds,sizeuint(p1),dos_selector,tb+strlen(p2)+2,strlen(p1)+1);
-  regs.realedi:=tb_offset;
-  regs.realedx:=tb_offset + strlen(p2)+2;
-  regs.realds:=tb_segment;
-  regs.reales:=tb_segment;
-  if LFNSupport then
-   regs.realeax:=$7156
-  else
-   regs.realeax:=$5600;
-  regs.realecx:=$ff;            { attribute problem here ! }
-  sysrealintr($21,regs);
-  if (regs.realflags and carryflag) <> 0 then
-   GetInOutRes(lo(regs.realeax));
-end;
-
-function do_write(h:longint;addr:pointer;len : longint) : longint;
-var
-  regs      : trealregs;
-  size,
-  writesize : longint;
-begin
-  writesize:=0;
-  while len > 0 do
-   begin
-     if len>tb_size then
-      size:=tb_size
-     else
-      size:=len;
-     syscopytodos(ptrint(addr)+writesize,size);
-     regs.realecx:=size;
-     regs.realedx:=tb_offset;
-     regs.realds:=tb_segment;
-     regs.realebx:=h;
-     regs.realeax:=$4000;
-     sysrealintr($21,regs);
-     if (regs.realflags and carryflag) <> 0 then
-      begin
-        GetInOutRes(lo(regs.realeax));
-        exit(writesize);
-      end;
-     inc(writesize,lo(regs.realeax));
-     dec(len,lo(regs.realeax));
-     { stop when not the specified size is written }
-     if lo(regs.realeax)<size then
-      break;
-   end;
-  Do_Write:=WriteSize;
-end;
-
-function do_read(h:longint;addr:pointer;len : longint) : longint;
-var
-  regs     : trealregs;
-  size,
-  readsize : longint;
-begin
-  readsize:=0;
-  while len > 0 do
-   begin
-     if len>tb_size then
-      size:=tb_size
-     else
-      size:=len;
-     regs.realecx:=size;
-     regs.realedx:=tb_offset;
-     regs.realds:=tb_segment;
-     regs.realebx:=h;
-     regs.realeax:=$3f00;
-     sysrealintr($21,regs);
-     if (regs.realflags and carryflag) <> 0 then
-      begin
-        GetInOutRes(lo(regs.realeax));
-        do_read:=0;
-        exit;
-      end;
-     syscopyfromdos(ptrint(addr)+readsize,lo(regs.realeax));
-     inc(readsize,lo(regs.realeax));
-     dec(len,lo(regs.realeax));
-     { stop when not the specified size is read }
-     if lo(regs.realeax)<size then
-      break;
-   end;
-  do_read:=readsize;
-end;
-
-
-function do_filepos(handle : longint) : longint;
-var
-  regs : trealregs;
-begin
-  regs.realebx:=handle;
-  regs.realecx:=0;
-  regs.realedx:=0;
-  regs.realeax:=$4201;
-  sysrealintr($21,regs);
-  if (regs.realflags and carryflag) <> 0 then
-   Begin
-     GetInOutRes(lo(regs.realeax));
-     do_filepos:=0;
-   end
-  else
-   do_filepos:=lo(regs.realedx) shl 16+lo(regs.realeax);
-end;
+ { include heap.inc}
 
 
-procedure do_seek(handle,pos : longint);
-var
-  regs : trealregs;
-begin
-  regs.realebx:=handle;
-  regs.realecx:=pos shr 16;
-  regs.realedx:=pos and $ffff;
-  regs.realeax:=$4200;
-  sysrealintr($21,regs);
-  if (regs.realflags and carryflag) <> 0 then
-   GetInOutRes(lo(regs.realeax));
-end;
-
-
-
-function do_seekend(handle:longint):longint;
-var
-  regs : trealregs;
-begin
-  regs.realebx:=handle;
-  regs.realecx:=0;
-  regs.realedx:=0;
-  regs.realeax:=$4202;
-  sysrealintr($21,regs);
-  if (regs.realflags and carryflag) <> 0 then
-   Begin
-     GetInOutRes(lo(regs.realeax));
-     do_seekend:=0;
-   end
-  else
-   do_seekend:=lo(regs.realedx) shl 16+lo(regs.realeax);
-end;
-
-
-function do_filesize(handle : longint) : longint;
-var
-  aktfilepos : longint;
-begin
-  aktfilepos:=do_filepos(handle);
-  do_filesize:=do_seekend(handle);
-  do_seek(handle,aktfilepos);
-end;
-
-
-{ truncate at a given position }
-procedure do_truncate (handle,pos:longint);
-var
-  regs : trealregs;
-begin
-  do_seek(handle,pos);
-  regs.realecx:=0;
-  regs.realedx:=tb_offset;
-  regs.realds:=tb_segment;
-  regs.realebx:=handle;
-  regs.realeax:=$4000;
-  sysrealintr($21,regs);
-  if (regs.realflags and carryflag) <> 0 then
-   GetInOutRes(lo(regs.realeax));
-end;
-
-const
-  FileHandleCount : longint = 20;
-
-function Increase_file_handle_count : boolean;
-var
-  regs : trealregs;
-begin
-  Inc(FileHandleCount,10);
-  regs.realebx:=FileHandleCount;
-  regs.realeax:=$6700;
-  sysrealintr($21,regs);
-  if (regs.realflags and carryflag) <> 0 then
-   begin
-    Increase_file_handle_count:=false;
-    Dec (FileHandleCount, 10);
-   end
-  else
-    Increase_file_handle_count:=true;
-end;
-
-
-function dos_version : word;
-var
-  regs   : trealregs;
-begin
-  regs.realeax := $3000;
-  sysrealintr($21,regs);
-  dos_version := regs.realeax
-end;
-
-
-procedure do_open(var f;p:pchar;flags:longint);
-{
-  filerec and textrec have both handle and mode as the first items so
-  they could use the same routine for opening/creating.
-  when (flags and $100)   the file will be append
-  when (flags and $1000)  the file will be truncate/rewritten
-  when (flags and $10000) there is no check for close (needed for textfiles)
-}
-var
-  regs   : trealregs;
-  action : longint;
-  Avoid6c00 : boolean;
-begin
-  AllowSlash(p);
-{ check if Extended Open/Create API is safe to use }
-  Avoid6c00 := lo(dos_version) < 7;
-{ close first if opened }
-  if ((flags and $10000)=0) then
-   begin
-     case filerec(f).mode of
-      fminput,fmoutput,fminout : Do_Close(filerec(f).handle);
-      fmclosed : ;
-     else
-      begin
-        inoutres:=102; {not assigned}
-        exit;
-      end;
-     end;
-   end;
-{ reset file handle }
-  filerec(f).handle:=UnusedHandle;
-  action:=$1;
-{ convert filemode to filerec modes }
-  case (flags and 3) of
-   0 : filerec(f).mode:=fminput;
-   1 : filerec(f).mode:=fmoutput;
-   2 : filerec(f).mode:=fminout;
-  end;
-  if (flags and $1000)<>0 then
-   action:=$12; {create file function}
-{ empty name is special }
-  if p[0]=#0 then
-   begin
-     case FileRec(f).mode of
-       fminput :
-         FileRec(f).Handle:=StdInputHandle;
-       fminout, { this is set by rewrite }
-       fmoutput :
-         FileRec(f).Handle:=StdOutputHandle;
-       fmappend :
-         begin
-           FileRec(f).Handle:=StdOutputHandle;
-           FileRec(f).mode:=fmoutput; {fool fmappend}
-         end;
-     end;
-     exit;
-   end;
-{ real dos call }
-  syscopytodos(longint(p),strlen(p)+1);
-{$ifndef RTLLITE}
-  if LFNSupport then
-   regs.realeax := $716c                           { Use LFN Open/Create API }
-  else
-   regs.realeax:=$6c00;
-{$endif RTLLITE}
-   if Avoid6c00 then
-     regs.realeax := $3d00 + (flags and $ff)      { For now, map to Open API }
-   else
-     regs.realeax := $6c00;                   { Use Extended Open/Create API }
-  if byte(regs.realeax shr 8) = $3d then
-    begin  { Using the older Open or Create API's }
-      if (action and $00f0) <> 0 then
-        regs.realeax := $3c00;                   { Map to Create/Replace API }
-      regs.realds := tb_segment;
-      regs.realedx := tb_offset;
-    end
-  else
-    begin  { Using LFN or Extended Open/Create API }
-      regs.realedx := action;            { action if file does/doesn't exist }
-      regs.realds := tb_segment;
-      regs.realesi := tb_offset;
-      regs.realebx := $2000 + (flags and $ff);              { file open mode }
-    end;
-  regs.realecx := $20;                                     { file attributes }
-  sysrealintr($21,regs);
-{$ifndef RTLLITE}
-  if (regs.realflags and carryflag) <> 0 then
-    if lo(regs.realeax)=4 then
-      if Increase_file_handle_count then
-        begin
-          { Try again }
-          if LFNSupport then
-            regs.realeax := $716c                    {Use LFN Open/Create API}
-          else
-            if Avoid6c00 then
-              regs.realeax := $3d00+(flags and $ff) {For now, map to Open API}
-            else
-              regs.realeax := $6c00;            {Use Extended Open/Create API}
-          if byte(regs.realeax shr 8) = $3d then
-            begin  { Using the older Open or Create API's }
-              if (action and $00f0) <> 0 then
-                regs.realeax := $3c00;             {Map to Create/Replace API}
-              regs.realds := tb_segment;
-              regs.realedx := tb_offset;
-            end
-          else
-            begin  { Using LFN or Extended Open/Create API }
-              regs.realedx := action;      {action if file does/doesn't exist}
-              regs.realds := tb_segment;
-              regs.realesi := tb_offset;
-              regs.realebx := $2000+(flags and $ff);          {file open mode}
-            end;
-          regs.realecx := $20;                               {file attributes}
-          sysrealintr($21,regs);
-        end;
-{$endif RTLLITE}
-  if (regs.realflags and carryflag) <> 0 then
-    begin
-      GetInOutRes(lo(regs.realeax));
-      exit;
-    end
-  else
-    begin
-      filerec(f).handle:=lo(regs.realeax);
-{$ifndef RTLLITE}
-      { for systems that have more then 20 by default ! }
-      if lo(regs.realeax)>FileHandleCount then
-        FileHandleCount:=lo(regs.realeax);
-{$endif RTLLITE}
-    end;
-  if lo(regs.realeax)<max_files then
-    begin
-{$ifdef SYSTEMDEBUG}
-       if openfiles[lo(regs.realeax)] and
-          assigned(opennames[lo(regs.realeax)]) then
-         begin
-            Writeln(stderr,'file ',opennames[lo(regs.realeax)],'(',lo(regs.realeax),') not closed but handle reused!');
-            sysfreememsize(opennames[lo(regs.realeax)],strlen(opennames[lo(regs.realeax)])+1);
-         end;
-{$endif SYSTEMDEBUG}
-       openfiles[lo(regs.realeax)]:=true;
-{$ifdef SYSTEMDEBUG}
-       opennames[lo(regs.realeax)] := sysgetmem(strlen(p)+1);
-       move(p^,opennames[lo(regs.realeax)]^,strlen(p)+1);
-{$endif SYSTEMDEBUG}
-    end;
-{ append mode }
-  if ((flags and $100) <> 0) and
-   (FileRec (F).Handle <> UnusedHandle) then
-   begin
-     do_seekend(filerec(f).handle);
-     filerec(f).mode:=fmoutput; {fool fmappend}
-   end;
-end;
-
-function do_isdevice(handle:THandle):boolean;
-var
-  regs : trealregs;
-begin
-  regs.realebx:=handle;
-  regs.realeax:=$4400;
-  sysrealintr($21,regs);
-  do_isdevice:=(regs.realedx and $80)<>0;
-  if (regs.realflags and carryflag) <> 0 then
-   GetInOutRes(lo(regs.realeax));
-end;
-
+(*
 {*****************************************************************************
                            UnTyped File Handling
 *****************************************************************************}
@@ -1317,134 +685,7 @@ end;
 {$ifdef TEST_GENERIC}
 {$i generic.inc}
 {$endif TEST_GENERIC}
-
-{*****************************************************************************
-                           Directory Handling
-*****************************************************************************}
-
-procedure DosDir(func:byte;const s:string);
-var
-  buffer : array[0..255] of char;
-  regs   : trealregs;
-begin
-  move(s[1],buffer,length(s));
-  buffer[length(s)]:=#0;
-  AllowSlash(pchar(@buffer));
-  { True DOS does not like backslashes at end
-    Win95 DOS accepts this !!
-    but "\" and "c:\" should still be kept and accepted hopefully PM }
-  if (length(s)>0) and (buffer[length(s)-1]='\') and
-     Not ((length(s)=1) or ((length(s)=3) and (s[2]=':'))) then
-    buffer[length(s)-1]:=#0;
-  syscopytodos(longint(@buffer),length(s)+1);
-  regs.realedx:=tb_offset;
-  regs.realds:=tb_segment;
-  if LFNSupport then
-   regs.realeax:=$7100+func
-  else
-   regs.realeax:=func shl 8;
-  sysrealintr($21,regs);
-  if (regs.realflags and carryflag) <> 0 then
-   GetInOutRes(lo(regs.realeax));
-end;
-
-
-procedure mkdir(const s : string);[IOCheck];
-begin
-  If (s='') or (InOutRes <> 0) then
-   exit;
-  DosDir($39,s);
-end;
-
-
-procedure rmdir(const s : string);[IOCheck];
-begin
-  if (s = '.' ) then
-    InOutRes := 16;
-  If (s='') or (InOutRes <> 0) then
-   exit;
-  DosDir($3a,s);
-end;
-
-
-procedure chdir(const s : string);[IOCheck];
-var
-  regs : trealregs;
-begin
-  If (s='') or (InOutRes <> 0) then
-   exit;
-{ First handle Drive changes }
-  if (length(s)>=2) and (s[2]=':') then
-   begin
-     regs.realedx:=(ord(s[1]) and (not 32))-ord('A');
-     regs.realeax:=$0e00;
-     sysrealintr($21,regs);
-     regs.realeax:=$1900;
-     sysrealintr($21,regs);
-     if byte(regs.realeax)<>byte(regs.realedx) then
-      begin
-        Inoutres:=15;
-        exit;
-      end;
-     { DosDir($3b,'c:') give Path not found error on
-       pure DOS PM }
-     if length(s)=2 then
-       exit;
-   end;
-{ do the normal dos chdir }
-  DosDir($3b,s);
-end;
-
-
-procedure getdir(drivenr : byte;var dir : shortstring);
-var
-  temp : array[0..255] of char;
-  i    : longint;
-  regs : trealregs;
-begin
-  regs.realedx:=drivenr;
-  regs.realesi:=tb_offset;
-  regs.realds:=tb_segment;
-  if LFNSupport then
-   regs.realeax:=$7147
-  else
-   regs.realeax:=$4700;
-  sysrealintr($21,regs);
-  if (regs.realflags and carryflag) <> 0 then
-   Begin
-     GetInOutRes(lo(regs.realeax));
-     Dir := char (DriveNr + 64) + ':\';
-     exit;
-   end
-  else
-   syscopyfromdos(longint(@temp),251);
-{ conversion to Pascal string including slash conversion }
-  i:=0;
-  while (temp[i]<>#0) do
-   begin
-     if temp[i]='/' then
-      temp[i]:='\';
-     dir[i+4]:=temp[i];
-     inc(i);
-   end;
-  dir[2]:=':';
-  dir[3]:='\';
-  dir[0]:=char(i+3);
-{ upcase the string }
-  if not FileNameCaseSensitive then
-   dir:=upcase(dir);
-  if drivenr<>0 then   { Drive was supplied. We know it }
-   dir[1]:=char(65+drivenr-1)
-  else
-   begin
-   { We need to get the current drive from DOS function 19H  }
-   { because the drive was the default, which can be unknown }
-     regs.realeax:=$1900;
-     sysrealintr($21,regs);
-     i:= (regs.realeax and $ff) + ord('A');
-     dir[1]:=chr(i);
-   end;
-end;
+*)
 
 {*****************************************************************************
                          SystemUnit Initialization

rtl/watcom/systhrd.inc

@@ -0,0 +1,25 @@
+{
+    This file is part of the Free Pascal run time library.
+    Copyright (c) 2002 by Peter Vreman,
+    member of the Free Pascal development team.
+
+    Linux (pthreads) threading support implementation
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+
+Procedure InitSystemThreads;
+begin
+  { This should be changed to a real value during
+    thread driver initialization if appropriate. }
+  ThreadID := 1;
+  SetNoThreadManager;
+end;
+
+

rtl/watcom/watcom.pp

@@ -209,7 +209,7 @@ interface
       end;
 
 
-    procedure test_int31(flag : longint);
+    procedure test_int31(flag : longint); stdcall; { flag is pushed on stack }
       begin
          asm
             pushl %ebx