* PPU checking errors for fpu emulation

compiler/msg/errore.msg

@@ -1768,6 +1768,10 @@ unit_h_source_modified=10041_H_File $1 is newer than Release PPU file $2
 % A modified source file for a unit was found that was compiled with the
 % release flag (-Ur). The unit will not implicitly be recompiled because
 % this release flag is set.
+unit_u_ppu_invalid_fpumode=10042_U_Using a unit which was not compiled with correct FPU mode
+% Trying to compile code while using units which were not compiled with
+% the same floating point format mode. Either all code should be compiled
+% with FPU emulation on, or with FPU emulation off.
 % \end{description}
 # EndOfTeX
 

compiler/msgidx.inc

@@ -577,6 +577,7 @@ const
   unit_h_cond_set_in_last_compile=10039;
   unit_w_cant_compile_unit_with_changed_incfile=10040;
   unit_h_source_modified=10041;
+  unit_u_ppu_invalid_fpumode=10042;
   option_usage=11000;
   option_only_one_source_support=11001;
   option_def_only_for_os2=11002;
@@ -609,9 +610,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 34184;
+  MsgTxtSize = 34250;
 
   MsgIdxMax : array[1..20] of longint=(
-    17,62,184,42,42,41,98,17,35,42,
+    17,62,184,42,42,41,98,17,35,43,
     31,1,1,1,1,1,1,1,1,1
   );

compiler/msgtxt.inc

