--- Merging r43121 into '.':

U    rtl/inc/cgeneric.inc
--- Recording mergeinfo for merge of r43121 into '.':
 U   .
--- Merging r47123 into '.':
U    rtl/aarch64/math.inc
--- Recording mergeinfo for merge of r47123 into '.':
 G   .

# revisions: 43121,47123
r43121 | svenbarth | 2019-10-05 11:42:55 +0200 (Sat, 05 Oct 2019) | 1 line
Changed paths:
   M /trunk/rtl/inc/cgeneric.inc

* use clib constant instead of literal 'c' in case we have a target where the library is not called 'c' (hopefully all targets that use cgeneric.inc have the clib constant declared in their sysos.inc)
r47123 | svenbarth | 2020-10-18 10:52:41 +0200 (Sun, 18 Oct 2020) | 1 line
Changed paths:
   M /trunk/rtl/aarch64/math.inc

* for Aarch64 inline assembly comments need to start with //

git-svn-id: branches/fixes_3_2@47916 -

rtl/aarch64/math.inc

@@ -55,7 +55,7 @@
     {$define FPC_SYSTEM_HAS_INT}
     function fpc_int_real(d : ValReal) : ValReal;assembler;nostackframe;compilerproc;
       asm
-        { round as floating point towards zero }
+        // { round as floating point towards zero }
         frintz d0,d0
       end;
     {$endif FPC_SYSTEM_HAS_INT}

rtl/inc/cgeneric.inc

@@ -21,7 +21,7 @@
 
 {$ifndef FPC_SYSTEM_HAS_MOVE}
 {$define FPC_SYSTEM_HAS_MOVE}
-procedure bcopy(const source;var dest;count:size_t); cdecl; external 'c' name 'bcopy';
+procedure bcopy(const source;var dest;count:size_t); cdecl; external clib name 'bcopy';
 
 { we need this separate move declaration because we can't add a "public, alias" to the above }
 procedure Move(const source;var dest;count:sizeint); [public, alias: 'FPC_MOVE'];{$ifdef SYSTEMINLINE}inline;{$endif}
@@ -35,7 +35,7 @@ end;
 
 {$ifndef FPC_SYSTEM_HAS_FILLCHAR}
 {$define FPC_SYSTEM_HAS_FILLCHAR}
-procedure memset(var x; value: byte; count: size_t); cdecl; external 'c';
+procedure memset(var x; value: byte; count: size_t); cdecl; external clib;
 
 Procedure FillChar(var x;count: sizeint;value:byte);{$ifdef SYSTEMINLINE}inline;{$endif}
 begin
@@ -53,9 +53,9 @@ end;
   {$define BUGGYMEMCHR}
 {$endif}
 
-function memchr(const buf; b: cint; len: size_t): pointer; cdecl; external 'c';
+function memchr(const buf; b: cint; len: size_t): pointer; cdecl; external clib;
 {$ifdef BUGGYMEMCHR}
-function rawmemchr(const buf; b: cint): pointer; cdecl; external 'c';
+function rawmemchr(const buf; b: cint): pointer; cdecl; external clib;
 {$endif BUGGYMEMCHR}
 
 function IndexByte(Const buf;len:sizeint;b:byte):sizeint;{$ifdef SYSTEMINLINE}inline;{$endif}
@@ -83,7 +83,7 @@ end;
 
 {$ifndef FPC_SYSTEM_HAS_COMPAREBYTE}
 {$define FPC_SYSTEM_HAS_COMPAREBYTE}
-function memcmp_comparechar(Const buf1,buf2;len:size_t):cint; cdecl; external 'c' name 'memcmp';
+function memcmp_comparechar(Const buf1,buf2;len:size_t):cint; cdecl; external clib name 'memcmp';
 
 function CompareByte(Const buf1,buf2;len:sizeint):sizeint;{$ifdef SYSTEMINLINE}inline;{$endif}
 var
@@ -104,7 +104,7 @@ end;
 
 {$ifndef FPC_SYSTEM_HAS_COMPARECHAR0}
 {$define FPC_SYSTEM_HAS_COMPARECHAR0}
-function strncmp_comparechar0(Const buf1,buf2;len:size_t):longint; cdecl; external 'c' name 'strncmp';
+function strncmp_comparechar0(Const buf1,buf2;len:size_t):longint; cdecl; external clib name 'strncmp';
 
 function CompareChar0(Const buf1,buf2;len:sizeint):sizeint;{$ifdef SYSTEMINLINE}inline;{$endif}
 begin
@@ -120,7 +120,7 @@ end;
 {$ifndef FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH}
 {$define FPC_SYSTEM_HAS_FPC_PCHAR_LENGTH}
 
-function libc_pchar_length(p:pchar):size_t; cdecl; external 'c' name 'strlen';
+function libc_pchar_length(p:pchar):size_t; cdecl; external clib name 'strlen';
 
 function fpc_pchar_length(p:pchar):sizeint;[public,alias:'FPC_PCHAR_LENGTH']; compilerproc;
 begin