Commit 8e631acb authored by Stewart Brodie's avatar Stewart Brodie
Browse files

Major fix to Makefile.

Detail:
  Due to a dependency cockup, the C library wasn't being relinked properly
    during rom_link, so all the symbols exported in abssym files pointed
    to the locations the previous build was linked at.  This is now fixed
    by the addition of a new pseudo-target.
Admin:
  Tested clean and incremental build and verified the abssym file.
  Checked the build log to ensure relinking was occurring.
  Versions 5.11 and 5.12 of this component are fundamentally flawed.

Version 5.13. Tagged as 'RISC_OSLib-5_13'
parent e0629bcd
......@@ -464,23 +464,24 @@ aof.CLib: ${CLIB_ROM_OBJS}
#
# Final link for the ROM Image {using given base address}
#
linked.RISC_OSLib: ${ROM_OBJS}
${LD} -o $@ ${ROM_OBJS} \
rom_link_RISC_OSLib: ${ROM_OBJS}
${LD} -o linked.RISC_OSLib ${ROM_OBJS} \
-symbols syms.${TARGET} \
-bin -base ${ADDRESS} \
-map > map.${TARGET}
linked.CLib: ${CLIB_ROM_OBJS}
${LD} -o $@ ${CLIB_ROM_OBJS} \
rom_link_CLib: ${CLIB_ROM_OBJS}
${LD} -o linked.CLib ${CLIB_ROM_OBJS} \
-symbols syms.${TARGET} \
-bin -base ${ADDRESS} \
-map > map.${TARGET}
rom_link: linked.${TARGET}
rom_link: rom_link_${TARGET}
${CP} linked.${TARGET} ${LINKDIR}.${TARGET} ${CPFLAGS}
|
if "${TARGET}"="RISC_OSLib" Then Set ExtraLibs$xtentries rlib.s.rl_entries Else Unset ExtraLibs$xtentries
do xtentries syms.Entries kernel.s.k_entries clib.s.cl_entries <ExtraLibs$xtentries>
@echo xtentries syms.Entries kernel.s.k_entries clib.s.cl_entries <ExtraLibs$xtentries>
@do xtentries syms.Entries kernel.s.k_entries clib.s.cl_entries <ExtraLibs$xtentries>
unset ExtraLibs$xtentries
print rlib.swi { >> syms.Entries }
xtentries syms.C_Entries kernel.s.k_entries clib.s.cl_entries
......
......@@ -8,11 +8,11 @@
GBLS Module_FullVersion
GBLS Module_ApplicationDate2
GBLS Module_ApplicationDate4
Module_MajorVersion SETS "5.12"
Module_Version SETA 512
Module_MajorVersion SETS "5.13"
Module_Version SETA 513
Module_MinorVersion SETS ""
Module_Date SETS "15 Aug 2000"
Module_ApplicationDate2 SETS "15-Aug-00"
Module_ApplicationDate4 SETS "15-Aug-2000"
Module_FullVersion SETS "5.12"
Module_Date SETS "17 Aug 2000"
Module_ApplicationDate2 SETS "17-Aug-00"
Module_ApplicationDate4 SETS "17-Aug-2000"
Module_FullVersion SETS "5.13"
END
/* (5.12)
/* (5.13)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 5.12
#define Module_MajorVersion_CMHG 5.13
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 15 Aug 2000
#define Module_Date_CMHG 17 Aug 2000
#define Module_MajorVersion "5.12"
#define Module_Version 512
#define Module_MajorVersion "5.13"
#define Module_Version 513
#define Module_MinorVersion ""
#define Module_Date "15 Aug 2000"
#define Module_Date "17 Aug 2000"
#define Module_ApplicationDate2 "15-Aug-00"
#define Module_ApplicationDate4 "15-Aug-2000"
#define Module_ApplicationDate2 "17-Aug-00"
#define Module_ApplicationDate4 "17-Aug-2000"
#define Module_FullVersion "5.12"
#define Module_FullVersion "5.13"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment