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

* changed paratargetasm from a global variable into a field of toption

Browse Source 
git-svn-id: trunk@31442 -
This commit is contained in:
Jonas Maebe 2015-08-28 22:31:12 +00:00
parent 13638d958d
commit 84bd523867
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/globals.pas
View File

@ -231,7 +231,6 @@ interface
{ things specified with parameters } { things specified with parameters }
paratargetdbg : tdbg; paratargetdbg : tdbg;
paratargetasm : tasm;
paralinkoptions : TCmdStr; paralinkoptions : TCmdStr;
paradynamiclinker : string; paradynamiclinker : string;
paraprintnodetree : byte; paraprintnodetree : byte;
@ -1371,7 +1370,6 @@ implementation
compile_level:=0; compile_level:=0;
codegenerror:=false; codegenerror:=false;
DLLsource:=false; DLLsource:=false;
paratargetasm:=as_none;
paratargetdbg:=dbg_none; paratargetdbg:=dbg_none;
{ Output } { Output }

14
compiler/options.pas
View File

@ -51,6 +51,7 @@ Type
ParaFrameworkPath : TSearchPathList; ParaFrameworkPath : TSearchPathList;
ParaAlignment : TAlignmentInfo; ParaAlignment : TAlignmentInfo;
paratarget : tsystem; paratarget : tsystem;
paratargetasm : tasm;
Constructor Create; Constructor Create;
Destructor Destroy;override; Destructor Destroy;override;
procedure WriteLogo; procedure WriteLogo;
@ -3094,6 +3095,7 @@ begin
FillChar(ParaAlignment,sizeof(ParaAlignment),0); FillChar(ParaAlignment,sizeof(ParaAlignment),0);
MacVersionSet:=false; MacVersionSet:=false;
paratarget:=system_none; paratarget:=system_none;
paratargetasm:=as_none;
end; end;
@ -3645,22 +3647,22 @@ begin
{$ifdef llvm} {$ifdef llvm}
{ force llvm assembler writer } { force llvm assembler writer }
paratargetasm:=as_llvm; option.paratargetasm:=as_llvm;
{$endif llvm} {$endif llvm}
{ maybe override assembler } { maybe override assembler }
if (paratargetasm<>as_none) then if (option.paratargetasm<>as_none) then
begin begin
if not set_target_asm(paratargetasm) then if not set_target_asm(option.paratargetasm) then
begin begin
Message2(option_incompatible_asm,asminfos[paratargetasm]^.idtxt,target_info.name); Message2(option_incompatible_asm,asminfos[option.paratargetasm]^.idtxt,target_info.name);
set_target_asm(target_info.assemextern); set_target_asm(target_info.assemextern);
Message1(option_asm_forced,target_asm.idtxt); Message1(option_asm_forced,target_asm.idtxt);
end; end;
if (af_no_debug in asminfos[paratargetasm]^.flags) and if (af_no_debug in asminfos[option.paratargetasm]^.flags) and
(paratargetdbg<>dbg_none) then (paratargetdbg<>dbg_none) then
begin begin
Message1(option_confict_asm_debug, Message1(option_confict_asm_debug,
asminfos[paratargetasm]^.idtxt); asminfos[option.paratargetasm]^.idtxt);
paratargetdbg:=dbg_none; paratargetdbg:=dbg_none;
exclude(init_settings.moduleswitches,cs_debuginfo); exclude(init_settings.moduleswitches,cs_debuginfo);
end; end;