23 files changed, 78 insertions, 64 deletions
diff --git a/compiler/aarch64/symcpu.pas b/compiler/aarch64/symcpu.pas
index a95c77ba6f..8e2450fb94 100644
--- a/compiler/aarch64/symcpu.pas
+++ b/compiler/aarch64/symcpu.pas
@@ -26,7 +26,7 @@ unit symcpu;
 interface
 
 uses
-  symdef,symsym;
+  symtype,symdef,symsym;
 
 type
   { defs }
@@ -131,6 +131,10 @@ type
   end;
 
 
+const
+  pbestrealtype : ^tdef = @s64floattype;
+
+
 implementation
 
 begin
diff --git a/compiler/alpha/symcpu.pas b/compiler/alpha/symcpu.pas
index 5063b90f3c..76cf661034 100644
--- a/compiler/alpha/symcpu.pas
+++ b/compiler/alpha/symcpu.pas
@@ -26,7 +26,7 @@ unit symcpu;
 interface
 
 uses
-  symdef,symsym;
+  symtype,symdef,symsym;
 
 type
   { defs }
@@ -164,6 +164,10 @@ type
   tcpusyssymclass = class of tcpusyssym;
 
 
+const
+  pbestrealtype : ^tdef = @s64floattype;
+
+
 implementation
 
 begin
diff --git a/compiler/arm/symcpu.pas b/compiler/arm/symcpu.pas
index 0a1a297c43..a982ae490c 100644
--- a/compiler/arm/symcpu.pas
+++ b/compiler/arm/symcpu.pas
@@ -26,7 +26,7 @@ unit symcpu;
 interface
 
 uses
-  symdef,symsym,globtype;
+  symtype,symdef,symsym,globtype;
 
 type
   { defs }
@@ -168,6 +168,10 @@ type
   tcpusyssymclass = class of tcpusyssym;
 
 
+const
+  pbestrealtype : ^tdef = @s64floattype;
+
+
 implementation
 
 begin
diff --git a/compiler/avr/symcpu.pas b/compiler/avr/symcpu.pas
index 1379dc163c..fc61cff9f8 100644
--- a/compiler/avr/symcpu.pas
+++ b/compiler/avr/symcpu.pas
@@ -26,7 +26,7 @@ unit symcpu;
 interface
 
 uses
-  symdef,symsym;
+  symtype,symdef,symsym;
 
 type
   { defs }
@@ -164,6 +164,10 @@ type
   tcpusyssymclass = class of tcpusyssym;
 
 
+const
+  pbestrealtype : ^tdef = @s64floattype;
+
+
 implementation
 
 begin
diff --git a/compiler/generic/symcpu.pas b/compiler/generic/symcpu.pas
index 1a9b3e19e4..23cc9713d6 100644
--- a/compiler/generic/symcpu.pas
+++ b/compiler/generic/symcpu.pas
@@ -26,7 +26,7 @@ unit symcpu;
 interface
 
 uses
-  symdef,symsym;
+  symtype,symdef,symsym;
 
 type
   { defs }
@@ -164,6 +164,10 @@ type
   tcpusyssymclass = class of tcpusyssym;
 
 
+const
+  pbestrealtype : ^tdef = @<somestandardfloattype>;
+
+
 implementation
 
 begin
diff --git a/compiler/i386/symcpu.pas b/compiler/i386/symcpu.pas
index e06001eea3..2b769c2468 100644
--- a/compiler/i386/symcpu.pas
+++ b/compiler/i386/symcpu.pas
@@ -26,7 +26,7 @@ unit symcpu;
 interface
 
 uses
-  symdef,symsym,symx86,symi86;
+  symtype,symdef,symsym,symx86,symi86;
 
 type
   { defs }
@@ -164,6 +164,10 @@ type
   tcpusyssymclass = class of tcpusyssym;
 
 
+const
+  pbestrealtype : ^tdef = @s80floattype;
+
+
 implementation
 
 begin
