diff --git a/ToolOptions/APCS-32,feb b/ToolOptions/APCS-32,feb index 710060ababbeb0dfad0a7cf7e9b1c3106aca450a..d3d2ea5fff67bdb8733d6d4e5aebaffa0b34f9b9 100644 --- a/ToolOptions/APCS-32,feb +++ b/ToolOptions/APCS-32,feb @@ -27,9 +27,9 @@ If "<Machine>"="CortexA9" then Set Alias$CC %%CC -APCS 3/32bit/fpe3 -cpu 6 -me 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 -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 +if "<Machine>"="ARM11ZF" 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 | 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 diff --git a/VersionNum b/VersionNum index afa66df2cf7ae97ae28249a35720cff434063682..9e7926debb0a246994e0088b093881f3a3daf7ca 100644 --- a/VersionNum +++ b/VersionNum @@ -1,15 +1,15 @@ -/* (1.47) +/* (1.48) * * This file is automatically maintained by srccommit, do not edit manually. * Last processed by srccommit version: 1.1. * */ -#define Module_MajorVersion_CMHG 1.47 +#define Module_MajorVersion_CMHG 1.48 #define Module_MinorVersion_CMHG #define Module_Date_CMHG 12 Sep 2011 -#define Module_MajorVersion "1.47" -#define Module_Version 147 +#define Module_MajorVersion "1.48" +#define Module_Version 148 #define Module_MinorVersion "" #define Module_Date "12 Sep 2011" @@ -18,6 +18,6 @@ #define Module_ComponentName "Library" #define Module_ComponentPath "mixed/RiscOS/Library" -#define Module_FullVersion "1.47" -#define Module_HelpVersion "1.47 (12 Sep 2011)" -#define Module_LibraryVersionInfo "1:47" +#define Module_FullVersion "1.48" +#define Module_HelpVersion "1.48 (12 Sep 2011)" +#define Module_LibraryVersionInfo "1:48"