From ff3acfb8cda7f6a077dfc585cbe9acb0d8e34418 Mon Sep 17 00:00:00 2001 From: florian Date: Sun, 31 Oct 2021 13:20:28 +0100 Subject: [PATCH] * cleanup of 2.7.0 defines --- compiler/aarch64/cpuinfo.pas | 2 -- compiler/arm/cpuinfo.pas | 2 -- compiler/avr/cpuinfo.pas | 2 -- compiler/compiler.pas | 4 ++-- compiler/cresstr.pas | 3 --- compiler/generic/cpuinfo.pas | 2 -- compiler/i386/cpuinfo.pas | 2 -- compiler/i8086/cpuinfo.pas | 2 -- compiler/jvm/cpuinfo.pas | 2 -- compiler/m68k/cpuinfo.pas | 2 -- compiler/mips/cpuinfo.pas | 2 -- compiler/nadd.pas | 4 ++-- compiler/options.pas | 2 +- compiler/powerpc/cpuinfo.pas | 2 -- compiler/powerpc64/cpuinfo.pas | 2 -- compiler/riscv32/cpuinfo.pas | 2 -- compiler/riscv64/cpuinfo.pas | 2 -- compiler/scanner.pas | 6 +----- compiler/sparc/cpuinfo.pas | 2 -- compiler/sparc64/cpuinfo.pas | 2 -- compiler/wasm32/cpuinfo.pas | 2 -- compiler/x86_64/cpuinfo.pas | 2 -- compiler/z80/cpuinfo.pas | 2 -- 23 files changed, 6 insertions(+), 49 deletions(-) diff --git a/compiler/aarch64/cpuinfo.pas b/compiler/aarch64/cpuinfo.pas index f5a3c3cefc..4c0e49350b 100644 --- a/compiler/aarch64/cpuinfo.pas +++ b/compiler/aarch64/cpuinfo.pas @@ -23,9 +23,7 @@ Interface Type bestreal = double; -{$if FPC_FULLVERSION>20700} bestrealrec = TDoubleRec; -{$endif FPC_FULLVERSION>20700} ts32real = single; ts64real = double; ts80real = type extended; diff --git a/compiler/arm/cpuinfo.pas b/compiler/arm/cpuinfo.pas index ae2f4c73bf..6ccb1ee655 100644 --- a/compiler/arm/cpuinfo.pas +++ b/compiler/arm/cpuinfo.pas @@ -23,9 +23,7 @@ Interface Type bestreal = double; -{$if FPC_FULLVERSION>20700} bestrealrec = TDoubleRec; -{$endif FPC_FULLVERSION>20700} ts32real = single; ts64real = double; ts80real = type extended; diff --git a/compiler/avr/cpuinfo.pas b/compiler/avr/cpuinfo.pas index fad8c4bf73..4a27c3e0e9 100644 --- a/compiler/avr/cpuinfo.pas +++ b/compiler/avr/cpuinfo.pas @@ -23,9 +23,7 @@ Interface Type bestreal = double; -{$if FPC_FULLVERSION>20700} bestrealrec = TDoubleRec; -{$endif FPC_FULLVERSION>20700} ts32real = single; ts64real = double; ts80real = type extended; diff --git a/compiler/compiler.pas b/compiler/compiler.pas index 0fc92f11a0..2c899fcd5d 100644 --- a/compiler/compiler.pas +++ b/compiler/compiler.pas @@ -36,7 +36,7 @@ uses {$ifdef WATCOM} emu387, {$endif WATCOM} -{$if defined(unix) and (FPC_FULLVERSION>20700)} +{$if defined(unix)} { system code page stuff for unix } unixcp, fpwidestring, @@ -197,7 +197,7 @@ procedure InitCompiler(const cmd:TCmdStr); begin if CompilerInited then DoneCompiler; -{$if defined(unix) and (FPC_FULLVERSION>20700)} +{$if defined(unix)} { Set default code page for ansistrings on unix-like systems } DefaultSystemCodePage:=GetSystemCodePage; {$endif} diff --git a/compiler/cresstr.pas b/compiler/cresstr.pas index 94179db44f..36490a7903 100644 --- a/compiler/cresstr.pas +++ b/compiler/cresstr.pas @@ -32,9 +32,6 @@ implementation uses SysUtils, -{$if FPC_FULLVERSION<20700} - ccharset, -{$endif} cclasses,widestr, cutils,globtype,globals,systems, symbase,symconst,symtype,symdef,symsym,symtable, diff --git a/compiler/generic/cpuinfo.pas b/compiler/generic/cpuinfo.pas index c1f5daef8a..477a2c2a8b 100644 --- a/compiler/generic/cpuinfo.pas +++ b/compiler/generic/cpuinfo.pas @@ -24,13 +24,11 @@ Interface Type bestreal = extended; -{$if FPC_FULLVERSION>20700} {$ifdef FPC_HAS_TYPE_EXTENDED} bestrealrec = TExtended80Rec; {$else} bestrealrec = TDoubleRec; {$endif} -{$endif FPC_FULLVERSION>20700} ts32real = single; ts64real = double; ts80real = type extended; diff --git a/compiler/i386/cpuinfo.pas b/compiler/i386/cpuinfo.pas index ddffda6922..3a11f87d8b 100644 --- a/compiler/i386/cpuinfo.pas +++ b/compiler/i386/cpuinfo.pas @@ -30,9 +30,7 @@ Interface Type bestreal = extended; -{$if FPC_FULLVERSION>20700} bestrealrec = TExtended80Rec; -{$endif FPC_FULLVERSION>20700} ts32real = single; ts64real = double; ts80real = extended; diff --git a/compiler/i8086/cpuinfo.pas b/compiler/i8086/cpuinfo.pas index c1900175b2..5c04a37649 100644 --- a/compiler/i8086/cpuinfo.pas +++ b/compiler/i8086/cpuinfo.pas @@ -30,9 +30,7 @@ Interface Type bestreal = extended; -{$if FPC_FULLVERSION>20700} bestrealrec = TExtended80Rec; -{$endif FPC_FULLVERSION>20700} ts32real = single; ts64real = double; ts80real = extended; diff --git a/compiler/jvm/cpuinfo.pas b/compiler/jvm/cpuinfo.pas index 3cd6bd1fe9..818b6e296e 100644 --- a/compiler/jvm/cpuinfo.pas +++ b/compiler/jvm/cpuinfo.pas @@ -23,9 +23,7 @@ Interface Type bestreal = double; -{$if FPC_FULLVERSION>20700} bestrealrec = TDoubleRec; -{$endif FPC_FULLVERSION>20700} ts32real = single; ts64real = double; ts80real = extended; diff --git a/compiler/m68k/cpuinfo.pas b/compiler/m68k/cpuinfo.pas index c25e2ab6fa..e681a9af79 100644 --- a/compiler/m68k/cpuinfo.pas +++ b/compiler/m68k/cpuinfo.pas @@ -23,9 +23,7 @@ Interface Type bestreal = double; -{$if FPC_FULLVERSION>20700} bestrealrec = TDoubleRec; -{$endif FPC_FULLVERSION>20700} ts32real = single; ts64real = double; ts80real = extended; diff --git a/compiler/mips/cpuinfo.pas b/compiler/mips/cpuinfo.pas index c8c0d5c238..1c2841b9c8 100644 --- a/compiler/mips/cpuinfo.pas +++ b/compiler/mips/cpuinfo.pas @@ -23,9 +23,7 @@ Interface Type bestreal = double; -{$if FPC_FULLVERSION>20700} bestrealrec = TDoubleRec; -{$endif FPC_FULLVERSION>20700} ts32real = single; ts64real = double; ts80real = type double; diff --git a/compiler/nadd.pas b/compiler/nadd.pas index 14e4b01a4b..b4a4b241fa 100644 --- a/compiler/nadd.pas +++ b/compiler/nadd.pas @@ -1121,7 +1121,7 @@ implementation end; end; -{$if (FPC_FULLVERSION>20700) and not defined(FPC_SOFT_FPUX80)} +{$if not defined(FPC_SOFT_FPUX80)} { bestrealrec is 2.7.1+ only } { replace .../const by a multiplication, but only if fastmath is enabled or @@ -1170,7 +1170,7 @@ implementation else ; end; -{$endif FPC_FULLVERSION>20700} +{$endif not defined(FPC_SOFT_FPUX80)} { first, we handle widestrings, so we can check later for } { stringconstn only } diff --git a/compiler/options.pas b/compiler/options.pas index c8530fff8a..727c7e4831 100644 --- a/compiler/options.pas +++ b/compiler/options.pas @@ -95,7 +95,7 @@ implementation uses widestr, - {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif}, + charset, SysUtils, version, cutils,cmsgs, diff --git a/compiler/powerpc/cpuinfo.pas b/compiler/powerpc/cpuinfo.pas index 2330eacb41..7b10ed3b61 100644 --- a/compiler/powerpc/cpuinfo.pas +++ b/compiler/powerpc/cpuinfo.pas @@ -23,9 +23,7 @@ Interface Type bestreal = double; -{$if FPC_FULLVERSION>20700} bestrealrec = TDoubleRec; -{$endif FPC_FULLVERSION>20700} ts32real = single; ts64real = double; ts80real = extended; diff --git a/compiler/powerpc64/cpuinfo.pas b/compiler/powerpc64/cpuinfo.pas index b435387be3..81af80bd63 100644 --- a/compiler/powerpc64/cpuinfo.pas +++ b/compiler/powerpc64/cpuinfo.pas @@ -23,9 +23,7 @@ uses type bestreal = double; -{$if FPC_FULLVERSION>20700} bestrealrec = TDoubleRec; -{$endif FPC_FULLVERSION>20700} ts32real = single; ts64real = double; ts80real = extended; diff --git a/compiler/riscv32/cpuinfo.pas b/compiler/riscv32/cpuinfo.pas index f5ee0f5e60..0ca2506c9c 100644 --- a/compiler/riscv32/cpuinfo.pas +++ b/compiler/riscv32/cpuinfo.pas @@ -23,9 +23,7 @@ Interface Type bestreal = double; -{$if FPC_FULLVERSION>20700} bestrealrec = TDoubleRec; -{$endif FPC_FULLVERSION>20700} ts32real = single; ts64real = double; ts80real = extended; diff --git a/compiler/riscv64/cpuinfo.pas b/compiler/riscv64/cpuinfo.pas index d9b86a893b..22d7d34bc1 100644 --- a/compiler/riscv64/cpuinfo.pas +++ b/compiler/riscv64/cpuinfo.pas @@ -23,9 +23,7 @@ uses type bestreal = double; -{$if FPC_FULLVERSION>20700} bestrealrec = TDoubleRec; -{$endif FPC_FULLVERSION>20700} ts32real = single; ts64real = double; ts80real = extended; diff --git a/compiler/scanner.pas b/compiler/scanner.pas index 9632471f24..7570970a07 100644 --- a/compiler/scanner.pas +++ b/compiler/scanner.pas @@ -291,11 +291,7 @@ implementation cpuinfo, fmodule,fppu, { this is needed for $I %CURRENTROUTINE%} - procinfo -{$if FPC_FULLVERSION<20700} - ,ccharset -{$endif} - ; + procinfo; var { dictionaries with the supported directives } diff --git a/compiler/sparc/cpuinfo.pas b/compiler/sparc/cpuinfo.pas index 3ff72b49f1..47b3233cfb 100644 --- a/compiler/sparc/cpuinfo.pas +++ b/compiler/sparc/cpuinfo.pas @@ -30,9 +30,7 @@ uses type bestreal = double; -{$if FPC_FULLVERSION>20700} bestrealrec = TDoubleRec; -{$endif FPC_FULLVERSION>20700} ts32real = single; ts64real = double; ts80real = extended; diff --git a/compiler/sparc64/cpuinfo.pas b/compiler/sparc64/cpuinfo.pas index cae21e0e6c..a888e9954d 100644 --- a/compiler/sparc64/cpuinfo.pas +++ b/compiler/sparc64/cpuinfo.pas @@ -30,9 +30,7 @@ uses type bestreal = double; -{$if FPC_FULLVERSION>20700} bestrealrec = TDoubleRec; -{$endif FPC_FULLVERSION>20700} ts32real = single; ts64real = double; ts80real = extended; diff --git a/compiler/wasm32/cpuinfo.pas b/compiler/wasm32/cpuinfo.pas index 0ad80861d3..e11b3485d8 100644 --- a/compiler/wasm32/cpuinfo.pas +++ b/compiler/wasm32/cpuinfo.pas @@ -23,9 +23,7 @@ Interface Type bestreal = double; -{$if FPC_FULLVERSION>20700} bestrealrec = TDoubleRec; -{$endif FPC_FULLVERSION>20700} ts32real = single; ts64real = double; ts80real = extended; diff --git a/compiler/x86_64/cpuinfo.pas b/compiler/x86_64/cpuinfo.pas index 5b5a03136e..e8632d253f 100644 --- a/compiler/x86_64/cpuinfo.pas +++ b/compiler/x86_64/cpuinfo.pas @@ -30,13 +30,11 @@ Interface Type bestreal = extended; -{$if FPC_FULLVERSION>20700} {$ifdef FPC_HAS_TYPE_EXTENDED} bestrealrec = TExtended80Rec; {$else} bestrealrec = TDoubleRec; {$endif} -{$endif FPC_FULLVERSION>20700} ts32real = single; ts64real = double; ts80real = extended; diff --git a/compiler/z80/cpuinfo.pas b/compiler/z80/cpuinfo.pas index 0b211364d6..036c4ea390 100644 --- a/compiler/z80/cpuinfo.pas +++ b/compiler/z80/cpuinfo.pas @@ -23,9 +23,7 @@ Interface Type bestreal = double; -{$if FPC_FULLVERSION>20700} bestrealrec = TDoubleRec; -{$endif FPC_FULLVERSION>20700} ts32real = single; ts64real = double; ts80real = type extended;