* moved adding of '-mfpu=softvfp' for arm/softfloat to overridden

method in TArmGNUAssembler, because it's cleaner (no ifdef) and it
    mustn't be added for darwin (which uses TArmAppleGNUAssembler)

git-svn-id: trunk@11854 -
This commit is contained in:
Jonas Maebe 2008-10-02 21:52:47 +00:00
parent 3aa600e569
commit 5f39783ec6
2 changed files with 9 additions and 6 deletions

View File

@ -29,6 +29,7 @@ unit agarmgas;
interface interface
uses uses
globtype,
aasmtai,aasmdata, aasmtai,aasmdata,
aggas, aggas,
cpubase; cpubase;
@ -36,6 +37,7 @@ unit agarmgas;
type type
TARMGNUAssembler=class(TGNUassembler) TARMGNUAssembler=class(TGNUassembler)
constructor create(smart: boolean); override; constructor create(smart: boolean); override;
function MakeCmdLine: TCmdStr; override;
end; end;
TArmInstrWriter=class(TCPUInstrWriter) TArmInstrWriter=class(TCPUInstrWriter)
@ -57,7 +59,7 @@ unit agarmgas;
cutils,globals,verbose, cutils,globals,verbose,
systems, systems,
assemble, assemble,
aasmcpu, cpuinfo,aasmcpu,
itcpugas, itcpugas,
cgbase,cgutils; cgbase,cgutils;
@ -72,6 +74,12 @@ unit agarmgas;
end; end;
function TArmGNUAssembler.MakeCmdLine: TCmdStr;
begin
if (current_settings.fputype = fpu_soft) then
result:='-mfpu=softvfp '+result;
end;
{****************************************************************************} {****************************************************************************}
{ GNU/Apple PPC Assembler writer } { GNU/Apple PPC Assembler writer }
{****************************************************************************} {****************************************************************************}

View File

@ -510,11 +510,6 @@ Implementation
result:='-m68000 '+result; result:='-m68000 '+result;
{$endif} {$endif}
{$ifdef arm}
if current_settings.fputype = fpu_soft then
result:='-mfpu=softvfp '+result;
{$endif arm}
if (cs_link_on_target in current_settings.globalswitches) then if (cs_link_on_target in current_settings.globalswitches) then
begin begin
Replace(result,'$ASM',maybequoted(ScriptFixFileName(AsmFileName))); Replace(result,'$ASM',maybequoted(ScriptFixFileName(AsmFileName)));