Check mf_symansistr is compatible with current compiler mode and issue a message before failing PPU loading

This commit is contained in:
Pierre Muller 2022-04-11 22:10:48 +00:00
parent 7ff6d78543
commit 85c648e603
4 changed files with 350 additions and 335 deletions

View File

@ -356,6 +356,11 @@ var
exit;
end;
{$endif}
if {$ifdef symansistr}not{$endif}(mf_symansistr in moduleflags) then
begin
Message(unit_u_ppu_symansistr_mismatch,@queuecomment);
exit;
end;
if {$ifdef llvm}not{$endif}(mf_llvm in moduleflags) then
begin
Message(unit_u_ppu_llvm_mismatch,@queuecomment);

View File

@ -3219,7 +3219,7 @@ link_e_undefined_symbol=09222_E_Undefined symbol: $1
#
# Unit loading
#
# 10068 is the last used one
# 10069 is the last used one
#
# BeginOfTeX
% \section{Unit loading messages.}
@ -3446,6 +3446,9 @@ unit_u_ppu_llvm_mismatch=10067_U_Skipping unit, PPU and compiler have to be both
% 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.
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.
% \end{description}
# EndOfTeX

View File

@ -1038,6 +1038,7 @@ const
cg_f_internal_type_does_not_match=10066;
unit_u_ppu_llvm_mismatch=10067;
unit_u_ppu_invalid_wasm_exceptions_mode=10068;
unit_u_ppu_symansistr_mismatch=10069;
option_usage=11000;
option_only_one_source_support=11001;
option_def_only_for_os2=11002;
@ -1151,9 +1152,9 @@ const
option_info=11024;
option_help_pages=11025;
MsgTxtSize = 89519;
MsgTxtSize = 89619;
MsgIdxMax : array[1..20] of longint=(
28,109,365,131,99,63,148,37,223,69,
28,109,365,131,99,63,148,37,223,70,
65,20,30,1,1,1,1,1,1,1
);

File diff suppressed because it is too large Load Diff