Set FPC_USE_INTRINSICS after _USES clause for i386 and x86_64

rtl/amicommon/classes.pp

@@ -29,10 +29,6 @@
 {$if defined(CPURISCV32) or defined(CPURISCV64)}
    {$define FPC_USE_INTRINSICS}
 {$endif}
-{ Also set FPC_USE_INTRINSICS for i386 and x86_64 }
-{$if defined(CPURISCV32) or defined(CPURISCV64)}
-   {$define FPC_USE_INTRINSICS}
-{$endif}
 {$endif}
 {$endif}
 
@@ -73,6 +69,13 @@ uses
   typinfo;
 {$ENDIF FPC_DOTTEDUNITS}
 
+{ Also set FPC_USE_INTRINSICS for i386 and x86_64,
+  but only after _USES clause as there
+  is not intinsics unit for those CPUs }
+{$if defined(CPUI386) or defined(CPUX86_64)}
+   {$define FPC_USE_INTRINSICS}
+{$endif}
+
 {$i classesh.inc}
 
 

rtl/embedded/classes.pp

@@ -29,10 +29,6 @@
 {$if defined(CPURISCV32) or defined(CPURISCV64)}
    {$define FPC_USE_INTRINSICS}
 {$endif}
-{ Also set FPC_USE_INTRINSICS for i386 and x86_64 }
-{$if defined(CPURISCV32) or defined(CPURISCV64)}
-   {$define FPC_USE_INTRINSICS}
-{$endif}
 {$endif}
 {$endif}
 
@@ -70,6 +66,13 @@ uses
   typinfo;
 {$ENDIF FPC_DOTTEDUNITS}
 
+{ Also set FPC_USE_INTRINSICS for i386 and x86_64,
+  but only after _USES clause as there
+  is not intinsics unit for those CPUs }
+{$if defined(CPUI386) or defined(CPUX86_64)}
+   {$define FPC_USE_INTRINSICS}
+{$endif}
+
 {$i classesh.inc}
 
 

rtl/unix/classes.pp

@@ -29,10 +29,6 @@
 {$if defined(CPURISCV32) or defined(CPURISCV64)}
    {$define FPC_USE_INTRINSICS}
 {$endif}
-{ Also set FPC_USE_INTRINSICS for i386 and x86_64 }
-{$if defined(CPURISCV32) or defined(CPURISCV64)}
-   {$define FPC_USE_INTRINSICS}
-{$endif}
 {$endif}
 {$endif}
 { determine the type of the resource/form file }
@@ -73,6 +69,13 @@ uses
   sortbase;
 {$ENDIF FPC_DOTTEDUNITS}
 
+{ Also set FPC_USE_INTRINSICS for i386 and x86_64,
+  but only after _USES clause as there
+  is not intinsics unit for those CPUs }
+{$if defined(CPUI386) or defined(CPUX86_64)}
+   {$define FPC_USE_INTRINSICS}
+{$endif}
+
 {$i classesh.inc}
 
 implementation

rtl/win32/classes.pp

@@ -29,10 +29,6 @@
 {$if defined(CPURISCV32) or defined(CPURISCV64)}
    {$define FPC_USE_INTRINSICS}
 {$endif}
-{ Also set FPC_USE_INTRINSICS for i386 and x86_64 }
-{$if defined(CPURISCV32) or defined(CPURISCV64)}
-   {$define FPC_USE_INTRINSICS}
-{$endif}
 {$endif}
 {$endif}
 
@@ -75,6 +71,15 @@ uses
   windows;
 {$ENDIF FPC_DOTTEDUNITS}
 
+{ Also set FPC_USE_INTRINSICS for i386 and x86_64,
+  but only after _USES clause as there
+  is not intinsics unit for those CPUs }
+{$if defined(CPUI386) or defined(CPUX86_64)}
+   {$define FPC_USE_INTRINSICS}
+{$endif}
+
+{$i classesh.inc}
+
 type
   TWndMethod = procedure(var msg : TMessage) of object;
 

rtl/win64/classes.pp

@@ -29,10 +29,6 @@
 {$if defined(CPURISCV32) or defined(CPURISCV64)}
    {$define FPC_USE_INTRINSICS}
 {$endif}
-{ Also set FPC_USE_INTRINSICS for i386 and x86_64 }
-{$if defined(CPURISCV32) or defined(CPURISCV64)}
-   {$define FPC_USE_INTRINSICS}
-{$endif}
 {$endif}
 {$endif}
 
@@ -75,6 +71,13 @@ uses
   windows;
 {$ENDIF FPC_DOTTEDUNITS}
 
+{ Also set FPC_USE_INTRINSICS for i386 and x86_64,
+  but only after _USES clause as there
+  is not intinsics unit for those CPUs }
+{$if defined(CPUI386) or defined(CPUX86_64)}
+   {$define FPC_USE_INTRINSICS}
+{$endif}
+
 type
   TWndMethod = procedure(var msg : TMessage) of object;