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

* enable VLink when running on Amiga/MorphOS targets earlier so it can even be disabled afterwards

Browse Source 
git-svn-id: trunk@33489 -
This commit is contained in:
Károly Balogh 2016-04-12 16:52:47 +00:00
parent c39bce3747
commit 9dae10b8ba
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/options.pas
View File

@ -2511,7 +2511,7 @@ begin
end; end;
'V' : 'V' :
begin begin
If UnsetBool(More, j, opt, false) then if UnsetBool(More, j, opt, false) then
exclude(init_settings.globalswitches,cs_link_vlink) exclude(init_settings.globalswitches,cs_link_vlink)
else else
begin begin
@ -3066,6 +3066,12 @@ begin
features:=features-target_unsup_features features:=features-target_unsup_features
else else
features:=features+target_unsup_features; features:=features+target_unsup_features;
{$ifdef hasamiga}
{ enable vlink as default linker on Amiga/MorphOS, but not for cross compilers (for now) }
if target_info.system in [system_m68k_amiga,system_powerpc_amiga,system_powerpc_morphos] then
include(init_settings.globalswitches,cs_link_vlink);
{$endif}
end; end;
procedure TOption.checkoptionscompatibility; procedure TOption.checkoptionscompatibility;
@ -3733,11 +3739,6 @@ begin
(cs_link_nolink in init_settings.globalswitches)) then (cs_link_nolink in init_settings.globalswitches)) then
begin begin
include(init_settings.globalswitches,cs_link_extern); include(init_settings.globalswitches,cs_link_extern);
{$ifdef hasamiga}
{ enable vlink as default linker on Amiga/MorphOS, but not for cross compilers (for now) }
if target_info.system in [system_m68k_amiga,system_powerpc_amiga,system_powerpc_morphos] then
include(init_settings.globalswitches,cs_link_vlink);
{$endif}
end; end;
{ turn off stripping if compiling with debuginfo or profile } { turn off stripping if compiling with debuginfo or profile }