Commit f110d6b3 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Tweak objasm alias setup

Detail:
  ToolOptions/APCS-32,feb - Add a new objasm alias, ObjAsmVFP, for assembling code that requires VFP word ordering for DCFD (objasm will complain if it sees conflicting -APCS fp options on the command line, so we can't just use "-APCS /vfp" with the existing alias)
  To keep things simple, drop support for old versions of objasm
Admin:
  Tested with Raspberry Pi ROM build


Version 1.91. Tagged as 'Library-1_91'
parent 8bdf8687
......@@ -26,23 +26,18 @@ If "<Machine>"="RPi" then Set Alias$CC %%CC -APCS 3/32bit/fpe3 -cpu 6 -me
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>"="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
if "<Machine>"="Tungsten" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit -cpu 5TE %%*0
if "<Machine>"="ARM11ZF" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit/fpe3 -cpu 6Z --fpu VFPv2 %%*0
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>"="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
if "<Sys$ReturnCode>"="1" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit -cpu 5TEJ %%*0
| 0 will be returned for unrecognised -cpu options, so check any warning output
grep -F "Target cpu not recognised" <Wimp$ScrapDir>.ToolOptions { > null: }
if "<Sys$ReturnCode>"="0" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit -cpu 5TEJ %%*0
remove <Wimp$ScrapDir>.ToolOptions
Unset Build$ObjAsmCPU
if "<Machine>"="All32" then Set Build$ObjAsmCPU -cpu 3
if "<Machine>"="32" then Set Build$ObjAsmCPU -cpu 3
if "<Machine>"="Tungsten" then Set Build$ObjAsmCPU -cpu 5TE
if "<Machine>"="ARM11ZF" then Set Build$ObjAsmCPU -cpu 6Z --fpu VFPv2
if "<Machine>"="RPi" then Set Build$ObjAsmCPU -cpu 6Z --fpu VFPv2
if "<Machine>"="CortexA8" then Set Build$ObjAsmCPU -cpu Cortex-A8
if "<Machine>"="CortexA9" then Set Build$ObjAsmCPU -cpu Cortex-A9
if "<Machine>"="CortexA7" then Set Build$ObjAsmCPU -cpu Cortex-A7
Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit/fpe3 <Build$ObjAsmCPU> %%*0
| Declare an alias for VFP APCS variants (necessary to get the correct word ordering with DCFD)
Set Alias$ObjAsmVFP %%ObjAsm -APCS 3/32bit/vfp <Build$ObjAsmCPU> %%*0
Set Alias$CMHG %%CMHG -32bit %%*0
Set Alias$ResGen %%ResGen -32bit %%*0
Set Alias$DefMod %%DefMod.!Run -32bit %%*0
......
/* (1.90)
/* (1.91)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.90
#define Module_MajorVersion_CMHG 1.91
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 15 Apr 2017
#define Module_Date_CMHG 03 Jun 2017
#define Module_MajorVersion "1.90"
#define Module_Version 190
#define Module_MajorVersion "1.91"
#define Module_Version 191
#define Module_MinorVersion ""
#define Module_Date "15 Apr 2017"
#define Module_Date "03 Jun 2017"
#define Module_ApplicationDate "15-Apr-17"
#define Module_ApplicationDate "03-Jun-17"
#define Module_ComponentName "Library"
#define Module_ComponentPath "mixed/RiscOS/Library"
#define Module_FullVersion "1.90"
#define Module_HelpVersion "1.90 (15 Apr 2017)"
#define Module_LibraryVersionInfo "1:90"
#define Module_FullVersion "1.91"
#define Module_HelpVersion "1.91 (03 Jun 2017)"
#define Module_LibraryVersionInfo "1:91"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment