From d70d7abee66519a62f4a4f000e7beb0c7e3c4638 Mon Sep 17 00:00:00 2001
From: Kevin Bracey <kbracey@gitlab.riscosopen.org>
Date: Mon, 3 Jul 2000 12:30:41 +0000
Subject: [PATCH] C library now has a default message for C71 (Calling standard
no longer supported), so you get a meaningful message if soft-loading a new
version.
No code changes.
Version 5.10. Tagged as 'RISC_OSLib-5_10'
---
VersionASM | 12 ++++++------
VersionNum | 18 +++++++++---------
s/h_brazil | 12 ++++++++----
s/initmodule | 2 +-
4 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/VersionASM b/VersionASM
index 2beadf3..05d0352 100644
--- a/VersionASM
+++ b/VersionASM
@@ -8,11 +8,11 @@
GBLS Module_FullVersion
GBLS Module_ApplicationDate2
GBLS Module_ApplicationDate4
-Module_MajorVersion SETS "5.09"
-Module_Version SETA 509
+Module_MajorVersion SETS "5.10"
+Module_Version SETA 510
Module_MinorVersion SETS ""
-Module_Date SETS "20 Jun 2000"
-Module_ApplicationDate2 SETS "20-Jun-00"
-Module_ApplicationDate4 SETS "20-Jun-2000"
-Module_FullVersion SETS "5.09"
+Module_Date SETS "03 Jul 2000"
+Module_ApplicationDate2 SETS "03-Jul-00"
+Module_ApplicationDate4 SETS "03-Jul-2000"
+Module_FullVersion SETS "5.10"
END
diff --git a/VersionNum b/VersionNum
index 742f960..ae67bf9 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,18 +1,18 @@
-/* (5.09)
+/* (5.10)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
-#define Module_MajorVersion_CMHG 5.09
+#define Module_MajorVersion_CMHG 5.10
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 20 Jun 2000
+#define Module_Date_CMHG 03 Jul 2000
-#define Module_MajorVersion "5.09"
-#define Module_Version 509
+#define Module_MajorVersion "5.10"
+#define Module_Version 510
#define Module_MinorVersion ""
-#define Module_Date "20 Jun 2000"
+#define Module_Date "03 Jul 2000"
-#define Module_ApplicationDate2 "20-Jun-00"
-#define Module_ApplicationDate4 "20-Jun-2000"
+#define Module_ApplicationDate2 "03-Jul-00"
+#define Module_ApplicationDate4 "03-Jul-2000"
-#define Module_FullVersion "5.09"
+#define Module_FullVersion "5.10"
diff --git a/s/h_brazil b/s/h_brazil
index 41ae415..1f5e911 100644
--- a/s/h_brazil
+++ b/s/h_brazil
@@ -145,23 +145,27 @@ Application_Base EQU &8000
[ :DEF:DEFAULT_TEXT
MACRO
- ErrorBlock $name, $string, $tag
+ ErrorBlock $name, $string, $tag, $withdefault
E_$name
& Error_$name
= "$string", 0
ALIGN
ASSERT "$tag" <> ""
& Error_$name
- = "$tag"
+ = "$tag", 0
ALIGN
MEND
|
MACRO
- ErrorBlock $name, $string, $tag
+ ErrorBlock $name, $string, $tag, $withdefault
E_$name
ASSERT "$tag" <> ""
& Error_$name
- = "$tag"
+ [ "$withdefault" <> ""
+ = "$tag:$string", 0
+ |
+ = "$tag", 0
+ ]
ALIGN
MEND
]
diff --git a/s/initmodule b/s/initmodule
index 184e9c8..f1976fc 100644
--- a/s/initmodule
+++ b/s/initmodule
@@ -496,7 +496,7 @@ StubInitValue
ErrorBlock UnknownLib, "Unknown library chunk", C02
ErrorBlock StaticSizeWrong, "Static data size in library and stub disagree", C04
ErrorBlock StaticOffsetInconsistent, "Static data offset not the same for all library chunks", C05
- ErrorBlock OldAPCS, "Calling standard no longer supported by C library", C71
+ ErrorBlock OldAPCS, "Calling standard no longer supported by C library", C71, withdefault
ALIGN
LTORG
--
GitLab