paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-13 16:59:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

* based on patch by Christo Crause: when setting the controller type, set also the sub architecture, resolves #33189

Browse Source 
git-svn-id: trunk@38285 -
This commit is contained in:
florian 2018-02-18 21:19:35 +00:00
parent 5c18758b12
commit 5d17b335a6
4 changed files with 778 additions and 762 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/msg/errore.msg
View File

@ -142,7 +142,7 @@ general_e_exception_raised=01026_E_Compilation raised exception internally
# #
# Scanner # Scanner
# #
# 02104 is the last used one # 02105 is the last used one
# #
% \section{Scanner messages.} % \section{Scanner messages.}
% This section lists the messages that the scanner emits. The scanner takes % This section lists the messages that the scanner emits. The scanner takes
@ -427,6 +427,7 @@ scan_w_setpeosversion_not_support=02103_W_SETPEOSVERSION is not supported by the
% The \var{\{\$SETPEOSVERSION\}} directive is not supported by the target OS. % The \var{\{\$SETPEOSVERSION\}} directive is not supported by the target OS.
scan_w_setpesubsysversion_not_support=02104_W_SETPESUBSYSVERSION is not supported by the target OS scan_w_setpesubsysversion_not_support=02104_W_SETPESUBSYSVERSION is not supported by the target OS
% The \var{\{\$SETPESUBSYSVERSION\}} directive is not supported by the target OS. % The \var{\{\$SETPESUBSYSVERSION\}} directive is not supported by the target OS.
scan_n_changecputype=02105_N_Changed CPU type to be consistent with specified controller
% \end{description} % \end{description}
# #
# Parser # Parser

5
compiler/msgidx.inc
View File

@ -127,6 +127,7 @@ const
scan_w_setpeuserversion_not_support=02102; scan_w_setpeuserversion_not_support=02102;
scan_w_setpeosversion_not_support=02103; scan_w_setpeosversion_not_support=02103;
scan_w_setpesubsysversion_not_support=02104; scan_w_setpesubsysversion_not_support=02104;
scan_n_changecputype=02105;
parser_e_syntax_error=03000; parser_e_syntax_error=03000;
parser_e_dont_nest_interrupt=03004; parser_e_dont_nest_interrupt=03004;
parser_w_proc_directive_ignored=03005; parser_w_proc_directive_ignored=03005;
@ -1092,9 +1093,9 @@ const
option_info=11024; option_info=11024;
option_help_pages=11025; option_help_pages=11025;
MsgTxtSize = 81122; MsgTxtSize = 81190;
MsgIdxMax : array[1..20] of longint=( MsgIdxMax : array[1..20] of longint=(
27,105,347,125,96,58,139,33,221,67, 27,106,347,125,96,58,139,33,221,67,
61,20,30,1,1,1,1,1,1,1 61,20,30,1,1,1,1,1,1,1
); );

1522
compiler/msgtxt.inc
View File

File diff suppressed because it is too large Load Diff

10
compiler/options.pas
View File

@ -2384,7 +2384,15 @@ begin
begin begin
s:=upper(copy(more,j+1,length(more)-j)); s:=upper(copy(more,j+1,length(more)-j));
if not(SetControllerType(s,init_settings.controllertype)) then if not(SetControllerType(s,init_settings.controllertype)) then
IllegalPara(opt); IllegalPara(opt)
else
begin
if init_settings.cputype<>embedded_controllers[init_settings.controllertype].cputype then
begin
Message(scan_n_changecputype);
init_settings.cputype:=embedded_controllers[init_settings.controllertype].cputype;
end;
end;
break; break;
end end
else else