From 2d62b65772a7fb3cc200bd7092dd13a19fa98861 Mon Sep 17 00:00:00 2001
From: Stewart Brodie <sbrodie@gitlab.riscosopen.org>
Date: Tue, 21 Nov 2000 15:03:22 +0000
Subject: [PATCH] Fix to 32-bit flag - it was previously inverted.
Modulewrapped modules will now have the correct 32-bitness flag.
Admin:
Built.
Version 5.23. Tagged as 'RISC_OSLib-5_23'
---
VersionASM | 14 +++++++-------
VersionNum | 20 ++++++++++----------
clib/s/cl_rmhdr | 2 +-
s/modulewrap | 7 +++++++
4 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/VersionASM b/VersionASM
index 14b1057..3e38721 100644
--- a/VersionASM
+++ b/VersionASM
@@ -11,14 +11,14 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
-Module_MajorVersion SETS "5.22"
-Module_Version SETA 522
+Module_MajorVersion SETS "5.23"
+Module_Version SETA 523
Module_MinorVersion SETS ""
-Module_Date SETS "20 Nov 2000"
-Module_ApplicationDate2 SETS "20-Nov-00"
-Module_ApplicationDate4 SETS "20-Nov-2000"
+Module_Date SETS "21 Nov 2000"
+Module_ApplicationDate2 SETS "21-Nov-00"
+Module_ApplicationDate4 SETS "21-Nov-2000"
Module_ComponentName SETS "RISC_OSLib"
Module_ComponentPath SETS "RiscOS/Sources/Lib/RISC_OSLib"
-Module_FullVersion SETS "5.22"
-Module_HelpVersion SETS "5.22 (20 Nov 2000)"
+Module_FullVersion SETS "5.23"
+Module_HelpVersion SETS "5.23 (21 Nov 2000)"
END
diff --git a/VersionNum b/VersionNum
index 3ae29c1..0947c12 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,22 +1,22 @@
-/* (5.22)
+/* (5.23)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
-#define Module_MajorVersion_CMHG 5.22
+#define Module_MajorVersion_CMHG 5.23
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 20 Nov 2000
+#define Module_Date_CMHG 21 Nov 2000
-#define Module_MajorVersion "5.22"
-#define Module_Version 522
+#define Module_MajorVersion "5.23"
+#define Module_Version 523
#define Module_MinorVersion ""
-#define Module_Date "20 Nov 2000"
+#define Module_Date "21 Nov 2000"
-#define Module_ApplicationDate2 "20-Nov-00"
-#define Module_ApplicationDate4 "20-Nov-2000"
+#define Module_ApplicationDate2 "21-Nov-00"
+#define Module_ApplicationDate4 "21-Nov-2000"
#define Module_ComponentName "RISC_OSLib"
#define Module_ComponentPath "RiscOS/Sources/Lib/RISC_OSLib"
-#define Module_FullVersion "5.22"
-#define Module_HelpVersion "5.22 (20 Nov 2000)"
+#define Module_FullVersion "5.23"
+#define Module_HelpVersion "5.23 (21 Nov 2000)"
diff --git a/clib/s/cl_rmhdr b/clib/s/cl_rmhdr
index 119b60e..4996e53 100644
--- a/clib/s/cl_rmhdr
+++ b/clib/s/cl_rmhdr
@@ -78,7 +78,7 @@ Code_HelpString
ALIGN
Code_ModuleFlags
- [ {CONFIG}=32
+ [ {CONFIG}=26
DCD 0
|
DCD ModuleFlag_32bit
diff --git a/s/modulewrap b/s/modulewrap
index 9a7c179..731e6c2 100644
--- a/s/modulewrap
+++ b/s/modulewrap
@@ -88,6 +88,9 @@ Module_BaseAddr
|
DCD 0
]
+ [ :LNOT: No32bitCode
+ DCD ModuleWrap_ModuleFlags - Module_BaseAddr
+ ]
ModuleWrap_CommandTable
[ :DEF:FilerAct
@@ -153,6 +156,10 @@ ModuleWrap_TitleString DCB "!", ApplicationName, 0
ALIGN
+ [ :LNOT: No32bitCode
+ModuleWrap_ModuleFlags DCD ModuleFlag_32bit
+ ]
+
space * 32
strcpy_advance Entry "r1,r2"
--
GitLab