@@ -631,42 +631,43 @@ const msgtxt : array[0..000142,1..240] of char=(
   '10040_W_Can'#039't recompile unit $1, but found',' modifed include files'+
   #000+
   '10041_H_File $1 is newer than Release PPU file $2'#000+
+  '10042_U_Using a unit which was not compiled with correct FPU mode'#000+
   '11000_$1 [options] <inputfile> [options]'#000+
   '11001_W_Only one source file supported'#000+
-  '11002_W_DEF file can be created only for OS/2'#000+
-  '11003_E_nested response files are not sup','ported'#000+
+  '11002_W_DEF file can ','be created only for OS/2'#000+
+  '11003_E_nested response files are not supported'#000+
   '11004_F_No source file name in command line'#000+
   '11005_N_No option inside $1 config file'#000+
   '11006_E_Illegal parameter: $1'#000+
   '11007_H_-? writes help pages'#000+
-  '11008_F_Too many config files nested'#000+
+  '11008_F_Too many config ','files nested'#000+
   '11009_F_Unable to open file $1'#000+
-  '11010_D_Reading furthe','r options from $1'#000+
+  '11010_D_Reading further options from $1'#000+
   '11011_W_Target is already set to: $1'#000+
   '11012_W_Shared libs not supported on DOS platform, reverting to static'+
   #000+
   '11013_F_too many IF(N)DEFs'#000+
-  '11014_F_too many ENDIFs'#000+
+  '11014_F_too many ENDI','Fs'#000+
   '11015_F_open conditional at the end of the file'#000+
-  '11016_W_Debug i','nformation generation is not supported by this execut'+
-  'able'#000+
+  '11016_W_Debug information generation is not supported by this executab'+
+  'le'#000+
   '11017_H_Try recompiling with -dGDB'#000+
   '11018_E_You are using the obsolete switch $1'#000+
-  '11019_E_You are using the obsolete switch $1, please use $2'#000+
-  '11020_N_Switching assembler to default sou','rce writing assembler'#000+
+  '11019_E_You are using the obsolete s','witch $1, please use $2'#000+
+  '11020_N_Switching assembler to default source writing assembler'#000+
   '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
   '11022_W_"$1" assembler use forced'#000+
   '11026_T_Reading options from file $1'#000+
-  '11027_T_Reading options from environment $1'#000+
+  '11027_T_Readin','g options from environment $1'#000+
   '11028_D_Handling option "$1"'#000+
-  '11029__','*** press enter ***'#000+
+  '11029__*** press enter ***'#000+
   '11030_E_Unknown code page'#000+
   '11023_Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#010+
   'Copyright (c) 1993-2002 by Florian Klaempfl'#000+
-  '11024_Free Pascal Compiler version $FPCVER'#010+
+  '11024_Free Pasc','al Compiler version $FPCVER'#010+
   #010+
   'Compiler Date  : $FPCDATE'#010+
-  'Compiler Ta','rget: $FPCTARGET'#010+
+  'Compiler Target: $FPCTARGET'#010+
   #010+
   'Supported targets:'#010+
   '  $OSTARGETS'#010+
@@ -674,165 +675,165 @@ const msgtxt : array[0..000142,1..240] of char=(
   'This program comes under the GNU General Public Licence'#010+
   'For more information read COPYING.FPC'#010+
   #010+
-  'Report bugs,suggestions etc to:'#010+
+  'Report bugs,suggestions etc ','to:'#010+
   '                 [email protected]'#000+
-  '11025_**0*_put + after ','a boolean switch option to enable it, - to di'+
-  'sable it'#010+
+  '11025_**0*_put + after a boolean switch option to enable it, - to disa'+
+  'ble it'#010+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#010+
   '**2al_list sourcecode lines in assembler file'#010+
-  '**2ar_list register allocation/release info in assembler file'#010+
-  '**2at_list temp ','allocation/release info in assembler file'#010+
+  '**2ar_list r','egister allocation/release info in assembler file'#010+
+  '**2at_list temp allocation/release info in assembler file'#010+
   '**1b_generate browser info'#010+
   '**2bl_generate local symbol info'#010+
   '**1B_build all modules'#010+
   '**1C<x>_code generation options:'#010+
-  '**2CD_create also dynamic library (not supported)'#010+
-  '**2Ch<n>_<n> bytes heap (between',' 1023 and 67107840)'#010+
+  '**2CD_create als','o dynamic library (not supported)'#010+
+  '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
   '**2Ci_IO-checking'#010+
   '**2Cn_omit linking stage'#010+
   '**2Co_check overflow of integer operations'#010+
   '**2Cr_range checking'#010+
   '**2CR_verify object method call validity'#010+
-  '**2Cs<n>_set stack size to <n>'#010+
+  '**2Cs<','n>_set stack size to <n>'#010+
   '**2Ct_stack checking'#010+
-  '**2CX_create also sm','artlinked library'#010+
+  '**2CX_create also smartlinked library'#010+
   '**1d<x>_defines the symbol <x>'#010+
   '*O1D_generate a DEF file'#010+
   '*O2Dd<x>_set description to <x>'#010+
   '*O2Dw_PM application'#010+
   '**1e<x>_set path to executable'#010+
-  '**1E_same as -Cn'#010+
+  '**1E_same as -Cn',#010+
   '**1F<x>_set file names and paths:'#010+
-  '**2FD<x>_sets the directory whe','re to search for compiler utilities'#010+
+  '**2FD<x>_sets the directory where to search for compiler utilities'#010+
   '**2Fe<x>_redirect error output to <x>'#010+
   '**2FE<x>_set exe/unit output path to <x>'#010+
   '**2Fi<x>_adds <x> to include path'#010+
-  '**2Fl<x>_adds <x> to library path'#010+
+  '**2Fl<x>_adds <x> to libr','ary path'#010+
   '*L2FL<x>_uses <x> as dynamic linker'#010+
-  '**2Fo<x>_adds <x> to ','object path'#010+
+  '**2Fo<x>_adds <x> to object path'#010+
   '**2Fr<x>_load error message file <x>'#010+
   '**2Fu<x>_adds <x> to unit path'#010+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#010+
   '*g1g_generate debugger information:'#010+
-  '*g2gg_use gsym'#010+
+  '*g2gg_','use gsym'#010+
   '*g2gd_use dbx'#010+
-  '*g2gh_use heap trace unit (for memory leak ','debugging)'#010+
+  '*g2gh_use heap trace unit (for memory leak debugging)'#010+
   '*g2gl_use line info unit to show more info for backtraces'#010+
   '*g2gc_generate checks for pointers'#010+
   '**1i_information'#010+
   '**2iD_return compiler date'#010+
-  '**2iV_return compiler version'#010+
+  '**2iV_return compiler vers','ion'#010+
   '**2iSO_return compiler OS'#010+
   '**2iSP_return compiler processor'#010+
-  '**2','iTO_return target OS'#010+
+  '**2iTO_return target OS'#010+
   '**2iTP_return target processor'#010+
   '**1I<x>_adds <x> to include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
   '**1l_write logo'#010+
   '**1n_don'#039't read the default config file'#010+
-  '**1o<x>_change the name of the executable produced to <x>'#010+
-  '**1pg_gene','rate profile code for gprof (defines FPC_PROFILE)'#010+
+  '**','1o<x>_change the name of the executable produced to <x>'#010+
+  '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
   '*L1P_use pipes instead of creating temporary assembler files'#010+
   '**1S<x>_syntax options:'#010+
-  '**2S2_switch some Delphi 2 extensions on'#010+
+  '**2S2_switch some Delphi 2 extensions o','n'#010+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+
-  '**2Sa_include ','assertion code.'#010+
+  '**2Sa_include assertion code.'#010+
   '**2Sd_tries to be Delphi compatible'#010+
   '**2Se<x>_compiler stops after the <x> errors (default is 1)'#010+
   '**2Sg_allow LABEL and GOTO'#010+
   '**2Sh_Use ansistrings'#010+
-  '**2Si_support C++ styled INLINE'#010+
+  '**2Si_support',' C++ styled INLINE'#010+
   '**2Sm_support macros like C (global)'#010+
-  '**2So_trie','s to be TP/BP 7.0 compatible'#010+
+  '**2So_tries to be TP/BP 7.0 compatible'#010+
   '**2Sp_tries to be gpc compatible'#010+
   '**2Ss_constructor name must be init (destructor must be done)'#010+
   '**2St_allow static keyword in objects'#010+
-  '**1s_don'#039't call assembler and linker (only with -a)'#010+
-  '**2st_Generate script to l','ink on target'#010+
+  '**1s_don'#039't c','all assembler and linker (only with -a)'#010+
+  '**2st_Generate script to link on target'#010+
   '**2sh_Generate script to link on host'#010+
   '**1u<x>_undefines the symbol <x>'#010+
   '**1U_unit options:'#010+
   '**2Un_don'#039't check the unit name'#010+
   '**2Ur_generate release unit files'#010+
-  '**2Us_compile a system unit'#010+
-  '**1v<x>_Be verbose. <x> is a combination o','f the following letters:'#010+
+  '**2U','s_compile a system unit'#010+
+  '**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
   '**2*_e : Show errors (default)       d : Show debug info'#010+
   '**2*_w : Show warnings               u : Show unit info'#010+
-  '**2*_n : Show notes                  t : Show tried/used files'#010+
-  '**2*_h : Show hints                  m ',': Show defined macros'#010+
+  '**2*_n : Show notes                 ',' t : Show tried/used files'#010+
+  '**2*_h : Show hints                  m : Show defined macros'#010+
   '**2*_i : Show general info           p : Show compiled procedures'#010+
   '**2*_l : Show linenumbers            c : Show conditionals'#010+
-  '**2*_a : Show everything             0 : Show nothing (except errors)'#010+
-  '**2*_b : Show all proce','dure          r : Rhide/GCC compatibility mod'+
-  'e'#010+
+  '**2*_a : Show everything   ','          0 : Show nothing (except errors'+
+  ')'#010+
+  '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#010+
   '**2*_    declarations if an error    x : Executable info (Win32 only)'#010+
   '**2*_    occurs'#010+
   '**1X_executable options:'#010+
-  '*L2Xc_link with the c library'#010+
+  '*L2Xc_link with ','the c library'#010+
   '**2Xs_strip all symbols from executable'#010+
-  '**2XD_try to',' link dynamic          (defines FPC_LINK_DYNAMIC)'#010+
+  '**2XD_try to link dynamic          (defines FPC_LINK_DYNAMIC)'#010+
   '**2XS_try to link static (default) (defines FPC_LINK_STATIC)'#010+
   '**2XX_try to link smart            (defines FPC_LINK_SMART)'#010+
-  '**0*_Processor specific options:'#010+
+  '**0','*_Processor specific options:'#010+
   '3*1A<x>_output format:'#010+
-  '3*2Aas_assemb','le using GNU AS'#010+
+  '3*2Aas_assemble using GNU AS'#010+
   '3*2Aasaout_assemble using GNU AS for aout (Go32v1)'#010+
   '3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+
   '3*2Anasmelf_elf32 (Linux) file using Nasm'#010+
-  '3*2Anasmobj_obj file using Nasm'#010+
+  '3*2Anasmobj_obj file u','sing Nasm'#010+
   '3*2Amasm_obj file using Masm (Microsoft)'#010+
-  '3*2Atasm_obj fi','le using Tasm (Borland)'#010+
+  '3*2Atasm_obj file using Tasm (Borland)'#010+
   '3*2Acoff_coff (Go32v2) using internal writer'#010+
   '3*2Apecoff_pecoff (Win32) using internal writer'#010+
   '3*1R<x>_assembler reading style:'#010+
-  '3*2Ratt_read AT&T style assembler'#010+
+  '3*2Ratt_read AT&T style ','assembler'#010+
   '3*2Rintel_read Intel style assembler'#010+
-  '3*2Rdirect_copy ass','embler text directly to assembler file'#010+
+  '3*2Rdirect_copy assembler text directly to assembler file'#010+
   '3*1O<x>_optimizations:'#010+
   '3*2Og_generate smaller code'#010+
   '3*2OG_generate faster code (default)'#010+
   '3*2Or_keep certain variables in registers'#010+
-  '3*2Ou_enable uncertain optimizations (see docs)'#010+
-  '3*2O1_level 1 optimizat','ions (quick optimizations)'#010+
+  '3*2Ou','_enable uncertain optimizations (see docs)'#010+
+  '3*2O1_level 1 optimizations (quick optimizations)'#010+
   '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#010+
   '3*2O3_level 3 optimizations (-O2 repeatedly, max 5 times)'#010+
   '3*2Op<x>_target processor:'#010+
-  '3*3Op1_set target processor to 386/486'#010+
-  '3*3Op2_set target processor to P','entium/PentiumMMX (tm)'#010+
+  '3*3Op','1_set target processor to 386/486'#010+
+  '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+
   '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+
   '3*1T<x>_Target operating system:'#010+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#010+
-  '3*2TWDOSX DOS 32 Bit Extender'#010+
+  '3*2TWDOSX DOS 32',' Bit Extender'#010+
   '3*2TLINUX_Linux'#010+
-  '3*2Tnetware_Novell Netware Module (e','xperimental)'#010+
+  '3*2Tnetware_Novell Netware Module (experimental)'#010+
   '3*2TOS2_OS/2 2.x'#010+
   '3*2TSUNOS_SunOS/Solaris'#010+
   '3*2TWin32_Windows 32 Bit'#010+
   '3*1W<x>_Win32 target options'#010+
   '3*2WB<x>_Set Image base to Hexadecimal <x> value'#010+
-  '3*2WC_Specify console type application'#010+
-  '3*2WD_Use DEFFILE to export functions of DLL',' or EXE'#010+
+  '3*2WC_Specify con','sole type application'#010+
+  '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
   '3*2WF_Specify full-screen type application (OS/2 only)'#010+
   '3*2WG_Specify graphic type application'#010+
   '3*2WN_Do not generate relocation code (necessary for debugging)'#010+
-  '3*2WR_Generate relocation code'#010+
+  '3*2WR_Ge','nerate relocation code'#010+
   '6*1A<x>_output format'#010+
-  '6*2Aas_Unix o-file us','ing GNU AS'#010+
+  '6*2Aas_Unix o-file using GNU AS'#010+
   '6*2Agas_GNU Motorola assembler'#010+
   '6*2Amit_MIT Syntax (old GAS)'#010+
   '6*2Amot_Standard Motorola assembler'#010+
   '6*1O_optimizations:'#010+
   '6*2Oa_turn on the optimizer'#010+
-  '6*2Og_generate smaller code'#010+
+  '6*2Og_generate smal','ler code'#010+
   '6*2OG_generate faster code (default)'#010+
-  '6*2Ox_optimize maxim','um (still BUGGY!!!)'#010+
+  '6*2Ox_optimize maximum (still BUGGY!!!)'#010+
   '6*2O2_set target processor to a MC68020+'#010+
   '6*1R<x>_assembler reading style:'#010+
   '6*2RMOT_read motorola style assembler'#010+
   '6*1T<x>_Target operating system:'#010+
-  '6*2TAMIGA_Commodore Amiga'#010+
+  '6*2TAMIGA','_Commodore Amiga'#010+
   '6*2TATARI_Atari ST/STe/TT'#010+
-  '6*2TMACOS_Macintosh m68','k'#010+
+  '6*2TMACOS_Macintosh m68k'#010+
   '6*2TLINUX_Linux-68k'#010+
   '6*2TPALMOS_PalmOS'#010+
   '**1*_'#010+