--- Merging r21004 into '.':

U    rtl/inc/exeinfo.pp
--- Merging r21005 into '.':
U    rtl/unix/bunxh.inc
--- Merging r21028 into '.':
U    rtl/netbsd/signal.inc
--- Merging r21029 into '.':
U    rtl/netbsd/sysnr.inc
--- Merging r21030 into '.':
U    utils/fpcm/fpcmmain.pp

# revisions: 21004,21005,21028,21029,21030
r21004 | pierre | 2012-04-23 12:10:10 +0200 (Mon, 23 Apr 2012) | 1 line
Changed paths:
   M /trunk/rtl/inc/exeinfo.pp

 * Also enable ELF32 or ELF64 for OpenBSD OS
r21005 | pierre | 2012-04-23 12:12:43 +0200 (Mon, 23 Apr 2012) | 1 line
Changed paths:
   M /trunk/rtl/unix/bunxh.inc

 Fix FpSigProcMask overload for OpenBSD: Warning this probably breaks compilation of unix's RTL by obsolete 2.4.4 release compiler, 2.6.0 required
r21028 | pierre | 2012-04-25 01:05:20 +0200 (Wed, 25 Apr 2012) | 1 line
Changed paths:
   M /trunk/rtl/netbsd/signal.inc

 * Add missing sc_arg6 to sc_arg9 fields in x86_64 SigContext record
r21029 | pierre | 2012-04-25 01:06:22 +0200 (Wed, 25 Apr 2012) | 1 line
Changed paths:
   M /trunk/rtl/netbsd/sysnr.inc

 Define USE_SIGACTION_SIGTRAMP for x86_64
r21030 | pierre | 2012-04-25 01:12:30 +0200 (Wed, 25 Apr 2012) | 1 line
Changed paths:
   M /trunk/utils/fpcm/fpcmmain.pp

 + Add x86_64 netbsd target

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

rtl/inc/exeinfo.pp

@@ -109,7 +109,7 @@ uses
                              Executable Loaders
 ****************************************************************************}
 
-{$if defined(netbsd) or defined(freebsd) or defined(linux) or defined(sunos)}
+{$if defined(freebsd) or defined(netbsd) or defined (openbsd) or defined(linux) or defined(sunos)}
   {$ifdef cpu64}
     {$define ELF64}
   {$else}

rtl/netbsd/signal.inc

@@ -257,6 +257,10 @@ enum { _FRAME_GREG(GREG_OFFSETS) _NGREG = 26 };
 	sc_rcx : clong;
 	sc_r8  : clong;
 	sc_r9  : clong;
+	sc_arg6  : clong;
+	sc_arg7  : clong;
+	sc_arg8  : clong;
+	sc_arg9  : clong;
 	sc_r10 : clong;
 	sc_r11 : clong;
 	sc_r12 : clong;
@@ -312,4 +316,3 @@ enum { _FRAME_GREG(GREG_OFFSETS) _NGREG = 26 };
   If OldAct is non-nil the previous action is saved there.
 }
 
-

rtl/netbsd/sysnr.inc

@@ -491,6 +491,12 @@ const
      syscall_nr_issetugid = 305;
   { syscall: "utrace" ret: "int" args: "const char  " "void  " "size_t"  }
      syscall_nr_utrace = 306;
+  { syscall: "__sigaction_sigtramp" ret: "int" args: "int" "const struct sigaction *"
+	     "struct sigaction *" "const void *" "int"  }
+     syscall_nr___sigaction_sigtramp = 340;
+{$ifdef CPUX86_64}
+  {$define USE_SIGACTION_SIGTRAMP}
+{$endif}
   { syscall: "kqueue" ret: "int" args: }
      syscall_nr_kqueue = 344;
   { syscall: "kevent" ret: "int" args: "int" "const struct kevent *" "size_t" "struct kevent *" "size_t" "const struct timespec *" }

rtl/unix/bunxh.inc

@@ -21,7 +21,7 @@ Type TGrpArr = Array [0..0] of TGid;            { C style array workarounds}
 // if you are looking for macro definitions or non C template overloaded versions, they are moved to bunxovlh.inc
 
     Function  FpSigProcMask  (how : cInt; nset : pSigSet; oset : pSigSet): cInt; external name 'FPC_SYSC_SIGPROCMASK';
-    Function  FpSigProcMask  (how : cInt; Const nset : TSigSet; var oset : TSigSet): cInt; external name 'FPC_SYSC_SIGPROCMASK';
+    Function  FpSigProcMask  (how : cInt; constref nset : TSigSet; var oset : TSigSet): cInt; external name 'FPC_SYSC_SIGPROCMASK';
     Function  FpSigPending   (var nset : TSigSet): cInt;
     Function  FpSigSuspend   (Const sigmask : TSigSet): cInt;
 {$ifndef FPC_SYS_SIGTIMEDWAIT_UNAVAILABLE}

utils/fpcm/fpcmmain.pp

@@ -115,7 +115,7 @@ interface
         { freebsd } ( true,  true,  false, false, true,  false, false, false, false, false, false, false, false, false),
         { beos }    ( true,  false, false, false, false, false, false, false, false, false, false, false, false, false),
         { haiku }   ( true,  false, false, false, false, false, false, false, false, false, false, false, false, false),
-        { netbsd }  ( true,  true,  true,  true,  false, false, false, false, false, false, false, false, false, false),
+        { netbsd }  ( true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false),
         { amiga }   ( false, true,  true,  false, false, false, false, false, false, false, false, false, false, false),
         { atari }   ( false, true,  false, false, false, false, false, false, false, false, false, false, false, false),
         { solaris } ( true,  false, false, true,  true,  false, false, false, false, false, false, false, false, false),