diff options
Diffstat (limited to 'rtl/netbsd')
-rw-r--r-- | rtl/netbsd/Makefile | 55 | ||||
-rw-r--r-- | rtl/netbsd/pmutext.inc | 3 | ||||
-rw-r--r-- | rtl/netbsd/pthread.inc | 4 | ||||
-rw-r--r-- | rtl/netbsd/ptypes.inc | 6 |
4 files changed, 62 insertions, 6 deletions
diff --git a/rtl/netbsd/Makefile b/rtl/netbsd/Makefile index 02deef73b5..9ce3344105 100644 --- a/rtl/netbsd/Makefile +++ b/rtl/netbsd/Makefile @@ -1,9 +1,9 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-04-01 rev 27428] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2014-12-07 rev 29213] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim i386-android 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 powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos -BSDs = freebsd netbsd openbsd darwin +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim i386-android i386-aros 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 powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos +BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom @@ -424,6 +424,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes objpas macpas iso7185 strings syscall sysctl baseunix unixutil character unix rtlconsts initc cmem dl termio sysutils math typinfo types classes fgl dynlibs $(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo errors bsd sysconst cthreads dos cwstring fpintres unixcp fpwidestring endif +ifeq ($(FULL_TARGET),i386-aros) +override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes objpas macpas iso7185 strings syscall sysctl baseunix unixutil character unix rtlconsts initc cmem dl termio sysutils math typinfo types classes fgl dynlibs $(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo errors bsd sysconst cthreads dos cwstring fpintres unixcp fpwidestring +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes objpas macpas iso7185 strings syscall sysctl baseunix unixutil character unix rtlconsts initc cmem dl termio sysutils math typinfo types classes fgl dynlibs $(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo errors bsd sysconst cthreads dos cwstring fpintres unixcp fpwidestring endif @@ -511,6 +514,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes objpas macpas iso7185 strings syscall sysctl baseunix unixutil character unix rtlconsts initc cmem dl termio sysutils math typinfo types classes fgl dynlibs $(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo errors bsd sysconst cthreads dos cwstring fpintres unixcp fpwidestring endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes objpas macpas iso7185 strings syscall sysctl baseunix unixutil character unix rtlconsts initc cmem dl termio sysutils math typinfo types classes fgl dynlibs $(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo errors bsd sysconst cthreads dos cwstring fpintres unixcp fpwidestring +endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_UNITS+=$(SYSTEMUNIT) uuchar unixtype ctypes objpas macpas iso7185 strings syscall sysctl baseunix unixutil character unix rtlconsts initc cmem dl termio sysutils math typinfo types classes fgl dynlibs $(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo errors bsd sysconst cthreads dos cwstring fpintres unixcp fpwidestring endif @@ -649,6 +655,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 unicodedata unicodenumtable endif +ifeq ($(FULL_TARGET),i386-aros) +override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 unicodedata unicodenumtable +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 unicodedata unicodenumtable endif @@ -736,6 +745,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 unicodedata unicodenumtable endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 unicodedata unicodenumtable +endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_IMPLICITUNITS+=exeinfo cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp850 cp856 cp866 cp874 cp8859_1 cp8859_5 cp8859_2 cp852 unicodedata unicodenumtable endif @@ -874,6 +886,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override TARGET_LOADERS+=prt0 cprt0 dllprt0 endif +ifeq ($(FULL_TARGET),i386-aros) +override TARGET_LOADERS+=prt0 cprt0 dllprt0 +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_LOADERS+=prt0 cprt0 dllprt0 endif @@ -961,6 +976,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_LOADERS+=prt0 cprt0 dllprt0 endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override TARGET_LOADERS+=prt0 cprt0 dllprt0 +endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_LOADERS+=prt0 cprt0 dllprt0 endif @@ -1099,6 +1117,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override TARGET_RSTS+=math typinfo classes sysconst endif +ifeq ($(FULL_TARGET),i386-aros) +override TARGET_RSTS+=math typinfo classes sysconst +endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_RSTS+=math typinfo classes sysconst endif @@ -1186,6 +1207,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_RSTS+=math typinfo classes sysconst endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override TARGET_RSTS+=math typinfo classes sysconst +endif ifeq ($(FULL_TARGET),arm-linux) override TARGET_RSTS+=math typinfo classes sysconst endif @@ -1325,6 +1349,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) endif +ifeq ($(FULL_TARGET),i386-aros) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) endif @@ -1412,6 +1439,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) +endif ifeq ($(FULL_TARGET),arm-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(TARGETPROCINC) endif @@ -1550,6 +1580,9 @@ endif ifeq ($(FULL_TARGET),i386-android) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) endif +ifeq ($(FULL_TARGET),i386-aros) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) +endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) endif @@ -1637,6 +1670,9 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) endif +ifeq ($(FULL_TARGET),x86_64-dragonfly) +override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) +endif ifeq ($(FULL_TARGET),arm-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) endif @@ -1948,6 +1984,12 @@ EXEEXT= HASSHAREDLIB=1 SHORTSUFFIX=lnx endif +ifeq ($(OS_TARGET),dragonfly) +BATCHEXT=.sh +EXEEXT= +HASSHAREDLIB=1 +SHORTSUFFIX=df +endif ifeq ($(OS_TARGET),freebsd) BATCHEXT=.sh EXEEXT= @@ -1993,6 +2035,11 @@ EXEEXT= SHAREDLIBEXT=.library SHORTSUFFIX=amg endif +ifeq ($(OS_TARGET),aros) +EXEEXT= +SHAREDLIBEXT=.library +SHORTSUFFIX=aros +endif ifeq ($(OS_TARGET),morphos) EXEEXT= SHAREDLIBEXT=.library @@ -2457,7 +2504,7 @@ endif ifdef CREATESHARED override FPCOPT+=-Cg endif -ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) +ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif diff --git a/rtl/netbsd/pmutext.inc b/rtl/netbsd/pmutext.inc index ce7f13ce2a..4d8803ca8f 100644 --- a/rtl/netbsd/pmutext.inc +++ b/rtl/netbsd/pmutext.inc @@ -35,6 +35,9 @@ struct __pthread_mutex_st { {$ifdef I386} {$define __CPU_SIMPLE_LOCK_PAD} {$endif} +{$ifdef X86_64} + {$define __CPU_SIMPLE_LOCK_PAD} +{$endif} record ptm_magic : dword { should be cuint}; ptm_errorcheck : char { should be pthread_spin_t}; diff --git a/rtl/netbsd/pthread.inc b/rtl/netbsd/pthread.inc index 6ef25fb863..1aaa42f1f9 100644 --- a/rtl/netbsd/pthread.inc +++ b/rtl/netbsd/pthread.inc @@ -19,7 +19,9 @@ **********************************************************************} -CONST PTHREAD_EXPLICIT_SCHED = 1; +CONST + PTHREAD_INHERIT_SCHED = 0; + PTHREAD_EXPLICIT_SCHED = 1; PTHREAD_CREATE_DETACHED = 1; PTHREAD_SCOPE_PROCESS = 0; SEM_FAILED = 0; diff --git a/rtl/netbsd/ptypes.inc b/rtl/netbsd/ptypes.inc index c3e61934a5..a1a116dc0d 100644 --- a/rtl/netbsd/ptypes.inc +++ b/rtl/netbsd/ptypes.inc @@ -171,7 +171,11 @@ struct statfs12 { pmbstate_t = ^mbstate_t; pthread_t = pointer; - pthread_attr_t = pointer; + pthread_attr_t = record + pta_magic : cuint; + pta_flags : cint; + pta_private : pointer; + end; pthread_mutex_t = {$i pmutext.inc} pthread_mutexattr_t = record ptma_magic : cint; |