+ check of compatibility between selected assembler

    output and target OS

compiler/errore.msg

@@ -1647,6 +1647,11 @@ option_obsolete_switch_use_new=E_You are using the obsolete switch $1, please us
 option_switch_bin_to_src_assembler=N_Switching assembler to default source writing assembler
 % this notifies you that the assembler has been changed because you used the
 % -a switch which can't be used with a binary assembler writer.
+option_incompatible_asm=W_Assembler output selected "$1" is not compatible with "$2"
+option_asm_forced=W_"$1" assembler use forced
+% The assembler output selected can not generate
+% object files with the correct format. Therefore, the
+% default assembler for this target is used instead.
 %\end{description}
 # EndOfTeX
 #

compiler/msgidx.inc

@@ -528,6 +528,8 @@ type tmsgconst=(
   option_obsolete_switch,
   option_obsolete_switch_use_new,
   option_switch_bin_to_src_assembler,
+  option_incompatible_asm,
+  option_asm_forced,
   option_logo_start,
   option_logo_end,
   option_info_start,
@@ -695,4 +697,4 @@ type tmsgconst=(
 endmsgconst
 );
 const
-  MsgCRCValue : longint = -1828337603;
+  MsgCRCValue : longint = 58101950;

compiler/msgtxt.inc

@@ -552,170 +552,172 @@ const msgtxt : array[0..000111,1..240] of char=(
   'E_You are using the obsolete switch $1'#000+
   'E_You are using the obsolete switch $1, ple','ase use $2'#000+
   'N_Switching assembler to default source writing assembler'#000+
+  'W_Assembler output selected "$1" is not compatible with "$2"'#000+
+  'W_"$1" assembler use forced'#000+
   'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
-  'Copyright (c) 1993-2000 by Florian Klaempfl'#000+
+  'Copyright (c) 1993-','2000 by Florian Klaempfl'#000+
   'Free Pascal Compiler version $FPCVER'#000+
   #000+
-  'Compiler Date  : $FPCDATE'#000,
+  'Compiler Date  : $FPCDATE'#000+
   'Compiler Target: $FPCTARGET'#000+
   #000+
   'This program comes under the GNU General Public Licence'#000+
   'For more information read COPYING.FPC'#000+
   #000+
-  'Report bugs,suggestions etc to:'#000+
+  'Report bugs,suggestions etc',' to:'#000+
   '                 [email protected]'#000+
-  '**0*_put + after a boolean switch option to e','nable it, - to disable '+
-  'it'#000+
+  '**0*_put + after a boolean switch option to enable it, - to disable it'+
+  #000+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
   '**2al_list sourcecode lines in assembler file'#000+
-  '**2ar_list register allocation/release info in assembler file'#000+
-  '**2at_list temp allocation/release info in a','ssembler file'#000+
+  '**2ar_list regist','er allocation/release info in assembler file'#000+
+  '**2at_list temp allocation/release info in assembler file'#000+
   '**1b_generate browser info'#000+
   '**2bl_generate local symbol info'#000+
   '**1B_build all modules'#000+
   '**1C<x>_code generation options:'#000+
-  '**2CD_create also dynamic library (not supported)'#000+
+  '**2CD_create also dyn','amic library (not supported)'#000+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#000+
-  '**2Ci_IO','-checking'#000+
+  '**2Ci_IO-checking'#000+
   '**2Cn_omit linking stage'#000+
   '**2Co_check overflow of integer operations'#000+
   '**2Cr_range checking'#000+
   '**2Cs<n>_set stack size to <n>'#000+
-  '**2Ct_stack checking'#000+
+  '**2Ct_stack checking'#000,
   '**2CX_create also smartlinked library'#000+
   '**1d<x>_defines the symbol <x>'#000+
-  '*O1D_generate a DEF ','file'#000+
+  '*O1D_generate a DEF file'#000+
   '*O2Dd<x>_set description to <x>'#000+
   '*O2Dw_PM application'#000+
   '**1e<x>_set path to executable'#000+
   '**1E_same as -Cn'#000+
   '**1F<x>_set file names and paths:'#000+
-  '**2FD<x>_sets the directory where to search for compiler utilities'#000+
-  '**2Fe<x>_redirect error output to',' <x>'#000+
+  '**2FD<x>_se','ts the directory where to search for compiler utilities'#000+
+  '**2Fe<x>_redirect error output to <x>'#000+
   '**2FE<x>_set exe/unit output path to <x>'#000+
   '**2Fi<x>_adds <x> to include path'#000+
   '**2Fl<x>_adds <x> to library path'#000+
   '*L2FL<x>_uses <x> as dynamic linker'#000+
-  '**2Fo<x>_adds <x> to object path'#000+
+  '*','*2Fo<x>_adds <x> to object path'#000+
   '**2Fr<x>_load error message file <x>'#000+
-  '**2Fu<x>_adds <x> to',' unit path'#000+
+  '**2Fu<x>_adds <x> to unit path'#000+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#000+
   '*g1g_generate debugger information:'#000+
   '*g2gg_use gsym'#000+
   '*g2gd_use dbx'#000+
-  '*g2gh_use heap trace unit (for memory leak debugging)'#000+
-  '*g2gl_use line info unit to show more info for backtraces'#000,
+  '*g2gh_use heap trace un','it (for memory leak debugging)'#000+
+  '*g2gl_use line info unit to show more info for backtraces'#000+
   '*g2gc_generate checks for pointers'#000+
   '**1i_information'#000+
   '**2iD_return compiler date'#000+
   '**2iV_return compiler version'#000+
   '**2iSO_return compiler OS'#000+
-  '**2iSP_return compiler processor'#000+
+  '**2iSP_return co','mpiler processor'#000+
   '**2iTO_return target OS'#000+
   '**2iTP_return target processor'#000+
-  '**1I<x>_adds <x> ','to include path'#000+
+  '**1I<x>_adds <x> to include path'#000+
   '**1k<x>_Pass <x> to the linker'#000+
   '**1l_write logo'#000+
   '**1n_don'#039't read the default config file'#000+
-  '**1o<x>_change the name of the executable produced to <x>'#000+
+  '**1o<x>_change the name of the executable produc','ed to <x>'#000+
   '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#000+
-  '*L1P_use pipes inst','ead of creating temporary assembler files'#000+
+  '*L1P_use pipes instead of creating temporary assembler files'#000+
   '**1S<x>_syntax options:'#000+
   '**2S2_switch some Delphi 2 extensions on'#000+
-  '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
+  '**2Sc_supports operators like C (*=,+=,/= an','d -=)'#000+
   '**2sa_include assertion code.'#000+
   '**2Sd_tries to be Delphi compatible'#000+
-  '**2Se<x>_compiler',' stops after the <x> errors (default is 1)'#000+
+  '**2Se<x>_compiler stops after the <x> errors (default is 1)'#000+
   '**2Sg_allow LABEL and GOTO'#000+
   '**2Sh_Use ansistrings'#000+
   '**2Si_support C++ styled INLINE'#000+
-  '**2Sm_support macros like C (global)'#000+
+  '**2Sm_support macros like C',' (global)'#000+
   '**2So_tries to be TP/BP 7.0 compatible'#000+
   '**2Sp_tries to be gpc compatible'#000+
-  '**2Ss_c','onstructor name must be init (destructor must be done)'#000+
+  '**2Ss_constructor name must be init (destructor must be done)'#000+
   '**2St_allow static keyword in objects'#000+
   '**1s_don'#039't call assembler and linker (only with -a)'#000+
-  '**1u<x>_undefines the symbol <x>'#000+
+  '**1u<x','>_undefines the symbol <x>'#000+
   '**1U_unit options:'#000+
   '**2Un_don'#039't check the unit name'#000+
-  '**2Us_compi','le a system unit'#000+
+  '**2Us_compile a system unit'#000+
   '**1v<x>_Be verbose. <x> is a combination of the following letters:'#000+
   '**2*_e : Show errors (default)       d : Show debug info'#000+
-  '**2*_w : Show warnings               u : Show unit info'#000+
-  '**2*_n : Show notes                  t : Sh','ow tried/used files'#000+
+  '**2*_w : S','how warnings               u : Show unit info'#000+
+  '**2*_n : Show notes                  t : Show tried/used files'#000+
   '**2*_h : Show hints                  m : Show defined macros'#000+
   '**2*_i : Show general info           p : Show compiled procedures'#000+
-  '**2*_l : Show linenumbers            c : Show conditionals'#000+
-  '**2*_a : Show everything          ','   0 : Show nothing (except errors'+
-  ')'#000+
+  '**2*','_l : Show linenumbers            c : Show conditionals'#000+
+  '**2*_a : Show everything             0 : Show nothing (except errors)'#000+
   '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#000+
-  '**2*_    declarations if an error    x : Executable info (Win32 only)'#000+
+  '**2*_    declarations if an error    x : Exec','utable info (Win32 only'+
+  ')'#000+
   '**2*_    occurs'#000+
   '**1X_executable options:'#000+
-  '*L2Xc_link with the c l','ibrary'#000+
+  '*L2Xc_link with the c library'#000+
   '**2Xs_strip all symbols from executable'#000+
   '**2XD_try to link dynamic          (defines FPC_LINK_DYNAMIC)'#000+
-  '**2XS_try to link static (default) (defines FPC_LINK_STATIC)'#000+
+  '**2XS_try to link static (default) (define','s FPC_LINK_STATIC)'#000+
   '**2XX_try to link smart            (defines FPC_LINK_SMART)'#000+
-  '**0*_Proce','ssor specific options:'#000+
+  '**0*_Processor specific options:'#000+
   '3*1A<x>_output format:'#000+
   '3*2Aas_assemble using GNU AS'#000+
   '3*2Aasaout_assemble using GNU AS for aout (Go32v1)'#000+
-  '3*2Anasmcoff_coff (Go32v2) file using Nasm'#000+
+  '3*2Anasmcoff_coff (Go32v2',') file using Nasm'#000+
   '3*2Anasmelf_elf32 (Linux) file using Nasm'#000+
-  '3*2Anasmobj_obj file using Na','sm'#000+
+  '3*2Anasmobj_obj file using Nasm'#000+
   '3*2Amasm_obj file using Masm (Microsoft)'#000+
   '3*2Atasm_obj file using Tasm (Borland)'#000+
   '3*2Acoff_coff (Go32v2) using internal writer'#000+
-  '3*2Apecoff_pecoff (Win32) using internal writer'#000+
+  '3*2Apecoff_pecoff (Win3','2) using internal writer'#000+
   '3*1R<x>_assembler reading style:'#000+
-  '3*2Ratt_read AT&T style assembl','er'#000+
+  '3*2Ratt_read AT&T style assembler'#000+
   '3*2Rintel_read Intel style assembler'#000+
   '3*2Rdirect_copy assembler text directly to assembler file'#000+
   '3*1O<x>_optimizations:'#000+
   '3*2Og_generate smaller code'#000+
-  '3*2OG_generate faster code (default)'#000+
+  '3*','2OG_generate faster code (default)'#000+
   '3*2Or_keep certain variables in registers'#000+
-  '3*2Ou_enable',' uncertain optimizations (see docs)'#000+
+  '3*2Ou_enable uncertain optimizations (see docs)'#000+
   '3*2O1_level 1 optimizations (quick optimizations)'#000+
   '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#000+
-  '3*2O3_level 3 optimizations (same as -O2u)'#000+
+  '3*2O3_le','vel 3 optimizations (same as -O2u)'#000+
   '3*2Op<x>_target processor:'#000+
-  '3*3Op1_set target processor',' to 386/486'#000+
+  '3*3Op1_set target processor to 386/486'#000+
   '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#000+
   '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#000+
-  '3*1T<x>_Target operating system:'#000+
+  '3*1T<x>_Target operating syste','m:'#000+
   '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+
-  '3*2TGO32V2_version 2 of DJ Delorie DOS',' extender'#000+
+  '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+
   '3*2TLINUX_Linux'#000+
   '3*2TOS2_OS/2 2.x'#000+
   '3*2TWin32_Windows 32 Bit'#000+
   '3*1W<x>_Win32 target options'#000+
   '3*2WB<x>_Set Image base to Hexadecimal <x> value'#000+
-  '3*2WC_Specify console type application'#000+
+  '3*2WC','_Specify console type application'#000+
   '3*2WD_Use DEFFILE to export functions of DLL or EXE'#000+
-  '3*2','WG_Specify graphic type application'#000+
+  '3*2WG_Specify graphic type application'#000+
   '3*2WN_Do not generate relocation code (necessary for debugging)'#000+
   '3*2WR_Generate relocation code'#000+
-  '6*1A<x>_output format'#000+
+  '6*1A<x>_output forma','t'#000+
   '6*2Aas_Unix o-file using GNU AS'#000+
   '6*2Agas_GNU Motorola assembler'#000+
-  '6*2Amit_MIT Syntax (old ','GAS)'#000+
+  '6*2Amit_MIT Syntax (old GAS)'#000+
   '6*2Amot_Standard Motorola assembler'#000+
   '6*1O_optimizations:'#000+
   '6*2Oa_turn on the optimizer'#000+
   '6*2Og_generate smaller code'#000+
-  '6*2OG_generate faster code (default)'#000+
+  '6*2OG_generate faster code (defaul','t)'#000+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#000+
   '6*2O2_set target processor to a MC68020+'#000+
-  '6*1R<','x>_assembler reading style:'#000+
+  '6*1R<x>_assembler reading style:'#000+
   '6*2RMOT_read motorola style assembler'#000+
   '6*1T<x>_Target operating system:'#000+
   '6*2TAMIGA_Commodore Amiga'#000+
-  '6*2TATARI_Atari ST/STe/TT'#000+
+  '6*2TATARI_Atari ST/STe/TT'#000,
   '6*2TMACOS_Macintosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+
   '**1*_'#000+
   '**1?_shows this help'#000+
-  '**1h_shows this h','elp without waiting'#000
+  '**1h_shows this help without waiting'#000
 );

compiler/options.pas

@@ -1434,6 +1434,16 @@ begin
      initoutputformat:=target_asm.id;
    end;
 
+  if (target_asm.supported_target <> target_any) and
+     (target_asm.supported_target <> target_info.target) then
+   begin
+     Message2(option_incompatible_asm,target_asm.idtxt,target_os.name);
+     { Should we reset to default ??? }
+     set_target_asm(target_info.assemsrc);
+     Message1(option_asm_forced,target_asm.idtxt);
+     initoutputformat:=target_asm.id;
+   end;
+
 { turn off stripping if compiling with debuginfo or profile }
   if (cs_debuginfo in initmoduleswitches) or
      (cs_profile in initmoduleswitches) then
@@ -1453,7 +1463,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.68  2000-05-16 20:19:06  pierre
+  Revision 1.69  2000-05-23 21:28:22  pierre
+    + check of compatibility between selected assembler
+      output and target OS
+
+  Revision 1.68  2000/05/16 20:19:06  pierre
     + -CR option to enable check for object virtual method
 
   Revision 1.67  2000/05/10 13:40:19  peter