Machine selection changes

Detail:
  Since code wise and arch wise A7=A15=A17, the machines in HdrSrc have been made common on A7.
Admin:
  Requires HdrSrc-2_55.
  Retagged as Library-1_82.

ToolOptions/APCS-32,feb

@@ -24,7 +24,7 @@ If "<Machine>"="ARM11ZF"    then Set Alias$CC %%CC -APCS 3/32bit/fpe3 -cpu 6 -me
 If "<Machine>"="RPi"        then Set Alias$CC %%CC -APCS 3/32bit/fpe3 -cpu 6 -memaccess +L22+S22-L41 %%*0
 If "<Machine>"="CortexA8"   then Set Alias$CC %%CC -APCS 3/32bit/fpe3 -cpu 7 -memaccess +L22+S22-L41 %%*0
 If "<Machine>"="CortexA9"   then Set Alias$CC %%CC -APCS 3/32bit/fpe3 -cpu 7 -memaccess +L22+S22-L41 %%*0
-If "<Machine>"="CortexA15"  then Set Alias$CC %%CC -APCS 3/32bit/fpe3 -cpu 7 -memaccess +L22+S22-L41 %%*0
+If "<Machine>"="CortexA7"   then Set Alias$CC %%CC -APCS 3/32bit/fpe3 -cpu 7 -memaccess +L22+S22-L41 %%*0
                                  Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit %%*0
 if "<Machine>"="All32"      then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit -cpu 3 %%*0
 if "<Machine>"="32"         then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit -cpu 3 %%*0
@@ -33,7 +33,7 @@ if "<Machine>"="ARM11ZF"    then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit/fpe3 -c
 if "<Machine>"="RPi"        then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit/fpe3 -cpu 6Z --fpu VFPv2 %%*0
 if "<Machine>"="CortexA8"   then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit/fpe3 -cpu Cortex-A8 %%*0
 if "<Machine>"="CortexA9"   then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit/fpe3 -cpu Cortex-A9 %%*0
-if "<Machine>"="CortexA15"  then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit/fpe3 -cpu Cortex-A15 %%*0
+if "<Machine>"="CortexA7"   then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit/fpe3 -cpu Cortex-A7 %%*0
 | Fall back to -cpu 5TEJ for older versions of objasm
 objasm -h { > <Wimp$ScrapDir>.ToolOptions }
 | 1 will be returned for unrecognised parameters, e.g. -fpu