+ added the current WebAssembly exceptions mode to the .ppu module flags and

perform a check to ensure all units are compiled in the same exceptions mode
  as the main program

compiler/fppu.pas

@@ -341,6 +341,21 @@ var
               exit;
             end;
 {$endif i8086}
+{$ifdef wasm}
+          { check WebAssembly exceptions mode flag }
+          if ((mf_wasm_no_exceptions in moduleflags) <>
+              (ts_wasm_no_exceptions in current_settings.targetswitches)) or
+             ((mf_wasm_bf_exceptions in moduleflags) <>
+              (ts_wasm_bf_exceptions in current_settings.targetswitches)) or
+             ((mf_wasm_js_exceptions in moduleflags) <>
+              (ts_wasm_js_exceptions in current_settings.targetswitches)) or
+             ((mf_wasm_native_exceptions in moduleflags) <>
+              (ts_wasm_native_exceptions in current_settings.targetswitches)) then
+            begin
+              Message(unit_u_ppu_invalid_wasm_exceptions_mode,@queuecomment);
+              exit;
+            end;
+{$endif}
           if {$ifdef llvm}not{$endif}(mf_llvm in moduleflags) then
             begin
               Message(unit_u_ppu_llvm_mismatch,@queuecomment);
@@ -1024,6 +1039,16 @@ var
         if current_settings.x86memorymodel in [mm_tiny,mm_small,mm_medium] then
           include(moduleflags,mf_i8086_ss_equals_ds);
 {$endif i8086}
+{$ifdef wasm}
+        if ts_wasm_no_exceptions in current_settings.targetswitches then
+          include(moduleflags,mf_wasm_no_exceptions);
+        if ts_wasm_native_exceptions in current_settings.targetswitches then
+          include(moduleflags,mf_wasm_native_exceptions);
+        if ts_wasm_js_exceptions in current_settings.targetswitches then
+          include(moduleflags,mf_wasm_js_exceptions);
+        if ts_wasm_bf_exceptions in current_settings.targetswitches then
+          include(moduleflags,mf_wasm_bf_exceptions);
+{$endif wasm}
 {$ifdef llvm}
         include(moduleflags,mf_llvm);
 {$endif}

compiler/globtype.pas

@@ -402,7 +402,11 @@ interface
          mf_package_deny,             { this unit must not be part of a package }
          mf_package_weak,             { this unit may be completely contained in a package }
          mf_llvm,                     { compiled for LLVM code generator, not compatible with regular compiler because of different nodes in inline functions }
-         mf_symansistr                { symbols are ansistrings (for ppudump) }
+         mf_symansistr,               { symbols are ansistrings (for ppudump) }
+         mf_wasm_no_exceptions,       { unit was compiled in WebAssembly 'no exceptions' mode }
+         mf_wasm_bf_exceptions,       { unit was compiled in WebAssembly 'branchful' exceptions mode }
+         mf_wasm_js_exceptions,       { unit was compiled in WebAssembly JavaScript-based exceptions mode }
+         mf_wasm_native_exceptions    { unit was compiled in WebAssembly native exceptions mode }
        );
        tmoduleflags = set of tmoduleflag;
 

compiler/msg/errore.msg

@@ -3197,7 +3197,7 @@ link_e_undefined_symbol=09222_E_Undefined symbol: $1
 #
 # Unit loading
 #
-# 10064 is the last used one
+# 10068 is the last used one
 #
 # BeginOfTeX
 % \section{Unit loading messages.}
@@ -3422,6 +3422,8 @@ cg_f_internal_type_does_not_match=10066_F_Internal type "$1" does not look as ex
 unit_u_ppu_llvm_mismatch=10067_U_Skipping unit, PPU and compiler have to be both compiled with or without LLVM support
 % Units compiled by a compiler built with the LLVM code generator cannot be used with a regular compiler,
 % and vice versa.
+unit_u_ppu_invalid_wasm_exceptions_mode=10068_U_PPU is compiled for another WebAssembly exceptions mode
+% This unit file was compiled for a different WebAssembly exceptions mode.
 % \end{description}
 # EndOfTeX
 

compiler/msgidx.inc

@@ -1029,6 +1029,7 @@ const
   cg_f_internal_type_not_found=10065;
   cg_f_internal_type_does_not_match=10066;
   unit_u_ppu_llvm_mismatch=10067;
+  unit_u_ppu_invalid_wasm_exceptions_mode=10068;
   option_usage=11000;
   option_only_one_source_support=11001;
   option_def_only_for_os2=11002;
@@ -1142,9 +1143,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 88633;
+  MsgTxtSize = 88697;
 
   MsgIdxMax : array[1..20] of longint=(
-    28,107,361,131,99,63,147,37,223,68,
+    28,107,361,131,99,63,147,37,223,69,
     65,20,30,1,1,1,1,1,1,1
   );