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

git-svn-id: trunk@18862 -

compiler/arm/agarmgas.pas

@@ -81,8 +81,6 @@ unit agarmgas;
         if (current_settings.fputype = fpu_soft) then
           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
           result:='-march=armv7m -mthumb -mthumb-interwork '+result;
       end;

compiler/arm/cpuinfo.pas

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

compiler/ncgutil.pas

@@ -3139,7 +3139,7 @@ implementation
 {$ENDIF arm}
         begin
 {$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))
           else
             begin
@@ -3201,7 +3201,7 @@ implementation
         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));
 {$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 }
 {$ENDIF arm}