diff --git a/rtl/bsd/ossysc.inc b/rtl/bsd/ossysc.inc index 58b1d942dc..89cd225673 100644 --- a/rtl/bsd/ossysc.inc +++ b/rtl/bsd/ossysc.inc @@ -146,6 +146,7 @@ end; {$DEFINE FPC_LITTLE_ENDIAN} {$endif} + Function Fpmmap(start:pointer;len:size_t;prot:cint;flags:cint;fd:cint;offst:off_t):pointer; [public, alias: 'FPC_SYSC_MMAP']; begin @@ -612,32 +613,20 @@ begin end; -CONST - { Constansts for MMAP } - MAP_PRIVATE =2; - MAP_ANONYMOUS =$1000; - -Function sbrk(size : cint) : pointer; -begin - sbrk:=Fpmmap(nil,cardinal(Size),3,MAP_PRIVATE+MAP_ANONYMOUS,-1,0); - if sbrk=pointer(-1) then - sbrk:=nil - else - seterrno(0); -end; - - { $Log$ - Revision 1.20 2004-11-14 12:21:08 marco + Revision 1.21 2005-02-06 12:16:52 peter + * bsd thread updates + + Revision 1.20 2004/11/14 12:21:08 marco * moved some calls from unix to baseunix. Darwin untested. Revision 1.19 2004/07/18 11:32:24 marco * small 1.0.x fix to earlier patch Revision 1.18 2004/07/17 16:02:58 marco - * generalised the {$ifdef cpu_i386} ..powerpc stuff to FPC_BIG_ENDIAN and + * generalised the $ifdef cpu_i386 ..powerpc stuff to FPC_BIG_ENDIAN and FPC_LITTLE_ENDIAN Revision 1.17 2004/02/06 20:47:00 jonas diff --git a/rtl/bsd/ostypes.inc b/rtl/bsd/ostypes.inc index 96f5143e8b..76fc0d9d32 100644 --- a/rtl/bsd/ostypes.inc +++ b/rtl/bsd/ostypes.inc @@ -64,10 +64,19 @@ Const S_IFWHT = 57344; S_ISVTX = 512; +CONST + { Constansts for MMAP } + MAP_PRIVATE =2; + MAP_ANONYMOUS =$1000; + + { $Log$ - Revision 1.6 2004-12-02 11:22:11 marco + Revision 1.7 2005-02-06 12:16:52 peter + * bsd thread updates + + Revision 1.6 2004/12/02 11:22:11 marco * tz_ prefixed for timezone Revision 1.5 2003/09/27 13:45:58 peter diff --git a/rtl/bsd/sysheap.inc b/rtl/bsd/sysheap.inc new file mode 100644 index 0000000000..ee1e69c059 --- /dev/null +++ b/rtl/bsd/sysheap.inc @@ -0,0 +1,49 @@ +{ + $Id$ + 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. + + **********************************************************************} + + +{***************************************************************************** + OS Memory allocation / deallocation + ****************************************************************************} + +function SysOSAlloc(size: ptrint): pointer; +begin + result:=Fpmmap(nil,cardinal(Size),3,MAP_PRIVATE+MAP_ANONYMOUS,-1,0); + if result=pointer(-1) then + result:=nil + else + seterrno(0); +end; + +{$define HAS_SYSOSFREE} + +procedure SysOSFree(p: pointer; size: ptrint); +begin + fpmunmap(p, size); +end; + + + + +{ + $Log$ + Revision 1.1 2005-02-06 12:16:52 peter + * bsd thread updates + +} + diff --git a/rtl/bsd/sysos.inc b/rtl/bsd/sysos.inc new file mode 100644 index 0000000000..eac3351cdb --- /dev/null +++ b/rtl/bsd/sysos.inc @@ -0,0 +1,98 @@ +{ + $Id$ + 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. + + **********************************************************************} + +{$ifdef FPC_USE_LIBC} + +const clib = 'c'; + +type libcint=longint; + plibcint=^libcint; + +{$ifdef FreeBSD} // tested on x86 +function geterrnolocation: Plibcint; cdecl;external clib name '__error'; +{$else} +{$ifdef NetBSD} // from a sparc dump. +function geterrnolocation: Plibcint; cdecl;external clib name '__errno'; +{$else} +{$ifdef Darwin} +function geterrnolocation: Plibcint; cdecl;external clib name '__error'; +{$else} +{$ifdef OpenBSD} + +var libcerrno : libcint; cvar; + +function geterrnolocation: Plibcint; cdecl; + +begin + geterrnolocation:=@libcerrno; +end; + +{$else} +{$endif} +{$endif} +{$endif} +{$endif} + +function geterrno:libcint; [public, alias: 'FPC_SYS_GETERRNO']; + +begin + geterrno:=geterrnolocation^; +end; + +procedure seterrno(err:libcint); [public, alias: 'FPC_SYS_SETERRNO']; +begin + geterrnolocation^:=err; +end; + +{$else} +{$ifdef ver1_0} +Var +{$else} +threadvar +{$endif} + Errno : longint; + +function geterrno:longint; [public, alias: 'FPC_SYS_GETERRNO']; + +begin + GetErrno:=Errno; +end; + +procedure seterrno(err:longint); [public, alias: 'FPC_SYS_SETERRNO']; + +begin + Errno:=err; +end; +{$endif} + +{ OS dependant parts } + +{$I errno.inc} +{$I bunxtype.inc} +{$I ossysc.inc} +{$I osmain.inc} + + + +{ + $Log$ + Revision 1.1 2005-02-06 12:16:52 peter + * bsd thread updates + +} + diff --git a/rtl/bsd/sysosh.inc b/rtl/bsd/sysosh.inc new file mode 100644 index 0000000000..328b880f4a --- /dev/null +++ b/rtl/bsd/sysosh.inc @@ -0,0 +1,44 @@ +{ + $Id$ + 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 + { fd are int in C also for 64bit targets (x86_64) } + THandle = Longint; + + { pthread_mutex_t } + PRTLCriticalSection = ^TRTLCriticalSection; + TRTLCriticalSection = record + __m_reserved: longint; + __m_count: longint; + __m_owner: pointer; + __m_kind: longint; + __m_lock: record + __status: sizeint; + __spinlock: longint; + end; + end; + + +{ + $Log$ + Revision 1.1 2005-02-06 12:16:52 peter + * bsd thread updates + +} + diff --git a/rtl/bsd/system.pp b/rtl/bsd/system.pp index c1c19dbfc9..5c5f5a08ec 100644 --- a/rtl/bsd/system.pp +++ b/rtl/bsd/system.pp @@ -48,115 +48,8 @@ CONST SIGSTKSZ = 40960; Implementation -{$ifdef FPC_USE_LIBC} - -const clib = 'c'; - -type libcint=longint; - plibcint=^libcint; - -{$ifdef FreeBSD} // tested on x86 -function geterrnolocation: Plibcint; cdecl;external clib name '__error'; -{$else} -{$ifdef NetBSD} // from a sparc dump. -function geterrnolocation: Plibcint; cdecl;external clib name '__errno'; -{$else} -{$ifdef Darwin} -function geterrnolocation: Plibcint; cdecl;external clib name '__error'; -{$else} -{$ifdef OpenBSD} - -var libcerrno : libcint; cvar; - -function geterrnolocation: Plibcint; cdecl; - -begin - geterrnolocation:=@libcerrno; -end; - -{$else} -{$endif} -{$endif} -{$endif} -{$endif} - -function geterrno:libcint; [public, alias: 'FPC_SYS_GETERRNO']; - -begin - geterrno:=geterrnolocation^; -end; - -procedure seterrno(err:libcint); [public, alias: 'FPC_SYS_SETERRNO']; -begin - geterrnolocation^:=err; -end; - -{$else} -{$ifdef ver1_0} -Var -{$else} -threadvar -{$endif} - Errno : longint; - -function geterrno:longint; [public, alias: 'FPC_SYS_GETERRNO']; - -begin - GetErrno:=Errno; -end; - -procedure seterrno(err:longint); [public, alias: 'FPC_SYS_SETERRNO']; - -begin - Errno:=err; -end; -{$endif} - -{ OS independant parts} - {$I system.inc} -{***************************************************************************** - OS Memory allocation / deallocation - ****************************************************************************} - -{ OS dependant parts } - -{$I errno.inc} -{$I bunxtype.inc} -{$I ossysc.inc} -{$I osmain.inc} - -function SysOSAlloc(size: ptrint): pointer; -begin - result := sbrk(size); -end; - -{$define HAS_SYSOSFREE} - -procedure SysOSFree(p: pointer; size: ptrint); -begin - fpmunmap(p, size); -end; - - -{$I text.inc} -{$I heap.inc} - - -{***************************************************************************** - UnTyped File Handling -*****************************************************************************} - - -{$i file.inc} - -{***************************************************************************** - Typed File Handling -*****************************************************************************} - -{$i typefile.inc} - procedure SysInitStdIO; begin OpenStdIO(Input,fmInput,StdInputHandle); @@ -197,20 +90,19 @@ Begin IsLibrary := FALSE; StackLength := InitialStkLen; StackBottom := Sptr - StackLength; -{ Set up signals handlers } + { Set up signals handlers } InstallSignals; -{ Setup heap } + { Setup heap } InitHeap; SysInitExceptions; -{ Arguments } + { Arguments } SetupCmdLine; -{ Setup stdin, stdout and stderr } + { Setup stdin, stdout and stderr } SysInitStdIO; -{ Reset IO Error } + { Reset IO Error } InOutRes:=0; -(* This should be changed to a real value during *) -(* thread driver initialization if appropriate. *) - ThreadID := 1; + { threading } + InitSystemThreads; {$ifdef HASVARIANT} initvariantmanager; {$endif HASVARIANT} @@ -221,7 +113,10 @@ End. { $Log$ - Revision 1.22 2005-02-01 20:22:49 florian + Revision 1.23 2005-02-06 12:16:52 peter + * bsd thread updates + + Revision 1.22 2005/02/01 20:22:49 florian * improved widestring infrastructure manager Revision 1.21 2004/12/05 14:36:37 hajny diff --git a/rtl/darwin/Makefile b/rtl/darwin/Makefile index 9791d0792a..d5b713803d 100644 --- a/rtl/darwin/Makefile +++ b/rtl/darwin/Makefile @@ -257,202 +257,202 @@ ifndef USELIBGGI USELIBGGI=NO endif ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),i386-sunos) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),sparc-sunos) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil unix initc cmem matrix dynlibs dos dl objects printer sockets sysutils typinfo classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo termio video crt mouse keyboard console variants types sysctl dateutils sysconst cthreads strutils rtlconst endif ifeq ($(FULL_TARGET),i386-linux) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),i386-sunos) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),sparc-sunos) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst rtlconst endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -1838,7 +1838,6 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp sysconst.inc $(SYSDEPS) $(COMPILER) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp -systhrds$(PPUEXT): systhrds.pp $(INC)/threadh.inc $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) objpas$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp dateutils$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) sysutils$(PPUEXT) math$(PPUEXT) types$(PPUEXT) sysconst$(PPUEXT) $(OBJPASDIR)/dateutils.pp baseunix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) @@ -1866,9 +1865,9 @@ printer$(PPUEXT) : unix$(PPUEXT) strings$(PPUEXT) baseunix$(PPUEXT) $(UNIXINC)/p sysutils$(PPUEXT) : objpas$(PPUEXT) unix$(PPUEXT) errors$(PPUEXT) sysconst$(PPUEXT) $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \ objpas$(PPUEXT) unix$(PPUEXT) errors$(PPUEXT) sysconst$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp -classes$(PPUEXT) : sysutils$(PPUEXT) rtlconst$(PPUEXT) types$(PPUEXT) typinfo$(PPUEXT) unix$(PPUEXT) systhrds$(PPUEXT) classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ +classes$(PPUEXT) : sysutils$(PPUEXT) rtlconst$(PPUEXT) types$(PPUEXT) typinfo$(PPUEXT) unix$(PPUEXT) $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconst$(PPUEXT) types$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp + $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp typinfo$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp math$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT) @@ -1911,7 +1910,7 @@ ipc$(PPUEXT) : $(UNIXINC)/ipc.pp unix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) baseunix$( terminfo$(PPUEXT) : terminfo.pp baseunix$(PPUEXT) cmem$(PPUEXT) : $(INC)/cmem.pp $(SYSTEMUNIT)$(PPUEXT) sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) -cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp systhrds$(PPUEXT) unix$(PPUEXT) sysutils$(PPUEXT) +cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp unix$(PPUEXT) sysutils$(PPUEXT) initc$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) console$(PPUEXT) : baseunix$(PPUEXT) termio$(PPUEXT) ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT) diff --git a/rtl/darwin/Makefile.fpc b/rtl/darwin/Makefile.fpc index 3f94d2fe75..4e53938385 100644 --- a/rtl/darwin/Makefile.fpc +++ b/rtl/darwin/Makefile.fpc @@ -11,13 +11,13 @@ loaders= units=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings sysctl baseunix unixutil \ unix initc cmem matrix dynlibs \ dos dl objects printer sockets \ - sysutils typinfo systhrds classes math varutils \ + sysutils typinfo classes math varutils \ charset ucomplex getopts heaptrc lineinfo \ errors terminfo termio video crt mouse keyboard console \ variants types sysctl dateutils \ sysconst cthreads strutils rtlconst -rsts=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +rsts=math varutils typinfo classes variants dateutils sysconst rtlconst [require] nortl=y @@ -109,8 +109,6 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp sysconst.inc $(SYSDEPS) $(COMPILER) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp -systhrds$(PPUEXT): systhrds.pp $(INC)/threadh.inc $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) - objpas$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp @@ -171,9 +169,9 @@ sysutils$(PPUEXT) : objpas$(PPUEXT) unix$(PPUEXT) errors$(PPUEXT) sysconst$(PPUE objpas$(PPUEXT) unix$(PPUEXT) errors$(PPUEXT) sysconst$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp -classes$(PPUEXT) : sysutils$(PPUEXT) rtlconst$(PPUEXT) types$(PPUEXT) typinfo$(PPUEXT) unix$(PPUEXT) systhrds$(PPUEXT) classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ +classes$(PPUEXT) : sysutils$(PPUEXT) rtlconst$(PPUEXT) types$(PPUEXT) typinfo$(PPUEXT) unix$(PPUEXT) $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconst$(PPUEXT) types$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp + $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp typinfo$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp @@ -258,7 +256,7 @@ cmem$(PPUEXT) : $(INC)/cmem.pp $(SYSTEMUNIT)$(PPUEXT) sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) -cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp systhrds$(PPUEXT) unix$(PPUEXT) sysutils$(PPUEXT) +cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp unix$(PPUEXT) sysutils$(PPUEXT) initc$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) diff --git a/rtl/darwin/classes.pp b/rtl/darwin/classes.pp deleted file mode 100644 index 64a3837c3e..0000000000 --- a/rtl/darwin/classes.pp +++ /dev/null @@ -1,88 +0,0 @@ -{ - $Id$ - This file is part of the Free Component Library (FCL) - Copyright (c) 1999-2000 by Michael Van Canneyt and Florian Klaempfl - - Classes unit for linux - - See the file COPYING.FPC, included in this distribution, - for details about the copyright. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - **********************************************************************} - -{$mode objfpc} - -{ determine the type of the resource/form file } -{$define Win16Res} - -unit Classes; - -interface - -uses - sysutils, - rtlconst, - types, - typinfo; - -{$i classesh.inc} - -implementation - -uses - baseunix,unix,Systhrds - ; - -{ OS - independent class implementations are in /inc directory. } -{$i classes.inc} - - -initialization - CommonInit; - -finalization - CommonCleanup; - - if ThreadsInited then - DoneThreads; -end. -{ - $Log$ - Revision 1.3 2004-01-22 17:11:23 peter - * classes uses types to import TPoint and TRect - - Revision 1.2 2004/01/10 20:15:21 michael - + Some more fixes to rtlconst. Const strings moved from classes to rtlconst - - Revision 1.1 2004/01/04 20:05:38 jonas - * first working version of the Darwin/Mac OS X (for PowerPC) RTL - Several non-essential units are still missing, but make cycle works - - Revision 1.4 2003/12/22 16:16:33 marco - * small 1.0 compat fix - - Revision 1.3 2003/11/17 10:05:51 marco - * threads for FreeBSD. Not working tho - - Revision 1.2 2003/10/09 10:55:20 marco - * fix for moving classes to rtl while cycling with 1.0 start - - Revision 1.1 2003/10/06 21:01:06 peter - * moved classes unit to rtl - - Revision 1.1 2003/10/06 20:33:58 peter - * classes moved to rtl for 1.1 - * classes .inc and classes.pp files moved to fcl/classes for - backwards 1.0.x compatiblity to have it in the fcl - - Revision 1.6 2003/09/20 12:38:29 marco - * FCL now compiles for FreeBSD with new 1.1. Now Linux. - - Revision 1.5 2002/09/07 15:15:24 peter - * old logs removed and tabs fixed - -} diff --git a/rtl/darwin/sysconst.inc b/rtl/darwin/sysconst.inc index d826d612ae..cb09d5fe75 100644 --- a/rtl/darwin/sysconst.inc +++ b/rtl/darwin/sysconst.inc @@ -85,10 +85,6 @@ Const fs_proc = $9fa0; fs_xia = $012FD16D; - { Constansts for MMAP } - MAP_PRIVATE =2; - MAP_ANONYMOUS =$1000; - {Constansts Termios/Ioctl (used in Do_IsDevice) } IOCtl_TCGETS=$5401; // TCGETS is also in termios.inc, but the sysunix needs only this @@ -111,7 +107,10 @@ type { $Log$ - Revision 1.1 2003-05-20 23:56:40 florian + Revision 1.2 2005-02-06 12:16:52 peter + * bsd thread updates + + Revision 1.1 2003/05/20 23:56:40 florian * basic setup; derived from FreeBSD and Linux Revision 1.7 2002/09/07 16:01:17 peter diff --git a/rtl/freebsd/Makefile b/rtl/freebsd/Makefile index 761ba4e36a..0ed514fcb3 100644 --- a/rtl/freebsd/Makefile +++ b/rtl/freebsd/Makefile @@ -263,103 +263,103 @@ ifndef USELIBGGI USELIBGGI=NO endif ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),i386-sunos) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),sparc-sunos) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo systhrds types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects +override TARGET_UNITS+=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil unix rtlconst initc cmem matrix dl termio printer sysutils typinfo types classes math varutils dynlibs $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo errors sockets ipc terminfo video mouse keyboard console serial variants dateutils sysconst cthreads strutils convutils dos objects endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_LOADERS+=prt0 cprt0 gprt0 @@ -2008,9 +2008,9 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in $(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp rtlconst$(PPUEXT) : $(OBJPASDIR)/rtlconst.pp $(COMPILER): $(OBJPASDIR)/rtlconst.pp -classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ +classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconst$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp + $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT) @@ -2042,7 +2042,7 @@ terminfo$(PPUEXT) : terminfo.pp unix$(PPUEXT) callspec$(PPUEXT) : $(INC)/callspec.pp $(SYSTEMUNIT)$(PPUEXT) cmem$(PPUEXT) : $(INC)/cmem.pp $(SYSTEMUNIT)$(PPUEXT) sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) -cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp systhrds$(PPUEXT) +cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(SYSTEMUNIT)$(PPUEXT) strutils$(PPUEXT) : $(OBJPASDIR)/strutils.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ sysutils$(PPUEXT) $(COMPILER) $(OBJPASDIR)/strutils.pp diff --git a/rtl/freebsd/Makefile.fpc b/rtl/freebsd/Makefile.fpc index 28a3df9efe..83b2be3035 100644 --- a/rtl/freebsd/Makefile.fpc +++ b/rtl/freebsd/Makefile.fpc @@ -13,7 +13,7 @@ loaders=prt0 cprt0 gprt0 units=$(SYSTEMUNIT) unixtype ctypes objpas macpas strings syscall sysctl baseunix unixutil \ unix rtlconst initc cmem matrix \ dl termio printer \ - sysutils typinfo systhrds types classes math varutils dynlibs \ + sysutils typinfo types classes math varutils dynlibs \ $(CPU_UNITS) charset ucomplex crt getopts heaptrc lineinfo \ errors sockets ipc terminfo \ video mouse keyboard console serial variants dateutils \ @@ -196,9 +196,9 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in rtlconst$(PPUEXT) : $(OBJPASDIR)/rtlconst.pp $(COMPILER): $(OBJPASDIR)/rtlconst.pp -classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ +classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconst$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp + $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp @@ -264,7 +264,7 @@ cmem$(PPUEXT) : $(INC)/cmem.pp $(SYSTEMUNIT)$(PPUEXT) sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) -cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp systhrds$(PPUEXT) +cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(SYSTEMUNIT)$(PPUEXT) strutils$(PPUEXT) : $(OBJPASDIR)/strutils.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \ sysutils$(PPUEXT) diff --git a/rtl/freebsd/classes.pp b/rtl/freebsd/classes.pp deleted file mode 100644 index 8e00d019ad..0000000000 --- a/rtl/freebsd/classes.pp +++ /dev/null @@ -1,94 +0,0 @@ -{ - $Id$ - This file is part of the Free Component Library (FCL) - Copyright (c) 1999-2000 by Michael Van Canneyt and Florian Klaempfl - - Classes unit for FreeBSD - - See the file COPYING.FPC, included in this distribution, - for details about the copyright. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - **********************************************************************} - -{$mode objfpc} - -{ determine the type of the resource/form file } -{$define Win16Res} - -unit Classes; - -interface - -uses - sysutils, - rtlconst, - types, - typinfo; - -{$i classesh.inc} - -implementation - -uses - baseunix,unix,Systhrds - ; - -{ OS - independent class implementations are in /inc directory. } -{$i classes.inc} - - -initialization - CommonInit; -finalization - CommonCleanup; - {$ifndef ver1_0} - if ThreadsInited then - DoneThreads; - {$endif} -end. -{ - $Log$ - Revision 1.9 2004-12-23 15:08:58 marco - * 2nd synchronize attempt. cthreads<->systhrds difference was not ok, but - only showed on make install should be fixed now. - - Revision 1.8 2004/12/23 09:42:42 marco - * first tthread.synchronize support (merged neli's patches) - - Revision 1.7 2004/01/22 17:11:23 peter - * classes uses types to import TPoint and TRect - - Revision 1.6 2004/01/10 20:13:40 michael - + Some more fixes to rtlconst. Const strings moved from classes to rtlconst - - Revision 1.5 2004/01/03 12:18:29 marco - * a lot of copyright notices and CVS logs added and fixed - - Revision 1.4 2003/12/22 16:16:33 marco - * small 1.0 compat fix - - Revision 1.3 2003/11/17 10:05:51 marco - * threads for FreeBSD. Not working tho - - Revision 1.2 2003/10/09 10:55:20 marco - * fix for moving classes to rtl while cycling with 1.0 start - - Revision 1.1 2003/10/06 21:01:06 peter - * moved classes unit to rtl - - Revision 1.1 2003/10/06 20:33:58 peter - * classes moved to rtl for 1.1 - * classes .inc and classes.pp files moved to fcl/classes for - backwards 1.0.x compatiblity to have it in the fcl - - Revision 1.6 2003/09/20 12:38:29 marco - * FCL now compiles for FreeBSD with new 1.1. Now Linux. - - Revision 1.5 2002/09/07 15:15:24 peter - * old logs removed and tabs fixed - -} diff --git a/rtl/freebsd/tthread.inc b/rtl/freebsd/tthread.inc index b95e7fa747..eaf947baaf 100644 --- a/rtl/freebsd/tthread.inc +++ b/rtl/freebsd/tthread.inc @@ -600,7 +600,7 @@ begin if SynchronizeMethodProc = nil then { raise some error? } exit; - rtleventsync(systhrds.trtlmethod(method),synchronizemethodproc); + rtleventsync(trtlmethod(method),synchronizemethodproc); { EnterCriticalSection(SynchronizeCritSect); SynchronizeMethod := Method; @@ -624,7 +624,10 @@ end; { $Log$ - Revision 1.11 2004-12-23 15:08:58 marco + Revision 1.12 2005-02-06 12:16:52 peter + * bsd thread updates + + Revision 1.11 2004/12/23 15:08:58 marco * 2nd synchronize attempt. cthreads<->systhrds difference was not ok, but only showed on make install should be fixed now. diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile index 0c3d0ca6e9..9ec049d243 100644 --- a/rtl/linux/Makefile +++ b/rtl/linux/Makefile @@ -2218,9 +2218,9 @@ ggigraph$(PPUEXT) : $(UNIXINC)/ggigraph.pp unix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \ objpas$(PPUEXT) unix$(PPUEXT) errors$(PPUEXT) sysconst$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp -classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ +classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconst$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp + $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) sysutils$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT) diff --git a/rtl/linux/Makefile.fpc b/rtl/linux/Makefile.fpc index 2484e90399..48acc0d8b4 100644 --- a/rtl/linux/Makefile.fpc +++ b/rtl/linux/Makefile.fpc @@ -210,9 +210,9 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in objpas$(PPUEXT) unix$(PPUEXT) errors$(PPUEXT) sysconst$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp -classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ +classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconst$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp + $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) sysutils$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp diff --git a/rtl/linux/ossysc.inc b/rtl/linux/ossysc.inc index a8cda30208..308b86e425 100644 --- a/rtl/linux/ossysc.inc +++ b/rtl/linux/ossysc.inc @@ -398,6 +398,12 @@ type {$define OLDMMAP} {$endif cpuarm} +const + { Constansts for MMAP } + MAP_PRIVATE =2; + MAP_ANONYMOUS =$20; + + Function Fpmmap(adr:pointer;len:size_t;prot:cint;flags:cint;fd:cint;off:off_t):pointer; [public, alias : 'FPC_SYSC_MMAP']; // OFF_T procedure, and returns a pointer, NOT cint. @@ -493,11 +499,6 @@ end; {$ENDIF} CONST - - { Constansts for MMAP } - MAP_PRIVATE =2; - MAP_ANONYMOUS =$20; - {Constansts Termios/Ioctl (used in Do_IsDevice) } {$ifdef PowerPC} IOCtl_TCGETS=$402c7413; @@ -506,15 +507,6 @@ CONST {$endif} -Function sbrk(size : longint) : pointer; -begin - sbrk:=Fpmmap(nil,Size,3,MAP_PRIVATE+MAP_ANONYMOUS,-1,0); - if sbrk=pointer(-1) then - sbrk:=nil - else - seterrno(0); -end; - Function Do_IsDevice(Handle:THandle):boolean; { Interface to Unix ioctl call. @@ -533,7 +525,10 @@ end; { $Log$ - Revision 1.32 2005-01-31 20:13:24 peter + Revision 1.33 2005-02-06 12:16:52 peter + * bsd thread updates + + Revision 1.32 2005/01/31 20:13:24 peter * rt_sigaction for all cpus Revision 1.31 2005/01/31 19:22:48 peter diff --git a/rtl/linux/sysheap.inc b/rtl/linux/sysheap.inc index 7125a6de9f..4e779e2bbc 100644 --- a/rtl/linux/sysheap.inc +++ b/rtl/linux/sysheap.inc @@ -23,7 +23,11 @@ function SysOSAlloc(size: ptrint): pointer; begin - result := sbrk(size); + result:=Fpmmap(nil,Size,3,MAP_PRIVATE+MAP_ANONYMOUS,-1,0); + if result=pointer(-1) then + result:=nil + else + seterrno(0); end; {$define HAS_SYSOSFREE} @@ -38,7 +42,10 @@ end; { $Log$ - Revision 1.1 2005-02-06 11:20:52 peter + Revision 1.2 2005-02-06 12:16:52 peter + * bsd thread updates + + Revision 1.1 2005/02/06 11:20:52 peter * threading in system unit * removed systhrds unit diff --git a/rtl/linux/classes.pp b/rtl/unix/classes.pp similarity index 94% rename from rtl/linux/classes.pp rename to rtl/unix/classes.pp index 728b3ea88d..5700337ac5 100644 --- a/rtl/linux/classes.pp +++ b/rtl/unix/classes.pp @@ -53,7 +53,10 @@ finalization end. { $Log$ - Revision 1.8 2005-02-06 11:20:52 peter + Revision 1.1 2005-02-06 12:16:52 peter + * bsd thread updates + + Revision 1.8 2005/02/06 11:20:52 peter * threading in system unit * removed systhrds unit diff --git a/rtl/linux/systhrd.inc b/rtl/unix/systhrd.inc similarity index 88% rename from rtl/linux/systhrd.inc rename to rtl/unix/systhrd.inc index ea44d19fd5..8fd813b933 100644 --- a/rtl/linux/systhrd.inc +++ b/rtl/unix/systhrd.inc @@ -25,7 +25,10 @@ end; { $Log$ - Revision 1.1 2005-02-06 11:20:52 peter + Revision 1.1 2005-02-06 12:16:52 peter + * bsd thread updates + + Revision 1.1 2005/02/06 11:20:52 peter * threading in system unit * removed systhrds unit