diff --git a/compiler/i8086/symcpu.pas b/compiler/i8086/symcpu.pas
index 0b03112f9f..e1a5d21000 100644
--- a/compiler/i8086/symcpu.pas
+++ b/compiler/i8086/symcpu.pas
@@ -171,6 +171,10 @@ type
   tcpusyssymclass = class of tcpusyssym;
 
 
+const
+   pbestrealtype : ^tdef = @s80floattype;
+
+
 implementation
 
   uses
diff --git a/compiler/ia64/symcpu.pas b/compiler/ia64/symcpu.pas
index 04265c09e3..df2b935cad 100644
--- a/compiler/ia64/symcpu.pas
+++ b/compiler/ia64/symcpu.pas
@@ -26,7 +26,7 @@ unit symcpu;
 interface
 
 uses
-  symdef,symsym;
+  symtype,symdef,symsym;
 
 type
   { defs }
@@ -164,6 +164,10 @@ type
   tcpusyssymclass = class of tcpusyssym;
 
 
+const
+  pbestrealtype : ^tdef = @s64floattype;
+
+
 implementation
 
 begin
diff --git a/compiler/jvm/symcpu.pas b/compiler/jvm/symcpu.pas
index 3fc14084a3..da9d2d5e7d 100644
--- a/compiler/jvm/symcpu.pas
+++ b/compiler/jvm/symcpu.pas
@@ -197,6 +197,10 @@ type
   tcpusyssymclass = class of tcpusyssym;
 
 
+const
+  pbestrealtype : ^tdef = @s64floattype;
+
+
 implementation
 
   uses
diff --git a/compiler/m68k/symcpu.pas b/compiler/m68k/symcpu.pas
index e4c9c7af5d..4856432514 100644
--- a/compiler/m68k/symcpu.pas
+++ b/compiler/m68k/symcpu.pas
@@ -173,6 +173,10 @@ type
   tcpusyssymclass = class of tcpusyssym;
 
 
