- removed parameter from fpc_iocheck

rtl/bsd/bunxtype.inc

@@ -23,10 +23,10 @@
 
 {$i ptypes.inc}
 
-{$ifdef powerpc}
- {$ifdef netbsd}
-   {$define netbsdpowerpc}
-{$endif}
+{$ifdef cpupowerpc}
+  {$ifdef netbsd}
+    {$define netbsdpowerpc}
+  {$endif}
 {$endif}
 
 //      CONST SYS_NMLN=65;
@@ -191,7 +191,10 @@ CONST
 
 {
   $Log$
-  Revision 1.2  2003-06-01 16:35:27  marco
+  Revision 1.3  2003-08-21 22:23:34  olle
+    - removed parameter from fpc_iocheck
+
+  Revision 1.2  2003/06/01 16:35:27  marco
    * Several small fixes to harmonize the *BSD rtls and Linux.
 
   Revision 1.1  2003/01/03 15:45:21  marco

rtl/bsd/ossysc.inc

@@ -107,7 +107,7 @@ begin
 end;
 
 {$ifdef netbsd}
-  {$ifdef powerpc}
+  {$ifdef cpupowerpc}
     {$define netbsdmacppc}
   {$endif}
 {$endif}
@@ -139,7 +139,7 @@ end;
 Function Fpmmap(adr,len,prot,flags,fdes,off:longint):longint;  [public, alias : 'FPC_SYSC_MMAP'];
 
 begin
-  Fpmmap:=do_syscall(syscall_nr_mmap,Adr,Len,Prot,Flags,fdes,{$ifdef powerpc} 0,{$endif}off{$ifdef i386},0{$endif});
+  Fpmmap:=do_syscall(syscall_nr_mmap,Adr,Len,Prot,Flags,fdes,{$ifdef cpupowerpc} 0,{$endif}off{$ifdef i386},0{$endif});
 end;
 
 {$endif}
@@ -597,7 +597,10 @@ end;
 
 {
  $Log$
- Revision 1.4  2003-05-29 21:45:23  marco
+ Revision 1.5  2003-08-21 22:23:34  olle
+   - removed parameter from fpc_iocheck
+
+ Revision 1.4  2003/05/29 21:45:23  marco
   * Some other workaround
 
  Revision 1.3  2003/05/29 20:52:55  marco

rtl/darwin/signal.inc

@@ -63,15 +63,15 @@
         @(#)signal.h    8.2 (Berkeley) 1/21/94
     }
 
-{$ifdef powerpc}
+{$ifdef cpupowerpc}
 {$include powerpc/signal.inc}    { sigcontext }
-{$else powerpc}
-{$ifdef i386}
+{$else cpupowerpc}
+{$ifdef cpui386}
 {$include i386/signal.inc}    { sigcontext }
-{$else i386}
+{$else cpui386}
 {$error Unsupported cpu type!}
-{$endif i386}
-{$endif powerpc}
+{$endif cpui386}
+{$endif cpupowerpc}
 
 
   const
@@ -243,7 +243,10 @@
 
 {
   $Log$
-  Revision 1.2  2003-05-25 12:59:57  jonas
+  Revision 1.3  2003-08-21 22:25:17  olle
+    - removed parameter from fpc_iocheck
+
+  Revision 1.2  2003/05/25 12:59:57  jonas
     * several fixes, addition of Mach trap numbers (thye are simply syscalls
       with a negative number)
 

rtl/darwin/syscalls.inc

@@ -29,7 +29,7 @@ Procedure Do_SysCall( callnr:longint;var regs : SysCallregs );assembler;
   This function puts the registers in place, does the call, and then
   copies back the registers as they are after the SysCall.
 }
-{$ifdef powerpc}
+{$ifdef cpupowerpc}
 {$define fpc_syscall_ok}
 asm
 { load the registers... }
@@ -52,7 +52,7 @@ asm
   stw    r6, 16(r8)
   stw    r7, 20(r8)
 end;
-{$endif powerpc}
+{$endif cpupowerpc}
 {$ifndef fpc_syscall_ok}
 {$error Cannot decide which processor you have!}
 asm
@@ -462,7 +462,10 @@ end;
 
 {
   $Log$
-  Revision 1.3  2002-09-08 15:29:23  jonas
+  Revision 1.4  2003-08-21 22:25:17  olle
+    - removed parameter from fpc_iocheck
+
+  Revision 1.3  2002/09/08 15:29:23  jonas
     + added sys_readdir code from OpenBSD in fixes branch
 
   Revision 1.2  2002/09/07 16:01:17  peter

rtl/linux/signal.inc

@@ -97,7 +97,7 @@ type
            status: cardinal;
   end;
 
-{$ifdef i386}
+{$ifdef cpui386}
   PSigContextRec = ^SigContextRec;
   SigContextRec = record
     gs, __gsh: word;
@@ -123,27 +123,27 @@ type
     oldmask: cardinal;
     cr2: cardinal;
   end;
-{$endif i386}
+{$endif cpui386}
 
-{$Ifdef m68k}
+{$Ifdef cpum68k}
   PSigContextRec = ^SigContextRec;
   SigContextRec = record
     { dummy for now PM }
   end;
-{$endif m68k}
+{$endif cpum68k}
 
-{$ifdef powerpc}
+{$ifdef cpupowerpc}
   PSigContextRec = ^SigContextRec;
   SigContextRec = record
     { dummy for now PM }
   end;
-{$endif powerpc}
-{$ifdef SPARC}
+{$endif cpupowerpc}
+{$ifdef cpusparc}
   PSigContextRec = ^SigContextRec;
   SigContextRec = record
     { dummy for now PM }
   end;
-{$endif SPARC}
+{$endif cpusparc}
 
 (*
   PSigInfoRec = ^SigInfoRec;
@@ -224,7 +224,10 @@ type
 
 {
   $Log$
-  Revision 1.9  2002-12-24 21:30:20  mazen
+  Revision 1.10  2003-08-21 22:24:52  olle
+    - removed parameter from fpc_iocheck
+
+  Revision 1.9  2002/12/24 21:30:20  mazen
   - some writeln(s) removed in compiler
   + many files added to RTL
   * some errors fixed in RTL

rtl/linux/syscallo.inc

@@ -28,7 +28,7 @@ Procedure Do_SysCall( callnr:longint;var regs : SysCallregs );assembler;
   This function puts the registers in place, does the call, and then
   copies back the registers as they are after the SysCall.
 }
-{$ifdef i386}
+{$ifdef cpui386}
 {$define fpc_syscall_ok}
 asm
 { load the registers... }
@@ -53,8 +53,8 @@ asm
   popl %ebx
   movl %ebx,(%eax)
 end;
-{$endif i386}
-{$ifdef m68k}
+{$endif cpui386}
+{$ifdef cpum68k}
 {$define fpc_syscall_ok}
 asm
 { load the registers... }
@@ -79,8 +79,8 @@ asm
   move.l (sp)+,d1
   move.l d1,(a0)
 end;
-{$endif m68k}
-{$ifdef powerpc}
+{$endif cpum68k}
+{$ifdef cpupowerpc}
 {$define fpc_syscall_ok}
 asm
 { load the registers... }
@@ -104,8 +104,8 @@ Lsyscallo_ok:
   stw    r6, 12(r8)
   stw    r7, 16(r8)
 end;
-{$endif powerpc}
-{$ifdef sparc}
+{$endif cpupowerpc}
+{$ifdef cpusparc}
 {$define fpc_syscall_ok}
 asm
 { we are using the callers register window }
@@ -124,7 +124,7 @@ asm
   st   %o3,[%i1+12]
   st   %o4,[%i1+16]
 end;
-{$endif powerpc}
+{$endif cpupowerpc}
 {$ifndef fpc_syscall_ok}
 {$error Cannot decide which processor you have!}
 asm
@@ -186,7 +186,10 @@ end;
 
 {
   $Log$
-  Revision 1.4  2003-06-17 16:39:58  jonas
+  Revision 1.5  2003-08-21 22:24:52  olle
+    - removed parameter from fpc_iocheck
+
+  Revision 1.4  2003/06/17 16:39:58  jonas
     * fixed old syscall handling for ppc
 
   Revision 1.3  2003/06/04 15:18:14  peter

rtl/linux/systypes.inc

@@ -60,23 +60,23 @@ type
 { can't put definition in stat.inc because stat.inc is also included in }
 { bunxtype.inc, which is used together with ptypes.inc, which defines   }
 { def_t in another way :(                                               }
-{$ifdef i386}
+{$ifdef cpui386}
   dev_t = word;
-{$else i386}
-{$ifdef m68k}
+{$else cpui386}
+{$ifdef cpum68k}
   dev_t = word;
-{$else m68k}
-{$ifdef powerpc}
+{$else cpum68k}
+{$ifdef cpupowerpc}
   dev_t = cardinal;
-{$else powerpc}
-{$ifdef sparc}
+{$else cpupowerpc}
+{$ifdef cpusparc}
   dev_t = cardinal;
-{$else sparc}
+{$else cpusparc}
 {$error dev_t unknown for this processor}
-{$endif sparc}
-{$endif powerpc}
-{$endif m68k}
-{$endif i386}
+{$endif cpusparc}
+{$endif cpupowerpc}
+{$endif cpum68k}
+{$endif cpui386}
 
 { definition of stat record type }
 {$i stat.inc}
@@ -130,7 +130,10 @@ type
 
 {
   $Log$
-  Revision 1.10  2003-07-08 21:23:24  peter
+  Revision 1.11  2003-08-21 22:24:52  olle
+    - removed parameter from fpc_iocheck
+
+  Revision 1.10  2003/07/08 21:23:24  peter
     * sparc fixes
 
   Revision 1.9  2003/07/08 14:18:40  peter

rtl/netbsd/syscalls.inc

@@ -84,7 +84,7 @@ begin
   movl %edx,4(%ebx)
  end;
  sys_lseek:=longint(returnvalue64);
- {$else}		// powerpc
+ {$else}		// cpupowerpc
   sys_lseek:=fplseek(f,off,whence);
  {$endif}
 end;
@@ -354,7 +354,10 @@ end;
 
 {
   $Log$
-  Revision 1.5  2003-05-30 19:58:40  marco
+  Revision 1.6  2003-08-21 22:22:11  olle
+    - removed parameter from fpc_iocheck
+
+  Revision 1.5  2003/05/30 19:58:40  marco
    * Getting NetBSD/i386 to compile.
 
   Revision 1.3  2003/01/21 15:39:45  marco

rtl/unix/sysunix.inc

@@ -119,13 +119,13 @@ asm
         move.l  a0,d0
 end['A0','D0'];
 {$endif m68k}
-{$ifdef powerpc}
+{$ifdef cpupowerpc}
 {$define fpc_getheapstart_ok}
 asm
         lis r3,HEAP@ha
         la r3,HEAP@l(r3)
 end['R3'];
-{$endif powerpc}
+{$endif cpupowerpc}
 {$ifndef fpc_getheapstart_ok}
 asm
 end;
@@ -147,13 +147,13 @@ asm
         move.l   _HEAPSIZE,d0
 end ['D0'];
 {$endif m68k}
-{$ifdef powerpc}
+{$ifdef cpupowerpc}
 {$define fpc_getheapsize_ok}
 asm
         lis r9,HEAPSIZE@ha
         lwz r3,HEAPSIZE@l(r9)
 end ['R0','R9'];
-{$endif powerpc}
+{$endif cpupowerpc}
 {$ifndef fpc_getheapsize_ok}
 asm
 end;
@@ -394,6 +394,7 @@ Begin
    end;
 { reset file Handle }
   FileRec(f).Handle:=UnusedHandle;
+
 { We do the conversion of filemodes here, concentrated on 1 place }
   case (flags and 3) of
    0 : begin
@@ -414,6 +415,7 @@ Begin
   else
    if (flags and $100)=$100 then
     oflags:=oflags or (Open_APPEND);
+
 { empty name is special }
   if p[0]=#0 then
    begin
@@ -802,7 +804,10 @@ End.
 
 {
   $Log$
-  Revision 1.31  2002-10-14 19:39:17  peter
+  Revision 1.32  2003-08-21 22:21:00  olle
+    - removed parameter from fpc_iocheck
+
+  Revision 1.31  2002/10/14 19:39:17  peter
     * threads unit added for thread support
 
   Revision 1.30  2002/10/13 09:20:56  peter