mirror of http://shamusworld.gotdns.org/git/rln
Revbump for last commit. :-P
This commit is contained in:
parent
cf65d78a03
commit
ed794c04e7
44
rln.c
44
rln.c
|
@ -132,6 +132,32 @@ long FileSize(int fd)
|
|||
}
|
||||
|
||||
|
||||
//
|
||||
// Debugging detritus
|
||||
//
|
||||
void DumpOListAndObjSegSizeList(void)
|
||||
{
|
||||
struct OFILE * o;
|
||||
int i;
|
||||
|
||||
printf("Object list order:\n");
|
||||
|
||||
for(o=olist; o!=NULL; o=o->o_next)
|
||||
{
|
||||
printf("\t%s\n", o->o_name);
|
||||
}
|
||||
|
||||
printf("\nobj_segsize[][] list order:\n");
|
||||
|
||||
for(i=0; i<(int)obj_index; i++)
|
||||
{
|
||||
printf("\t%s\n", obj_fname[i]);
|
||||
}
|
||||
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// For this object file, add symbols to the output symbol table after
|
||||
// relocating them. Returns TRUE if OSTLookup returns an error (-1).
|
||||
|
@ -145,6 +171,8 @@ int DoSymbols(struct OFILE * ofile)
|
|||
struct HREC * hptr;
|
||||
unsigned tsoSave, dsoSave, bsoSave;
|
||||
|
||||
// DumpOListAndObjSegSizeList();
|
||||
|
||||
// Point to first symbol record in the object file
|
||||
char * symptr = (ofile->o_image + 32
|
||||
+ ofile->o_header.tsize
|
||||
|
@ -171,6 +199,10 @@ int DoSymbols(struct OFILE * ofile)
|
|||
}
|
||||
|
||||
// Accumulate segment sizes
|
||||
// N.B. We can get rid of this now that there is a spot in the OFILE for these.
|
||||
// Just have to make sure that the order that the linked list is in
|
||||
// corresponds to the order shown here...
|
||||
// I've proved to my satisfaction that the orders are the same...!
|
||||
tsegoffset += obj_segsize[j][0];
|
||||
dsegoffset += obj_segsize[j][1];
|
||||
bsegoffset += obj_segsize[j][2];
|
||||
|
@ -3120,9 +3152,15 @@ void ShowVersion(void)
|
|||
{
|
||||
if (displaybanner)// && vflag)
|
||||
{
|
||||
printf("\nReboot's Linker for Atari Jaguar\n");
|
||||
printf("Copyright (c) 199x Allan K. Pratt, 2014 Reboot\n");
|
||||
printf("V%i.%i.%i %s (%s)\n\n", MAJOR, MINOR, PATCH, __DATE__, PLATFORM);
|
||||
printf(
|
||||
" _\n"
|
||||
" _ __| |_ ___\n"
|
||||
"| '__| | '_ \\\n"
|
||||
"| | | | | | |\n"
|
||||
"|_| |_|_| |_|\n"
|
||||
"\nReboot's Linker for Atari Jaguar\n"
|
||||
"Copyright (c) 199x Allan K. Pratt, 2014-2015 Reboot\n"
|
||||
"V%i.%i.%i %s (%s)\n\n", MAJOR, MINOR, PATCH, __DATE__, PLATFORM);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
9
rln.h
9
rln.h
|
@ -7,11 +7,6 @@
|
|||
#ifndef __RLN_H__
|
||||
#define __RLN_H__
|
||||
|
||||
// Required Include Files
|
||||
|
||||
// Macro Definitions
|
||||
|
||||
// Requirements for Windows Compilation
|
||||
|
||||
#ifdef WIN32
|
||||
//#define _OPEN_FLAGS _O_BINARY|_O_RDWR
|
||||
|
@ -33,8 +28,6 @@
|
|||
#include <setjmp.h>
|
||||
#endif
|
||||
|
||||
// Requirements for Mac OS-X or Linux Compilation
|
||||
|
||||
#ifdef __GCCUNIX__
|
||||
//#define _OPEN_FLAGS O_RDWR
|
||||
#define _OPEN_FLAGS O_RDONLY
|
||||
|
@ -52,7 +45,7 @@
|
|||
|
||||
#define MAJOR 1 // Major version number
|
||||
#define MINOR 4 // Minor version number
|
||||
#define PATCH 2 // Patch release number
|
||||
#define PATCH 3 // Patch release number
|
||||
|
||||
#ifdef WIN32
|
||||
#define PLATFORM "Win32" // Release platform - Windows
|
||||
|
|
Loading…
Reference in New Issue