Commit 6ca4d0ca authored by Ben Avison's avatar Ben Avison
Browse files

Updates to ToolOptions file

Detail:
  * Alias for objasm sets correct -cpu and -fpu flags for v6/v7 architecture
    builds if you're using a version of objasm (>= 4.00) that supports them
  * Corrected Machine Any32 to All32 to match HdrSrc
Admin:
  Tested with objasm 3 and 4

Version 1.46. Tagged as 'Library-1_46'
parent 36a5979e
......@@ -17,19 +17,22 @@
Set Alias$CC %%CC -APCS 3/32bit/fpe3 -memaccess -L22-S22-L41 %%*0
If "<Machine>"="Archimedes" then Set Alias$CC %%CC -APCS 3/32bit/fpe3 -memaccess -L22-S22+L41 %%*0
If "<Machine>"="Any32" then Set Alias$CC %%CC -APCS 3/32bit/fpe3 -cpu 3 -memaccess -L22-S22-L41 %%*0
If "<Machine>"="All32" then Set Alias$CC %%CC -APCS 3/32bit/fpe3 -cpu 3 -memaccess -L22-S22-L41 %%*0
If "<Machine>"="32" then Set Alias$CC %%CC -APCS 3/32bit/fpe3 -cpu 3 -memaccess -L22-S22+L41 %%*0
If "<Machine>"="Tungsten" then Set Alias$CC %%CC -APCS 3/32bit/fpe3 -cpu 5TE -memaccess +L22+S22+L41 %%*0
If "<Machine>"="ARM11ZF" 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 6 -memaccess +L22+S22-L41 %%*0
If "<Machine>"="CortexA9" then Set Alias$CC %%CC -APCS 3/32bit/fpe3 -cpu 6 -memaccess +L22+S22-L41 %%*0
If "<Machine>"="ARM11ZF" then Set Alias$CC %%CC -APCS 3/32bit/fpe3 -cpu 6 -memaccess +L22+S22-L41 %%*0
Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit %%*0
if "<Machine>"="Any32" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit -cpu 3 %%*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>"="CortexA8" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit -cpu 5TEJ %%*0
if "<Machine>"="CortexA9" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit -cpu 5TEJ %%*0
if "<Machine>"="ARM11ZF" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit -cpu 5TEJ %%*0
if "<Machine>"="ARM11ZF" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit -cpu 6Z -fpu VFPv2 %%*0
if "<Machine>"="CortexA8" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit -cpu Cortex-A8 %%*0
if "<Machine>"="CortexA9" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit -cpu Cortex-A9 %%*0
| Fall back to -cpu 5TEJ for older versions of objasm
objasm -h { > null: }
if "<Sys$ReturnCode>"="1" then Set Alias$ObjAsm %%ObjAsm -APCS 3/32bit -cpu 5TEJ %%*0
Set Alias$CMHG %%CMHG -32bit %%*0
Set Alias$ResGen %%ResGen -32bit %%*0
Set Alias$DefMod %%DefMod -32bit %%*0
......
/* (1.45)
/* (1.46)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.45
#define Module_MajorVersion_CMHG 1.46
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 31 Jul 2011
#define Module_Date_CMHG 12 Sep 2011
#define Module_MajorVersion "1.45"
#define Module_Version 145
#define Module_MajorVersion "1.46"
#define Module_Version 146
#define Module_MinorVersion ""
#define Module_Date "31 Jul 2011"
#define Module_Date "12 Sep 2011"
#define Module_ApplicationDate "31-Jul-11"
#define Module_ApplicationDate "12-Sep-11"
#define Module_ComponentName "Library"
#define Module_ComponentPath "mixed/RiscOS/Library"
#define Module_FullVersion "1.45"
#define Module_HelpVersion "1.45 (31 Jul 2011)"
#define Module_LibraryVersionInfo "1:45"
#define Module_FullVersion "1.46"
#define Module_HelpVersion "1.46 (12 Sep 2011)"
#define Module_LibraryVersionInfo "1:46"
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