+const
+   pbestrealtype : ^tdef = @s64floattype;
+
+
 implementation
 
 {****************************************************************************
diff --git a/compiler/mips/symcpu.pas b/compiler/mips/symcpu.pas
index f6e9af68a0..34a93a0b51 100644
--- a/compiler/mips/symcpu.pas
+++ b/compiler/mips/symcpu.pas
@@ -26,7 +26,7 @@ unit symcpu;
 interface
 
 uses
-  symdef,symsym;
+  symtype,symdef,symsym;
 
 type
   { defs }
@@ -166,6 +166,10 @@ type
   tcpusyssymclass = class of tcpusyssym;
 
 
+const
+  pbestrealtype : ^tdef = @s64floattype;
+
+
 implementation
 
 begin
diff --git a/compiler/nadd.pas b/compiler/nadd.pas
index 9ee487d53d..f7ff9c6bea 100644
--- a/compiler/nadd.pas
+++ b/compiler/nadd.pas
@@ -110,7 +110,7 @@ implementation
 {$ENDIF}
       globtype,systems,constexp,
       cutils,verbose,globals,widestr,
-      symconst,symdef,symsym,symtable,defutil,defcmp,
+      symconst,symdef,symsym,symcpu,symtable,defutil,defcmp,
       cgbase,
       htypechk,pass_1,
       nld,nbas,nmat,ncnv,ncon,nset,nopt,ncal,ninl,nmem,nutils,
diff --git a/compiler/ncnv.pas b/compiler/ncnv.pas
index bb70e434ef..985217c207 100644
--- a/compiler/ncnv.pas
+++ b/compiler/ncnv.pas
@@ -293,7 +293,7 @@ implementation
    uses
       globtype,systems,constexp,
       cutils,verbose,globals,widestr,
-      symconst,symdef,symsym,symtable,
+      symconst,symdef,symsym,symcpu,symtable,
       ncon,ncal,nset,nadd,nmem,nmat,nbas,nutils,ninl,
       cgbase,procinfo,
       htypechk,pass_1,cpuinfo;
diff --git a/compiler/ninl.pas b/compiler/ninl.pas
index 28772dc817..8db21dd947 100644
--- a/compiler/ninl.pas
+++ b/compiler/ninl.pas
@@ -108,7 +108,7 @@ implementation
     uses
       verbose,globals,systems,constexp,
       globtype,cutils,fmodule,
-      symconst,symdef,symsym,symtable,paramgr,defutil,symbase,
+      symconst,symdef,symsym,symcpu,symtable,paramgr,defutil,symbase,
       pass_1,
       ncal,ncon,ncnv,nadd,nld,nbas,nflw,nmem,nmat,nutils,
       nobjc,objcdef,
diff --git a/compiler/pexpr.pas b/compiler/pexpr.pas
index eb08b00719..31243b39f4 100644
--- a/compiler/pexpr.pas
+++ b/compiler/pexpr.pas
@@ -62,7 +62,7 @@ implementation
        verbose,
        systems,widestr,
        { symtable }
-       symconst,symtable,symsym,defutil,defcmp,
+       symconst,symtable,symsym,symcpu,defutil,defcmp,
        { module }
        fmodule,ppu,
        { pass 1 }
diff --git a/compiler/powerpc/nppccnv.pas b/compiler/powerpc/nppccnv.pas
index 375eb957ad..668dc37e38 100644
--- a/compiler/powerpc/nppccnv.pas
+++ b/compiler/powerpc/nppccnv.pas
@@ -58,7 +58,7 @@ implementation
    uses
       verbose,globtype,globals,systems,
       symconst,symdef,aasmbase,aasmtai,aasmdata,
-      defutil,
+      defutil,symcpu,
       cgbase,cgutils,pass_1,pass_2,
       ncon,ncal,
       ncgutil,procinfo,
diff --git a/compiler/powerpc/symcpu.pas b/compiler/powerpc/symcpu.pas
index af9e926aa5..12bb2e07b5 100644
--- a/compiler/powerpc/symcpu.pas
+++ b/compiler/powerpc/symcpu.pas
@@ -173,6 +173,10 @@ type
   tcpusyssymclass = class of tcpusyssym;
 
 
+const
+   pbestrealtype : ^tdef = @s64floattype;
+
+
 implementation
 
 {****************************************************************************
diff --git a/compiler/powerpc64/nppccnv.pas b/compiler/powerpc64/nppccnv.pas
index 606bd558cb..7eeeffd51f 100644
--- a/compiler/powerpc64/nppccnv.pas
+++ b/compiler/powerpc64/nppccnv.pas
@@ -58,7 +58,7 @@ implementation
 uses
   verbose, globtype, globals, systems,
   symconst, symdef, aasmbase, aasmtai,aasmdata,
-  defutil,
+  defutil, symcpu,
   cgbase, cgutils, pass_1, pass_2,
   ncon, ncal,procinfo,
   ncgutil,
diff --git a/compiler/powerpc64/symcpu.pas b/compiler/powerpc64/symcpu.pas
index e6c9922cef..c9cbe9a002 100644
--- a/compiler/powerpc64/symcpu.pas
+++ b/compiler/powerpc64/symcpu.pas
@@ -26,7 +26,7 @@ unit symcpu;
 interface
 
 uses
-  symdef,symsym;
+  symtype,symdef,symsym;
 
 type
   { defs }
@@ -164,6 +164,10 @@ type
   tcpusyssymclass = class of tcpusyssym;
 
 
+const
+  pbestrealtype : ^tdef = @s64floattype;
+
+
 implementation
 
 begin
diff --git a/compiler/sparc/symcpu.pas b/compiler/sparc/symcpu.pas
index cec5293b3c..f49adc7320 100644
--- a/compiler/sparc/symcpu.pas
+++ b/compiler/sparc/symcpu.pas
@@ -26,7 +26,7 @@ unit symcpu;
 interface
 
 uses
-  symdef,symsym;
+  symtype,symdef,symsym;
 
 type
   { defs }
@@ -164,6 +164,10 @@ type
   tcpusyssymclass = class of tcpusyssym;
 
 
+const
+  pbestrealtype : ^tdef = @s64floattype;
+
+
 implementation
 
 begin
diff --git a/compiler/symdef.pas b/compiler/symdef.pas
index 96c79fe98b..7b76100cb3 100644
--- a/compiler/symdef.pas
+++ b/compiler/symdef.pas
@@ -1047,52 +1047,6 @@ interface
        { FPC java procvar base class }
        java_procvarbase          : tobjectdef;
 
-    const
-{$ifdef i8086}
-       pbestrealtype : ^tdef = @s80floattype;
-{$endif}
-{$ifdef i386}
-       pbestrealtype : ^tdef = @s80floattype;
-{$endif}
-{$ifdef x86_64}
-       pbestrealtype : ^tdef = @s80floattype;
-{$endif}
-{$ifdef m68k}
-       pbestrealtype : ^tdef = @s64floattype;
-{$endif}
-{$ifdef alpha}
-       pbestrealtype : ^tdef = @s64floattype;
-{$endif}
-{$ifdef powerpc}
-       pbestrealtype : ^tdef = @s64floattype;
-{$endif}
-{$ifdef POWERPC64}
-       pbestrealtype : ^tdef = @s64floattype;
-{$endif}
-{$ifdef ia64}
-       pbestrealtype : ^tdef = @s64floattype;
-{$endif}
-{$ifdef SPARC}
-       pbestrealtype : ^tdef = @s64floattype;
-{$endif SPARC}
-{$ifdef vis}
-       pbestrealtype : ^tdef = @s64floattype;
-{$endif vis}
-{$ifdef ARM}
-       pbestrealtype : ^tdef = @s64floattype;
-{$endif ARM}
-{$ifdef MIPS}
-       pbestrealtype : ^tdef = @s64floattype;
-{$endif MIPS}
-{$ifdef AVR}
-       pbestrealtype : ^tdef = @s64floattype;
-{$endif AVR}
-{$ifdef JVM}
-       pbestrealtype : ^tdef = @s64floattype;
-{$endif JVM}
-{$ifdef AARCH64}
-       pbestrealtype : ^tdef = @s64floattype;
-{$endif AARCH64}
 
     function make_mangledname(const typeprefix:TSymStr;st:TSymtable;const suffix:TSymStr):TSymStr;
     function make_dllmangledname(const dllname,importname:TSymStr;
diff --git a/compiler/x86/nx86inl.pas b/compiler/x86/nx86inl.pas
index f028e53642..c9eef4f32c 100644
--- a/compiler/x86/nx86inl.pas
+++ b/compiler/x86/nx86inl.pas
@@ -77,7 +77,7 @@ implementation
       symconst,
       defutil,
       aasmbase,aasmtai,aasmdata,aasmcpu,
-      symtype,symdef,
+      symtype,symdef,symcpu,
       cgbase,pass_2,
       cpuinfo,cpubase,paramgr,
       nbas,ncon,ncal,ncnv,nld,ncgutil,
diff --git a/compiler/x86_64/symcpu.pas b/compiler/x86_64/symcpu.pas
index 274721dc35..baba54b9e9 100644
--- a/compiler/x86_64/symcpu.pas
+++ b/compiler/x86_64/symcpu.pas
@@ -26,7 +26,7 @@ unit symcpu;
 interface
 
 uses
-  symdef,symsym,symx86;
+  symtype,symdef,symsym,symx86;
 
 type
   { defs }
@@ -164,6 +164,10 @@ type
   tcpusyssymclass = class of tcpusyssym;
 
 
+const
+  pbestrealtype : ^tdef = @s80floattype;
+
+
 implementation
 
 begin