paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-19 23:19:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Allow to disable specific feature with -Sf-FEATURE_NAME

Browse Source 
* Fix "-CX -al" use for i8086, because it was currently broken
  -al triggered switch to nasm external assembler but with smart linking,
  this should also generate a switch to external assembler.

git-svn-id: trunk@34017 -
This commit is contained in:
pierre 2016-06-24 15:55:10 +00:00
parent dfeadf89e9
commit 270a574d6a
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/options.pas
View File

@ -1952,9 +1952,16 @@ begin
inc(j);
if more[j]='-' then
begin
features:=[];
if length(more)>j then
IllegalPara(opt);
begin
inc(j);
if (ExcludeFeature(upper(copy(more,j,length(more)-j+1)))) then
j:=length(more)
else
IllegalPara(opt);
end
else
features:=[];
end
else
begin
@ -3730,6 +3737,9 @@ begin
begin
Message(option_switch_bin_to_src_assembler);
set_target_asm(target_info.assemextern);
{ At least i8086 needs that for nasm and -CX
which is incompatible with internal linker }
option.checkoptionscompatibility;
end;
{ Force use of external linker if there is no
@ -3915,7 +3925,7 @@ begin
{ Use init_settings cpu type for asm cpu type,
if asmcputype is cpu_none,
at least as long as there is no explicit
at least as long as there is no explicit
option to set it on command line PM }
if init_settings.asmcputype = cpu_none then
init_settings.asmcputype:=init_settings.cputype;