From 7b519c1ce313163a4eaa814e2c147e304f292391 Mon Sep 17 00:00:00 2001 From: florian Date: Mon, 28 May 2007 16:18:35 +0000 Subject: [PATCH] * prevent usage of units being compiled with different fpu emulation state git-svn-id: trunk@7501 - --- compiler/fppu.pas | 9 ++-- compiler/msg/errore.msg | 2 +- compiler/msgidx.inc | 2 +- compiler/msgtxt.inc | 117 ++++++++++++++++++++-------------------- 4 files changed, 65 insertions(+), 65 deletions(-) diff --git a/compiler/fppu.pas b/compiler/fppu.pas index 5a6145ba84..91907539ea 100644 --- a/compiler/fppu.pas +++ b/compiler/fppu.pas @@ -228,17 +228,16 @@ uses exit; end; {$ifdef cpufpemu} - { check if floating point emulation is on?} - { fpu emulation isn't unit levelwise - if ((ppufile.header.flags and uf_fpu_emulation)<>0) and + { check if floating point emulation is on? + fpu emulation isn't unit levelwise because it affects calling convention } + if ((ppufile.header.flags and uf_fpu_emulation)<>0) xor (cs_fp_emulation in current_settings.moduleswitches) then begin ppufile.free; ppufile:=nil; - Message(unit_u_ppu_invalid_fpumode); + Message(unit_u_ppu_invalid_fpumode,@queuecomment); exit; end; - } {$endif cpufpemu} { Load values to be access easier } diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index 85b5d3dcbb..16e69e733b 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -2213,7 +2213,7 @@ unit_w_cant_compile_unit_with_changed_incfile=10040_W_Can't recompile unit $1, b % some source files were not found, so recompilation is impossible. unit_u_source_modified=10041_U_File $1 is newer than PPU file $2 % A modified source file for a compiler unit was found. -unit_u_ppu_invalid_fpumode=10042_U_Using a unit which was not compiled with correct FPU mode +unit_u_ppu_invalid_fpumode=10042_U_Trying to use a unit which was compiled with a different 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. diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc index 2ee94e868e..07fdb678f5 100644 --- a/compiler/msgidx.inc +++ b/compiler/msgidx.inc @@ -722,7 +722,7 @@ const option_info=11024; option_help_pages=11025; - MsgTxtSize = 43124; + MsgTxtSize = 43132; MsgIdxMax : array[1..20] of longint=( 24,82,235,79,63,49,107,22,135,60, diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc index 9815741ff9..ed97ffee73 100644 --- a/compiler/msgtxt.inc +++ b/compiler/msgtxt.inc @@ -732,71 +732,72 @@ const msgtxt : array[0..000179,1..240] of char=( '10037_U_PPU Check file $1 time $2'#000+ '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+ '10041_U_File $1 is newer than PPU file $2'#000+ - '10042_U_Using a unit which was not compiled with correct FPU mode'#000+ - '10043_U','_Loading interface units from $1'#000+ + '10042_U_Trying to use a unit which was compiled with a different FPU m'+ + 'ode',#000+ + '10043_U_Loading interface units from $1'#000+ '10044_U_Loading implementation units from $1'#000+ '10045_U_Interface CRC changed for unit $1'#000+ '10046_U_Implementation CRC changed for unit $1'#000+ '10047_U_Finished compiling unit $1'#000+ - '10048_U_Add dependency of $1 to $2'#000+ - '100','49_U_No reload, is caller: $1'#000+ + '10048_U_Add dependency of $1 t','o $2'#000+ + '10049_U_No reload, is caller: $1'#000+ '10050_U_No reload, already in second compile: $1'#000+ '10051_U_Flag for reload: $1'#000+ '10052_U_Forced reloading'#000+ '10053_U_Previous state of $1: $2'#000+ '10054_U_Already compiling $1, setting second compile'#000+ - '10055_U_Loading unit $','1'#000+ + '10055_U_Loadin','g unit $1'#000+ '10056_U_Finished loading unit $1'#000+ '10057_U_Registering new unit $1'#000+ '10058_U_Re-resolving unit $1'#000+ '10059_U_Skipping re-resolving unit $1, still loading used units'#000+ '11000_O_$1 [options] [options]'#000+ - '11001_W_Only one source file supporte','d'#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 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+ - '1','1008_F_Too many config files nested'#000+ + '11007_H_-? writes help',' pages'#000+ + '11008_F_Too many config files nested'#000+ '11009_F_Unable to open file $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)DEF','s'#000+ + '11013_F_too many ','IF(N)DEFs'#000+ '11014_F_too many ENDIFs'#000+ '11015_F_open conditional at the end of the file'#000+ '11016_W_Debug information generation is not supported by this executab'+ 'le'#000+ '11017_H_Try recompiling with -dGDB'#000+ '11018_W_You are using the obsolete switch $1'#000+ - '11019_W_You a','re using the obsolete switch $1, please use $2'#000+ + '11019','_W_You are using the obsolete switch $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+ + '11026_T_Reading opti','ons from file $1'#000+ '11027_T_Reading options from environment $1'#000+ '11028_D_Handling option "$1"'#000+ '11029__*** press enter ***'#000+ '11030_H_Start of reading config file $1'#000+ '11031_H_End of reading config file $1'#000+ '11032_D_interpreting option "$1"'#000+ - '11036_D_interpreting',' firstpass option "$1"'#000+ + '11036_D_inte','rpreting firstpass option "$1"'#000+ '11033_D_interpreting file option "$1"'#000+ '11034_D_Reading config file "$1"'#000+ '11035_D_found source file name "$1"'#000+ '11039_E_Unknown code page'#000+ '11040_F_Config file $1 is a directory'#000+ - '11041_W_Assembler output selected "$1" cannot ','generate debug info, d'+ + '11041_W_Assembler output selected "$1"',' cannot generate debug info, d'+ 'ebugging disabled'#000+ '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+ 'CPU'#010+ 'Copyright (c) 1993-2007 by Florian Klaempfl'#000+ '11024_Free Pascal Compiler version $FPCVERSION'#010+ #010+ - 'Compiler Date : $FPCDATE'#010+ - 'Comp','iler CPU Target: $FPCCPU'#010+ + 'Compiler Date : $FPCD','ATE'#010+ + 'Compiler CPU Target: $FPCCPU'#010+ #010+ 'Supported targets:'#010+ ' $OSTARGETS'#010+ @@ -810,37 +811,37 @@ const msgtxt : array[0..000179,1..240] of char=( 'Supported Optimizations:'#010+ ' $OPTIMIZATIONS'#010+ #010+ - 'This program comes under the GN','U General Public Licence'#010+ + 'This program comes unde','r the GNU General Public Licence'#010+ 'For more information read COPYING.FPC'#010+ #010+ 'Report bugs,suggestions etc to:'#010+ ' bugs@freepascal.org'#000+ '11025_**0*_put + after a boolean switch option to enable it, - to disa'+ 'ble it'#010+ - '**1a_the compiler doesn'#039't dele','te the generated assembler file'#010+ + '**1a_the compiler does','n'#039't delete the generated assembler file'#010+ '**2al_list sourcecode lines in assembler file'#010+ '**2an_list node info in assembler file'#010+ '*L2ap_use pipes instead of creating temporary assembler files'#010+ - '**2ar_list register allocation/release info in assembler file',#010+ + '**2ar_list register allocation/release info in assemb','ler file'#010+ '**2at_list temp allocation/release info in assembler file'#010+ '**1A_output format:'#010+ '**2Adefault_use default assembler'#010+ '3*2Aas_assemble using GNU AS'#010+ '3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+ '3*2Anasmelf_elf32 (Linux) file using Nasm'#010+ - '3*2Anasmwi','n32_Win32 object file using Nasm'#010+ + '3*','2Anasmwin32_Win32 object file using Nasm'#010+ '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+ '3*2Awasm_obj file using Wasm (Watcom)'#010+ '3*2Anasmobj_obj file using Nasm'#010+ '3*2Amasm_obj file using Masm (Microsoft)'#010+ - '3*2Atasm_obj file using Tasm (Borland)'#010+ - '3*2Aelf_','elf32 (Linux) using internal writer'#010+ + '3*2Atasm_obj file using Tasm (Borland)'#010, + '3*2Aelf_elf32 (Linux) using internal writer'#010+ '3*2Acoff_coff (Go32v2) using internal writer'#010+ '3*2Apecoff_pecoff (Win32) using internal writer'#010+ '4*2Aas_assemble using 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*2Amit_MIT',' Syntax (old GAS)'#010+ '6*2Amot_Standard Motorola assembler'#010+ 'A*2Aas_assemble using GNU AS'#010+ 'P*2Aas_assemble using GNU AS'#010+ @@ -848,26 +849,26 @@ const msgtxt : array[0..000179,1..240] of char=( '**1b_generate browser info'#010+ '**2bl_generate local symbol info'#010+ '**1B_build all modules'#010+ - '**1C_code generation ','options:'#010+ + '**1C_code gen','eration options:'#010+ '**2Cc_set default calling convention to '#010+ '**2CD_create also dynamic library (not supported)'#010+ '**2Ce_Compilation with emulated floating point opcodes'#010+ '**2Cf_Select fpu instruction set to use, see fpc -i for possible va'+ - 'lues'#010+ - '**2C','g_Generate PIC code'#010+ + 'l','ues'#010+ + '**2Cg_Generate PIC code'#010+ '**2Ch_ bytes heap (between 1023 and 67107840)'#010+ '**2Ci_IO-checking'#010+ '**2Cn_omit linking stage'#010+ '**2Co_check overflow of integer operations'#010+ '**2Cp_select instruction set, see fpc -i for possible values'#010+ - '**2CP=_ pack','ing settings'#010+ + '**2CP=<','y>_ packing settings'#010+ '**3CPPACKSET=_ set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+ 'and 8'#010+ '**2Cr_range checking'#010+ '**2CR_verify object method call validity'#010+ '**2Cs_set stack size to '#010+ '**2Ct_stack checking'#010+ - '**2CX_create also smartlinked library',#010+ + '**2CX_create also smartlinked',' library'#010+ '**1d_defines the symbol '#010+ '**1D_generate a DEF file'#010+ '**2Dd_set description to '#010+ @@ -876,32 +877,32 @@ const msgtxt : array[0..000179,1..240] of char=( '**1e_set path to executable'#010+ '**1E_same as -Cn'#010+ '**1fPIC_same as -Cg'#010+ - '**1F_set file names and pat','hs:'#010+ + '**1F_set file names',' and paths:'#010+ '**2Fa[,y]_for a program load first units and [y] before uses is'+ ' parsed'#010+ '**2Fc_sets input codepage to '#010+ '**2FD_sets the directory where to search for compiler utilities'#010+ '**2Fe_redirect error output to '#010+ - '**2FE_set exe/','unit output path to '#010+ + '**2FE_','set exe/unit output path to '#010+ '**2Fi_adds to include path'#010+ '**2Fl_adds to library path'#010+ '**2FL_uses as dynamic linker'#010+ '**2Fm_load unicode conversion table from .txt in the compiler di'+ 'r'#010+ - '**2Fo_adds to object path'#010+ - '**2Fr_load error message file '#010+ + '**2Fo_adds to object path',#010+ + '**2Fr_load error message file '#010+ '**2Fu_adds to unit path'#010+ '**2FU_set unit output path to , overrides -FE'#010+ '*g1g_generate debugger information:'#010+ '*g2gc_generate checks for pointers'#010+ '*g2gd_use dbx'#010+ '*g2gg_use gsym'#010+ - '*g2gh_use heap trace unit (','for memory leak debugging)'#010+ + '*g2gh_use heap trac','e unit (for memory leak debugging)'#010+ '*g2gl_use line info unit to show more info for backtraces'#010+ '*g2gp_preserve case in stabs symbol names'#010+ '*g2gt_trash local variables (to detect uninitialized uses)'#010+ - '*g2gv_generates programs traceable with valgrind'#010+ - '*g2gw','_generate dwarf debugging info'#010+ + '*g2gv_generates programs traceable with valgri','nd'#010+ + '*g2gw_generate dwarf debugging info'#010+ '**1i_information'#010+ '**2iD_return compiler date'#010+ '**2iV_return compiler version'#010+ @@ -909,51 +910,51 @@ const msgtxt : array[0..000179,1..240] of char=( '**2iSO_return compiler OS'#010+ '**2iSP_return compiler processor'#010+ '**2iTO_return target OS'#010+ - '**2iTP_return tar','get processor'#010+ + '**2iTP_re','turn target processor'#010+ '**1I_adds to include path'#010+ '**1k_Pass to the linker'#010+ '**1l_write logo'#010+ '**1M_set language mode to '#010+ '**2Mfpc_free pascal dialect (default)'#010+ '**2Mobjfpc_switch some Delphi 2 extensions on'#010+ - '**2Mdelphi_tries to be Delphi',' compatible'#010+ + '**2Mdelphi_tries to b','e Delphi compatible'#010+ '**2Mtp_tries to be TP/BP 7.0 compatible'#010+ '**2Mgpc_tries to be gpc compatible'#010+ '**2Mmacpas_tries to be compatible to the macintosh pascal dialects'#010+ '**1n_don'#039't read the default config file'#010+ '**1N_node tree optimizations'#010+ - '**2Nu_unroll l','oops'#010+ + '**2Nu_','unroll loops'#010+ '**1o_change the name of the executable produced to '#010+ '**1O_optimizations:'#010+ '**2O-_disable optimizations'#010+ '**2O1_level 1 optimizations (quick and debugger friendly)'#010+ '**2O2_level 2 optimizations (-O1 + quick optimizations)'#010+ - '**2O3_level ','3 optimizations (-O2 + slow optimizations)'#010+ + '**2O','3_level 3 optimizations (-O2 + slow optimizations)'#010+ '**2Oa=_set alignment'#010+ '**2Oo[NO]_enable or disable optimizations, see fpc -i for possible '+ 'values'#010+ '**2Op_set target cpu for optimizing, see fpc -i for possible values'+ #010+ - '**2Os_generate smaller',' code'#010+ + '**2Os_generate',' smaller code'#010+ '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+ '**1R_assembler reading style:'#010+ '**2Rdefault_use default assembler'#010+ '3*2Ratt_read AT&T style assembler'#010+ '3*2Rintel_read Intel style assembler'#010+ - '6*2RMOT_read motorola style assemble','r'#010+ + '6*2RMOT_read motorola style ','assembler'#010+ '**1S_syntax options:'#010+ '**2S2_same as -Mobjfpc'#010+ '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+ '**2Sa_include assertion code.'#010+ '**2Sd_same as -Mdelphi'#010+ '**2Se_error options. is a combination of the following:'#010+ - '**3*_ : compiler stops',' after the errors (default is 1)'#010+ + '**3*_ : compil','er stops after the errors (default is 1)'#010+ '**3*_w : compiler stops also after warnings'#010+ '**3*_n : compiler stops also after notes'#010+ '**3*_h : compiler stops also after hints'#010+ '**2Sg_allow LABEL and GOTO'#010+ '**2Sh_Use ansistrings'#010+ - '**2Si_support C++ styled INL','INE'#010+ + '**2Si_support C++ st','yled INLINE'#010+ '**2Sk_load fpcylix unit'#010+ '**2SI_set interface style to '#010+ '**3SIcom_COM compatible interface (default)'#010+ @@ -961,18 +962,18 @@ const msgtxt : array[0..000179,1..240] of char=( '**2Sm_support macros like C (global)'#010+ '**2So_same as -Mtp'#010+ '**2Sp_same as -Mgpc'#010+ - '**2Ss_constructor ','name must be init (destructor must be done)'#010+ + '**2Ss_cons','tructor name must be init (destructor must be done)'#010+ '**2St_allow static keyword in objects'#010+ '**2Sx_enable exception keywords (default in Delphi/ObjFPC modes)'#010+ '**1s_don'#039't call assembler and linker'#010+ '**2sh_Generate script to link on host'#010+ - '**2st_Generate scr','ipt to link on target'#010+ + '**2st_Gene','rate script to link on target'#010+ '**2sr_Skip register allocation phase (use with -alr)'#010+ '**1T_Target operating system:'#010+ '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+ '3*2Tfreebsd_FreeBSD'#010+ '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+ - '3*2Tlinux_Linu','x'#010+ + '3*2Tli','nux_Linux'#010+ '3*2Tnetbsd_NetBSD'#010+ '3*2Tnetware_Novell Netware Module (clib)'#010+ '3*2Tnetwlibc_Novell Netware Module (libc)'#010+ @@ -980,7 +981,7 @@ const msgtxt : array[0..000179,1..240] of char=( '3*2Tos2_OS/2 / eComStation'#010+ '3*2Tsunos_SunOS/Solaris'#010+ '3*2Twatcom_Watcom compatible DOS extender'#010+ - '3*2Twdosx_WDOSX DOS exte','nder'#010+ + '3*2Twdosx_WDOSX ','DOS extender'#010+ '3*2Twin32_Windows 32 Bit'#010+ '3*2Twince_Windows CE'#010+ '4*2Tlinux_Linux'#010+ @@ -990,8 +991,8 @@ const msgtxt : array[0..000179,1..240] of char=( '6*2Tmacos_Macintosh m68k (not supported)'#010+ '6*2Tpalmos_PalmOS'#010+ 'A*2Tlinux_Linux'#010+ - 'A*2Twince_Windows CE'#010+ - 'P*2T','amiga_AmigaOS on PowerPC'#010+ + 'A*2Twince_Windows',' CE'#010+ + 'P*2Tamiga_AmigaOS on PowerPC'#010+ 'P*2Tdarwin_Darwin and Mac OS X on PowerPC'#010+ 'P*2Tlinux_Linux on PowerPC'#010+ 'P*2Tmacos_Mac OS (classic) on PowerPC'#010+ @@ -999,49 +1000,49 @@ const msgtxt : array[0..000179,1..240] of char=( 'S*2Tlinux_Linux'#010+ '**1u_undefines the symbol '#010+ '**1U_unit options:'#010+ - '**2Un_don'#039't check th','e unit name'#010+ + '**2Un_don'#039't ','check the unit name'#010+ '**2Ur_generate release unit files'#010+ '**2Us_compile a system unit'#010+ '**1v_Be verbose. is a combination of the following letters:'#010+ '**2*_e : Show errors (default) 0 : Show nothing (except errors)'#010+ - '**2*_w : Show warnings ',' u : Show unit info'#010+ + '**2*_w : Show warning','s u : Show unit info'#010+ '**2*_n : Show notes t : Show tried/used files'#010+ '**2*_h : Show hints c : Show conditionals'#010+ '**2*_i : Show general info d : Show debug info'#010+ - '**2*_l : Show linenumbers ',' r : Rhide/GCC compatibility mod'+ + '**2*_l : Show linenumbers ',' r : Rhide/GCC compatibility mod'+ 'e'#010+ '**2*_a : Show everything x : Executable info (Win32 only)'#010+ '**2*_b : Write file names messages with full path'#010+ '**2*_v : write fpcdebug.txt with p : Write tree.log with parse tre'+ 'e'#010+ - '**2*_ lot','s of debugging info'#010+ + '**2*','_ lots of debugging info'#010+ '3*1W_Win32-like target options'#010+ '3*2WB_Create a relocatable image'#010+ '3*2WB_Set Image base to Hexadecimal value'#010+ '3*2WC_Specify console 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*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+ 'P*2WC_Specify console type application (Mac OS only)'#010+ - 'P*2WG_Speci','fy graphic type application (Mac OS only)'#010+ + 'P*2','WG_Specify graphic type application (Mac OS only)'#010+ 'P*2WT_Specify tool type application (MPW tool, Mac OS only)'#010+ '**1X_executable options:'#010+ '**2Xc_pass --shared to the linker (Unix only)'#010+ - '**2Xd_don'#039't use standard library search path (needed for cross com'+ - 'p','ile)'#010+ + '**2Xd_don'#039't use standard library search path (needed for cr','oss c'+ + 'ompile)'#010+ '**2Xe_use external linker'#010+ '**2XD_try to link units dynamic (defines FPC_LINK_DYNAMIC)'#010+ '**2Xi_use internal linker'#010+ '**2Xm_generate link map'#010+ '**2XM_set the name of the '#039'main'#039' program routine (default i'+ 's '#039'main'#039')'#010+ - '**2XP_prepend th','e binutils names with the prefix '#010+ + '**2XP_pr','epend the binutils names with the prefix '#010+ '**2Xr_set library search path to (needed for cross compile)'#010+ '**2Xs_strip all symbols from executable'#010+ '**2XS_try to link units static (default) (defines FPC_LINK_STATIC)'#010+ - '**2Xt_link with static librar','ies (-static is passed to linker)'#010+ + '**2Xt_link with stati','c libraries (-static is passed to linker)'#010+ '**2XX_try to link units smart (defines FPC_LINK_SMART)'#010+ '**1*_'#010+ '**1?_shows this help'#010+