diff --git a/rtl/i386/cpu.pp b/rtl/i386/cpu.pp index 5e4ad792e7..ba08c754d9 100644 --- a/rtl/i386/cpu.pp +++ b/rtl/i386/cpu.pp @@ -21,14 +21,6 @@ unit cpu; interface -{$IFDEF FPC_DOTTEDUNITS} - uses - System.SysUtils; -{$ELSE FPC_DOTTEDUNITS} - uses - sysutils; -{$ENDIF FPC_DOTTEDUNITS} - { returns true, if the processor supports the cpuid instruction } function cpuid_support : boolean; diff --git a/rtl/inc/systemh.inc b/rtl/inc/systemh.inc index d00a82279a..00478ee5c5 100644 --- a/rtl/inc/systemh.inc +++ b/rtl/inc/systemh.inc @@ -788,6 +788,18 @@ type (* means that default handling should be used. *) TCtrlBreakHandler = function (CtrlBreak: boolean): boolean; + Int128Rec = packed record + case integer of +{$ifdef FPC_LITTLE_ENDIAN} + 0 : (Lo,Hi : QWord); +{$else FPC_LITTLE_ENDIAN} + 0 : (Hi,Lo : QWord); +{$endif FPC_LITTLE_ENDIAN} + 1 : (DWords : Array[0..3] of DWord); + 2 : (Words : Array[0..7] of Word); + 3 : (Bytes : Array[0..15] of Byte); + end; + { Numbers for routines that have compiler magic } {$I innr.inc} diff --git a/rtl/objpas/sysutils/sysutilh.inc b/rtl/objpas/sysutils/sysutilh.inc index 446f8acc2d..13b77601ce 100644 --- a/rtl/objpas/sysutils/sysutilh.inc +++ b/rtl/objpas/sysutils/sysutilh.inc @@ -81,17 +81,7 @@ type 2 : (Bytes : Array[0..7] of Byte); end; - Int128Rec = packed record - case integer of -{$ifdef FPC_LITTLE_ENDIAN} - 0 : (Lo,Hi : QWord); -{$else FPC_LITTLE_ENDIAN} - 0 : (Hi,Lo : QWord); -{$endif FPC_LITTLE_ENDIAN} - 1 : (DWords : Array[0..3] of DWord); - 2 : (Words : Array[0..7] of Word); - 3 : (Bytes : Array[0..15] of Byte); - end; + Int128Rec = System.Int128Rec; OWordRec = packed record case integer of diff --git a/rtl/x86_64/cpu.pp b/rtl/x86_64/cpu.pp index ab0c0d7f3f..92dc468701 100644 --- a/rtl/x86_64/cpu.pp +++ b/rtl/x86_64/cpu.pp @@ -27,14 +27,6 @@ unit cpu; {$endif} {$endif} -{$IFDEF FPC_DOTTEDUNITS} - uses - System.SysUtils; -{$ELSE FPC_DOTTEDUNITS} - uses - sysutils; -{$ENDIF FPC_DOTTEDUNITS} - type TCpuidResult = record eax, ebx, ecx, edx: uint32;