* Changed m68k to cpum68k, i386 to cpui386

rtl/inc/lineinfo.pp

@@ -410,9 +410,9 @@ begin
  if elfheader.magic0123<>$7f454c46 then
    exit;
  { this seems to be at least the case for m68k cpu PM }
-{$ifdef m68k}
+{$ifdef cpum68k}
  {StabsFunctionRelative:=false;}
-{$endif m68k}
+{$endif cpum68k}
 {$endif ENDIAN_BIG}
   if elfheader.e_shentsize<>sizeof(telf32sechdr) then
    exit;
@@ -781,7 +781,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.18  2003-03-25 19:27:45  peter
+  Revision 1.19  2003-10-17 20:52:12  olle
+    * Changed m68k to cpum68k, i386 to cpui386
+
+  Revision 1.18  2003/03/25 19:27:45  peter
     * fix ifdef to define elf32
 
   Revision 1.16  2003/03/17 14:30:11  peter

rtl/inc/systemh.inc

@@ -291,14 +291,14 @@ type
   PPCharArray = ^TPCharArray;
 
 const
-{$ifdef i386}
+{$ifdef cpui386}
   Test8086 : byte = 2;       { Always i386 or newer }
   Test8087 : byte = 3;       { Always 387 or newer. Emulated if needed. }
-{$endif i386}
-{$ifdef m68k}
+{$endif cpui386}
+{$ifdef cpum68k}
   Test68000 : byte = 0;      { Must be determined at startup for both }
   Test68881 : byte = 0;
-{$endif}
+{$endif cpum68k}
 
 { max level in dumping on error }
   Max_Frame_Dump : Word = 8;
@@ -693,7 +693,10 @@ const
 
 {
   $Log$
-  Revision 1.75  2003-10-16 15:43:13  peter
+  Revision 1.76  2003-10-17 20:52:12  olle
+    * Changed m68k to cpum68k, i386 to cpui386
+
+  Revision 1.75  2003/10/16 15:43:13  peter
     * THandle is platform dependent
 
   Revision 1.74  2003/10/08 16:24:47  florian

rtl/linux/ossysc.inc

@@ -344,13 +344,13 @@ type
   end;
 
 
-{$ifdef i386}
+{$ifdef cpui386}
 {$define OLDMMAP}
-{$endif i386}
+{$endif cpui386}
 
-{$ifdef m68k}
+{$ifdef cpum68k}
 {$define OLDMMAP}
-{$endif m68k}
+{$endif cpum68k}
 
 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.
@@ -454,7 +454,10 @@ end;
 
 {
  $Log$
- Revision 1.8  2003-09-27 13:45:58  peter
+ Revision 1.9  2003-10-17 20:56:24  olle
+   * Changed m68k to cpum68k, i386 to cpui386
+
+ Revision 1.8  2003/09/27 13:45:58  peter
    * fpnanosleep exported in baseunix
    * fpnanosleep has pointer arguments to be C compliant
 

rtl/linux/syscalls.inc

@@ -54,7 +54,7 @@ function Clone(func:TCloneFunc;sp:pointer;flags:longint;args:pointer):longint;
 begin
   if (pointer(func)=nil) or (sp=nil) then
    exit(-1); // give an error result
-{$ifdef i386}
+{$ifdef cpui386}
   asm
         { Insert the argument onto the new stack. }
         movl    sp,%ecx
@@ -87,8 +87,8 @@ begin
 .Lclone_end:
         movl    %eax,__RESULT
   end;
-{$endif i386}
-{$ifdef m68k}
+{$endif cpui386}
+{$ifdef cpum68k}
   { No yet translated, my m68k assembler is too weak for such things PM }
 (*
   asm
@@ -124,7 +124,7 @@ begin
         movl    %eax,__RESULT
   end;
   *)
-{$endif m68k}
+{$endif cpum68k}
 end;
 
 
@@ -149,7 +149,10 @@ end;
 
 {
   $Log$
-  Revision 1.18  2003-09-14 20:15:01  marco
+  Revision 1.19  2003-10-17 20:56:24  olle
+    * Changed m68k to cpum68k, i386 to cpui386
+
+  Revision 1.18  2003/09/14 20:15:01  marco
    * Unix reform stage two. Remove all calls from Unix that exist in Baseunix.
 
   Revision 1.17  2002/12/18 16:43:26  marco

rtl/netbsd/syscalls.inc

@@ -71,12 +71,12 @@ begin
  sys_close:=do_syscall(syscall_nr_close,f);
 end;
 
-{$ifndef m68k}
+{$ifndef cpum68k}
 Function Sys_Lseek(F:longint;Off:longint;Whence:longint):longint;
 var returnvalue64 : int64;
 begin
  {Lseek's offset is 64-bit, the highword  is the 0}
-{$ifdef i386} 
+{$ifdef cpui386} 
  do_syscall(syscall_nr___syscall,syscall_nr_lseek,0,f,0,off,0,whence);
  asm
   lea  returnvalue64,%ebx
@@ -88,7 +88,7 @@ begin
   sys_lseek:=fplseek(f,off,whence);
  {$endif}
 end;
-{$endif m68k}
+{$endif cpum68k}
 
 
 Function Sys_Read(f:longint;buffer:pchar;count:longint):longint;
@@ -354,7 +354,10 @@ end;
 
 {
   $Log$
-  Revision 1.6  2003-08-21 22:22:11  olle
+  Revision 1.7  2003-10-17 20:57:10  olle
+    * Changed m68k to cpum68k, i386 to cpui386
+
+  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

rtl/objpas/typinfo.pp

@@ -910,10 +910,10 @@ begin
          Value:=PDouble(Pointer(Instance)+Longint(PropInfo^.GetProc))^;
        ftExtended:
          Value:=PExtended(Pointer(Instance)+Longint(PropInfo^.GetProc))^;
-{$ifndef m68k}
+{$ifndef cpum68k}
        ftcomp:
          Value:=PComp(Pointer(Instance)+Longint(PropInfo^.GetProc))^;
-{$endif m68k}
+{$endif cpum68k}
        end;
 
     ptStatic:
@@ -971,10 +971,10 @@ begin
           PDouble(Pointer(Instance)+Longint(PropInfo^.SetProc))^:=Value;
         ftExtended:
           PExtended(Pointer(Instance)+Longint(PropInfo^.SetProc))^:=Value;
-{$ifndef m68k}
+{$ifndef cpum68k}
        ftcomp:
           PComp(Pointer(Instance)+Longint(PropInfo^.SetProc))^:=Comp(Value);
-{$endif m68k}
+{$endif cpum68k}
         { Uncommenting this code results in a internal error!!
        ftFixed16:
          PFixed16(Pointer(Instance)+Longint(PropInfo^.SetProc))^:=Value;
@@ -1213,7 +1213,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.16  2003-04-24 11:46:25  florian
+  Revision 1.17  2003-10-17 20:58:27  olle
+    * Changed m68k to cpum68k, i386 to cpui386
+
+  Revision 1.16  2003/04/24 11:46:25  florian
     * fixed wrong newlines
 
   Revision 1.15  2003/03/29 16:55:56  michael