diff --git a/compiler/options.pas b/compiler/options.pas index e53138b3a6..213b8dab35 100644 --- a/compiler/options.pas +++ b/compiler/options.pas @@ -3307,7 +3307,7 @@ begin {$if defined(atari) or defined(hasamiga)} { enable vlink as default linker on Atari, Amiga, and MorphOS, but not for cross compilers (for now) } if (target_info.system in [system_m68k_amiga,system_m68k_atari, - system_powerpc_amiga,system_powerpc_morphos]) and + system_powerpc_amiga]) and not LinkerSetExplicitly then include(init_settings.globalswitches,cs_link_vlink); {$endif} diff --git a/compiler/systems/i_morph.pas b/compiler/systems/i_morph.pas index 34d2bfe2fa..a7d2255db5 100644 --- a/compiler/systems/i_morph.pas +++ b/compiler/systems/i_morph.pas @@ -62,8 +62,8 @@ unit i_morph; Cprefix : ''; newline : #10; dirsep : '/'; - assem : as_powerpc_gas_legacy; - assemextern : as_powerpc_gas_legacy; + assem : as_gas; + assemextern : as_gas; link : ld_none; linkextern : ld_morphos; ar : ar_gnu_ar;