florian 1 ano atrás
pai
commit
a0cae50af6

+ 3 - 3
rtl/arm/arm.inc

@@ -1349,17 +1349,17 @@ asm
 {$endif CPUARM_HAS_DMB}
 end;
 
-procedure ReadBarrier;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadBarrier;
 begin
   barrier;
 end;
 
-procedure ReadDependencyBarrier;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadDependencyBarrier;
 begin
   { reads imply barrier on earlier reads depended on; not required on ARM }
 end;
 
-procedure ReadWriteBarrier;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadWriteBarrier;
 begin
   barrier;
 end;

+ 1 - 1
rtl/i386/i386.inc

@@ -2539,7 +2539,7 @@ asm
 {$endif CPUX86_HAS_SSE2}
 end;
 
-procedure ReadDependencyBarrier;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadDependencyBarrier;
 begin
   { reads imply barrier on earlier reads depended on }
 end;

+ 12 - 12
rtl/inc/compproc.inc

@@ -105,14 +105,14 @@ procedure fpc_ShortStr_Currency(c : currency; len,f : SizeInt; out s : shortstri
 procedure fpc_chararray_sint(v : valsint;len : SizeInt;out a : array of AnsiChar); compilerproc;
 procedure fpc_chararray_uint(v : valuint;len : SizeInt;out a : array of AnsiChar); compilerproc;
 {$ifdef FPC_HAS_FEATURE_ANSISTRINGS}
-procedure fpc_AnsiStr_sint(v : valsint; Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc;
-procedure fpc_AnsiStr_uint(v : valuint;Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc;
+procedure fpc_AnsiStr_sint(v : valsint; Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc; inline;
+procedure fpc_AnsiStr_uint(v : valuint;Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc; inline;
 {$ifndef FPUNONE}
-procedure fpc_AnsiStr_Float(d : ValReal;len,fr,rt : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc;
+procedure fpc_AnsiStr_Float(d : ValReal;len,fr,rt : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc; inline;
 {$endif}
-procedure fpc_ansistr_enum(ordinal,len:sizeint;typinfo,ord2strindex:pointer;out s:RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc;
-procedure fpc_ansistr_bool(b : boolean;len:sizeint;out s:RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc;
-procedure fpc_AnsiStr_Currency(c : currency;len,fr : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc;
+procedure fpc_ansistr_enum(ordinal,len:sizeint;typinfo,ord2strindex:pointer;out s:RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc; inline;
+procedure fpc_ansistr_bool(b : boolean;len:sizeint;out s:RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc; inline;
+procedure fpc_AnsiStr_Currency(c : currency;len,fr : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc; inline;
 {$endif FPC_HAS_FEATURE_ANSISTRINGS}
 
 {$ifdef FPC_HAS_FEATURE_WIDESTRINGS}
@@ -130,8 +130,8 @@ procedure fpc_AnsiStr_Currency(c : currency;len,fr : SizeInt;out s : RawByteStri
   procedure fpc_chararray_qword(v : qword;len : SizeInt;out a : array of AnsiChar); compilerproc;
   procedure fpc_chararray_int64(v : int64;len : SizeInt;out a : array of AnsiChar); compilerproc;
   {$ifdef FPC_HAS_FEATURE_ANSISTRINGS}
-  procedure fpc_ansistr_qword(v : qword;len : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc;
-  procedure fpc_ansistr_int64(v : int64;len : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc;
+  procedure fpc_ansistr_qword(v : qword;len : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc; inline;
+  procedure fpc_ansistr_int64(v : int64;len : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc; inline;
   {$endif FPC_HAS_FEATURE_ANSISTRINGS}
 
   {$ifdef FPC_HAS_FEATURE_WIDESTRINGS}
@@ -201,7 +201,7 @@ procedure fpc_AnsiStr_Currency(c : currency;len,fr : SizeInt;out s : RawByteStri
 procedure fpc_chararray_Float(d : ValReal;len,fr,rt : SizeInt;out a : array of AnsiChar); compilerproc;
 {$endif}
 {$ifndef CPUAVR}
-{ currently, the avr code generator fails on this procedure, so we disable it, 
+{ currently, the avr code generator fails on this procedure, so we disable it,
   this is not a good solution but fixing compilation of this procedure for
   avr is hard, requires significant changes to the register allocator to take
   care of different register classes }
@@ -302,8 +302,8 @@ Function fpc_Val_smallint_UnicodeStr (Const S : UnicodeString; out Code : ValSIn
 {$endif CPU16 or CPU8}
 
 {$ifdef FPC_HAS_FEATURE_ANSISTRINGS}
-Procedure fpc_ansistr_decr_ref (Var S : Pointer); compilerproc;
-Procedure fpc_ansistr_incr_ref (S : Pointer); compilerproc;
+Procedure fpc_ansistr_decr_ref (Var S : Pointer); compilerproc; inline;
+Procedure fpc_ansistr_incr_ref (S : Pointer); compilerproc; inline;
 Procedure fpc_AnsiStr_Assign (Var DestS : Pointer;S2 : Pointer); compilerproc;
 Procedure fpc_AnsiStr_Concat (Var DestS : RawByteString;const S1,S2 : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc;
 Procedure fpc_AnsiStr_Concat_multi (Var DestS : RawByteString;const sarr:array of RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc;
@@ -337,7 +337,7 @@ Function fpc_AnsiStr_ShortStr_Compare (Var S1 : Pointer; Var S2 : ShortString):
 { pointer argument because otherwise when calling this, we get
   an endless loop since a 'var s: ansistring' must be made
   unique as well                                               }
-Function fpc_ansistr_Unique(Var S : Pointer): Pointer; compilerproc;
+Function fpc_ansistr_Unique(Var S : Pointer): Pointer; compilerproc; inline;
 {$endif FPC_HAS_FEATURE_ANSISTRINGS}
 
 {*****************************************************************************

+ 4 - 4
rtl/inc/generic.inc

@@ -2971,19 +2971,19 @@ function NtoLE(const AValue: QWord): QWord;{$ifdef SYSTEMINLINE}inline;{$endif}
 
 {$ifndef FPC_SYSTEM_HAS_MEM_BARRIER}
 
-procedure ReadBarrier;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadBarrier;
 begin
 end;
 
-procedure ReadDependencyBarrier;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadDependencyBarrier;
 begin
 end;
 
-procedure ReadWriteBarrier;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadWriteBarrier;
 begin
 end;
 
-procedure WriteBarrier;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure WriteBarrier;
 begin
 end;
 

+ 2 - 2
rtl/inc/mathh.inc

@@ -142,10 +142,10 @@ procedure float_raise(i: TFPUExceptionMask);
 
 {$ifdef SUPPORT_DOUBLE}
     function Real2Double(r : real48) : double;
-    operator := (b:real48) d:double;
+    operator := (b:real48) d:double; {$ifdef SYSTEMINLINE}inline;{$endif}
 {$endif}
 {$ifdef SUPPORT_EXTENDED}
-    operator := (b:real48) e:extended;
+    operator := (b:real48) e:extended; {$ifdef SYSTEMINLINE}inline;{$endif}
 {$endif SUPPORT_EXTENDED}
 
     type

+ 7 - 6
rtl/inc/systemh.inc

@@ -928,10 +928,11 @@ procedure MoveChar0(const buf1;var buf2;len:SizeInt);
 function  IndexChar0(const buf;len:SizeInt;b:Ansichar):SizeInt;
 function  CompareChar0(const buf1,buf2;len:SizeInt):SizeInt;
 procedure Prefetch(const mem);[internproc:fpc_in_prefetch_var];
-procedure ReadBarrier;
-procedure ReadDependencyBarrier;
-procedure ReadWriteBarrier;
-procedure WriteBarrier;
+
+procedure ReadBarrier; {$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadDependencyBarrier; {$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadWriteBarrier; {$ifdef SYSTEMINLINE}inline;{$endif}
+procedure WriteBarrier; {$ifdef SYSTEMINLINE}inline;{$endif}
 {$ifdef cpui8086}
 procedure MoveData(srcseg,srcoff,destseg,destoff:Word;n:Word);
 {$endif cpui8086}
@@ -1029,8 +1030,8 @@ Function Odd(l:QWord):Boolean;[internconst:fpc_in_const_odd];{$ifdef SYSTEMINLIN
 
 function SwapEndian(const AValue: SmallInt): SmallInt;{$ifdef SYSTEMINLINE}inline;{$endif}
 function SwapEndian(const AValue: Word): Word;{$ifdef SYSTEMINLINE}inline;{$endif}
-function SwapEndian(const AValue: LongInt): LongInt;
-function SwapEndian(const AValue: DWord): DWord;
+function SwapEndian(const AValue: LongInt): LongInt{$ifdef SYSTEMINLINE}inline;{$endif}
+function SwapEndian(const AValue: DWord): DWord;{$ifdef SYSTEMINLINE}inline;{$endif}
 function SwapEndian(const AValue: Int64): Int64;
 function SwapEndian(const AValue: QWord): QWord;
 

+ 8 - 8
rtl/java/jcompproc.inc

@@ -99,16 +99,16 @@ procedure fpc_ShortStr_Currency({$ifdef cpujvm}constref{$endif} c : currency; le
 procedure fpc_chararray_sint(v : valsint;len : SizeInt;out a : array of AnsiChar); compilerproc;
 procedure fpc_chararray_uint(v : valuint;len : SizeInt;out a : array of AnsiChar); compilerproc;
 {$ifdef FPC_HAS_FEATURE_ANSISTRINGS}
-procedure fpc_AnsiStr_sint(v : valsint; Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc;
-procedure fpc_AnsiStr_uint(v : valuint;Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc;
+procedure fpc_AnsiStr_sint(v : valsint; Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc; inline;
+procedure fpc_AnsiStr_uint(v : valuint;Len : SizeInt; out S : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc; inline;
 {$ifndef FPUNONE}
-procedure fpc_AnsiStr_Float(d : ValReal;len,fr,rt : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc;
+procedure fpc_AnsiStr_Float(d : ValReal;len,fr,rt : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc; inline;
 {$endif}
 {$ifndef FPC_STR_ENUM_INTERN}
-procedure fpc_ansistr_enum(ordinal,len:sizeint;typinfo,ord2strindex:pointer;out s:RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc;
+procedure fpc_ansistr_enum(ordinal,len:sizeint;typinfo,ord2strindex:pointer;out s:RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc; inline;
 {$endif FPC_STR_ENUM_INTERN}
-procedure fpc_ansistr_bool(b : boolean;len:sizeint;out s:RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc;
-procedure fpc_AnsiStr_Currency(c : currency;len,fr : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc;
+procedure fpc_ansistr_bool(b : boolean;len:sizeint;out s:RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc; inline;
+procedure fpc_AnsiStr_Currency(c : currency;len,fr : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc; inline;
 {$endif FPC_HAS_FEATURE_ANSISTRINGS}
 
 {$ifdef FPC_HAS_FEATURE_WIDESTRINGS}
@@ -125,8 +125,8 @@ procedure fpc_AnsiStr_Currency(c : currency;len,fr : SizeInt;out s : RawByteStri
   procedure fpc_chararray_qword(v : qword;len : SizeInt;out a : array of AnsiChar); compilerproc;
   procedure fpc_chararray_int64(v : int64;len : SizeInt;out a : array of AnsiChar); compilerproc;
   {$ifdef FPC_HAS_FEATURE_ANSISTRINGS}
-  procedure fpc_ansistr_qword(v : qword;len : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc;
-  procedure fpc_ansistr_int64(v : int64;len : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc;
+  procedure fpc_ansistr_qword(v : qword;len : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc; inline;
+  procedure fpc_ansistr_int64(v : int64;len : SizeInt;out s : RawByteString{$ifdef FPC_HAS_CPSTRING};cp : TSystemCodePage{$endif FPC_HAS_CPSTRING}); compilerproc; inline;
   {$endif FPC_HAS_FEATURE_ANSISTRINGS}
 
   {$ifdef FPC_HAS_FEATURE_WIDESTRINGS}

+ 2 - 2
rtl/objpas/math.pp

@@ -663,7 +663,7 @@ procedure SumsAndSquares(const data : PSingle; Const N : Integer;
 {$endif FPC_HAS_TYPE_SINGLE}
 
 {$ifdef FPC_HAS_TYPE_DOUBLE}
-function SumOfSquares(const data : array of double) : float;
+function SumOfSquares(const data : array of double) : float;inline;
 function SumOfSquares(const data : PDouble; Const N : Integer) : float;
 { calculates the sum and the sum of squares of data }
 procedure SumsAndSquares(const data : array of Double;
@@ -2239,7 +2239,7 @@ procedure sumsandsquares(const data : PSingle; Const N : Integer;
   end;
 
 procedure sumsandsquares(const data : array of Double;
-  var sum,sumofsquares : float);
+  var sum,sumofsquares : float); inline;
 begin
   sumsandsquares (PDouble(@Data[0]),High(Data)+1,Sum,sumofsquares);
 end;

+ 24 - 24
rtl/objpas/types.pp

@@ -38,15 +38,15 @@ const
 Const
   Epsilon: Single = 1E-40;
   Epsilon2: Single = 1E-30;
-  
-  CurveKappa = 0.5522847498; 
+
+  CurveKappa = 0.5522847498;
   CurveKappaInv = 1 - CurveKappa;
 
 type
   TEndian =  Objpas.TEndian;
   TDirection = (FromBeginning, FromEnd);
   TValueRelationship = -1..1;
-  
+
   DWORD = LongWord;
 
   PLongint = System.PLongint;
@@ -65,7 +65,7 @@ type
   TBooleanDynArray = array of Boolean;
   TByteDynArray = array of Byte;
   TClassicByteDynArray = TByteDynArray;
-  
+
   TCardinalDynArray = array of Cardinal;
   TInt64DynArray = array of Int64;
   TIntegerDynArray = array of Integer;
@@ -79,7 +79,7 @@ type
   TAnsiStringDynArray = Array of AnsiString;
   TWideStringDynArray   = array of WideString;
   TUnicodeStringDynArray = array of UnicodeString;
-{$if SIZEOF(CHAR)=2}  
+{$if SIZEOF(CHAR)=2}
   TStringDynArray = Array of UnicodeString;
 {$ELSE}
   TStringDynArray = Array of AnsiString;
@@ -308,7 +308,7 @@ type
      constructor Create(const ax,ay,az:single);
      procedure   Offset(const adeltax,adeltay,adeltaz:single); inline;
      procedure   Offset(const adelta:TPoint3D); inline;
-   public  
+   public
      case Integer of
       0: (data:TSingle3Array);
       1: (x,y,z : single);
@@ -493,10 +493,10 @@ function IntersectRect(var Rect : TRect; const R1,R2 : TRect) : Boolean;
 function IntersectRect(var Rect : TRectF; const R1,R2 : TRectF) : Boolean;
 function RectCenter(var R: TRect; const Bounds: TRect): TRect;
 function RectCenter(var R: TRectF; const Bounds: TRectF): TRectF;
-function RectHeight(const Rect: TRect): Integer; inline; 
-function RectHeight(const Rect: TRectF): Single; inline; 
-function RectWidth(const Rect: TRect): Integer; inline; 
-function RectWidth(const Rect: TRectF): Single; inline; 
+function RectHeight(const Rect: TRect): Integer; inline;
+function RectHeight(const Rect: TRectF): Single; inline;
+function RectWidth(const Rect: TRect): Integer; inline;
+function RectWidth(const Rect: TRectF): Single; inline;
 function UnionRect(var Rect : TRect; const R1,R2 : TRect) : Boolean;
 function UnionRect(var Rect : TRectF; const R1,R2 : TRectF) : Boolean;
 function UnionRect(const R1,R2 : TRect) : TRect;
@@ -510,7 +510,7 @@ function CenterPoint(const Rect: TRect): TPoint;
 function InflateRect(var Rect: TRect; dx: Integer; dy: Integer): Boolean;
 function InflateRect(var Rect: TRectF; dx: single; dy: Single): Boolean;
 function Size(AWidth, AHeight: Integer): TSize; inline;
-function Size(const ARect: TRect): TSize;
+function Size(const ARect: TRect): TSize; inline;
 function ScalePoint(const P: TPointF; dX, dY: Single): TPointF; overload;
 function ScalePoint(const P: TPoint; dX, dY: Single): TPoint; overload;
 function MinPoint(const P1, P2: TPointF): TPointF; overload;
@@ -560,7 +560,7 @@ function MinPoint(const P1, P2: TPointF): TPointF; overload;
 
 begin
   Result:=P1;
-  if (P2.Y<P1.Y) 
+  if (P2.Y<P1.Y)
      or ((P2.Y=P1.Y) and (P2.X<P1.X)) then
     Result:=P2;
 end;
@@ -569,7 +569,7 @@ function MinPoint(const P1, P2: TPoint): TPoint; overload;
 
 begin
   Result:=P1;
-  if (P2.Y<P1.Y) 
+  if (P2.Y<P1.Y)
      or ((P2.Y=P1.Y) and (P2.X<P1.X)) then
     Result:=P2;
 end;
@@ -588,7 +588,7 @@ begin
   Result.Y:=Round(P.Y*dY);
 end;
 
-function NormalizeRectF(const Pts: array of TPointF): TRectF; 
+function NormalizeRectF(const Pts: array of TPointF): TRectF;
 
 var
   Pt: TPointF;
@@ -604,18 +604,18 @@ begin
     Result.Top:=Min(Pt.Y,Result.Top);
     Result.Right:=Max(Pt.X,Result.Right);
     Result.Bottom:=Max(Pt.Y,Result.Bottom);
-    end;  
+    end;
 end;
 
-function NormalizeRect(const aRect : TRectF): TRectF; 
+function NormalizeRect(const aRect : TRectF): TRectF;
 
 begin
   With aRect do
-   Result:=NormalizeRectF([PointF(Left,Top),  
+   Result:=NormalizeRectF([PointF(Left,Top),
                            PointF(Right,Top),
-                           PointF(Right,Bottom), 
-                           PointF(Left,Bottom)]);  
-end; 
+                           PointF(Right,Bottom),
+                           PointF(Left,Bottom)]);
+end;
 
 function EqualRect(const r1,r2 : TRect) : Boolean;
 
@@ -802,13 +802,13 @@ begin
   Result:=Rect.Width;
 end;
 
-function RectHeight(const Rect: TRect): Integer; inline; 
+function RectHeight(const Rect: TRect): Integer; inline;
 
 begin
   Result:=Rect.Height;
 end;
 
-function RectHeight(const Rect: TRectF): Single; inline; 
+function RectHeight(const Rect: TRectF): Single; inline;
 
 begin
   Result:=Rect.Height
@@ -1130,7 +1130,7 @@ begin
   result.y := 0.5 * (y + b.y);
 end;
 
-class function TPointF.Zero: TPointF; 
+class function TPointF.Zero: TPointF;
 
 begin
   Result.X:=0;
@@ -1254,7 +1254,7 @@ function TPointF.Normalize: TPointF;
 
 var
   L: Single;
-  
+
 begin
   L:=Sqrt(Sqr(X)+Sqr(Y));
   if SameValue(L,0,Epsilon) then

+ 6 - 6
rtl/powerpc/powerpc.inc

@@ -1018,7 +1018,7 @@ indicated by the first bit set to 1. This is checked below.}
 {Both routines below assumes that framebp is a valid framepointer or nil.}
 
 {$define FPC_SYSTEM_HAS_GET_CALLER_ADDR}
-function get_caller_addr(framebp:pointer;addr:pointer=nil):pointer;assembler;{$ifdef SYSTEMINLINE}inline;{$endif} nostackframe;
+function get_caller_addr(framebp:pointer;addr:pointer=nil):pointer;assembler; nostackframe;
 asm
    cmplwi  r3,0
    beq     .Lcaller_addr_invalid
@@ -1042,7 +1042,7 @@ end;
 
 
 {$define FPC_SYSTEM_HAS_GET_CALLER_FRAME}
-function get_caller_frame(framebp:pointer;addr:pointer=nil):pointer;assembler;{$ifdef SYSTEMINLINE}inline;{$endif} nostackframe;
+function get_caller_frame(framebp:pointer;addr:pointer=nil):pointer;assembler; nostackframe;
 asm
     cmplwi  r3,0
     beq     .Lcaller_frame_invalid
@@ -1176,23 +1176,23 @@ end;
 {$ifndef FPC_SYSTEM_HAS_MEM_BARRIER}
 {$define FPC_SYSTEM_HAS_MEM_BARRIER}
 
-procedure ReadBarrier;assembler;nostackframe;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadBarrier;assembler;nostackframe;
 asm
   isync
 end;
 
-procedure ReadDependencyBarrier;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadDependencyBarrier;
 begin
   { reads imply barrier on earlier reads depended on }
 end;
 
-procedure ReadWriteBarrier;assembler;nostackframe;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadWriteBarrier;assembler;nostackframe;
 asm
   isync
   eieio
 end;
 
-procedure WriteBarrier;assembler;nostackframe;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure WriteBarrier;assembler;nostackframe;
 asm
   eieio
 end;

+ 6 - 6
rtl/powerpc64/powerpc64.inc

@@ -531,7 +531,7 @@ asm
 end;
 
 {$define FPC_SYSTEM_HAS_GET_CALLER_ADDR}
-function get_caller_addr(framebp:pointer;addr:pointer=nil):pointer;assembler;{$ifdef SYSTEMINLINE}inline;{$endif} nostackframe;
+function get_caller_addr(framebp:pointer;addr:pointer=nil):pointer;assembler; nostackframe;
 asm
   cmpldi  r3,0
   beq     .Lcaller_addr_frame_null
@@ -545,7 +545,7 @@ end;
 
 
 {$define FPC_SYSTEM_HAS_GET_CALLER_FRAME}
-function get_caller_frame(framebp:pointer;addr:pointer=nil):pointer;assembler;{$ifdef SYSTEMINLINE}inline;{$endif} nostackframe;
+function get_caller_frame(framebp:pointer;addr:pointer=nil):pointer;assembler; nostackframe;
 asm
   cmpldi  r3,0
   beq     .Lcaller_frame_null
@@ -777,17 +777,17 @@ end;
 {$ifndef FPC_SYSTEM_HAS_MEM_BARRIER}
 {$define FPC_SYSTEM_HAS_MEM_BARRIER}
 
-procedure ReadBarrier;assembler;nostackframe;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadBarrier;assembler;nostackframe;
 asm
   isync
 end;
 
-procedure ReadDependencyBarrier;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadDependencyBarrier;
 begin
   { reads imply barrier on earlier reads depended on }
 end;
 
-procedure ReadWriteBarrier;assembler;nostackframe;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadWriteBarrier;assembler;nostackframe;
 asm
   isync
 {$ifdef FPC_HAS_LWSYNC}
@@ -795,7 +795,7 @@ asm
 {$endif}
 end;
 
-procedure WriteBarrier;assembler;nostackframe;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure WriteBarrier;assembler;nostackframe;
 asm
 {$ifdef FPC_HAS_LWSYNC}
   lwsync

+ 1 - 1
rtl/riscv64/riscv64.inc

@@ -239,7 +239,7 @@ procedure ReadBarrier; assembler; nostackframe;
   end;
 
 
-procedure ReadDependencyBarrier;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadDependencyBarrier;
   begin
   end;
 

+ 4 - 4
rtl/sparc/sparc.inc

@@ -672,7 +672,7 @@ const
 {$define CPUSPARC_HAS_MEMBAR}
 {$endif}
 
-procedure ReadBarrier;assembler;nostackframe;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadBarrier;assembler;nostackframe;
 asm
 {$ifdef CPUSPARC_HAS_MEMBAR}
   ba,pt .L1
@@ -681,12 +681,12 @@ asm
 {$endif}
 end;
 
-procedure ReadDependencyBarrier;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadDependencyBarrier;
 begin
   { reads imply barrier on earlier reads depended on }
 end;
 
-procedure ReadWriteBarrier;assembler;nostackframe;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadWriteBarrier;assembler;nostackframe;
 asm
 {$ifdef CPUSPARC_HAS_MEMBAR}
   ba,pt .L1
@@ -695,7 +695,7 @@ asm
 {$endif}
 end;
 
-procedure WriteBarrier;assembler;nostackframe;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure WriteBarrier;assembler;nostackframe;
 asm
 {$ifdef CPUSPARC_HAS_MEMBAR}
   ba,pt .L1

+ 4 - 4
rtl/sparc64/sparc64.inc

@@ -486,7 +486,7 @@ const
 {$define CPUSPARC_HAS_MEMBAR}
 {$endif}
 
-procedure ReadBarrier;assembler;nostackframe;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadBarrier;assembler;nostackframe;
 asm
 {$ifdef CPUSPARC_HAS_MEMBAR}
   ba,pt .L1
@@ -495,12 +495,12 @@ asm
 {$endif}
 end;
 
-procedure ReadDependencyBarrier;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadDependencyBarrier;
 begin
   { reads imply barrier on earlier reads depended on }
 end;
 
-procedure ReadWriteBarrier;assembler;nostackframe;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadWriteBarrier;assembler;nostackframe;
 asm
 {$ifdef CPUSPARC_HAS_MEMBAR}
   ba,pt .L1
@@ -509,7 +509,7 @@ asm
 {$endif}
 end;
 
-procedure WriteBarrier;assembler;nostackframe;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure WriteBarrier;assembler;nostackframe;
 asm
 {$ifdef CPUSPARC_HAS_MEMBAR}
   ba,pt .L1

+ 8 - 8
rtl/x86_64/x86_64.inc

@@ -31,14 +31,14 @@ var
 {$endif}
 
 {$define FPC_SYSTEM_HAS_SPTR}
-Function Sptr : Pointer;assembler;nostackframe;{$ifdef SYSTEMINLINE}inline;{$endif}
+Function Sptr : Pointer;assembler;nostackframe;
 asm
         movq    %rsp,%rax
 end;
 
 {$IFNDEF INTERNAL_BACKTRACE}
 {$define FPC_SYSTEM_HAS_GET_FRAME}
-function get_frame:pointer;assembler;nostackframe;{$ifdef SYSTEMINLINE}inline;{$endif}
+function get_frame:pointer;assembler;nostackframe;
 asm
         movq    %rbp,%rax
 end;
@@ -51,7 +51,7 @@ asm
 end;
 
 {$define FPC_SYSTEM_HAS_GET_CALLER_ADDR}
-function get_caller_addr(framebp:pointer;addr:pointer=nil):pointer;{$ifdef SYSTEMINLINE}inline;{$endif}
+function get_caller_addr(framebp:pointer;addr:pointer=nil):pointer;
 begin
   get_caller_addr:=framebp;
   if assigned(framebp) then
@@ -60,7 +60,7 @@ end;
 
 
 {$define FPC_SYSTEM_HAS_GET_CALLER_FRAME}
-function get_caller_frame(framebp:pointer;addr:pointer=nil):pointer;{$ifdef SYSTEMINLINE}inline;{$endif}
+function get_caller_frame(framebp:pointer;addr:pointer=nil):pointer;
 begin
   get_caller_frame:=framebp;
   if assigned(framebp) then
@@ -1532,22 +1532,22 @@ Procedure SysResetFPU;
 {$ifndef FPC_SYSTEM_HAS_MEM_BARRIER}
 {$define FPC_SYSTEM_HAS_MEM_BARRIER}
 
-procedure ReadBarrier;assembler;nostackframe;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadBarrier;assembler;nostackframe;
 asm
   lfence
 end;
 
-procedure ReadDependencyBarrier;assembler;nostackframe;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadDependencyBarrier;assembler;nostackframe;
 asm
   { reads imply barrier on earlier reads depended on }
 end;
 
-procedure ReadWriteBarrier;assembler;nostackframe;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure ReadWriteBarrier;assembler;nostackframe;
 asm
   mfence
 end;
 
-procedure WriteBarrier;assembler;nostackframe;{$ifdef SYSTEMINLINE}inline;{$endif}
+procedure WriteBarrier;assembler;nostackframe;
 asm
   sfence
 end;