summaryrefslogtreecommitdiff
path: root/compiler/options.pas
diff options
context:
space:
mode:
authorjonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2>2015-08-28 22:31:17 +0000
committerjonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2>2015-08-28 22:31:17 +0000
commit26052b236a2a9646c680763ae11aaec1a5eab5f1 (patch)
tree0a9f553f85aaaae89c26b0c3dd6503a416cc980d /compiler/options.pas
parentcd2d531b2e502a80626511df433d4ca7933f9d67 (diff)
downloadfpc-26052b236a2a9646c680763ae11aaec1a5eab5f1.tar.gz
* changed paratargetdbg from a global variable into a field of toption
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@31443 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'compiler/options.pas')
-rw-r--r--compiler/options.pas10
1 files changed, 6 insertions, 4 deletions
diff --git a/compiler/options.pas b/compiler/options.pas
index e7e0954c37..f558f6e48a 100644
--- a/compiler/options.pas
+++ b/compiler/options.pas
@@ -52,6 +52,7 @@ Type
ParaAlignment : TAlignmentInfo;
paratarget : tsystem;
paratargetasm : tasm;
+ paratargetdbg : tdbg;
Constructor Create;
Destructor Destroy;override;
procedure WriteLogo;
@@ -3096,6 +3097,7 @@ begin
MacVersionSet:=false;
paratarget:=system_none;
paratargetasm:=as_none;
+ paratargetdbg:=dbg_none;
end;
@@ -3659,11 +3661,11 @@ begin
Message1(option_asm_forced,target_asm.idtxt);
end;
if (af_no_debug in asminfos[option.paratargetasm]^.flags) and
- (paratargetdbg<>dbg_none) then
+ (option.paratargetdbg<>dbg_none) then
begin
Message1(option_confict_asm_debug,
asminfos[option.paratargetasm]^.idtxt);
- paratargetdbg:=dbg_none;
+ option.paratargetdbg:=dbg_none;
exclude(init_settings.moduleswitches,cs_debuginfo);
end;
end;
@@ -3671,8 +3673,8 @@ begin
option.checkoptionscompatibility;
{ maybe override debug info format }
- if (paratargetdbg<>dbg_none) then
- if not set_target_dbg(paratargetdbg) then
+ if (option.paratargetdbg<>dbg_none) then
+ if not set_target_dbg(option.paratargetdbg) then
Message(option_w_unsupported_debug_format);
{ switch assembler if it's binary and we got -a on the cmdline }