OSLib 6.70 on RISC OS: defmod.y line 1203

[Erik Groenhuis]

Right, so I started out generating OSLib with a fresh machine and a
fresh CVS checkout.

Setup: Sources checked out on Red Hat Linux with commands as given on
webpage (tag oslib-670). RiscPC with RISC OS 4.02 connected with
SunFish to NFS share on Unix where sources can be found. Converted
sources with RISCOSify. Using recent Acorn/Castle/Norcroft 32-bit compiler.
(And yes, double-clicked !OsLib to set environment. (:-)

This is the first of a (short) series of problems I encountered.

While building DefMod in Tools:

OSLibBin:bison -o c.defmod ^.sources.y.defmod
cc -c -throwback  -faf  -Wcp  -I^.sources -IC: -I<OSLib$ToolsDir>
    -I<OSLib$ToolsDir>.support  -DRISCOS -DEXECUTE_ON_RISCOS -DYYDEBUG=0
    -DUSE_OBJASM      -apcs 3/32 defmod.c -o defmod.o
Norcroft RISC OS ARM C vsn 5.54 [04 Apr 2003]
"^.sources.y.defmod", line 1203: Serious error: duplicate definition of 'psr'
^.sources.y.defmod: 0 warnings, 0 errors, 1 serious error
AMU: *** exit (1) ***

The offending line is in a EXECUTE_ON_RISCOS-only bit of the source.

Removing line 1203 with the dupicate definition of 'psr' solves the problem.

(Note: There is some suspicion that the first of these declarations
belongs inside the EXECUTE_ON_UNIX part of the #if/#else/#endif
combination. I can't be sure. In my experience the compilation on Unix
does not have a problem with a missing 'psr' definition.)
-- 
Erik Groenhuis http://www.xs4all.nl/~erikgrnh
Home of RCS for RISC OS v5.7.1.2  http://www.rcs.riscos.org.uk/
Csite on RiscPC with a StrongARM RISC processor and RISC OS 4.02