diff --git a/VersionASM b/VersionASM index d7d45c9782abbdaee7fbd1252bb47393c4d80a57..a22a9269d44867976c76c254697fd240160549b7 100644 --- a/VersionASM +++ b/VersionASM @@ -13,11 +13,11 @@ GBLS Module_ComponentPath Module_MajorVersion SETS "5.35" Module_Version SETA 535 -Module_MinorVersion SETS "4.79.2.148" -Module_Date SETS "15 May 2012" -Module_ApplicationDate SETS "15-May-12" +Module_MinorVersion SETS "4.79.2.149" +Module_Date SETS "18 May 2012" +Module_ApplicationDate SETS "18-May-12" Module_ComponentName SETS "Kernel" Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel" -Module_FullVersion SETS "5.35 (4.79.2.148)" -Module_HelpVersion SETS "5.35 (15 May 2012) 4.79.2.148" +Module_FullVersion SETS "5.35 (4.79.2.149)" +Module_HelpVersion SETS "5.35 (18 May 2012) 4.79.2.149" END diff --git a/VersionNum b/VersionNum index b9aed5ef2fcfa2ed734b47b6c309d1422cfb3fc5..3144e0b90a98fd0f416ff2938ffe24852f3a4cb4 100644 --- a/VersionNum +++ b/VersionNum @@ -5,19 +5,19 @@ * */ #define Module_MajorVersion_CMHG 5.35 -#define Module_MinorVersion_CMHG 4.79.2.148 -#define Module_Date_CMHG 15 May 2012 +#define Module_MinorVersion_CMHG 4.79.2.149 +#define Module_Date_CMHG 18 May 2012 #define Module_MajorVersion "5.35" #define Module_Version 535 -#define Module_MinorVersion "4.79.2.148" -#define Module_Date "15 May 2012" +#define Module_MinorVersion "4.79.2.149" +#define Module_Date "18 May 2012" -#define Module_ApplicationDate "15-May-12" +#define Module_ApplicationDate "18-May-12" #define Module_ComponentName "Kernel" #define Module_ComponentPath "castle/RiscOS/Sources/Kernel" -#define Module_FullVersion "5.35 (4.79.2.148)" -#define Module_HelpVersion "5.35 (15 May 2012) 4.79.2.148" +#define Module_FullVersion "5.35 (4.79.2.149)" +#define Module_HelpVersion "5.35 (18 May 2012) 4.79.2.149" #define Module_LibraryVersionInfo "5:35" diff --git a/s/ARMops b/s/ARMops index 50987702d4ac886f0d479d58607f5924f5b42979..f6a3d586ff7bccb1b9efa8ebf26096d6ff78eafc 100644 --- a/s/ARMops +++ b/s/ARMops @@ -732,7 +732,7 @@ KnownCPUTable CPUDesc ARM700, &007000, &FFFFF0, ARMv3, WT, 0, 8K, 4, 8 CPUDesc ARM710, &007100, &FFFFF0, ARMv3, WT, 0, 8K, 4, 8 CPUDesc ARM710a, &047100, &FDFFF0, ARMv3, WT, 0, 8K, 4, 4 - CPUDesc ARM7500, &067100, &FFFFF0, ARMv3, WT, 0, 4K, 4, 4 + CPUDesc ARM7500, &027100, &FFFFF0, ARMv3, WT, 0, 4K, 4, 4 CPUDesc ARM7500FE, &077100, &FFFFF0, ARMv3, WT, 0, 4K, 4, 4 CPUDesc ARMunk, &007000, &80F000, ARMv3, WT, 0, 8K, 4, 4 CPUDesc ARM720T, &807200, &FFFFF0, ARMv4T, WT, 0, 8K, 4, 4