Re: I'm back (RISC OS port)

[Timothy Baldwin]

Another bug fix, this time it wasn't working with old, APCS26 only, versions 
of the C Library, due to checking for the wrong error number.

diff -purN -x '*.mk' -x '*~' -x autom4te.cache -x configure -x '.#*' -x 
'*.orig' -x CVS grub2-submitted/kern/arm/RISC_OS/startup.S 
grub2-arm/kern/arm/RISC_OS/startup.S
--- grub2-submitted/kern/arm/RISC_OS/startup.S  2005-09-24 21:13:31.000000000 
+0100
+++ grub2-arm/kern/arm/RISC_OS/startup.S        2005-09-25 11:01:22.000000000 
+0100
@@ -83,13 +83,13 @@ grub_arm_startup:
        swi     X(SharedCLibrary_LibInitAPCS_32)
        bvc     1f @ Branch if no error
        
-       @ If error was "No Such SWI" and we are in 26-bit PC mode try APCS R,
-       @ otherwise raise error.
+       @ If error was "SWI value out of range for module SharedCLibrary"
+       @ and we are in 26-bit PC mode try APCS R, otherwise raise error.
        teq     pc, pc
        swieq   OS_GenerateError
        ldr     r14, [r0]
-       eor     r14, r14, #ERROR_NO_SUCH_SWI & 0xff00
-       teq     r14, #ERROR_NO_SUCH_SWI & 0x00ff
+       ldr     r13, =0x800E85
+       teq     r14, r13
        swine   OS_GenerateError
        adr     r0, stubs
        swi     SharedCLibrary_LibInitAPCS_R


-- 
Member AFFS, WYLUG, SWP (UK), UAF, RESPECT, StWC
No to software patents!    Victory to the iraqi resistance!

pgprr7LINM3ye.pgp
Description: PGP signature