Browse Source

* fixed compilation on FPC_USE_LIBC platforms after r17249 (they already
define a version of move() that calls libc.memmove())

git-svn-id: trunk@17250 -

Jonas Maebe 14 years ago
parent
commit
da16630c50
1 changed files with 4 additions and 0 deletions
  1. 4 0
      rtl/x86_64/x86_64.inc

+ 4 - 0
rtl/x86_64/x86_64.inc

@@ -72,6 +72,7 @@ asm
 .Lg_a_null:
 .Lg_a_null:
 end ['RAX'];
 end ['RAX'];
 
 
+{$ifndef FPC_SYSTEM_HAS_MOVE}
 {$define FPC_SYSTEM_HAS_MOVE}
 {$define FPC_SYSTEM_HAS_MOVE}
 procedure Move(const source;var dest;count:SizeInt);[public, alias: 'FPC_MOVE'];assembler;nostackframe;
 procedure Move(const source;var dest;count:SizeInt);[public, alias: 'FPC_MOVE'];assembler;nostackframe;
 { Linux: rdi source, rsi dest, rdx count
 { Linux: rdi source, rsi dest, rdx count
@@ -347,7 +348,9 @@ asm
     mfence
     mfence
     jmpq   .Ldestalignedb
     jmpq   .Ldestalignedb
 end;
 end;
+{$endif FPC_SYSTEM_HAS_MOVE}
 
 
+{$ifndef FPC_SYSTEM_HAS_FILLCHAR}
 {$define FPC_SYSTEM_HAS_FILLCHAR}
 {$define FPC_SYSTEM_HAS_FILLCHAR}
 Procedure FillChar(var x;count:SizeInt;value:byte);assembler;nostackframe;
 Procedure FillChar(var x;count:SizeInt;value:byte);assembler;nostackframe;
   asm
   asm
@@ -453,6 +456,7 @@ Procedure FillChar(var x;count:SizeInt;value:byte);assembler;nostackframe;
     mfence
     mfence
     jmp    .Lless64
     jmp    .Lless64
   end;
   end;
+{$endif FPC_SYSTEM_HAS_FILLCHAR}
 
 
 
 
 {$define FPC_SYSTEM_HAS_DECLOCKED_LONGINT}
 {$define FPC_SYSTEM_HAS_DECLOCKED_LONGINT}