* MIPS: fixed passing CPU type specified with -CpXXX switch to assembler

- removed mips_cpu variable and cpu_mips_default CPU type.
  * globals.pas: default CPU type changed to MIPS2, this is what was passed to assembler before.

git-svn-id: trunk@24643 -
This commit is contained in:
sergei 2013-05-30 15:02:40 +00:00
parent a1bc04bbb3
commit fe322f35d5
3 changed files with 5 additions and 9 deletions

View File

@ -446,8 +446,8 @@ interface
fputype : fpu_none;
{$endif avr}
{$ifdef mips}
cputype : cpu_mips32;
optimizecputype : cpu_mips32;
cputype : cpu_mips2;
optimizecputype : cpu_mips2;
fputype : fpu_mips2;
{$endif mips}
{$ifdef jvm}

View File

@ -53,7 +53,7 @@ unit cpugas;
uses
cutils, systems, cpuinfo,
verbose, itcpugas, cgbase, cgutils;
globals, verbose, itcpugas, cgbase, cgutils;
function gas_std_regname(r:Tregister):string;
var
@ -99,7 +99,7 @@ unit cpugas;
{ ABI selection }
Replace(result,'$ABI','-mabi='+abitypestr[mips_abi]);
{ ARCH selection }
Replace(result,'$ARCH','-march='+lower(cputypestr[mips_cpu]));
Replace(result,'$ARCH','-march='+lower(cputypestr[current_settings.cputype]));
end;
{****************************************************************************}

View File

@ -32,9 +32,8 @@ Type
{ possible supported processors for this target }
tcputype =
(cpu_none,
cpu_mips_default,
cpu_mips1,
cpu_mis2,
cpu_mips2,
cpu_mips3,
cpu_mips4,
cpu_mips5,
@ -80,7 +79,6 @@ Const
GNU assembler in -arch=XXX option
this ilist needs to be uppercased }
cputypestr : array[tcputype] of string[8] = ('',
{ cpu_mips_default } 'MIPS2',
{ cpu_mips1 } 'MIPS1',
{ cpu_mips2 } 'MIPS2',
{ cpu_mips3 } 'MIPS3',
@ -90,8 +88,6 @@ Const
{ cpu_mips32r2 } 'MIPS32R2'
);
mips_cpu : tcputype = cpu_mips_default;
fputypestr : array[tfputype] of string[9] = ('',
'SOFT',
'FPU_MIPS2','FPU_MIPS3'