BBE-related changes:

* clib.rom_link_v doesn't seem to have been kept in step with the changes
  to srcbuild as part of the cross-compilation work: it is no longer the
  job of the verbatim rom link makefie fragment to provide a rom_link rule.
  An appropriate alternative set of forwarding rules have been implemented
  instead.
* clib.rom_link_v was never taught about the new C99 library chunks, and the
  relevant s files weren't being exported in the BBE phase either.

Retagged since this won't affect code generation for existing builds.

Makefile

@@ -505,7 +505,9 @@ bbe-clibrary: bbe-generic
 	BBE_Export_File rlib.Resources.${LOCALE}.Messages
 	BBE_Export_File rlib.swi
 	BBE_Export_File kernel.s.k_entries
+	BBE_Export_File kernel.s.k_entries2
 	BBE_Export_File clib.s.cl_entries
+	BBE_Export_File clib.s.cl_entry2
 	BBE_Export_File rlib.s.rl_entries
 	BBE_Export_File aof.${TARGET}
 	${CP} clib.rom_link_v ${VERBATIMROMLINK} ${CPFLAGS}

clib/rom_link_v

@@ -11,21 +11,27 @@ A_ABSSYM  = RISC_OSLib:o.a_abssym
 #
 # Final link for the ROM Image {using given base address}
 #
-rom_link_Entries:
-        ${XTENT} syms.C_Entries kernel.s.k_entries clib.s.cl_entries
+rom_link-RISC_OSLib: rom_link__link rom_link__RISC_OSLib rom_link__Entries
+        @echo ${COMPONENT}: rom_link complete
+
+rom_link-CLib: rom_link__link rom_link__CLib rom_link__Entries
+        @echo ${COMPONENT}: rom_link complete
+
+rom_link__Entries:
+        ${XTENT} syms.C_Entries kernel.s.k_entries kernel.s.k_entries2 clib.s.cl_entries clib.s.cl_entry2
         print rlib.swi { >> syms.C_Entries }
         | C_Entries *currently* only adds _swi/_swix to RO2 symbols.
         egrep -v "^(0x00000000 . )?_swix?$" < syms.C_Entries > syms.A_Entries
 
-rom_link_RISC_OSLib:
-        ${XTENT} syms.Entries kernel.s.k_entries clib.s.cl_entries rlib.s.rl_entries
+rom_link__RISC_OSLib:
+        ${XTENT} syms.Entries kernel.s.k_entries kernel.s.k_entries2 clib.s.cl_entries clib.s.cl_entry2 rlib.s.rl_entries
         print rlib.swi { >> syms.Entries }
 
-rom_link_CLib:
-        ${XTENT} syms.Entries kernel.s.k_entries clib.s.cl_entries
+rom_link__CLib:
+        ${XTENT} syms.Entries kernel.s.k_entries kernel.s.k_entries2 clib.s.cl_entries clib.s.cl_entry2
         print rlib.swi { >> syms.Entries }
 
-rom_link: rom_link_${TARGET} rom_link_Entries
+rom_link__link:
         ${LD} ${LDFLAGS} -o linked.${TARGET} aof.${TARGET} \
               -symdefs syms.C_Entries \
               -symdefs syms.A_Entries \
@@ -39,6 +45,4 @@ rom_link: rom_link_${TARGET} rom_link_Entries
         ${CP} syms.Entries ${ABSSYM} ${CPFLAGS}
         ${CP} syms.C_Entries ${C_ABSSYM} ${CPFLAGS}
         ${CP} syms.A_Entries ${A_ABSSYM} ${CPFLAGS}
-        |
-        @echo ${COMPONENT}: rom_link complete