+ added check whether PPU and program are compiled in the same WebAssembly

exceptions mode (either both are turned on, or both are turned off)

compiler/fppu.pas

@@ -355,6 +355,12 @@ var
               Message(unit_u_ppu_invalid_wasm_exceptions_mode,@queuecomment);
               exit;
             end;
+          if (mf_wasm_threads in moduleflags) <>
+             (ts_wasm_threads in current_settings.targetswitches) then
+            begin
+              Message(unit_u_ppu_wasm_threads_mismatch,@queuecomment);
+              exit;
+            end;
 {$endif}
           if {$ifdef symansistr}not{$endif}(mf_symansistr in moduleflags) then
             begin
@@ -1053,6 +1059,8 @@ var
           include(moduleflags,mf_wasm_js_exceptions);
         if ts_wasm_bf_exceptions in current_settings.targetswitches then
           include(moduleflags,mf_wasm_bf_exceptions);
+        if ts_wasm_threads in current_settings.targetswitches then
+          include(moduleflags,mf_wasm_threads);
 {$endif wasm}
 {$ifdef llvm}
         include(moduleflags,mf_llvm);

compiler/globtype.pas

@@ -410,7 +410,8 @@ interface
          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 }
+         mf_wasm_native_exceptions,   { unit was compiled in WebAssembly native exceptions mode }
+         mf_wasm_threads              { unit was compiled with WebAssembly multithreading support turned on }
        );
        tmoduleflags = set of tmoduleflag;
 

compiler/msg/errore.msg

@@ -3227,7 +3227,7 @@ link_e_undefined_symbol=09222_E_Undefined symbol: $1
 #
 # Unit loading
 #
-# 10069 is the last used one
+# 10070 is the last used one
 #
 # BeginOfTeX
 % \section{Unit loading messages.}
@@ -3457,6 +3457,9 @@ unit_u_ppu_invalid_wasm_exceptions_mode=10068_U_PPU is compiled for another WebA
 unit_u_ppu_symansistr_mismatch=10069_U_Skipping unit, PPU and compiler have to be both compiled with or without SYMANSISTR support
 % Units compiled by a compiler built with -dSYMANSISTR cannot be used with a regular compiler built without,
 % and vice versa.
+unit_u_ppu_wasm_threads_mismatch=10070_U_PPU and program must both be compiled with or without WebAssembly multithreading support
+% The user is compiling a program with multithreading turned on, but the unit was compiled with multithreading off,
+% or vice versa.
 % \end{description}
 # EndOfTeX
 

compiler/msgidx.inc

@@ -1042,6 +1042,7 @@ const
   unit_u_ppu_llvm_mismatch=10067;
   unit_u_ppu_invalid_wasm_exceptions_mode=10068;
   unit_u_ppu_symansistr_mismatch=10069;
+  unit_u_ppu_wasm_threads_mismatch=10070;
   option_usage=11000;
   option_only_one_source_support=11001;
   option_def_only_for_os2=11002;
@@ -1155,9 +1156,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 90359;
+  MsgTxtSize = 90456;
 
   MsgIdxMax : array[1..20] of longint=(
-    28,109,365,132,100,63,148,38,223,70,
+    28,109,365,132,100,63,148,38,223,71,
     65,20,30,1,1,1,1,1,1,1
   );