paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-18 05:29:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

* remove cpu type cortex m3 on arm, it is just an ARMv7-M

Browse Source 
git-svn-id: trunk@18862 -
This commit is contained in:
florian 2011-08-27 19:26:16 +00:00
parent 7e537161c4
commit c95f7b1c2f
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/arm/agarmgas.pas
View File

@ -81,8 +81,6 @@ unit agarmgas;
if (current_settings.fputype = fpu_soft) then if (current_settings.fputype = fpu_soft) then
result:='-mfpu=softvfp '+result; result:='-mfpu=softvfp '+result;
if current_settings.cputype = cpu_cortexm3 then
result:='-mcpu=cortex-m3 -mthumb -mthumb-interwork '+result;
if current_settings.cputype = cpu_armv7m then if current_settings.cputype = cpu_armv7m then
result:='-march=armv7m -mthumb -mthumb-interwork '+result; result:='-march=armv7m -mthumb -mthumb-interwork '+result;
end; end;

8
compiler/arm/cpuinfo.pas
View File

@ -37,14 +37,13 @@ Type
cpu_armv5, cpu_armv5,
cpu_armv6, cpu_armv6,
cpu_armv7, cpu_armv7,
cpu_armv7m, cpu_armv7m
cpu_cortexm3
); );
Const Const
cpu_arm = [cpu_none,cpu_armv3,cpu_armv4,cpu_armv5]; cpu_arm = [cpu_none,cpu_armv3,cpu_armv4,cpu_armv5];
cpu_thumb = []; cpu_thumb = [];
cpu_thumb2 = [cpu_armv7m,cpu_cortexm3]; cpu_thumb2 = [cpu_armv7m];
Type Type
tfputype = tfputype =
@ -186,8 +185,7 @@ Const
'ARMV5', 'ARMV5',
'ARMV6', 'ARMV6',
'ARMV7', 'ARMV7',
'ARMV7M', 'ARMV7M'
'CORTEXM3'
); );
fputypestr : array[tfputype] of string[6] = ('', fputypestr : array[tfputype] of string[6] = ('',

4
compiler/ncgutil.pas
View File

@ -3139,7 +3139,7 @@ implementation
{$ENDIF arm} {$ENDIF arm}
begin begin
{$IFDEF arm} {$IFDEF arm}
if current_settings.cputype in [cpu_armv7m, cpu_cortexm3] then if current_settings.cputype in [cpu_armv7m] then
current_asmdata.asmlists[al_globals].concat(tai_const.Createname(name,0)) current_asmdata.asmlists[al_globals].concat(tai_const.Createname(name,0))
else else
begin begin
@ -3201,7 +3201,7 @@ implementation
new_section(current_asmdata.asmlists[al_globals],sec_init,'VECTORS',sizeof(pint)); new_section(current_asmdata.asmlists[al_globals],sec_init,'VECTORS',sizeof(pint));
current_asmdata.asmlists[al_globals].concat(Tai_symbol.Createname_global('VECTORS',AT_DATA,0)); current_asmdata.asmlists[al_globals].concat(Tai_symbol.Createname_global('VECTORS',AT_DATA,0));
{$IFDEF arm} {$IFDEF arm}
if current_settings.cputype in [cpu_armv7m, cpu_cortexm3] then if current_settings.cputype in [cpu_armv7m] then
current_asmdata.asmlists[al_globals].concat(tai_const.Createname('_stack_top',0)); { ARMv7-M processors have the initial stack value at address 0 } current_asmdata.asmlists[al_globals].concat(tai_const.Createname('_stack_top',0)); { ARMv7-M processors have the initial stack value at address 0 }
{$ENDIF arm} {$ENDIF arm}