Browse Source

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

git-svn-id: trunk@31444 -
Jonas Maebe 10 years ago
parent
commit
21066ba3f3
2 changed files with 3 additions and 3 deletions
  1. 0 2
      compiler/globals.pas
  2. 3 1
      compiler/options.pas

+ 0 - 2
compiler/globals.pas

@@ -294,7 +294,6 @@ interface
        MacOSXVersionMin,
        iPhoneOSVersionMin: string[15];
        RelocSectionSetExplicitly : boolean;
-       LinkTypeSetExplicitly : boolean;
 
        current_tokenpos,                  { position of the last token }
        current_filepos : tfileposinfo;    { current position }
@@ -1415,7 +1414,6 @@ implementation
         GenerateImportSection:=false;
         RelocSection:=false;
         RelocSectionSetExplicitly:=false;
-        LinkTypeSetExplicitly:=false;
         MacOSXVersionMin:='';
         iPhoneOSVersionMin:='';
         { memory sizes, will be overridden by parameter or default for target

+ 3 - 1
compiler/options.pas

@@ -53,6 +53,7 @@ Type
     paratarget        : tsystem;
     paratargetasm     : tasm;
     paratargetdbg     : tdbg;
+    LinkTypeSetExplicitly : boolean;
     Constructor Create;
     Destructor Destroy;override;
     procedure WriteLogo;
@@ -3098,6 +3099,7 @@ begin
   paratarget:=system_none;
   paratargetasm:=as_none;
   paratargetdbg:=dbg_none;
+  LinkTypeSetExplicitly:=false;
 end;
 
 
@@ -3973,7 +3975,7 @@ if (target_info.abi = abi_eabihf) then
      (target_info.system in [system_i386_win32,system_x86_64_win64]) then
     exclude(target_info.flags,tf_smartlink_sections);
 
-  if not LinkTypeSetExplicitly then
+  if not option.LinkTypeSetExplicitly then
     set_default_link_type;
 
   { Default alignment settings,