Bläddra i källkod

* fixed arm-linux compilation with FPC_USE_LIBC

git-svn-id: trunk@8809 -
florian 18 år sedan
förälder
incheckning
76b95fb058
2 ändrade filer med 4 tillägg och 1 borttagningar
  1. 2 1
      rtl/arm/arm.inc
  2. 2 0
      rtl/arm/math.inc

+ 2 - 1
rtl/arm/arm.inc

@@ -87,6 +87,7 @@ asm
 end ['R0'];
 end ['R0'];
 
 
 
 
+{$ifndef FPC_SYSTEM_HAS_FILLCHAR}
 {$define FPC_SYSTEM_HAS_FILLCHAR}
 {$define FPC_SYSTEM_HAS_FILLCHAR}
 Procedure FillChar(var x;count:longint;value:byte);assembler;nostackframe;
 Procedure FillChar(var x;count:longint;value:byte);assembler;nostackframe;
 asm
 asm
@@ -136,7 +137,7 @@ asm
         strb r2,[r3],#1
         strb r2,[r3],#1
         mov pc,lr
         mov pc,lr
 end;
 end;
-
+{$endif FPC_SYSTEM_HAS_FILLCHAR}
 
 
 {$ifndef FPC_SYSTEM_HAS_MOVE}
 {$ifndef FPC_SYSTEM_HAS_MOVE}
 {$define FPC_SYSTEM_HAS_MOVE}
 {$define FPC_SYSTEM_HAS_MOVE}

+ 2 - 0
rtl/arm/math.inc

@@ -29,6 +29,7 @@
       runerror(207);
       runerror(207);
       result:=0;
       result:=0;
     end;
     end;
+    {$ifndef FPC_SYSTEM_HAS_SQRT}
     {$define FPC_SYSTEM_HAS_SQRT}
     {$define FPC_SYSTEM_HAS_SQRT}
     function fpc_sqrt_real(d : ValReal) : ValReal;compilerproc;
     function fpc_sqrt_real(d : ValReal) : ValReal;compilerproc;
     begin
     begin
@@ -36,6 +37,7 @@
       runerror(207);
       runerror(207);
       result:=0;
       result:=0;
     end;
     end;
+    {$endif FPC_SYSTEM_HAS_SQRT}
 {$endif}
 {$endif}
     (* atn isn't supported by the linux fpe it seems
     (* atn isn't supported by the linux fpe it seems
     {$define FPC_SYSTEM_HAS_ARCTAN}
     {$define FPC_SYSTEM_HAS_ARCTAN}