Răsfoiți Sursa

* havelinuxrtl10 fixes

marco 22 ani în urmă
părinte
comite
80abe98cf0
4 a modificat fișierele cu 27 adăugiri și 20 ștergeri
  1. 5 2
      compiler/assemble.pas
  2. 8 6
      compiler/catch.pas
  3. 8 9
      compiler/globals.pas
  4. 6 3
      compiler/script.pas

+ 5 - 2
compiler/assemble.pas

@@ -181,7 +181,7 @@ Implementation
 
     uses
 {$ifdef hasunix}
-  {$ifdef ver1_0}
+  {$ifdef havelinuxrtl10}
       linux,
   {$else}
       unix,
@@ -1661,7 +1661,10 @@ Implementation
 end.
 {
   $Log$
-  Revision 1.58  2003-10-21 15:15:36  peter
+  Revision 1.59  2003-11-10 17:22:28  marco
+   * havelinuxrtl10 fixes
+
+  Revision 1.58  2003/10/21 15:15:36  peter
     * taicpu_abstract.oper[] changed to pointers
 
   Revision 1.57  2003/10/03 14:16:48  marco

+ 8 - 6
compiler/catch.pas

@@ -42,7 +42,7 @@ uses
 {$ifdef unix}
  {$ifndef beos}
   {$define has_signal}
-  {$ifdef ver1_0}
+  {$ifdef havelinuxrtl10}
     Linux,
   {$else}
     BaseUnix,Unix,
@@ -100,23 +100,25 @@ begin
 end;
 {$endif def has_signal}
 
-
 begin
 {$ifndef nocatch}
   {$ifdef has_signal}
     NewSignal:=SignalHandler({$ifdef fpcprocvar}@{$endif}CatchSignal);
     {$ifndef sunos}
-      OldSigSegm:={$ifdef VER1_0}Signal{$else}{$ifdef Unix}fpSignal{$else}Signal{$endif}{$endif} (SIGSEGV,NewSignal);
+      OldSigSegm:={$ifdef havelinuxrtl10}Signal{$else}{$ifdef Unix}fpSignal{$else}Signal{$endif}{$endif} (SIGSEGV,NewSignal);
     {$endif} // lxrun on solaris hooks this for handling linux-calls!
-    OldSigInt:={$ifdef VER1_0}Signal{$else}{$ifdef Unix}fpSignal{$else}Signal{$endif}{$endif}  (SIGINT,NewSignal);
-    OldSigFPE:={$ifdef VER1_0}Signal{$else}{$ifdef Unix}fpSignal{$else}Signal{$endif}{$endif}  (SIGFPE,NewSignal);
+     OldSigInt:={$ifdef havelinuxrtl10}Signal{$else}{$ifdef Unix}fpSignal{$else}Signal{$endif}{$endif}  (SIGINT,NewSignal);
+     OldSigFPE:={$ifdef havelinuxrtl10}Signal{$else}{$ifdef Unix}fpSignal{$else}Signal{$endif}{$endif}  (SIGFPE,NewSignal);
   {$endif}
 {$endif nocatch}
 end.
 
 {
   $Log$
-  Revision 1.16  2003-09-18 08:50:48  marco
+  Revision 1.17  2003-11-10 17:22:28  marco
+   * havelinuxrtl10 fixes
+
+  Revision 1.16  2003/09/18 08:50:48  marco
    * fix for snapshot building.
 
   Revision 1.15  2003/09/14 20:26:18  marco

+ 8 - 9
compiler/globals.pas

@@ -34,7 +34,7 @@ interface
       windows,
 {$endif}
 {$ifdef hasunix}
-  {$ifdef ver1_0}
+  {$ifdef havelinuxrtl10}
       linux,
   {$else}
       Baseunix,unix,
@@ -982,13 +982,9 @@ implementation
        L : longint;
      begin
      {$ifdef hasunix}
-       {$IFDEF VER1_0}
+       {$IFDEF havelinuxrtl10}
         FStat (F,Info);
-        {$ifdef BSD}
-        L:=Info.st_Mtime;
-        {$else}
         L:=Info.Mtime;
-        {$endif}
        {$ELSE}
         FPFStat (F,Info);
         L:=Info.st_Mtime;
@@ -1176,7 +1172,7 @@ implementation
       {$endif}
       begin
       {$ifdef hasunix}
-        GetEnvPchar:={$ifdef ver1_0}Linux.getenv{$else}BaseUnix.fpGetEnv{$endif}(envname);
+        GetEnvPchar:={$ifdef havelinuxrtl10}Linux.getenv{$else}BaseUnix.fpGetEnv{$endif}(envname);
         {$define GETENVOK}
       {$endif}
       {$ifdef win32}
@@ -1228,7 +1224,7 @@ implementation
         expansion under linux }
       {$ifdef hasunix}
       begin
-        {$ifdef ver1_0}Linux{$else}Unix{$endif}.Shell(command);
+        {$ifdef havelinuxrtl10}Linux{$else}Unix{$endif}.Shell(command);
       end;
       {$else}
       {$ifdef amiga}
@@ -1749,7 +1745,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.113  2003-11-07 15:58:32  florian
+  Revision 1.114  2003-11-10 17:22:28  marco
+   * havelinuxrtl10 fixes
+
+  Revision 1.113  2003/11/07 15:58:32  florian
     * Florian's culmutative nr. 1; contains:
       - invalid calling conventions for a certain cpu are rejected
       - arm softfloat calling conventions

+ 6 - 3
compiler/script.pas

@@ -94,7 +94,7 @@ implementation
 
 uses
 {$ifdef hasUnix}
-  {$ifdef ver1_0}
+  {$ifdef havelinuxrtl10}
     Linux,
   {$else}
     BaseUnix,
@@ -189,7 +189,7 @@ begin
   i:=ioresult;
 {$ifdef hasUnix}
   if executable then
-   {$ifdef VER1_0}ChMod{$else}fpchmod{$endif}(fn,493);
+   {$ifdef havelinuxrtl10}ChMod{$else}fpchmod{$endif}(fn,493);
 {$endif}
 end;
 
@@ -434,7 +434,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.24  2003-09-30 19:54:23  peter
+  Revision 1.25  2003-11-10 17:22:28  marco
+   * havelinuxrtl10 fixes
+
+  Revision 1.24  2003/09/30 19:54:23  peter
     * better link on target support
 
   Revision 1.23  2003/09/16 13:42:39  marco