* ignore warnings caused by boolean expression simplification

git-svn-id: trunk@35231 -
This commit is contained in:
florian 2017-01-04 16:33:31 +00:00
parent 331bb95c5e
commit 42cde51805
2 changed files with 9 additions and 1 deletions

View File

@ -2301,6 +2301,8 @@ begin
end; end;
'p': 'p':
begin begin
{$push}
{$warn 6018 off} { Unreachable code due to compile time evaluation }
if (target_info.system in systems_embedded) and if (target_info.system in systems_embedded) and
ControllerSupport then ControllerSupport then
begin begin
@ -2311,6 +2313,7 @@ begin
end end
else else
IllegalPara(opt); IllegalPara(opt);
{$pop}
end; end;
'P': 'P':
begin begin
@ -4104,6 +4107,8 @@ begin
if i in features then if i in features then
def_system_macro('FPC_HAS_FEATURE_'+featurestr[i]); def_system_macro('FPC_HAS_FEATURE_'+featurestr[i]);
{$push}
{$warn 6018 off} { Unreachable code due to compile time evaluation }
if ControllerSupport and (target_info.system in systems_embedded) and if ControllerSupport and (target_info.system in systems_embedded) and
(init_settings.controllertype<>ct_none) then (init_settings.controllertype<>ct_none) then
begin begin
@ -4119,6 +4124,7 @@ begin
set_system_macro('FPC_BOOTSIZE',tostr(bootsize)); set_system_macro('FPC_BOOTSIZE',tostr(bootsize));
end; end;
end; end;
{$pop}
option.free; option.free;
Option:=nil; Option:=nil;

View File

@ -398,12 +398,14 @@ implementation
AddUnit('fpcylix'); AddUnit('fpcylix');
AddUnit('dynlibs'); AddUnit('dynlibs');
end; end;
{$push}
{$warn 6018 off} { Unreachable code due to compile time evaluation }
{ CPU targets with microcontroller support can add a controller specific unit } { CPU targets with microcontroller support can add a controller specific unit }
if ControllerSupport and (target_info.system in systems_embedded) and if ControllerSupport and (target_info.system in systems_embedded) and
(current_settings.controllertype<>ct_none) and (current_settings.controllertype<>ct_none) and
(embedded_controllers[current_settings.controllertype].controllerunitstr<>'') then (embedded_controllers[current_settings.controllertype].controllerunitstr<>'') then
AddUnit(embedded_controllers[current_settings.controllertype].controllerunitstr); AddUnit(embedded_controllers[current_settings.controllertype].controllerunitstr);
{$pop}
end; end;