6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-07-03 22:29:31 +00:00
Code Issues Projects Releases Wiki Activity

Stopped interrupt dispatcher from being linked even when there are no interruptors.

Browse Source 
Put ld65's CONDES import names into object module's list instead of linker's list.
This commit is contained in:
Greg King 2013-04-22 15:55:52 -04:00
parent bfc362f79c
commit d57ae65aad
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ld65/exports.c
View File

@ -399,20 +399,25 @@ Export* ReadExport (FILE* F, ObjData* O)
*/ */
for (I = 0; I < CD_TYPE_COUNT; ++I) { for (I = 0; I < CD_TYPE_COUNT; ++I) {
const ConDesImport* CDI; const ConDesImport* CDI;
if (E->ConDes[I] != CD_PRIO_NONE && (CDI = ConDesGetImport (I)) != 0) {
if (E->ConDes[I] != CD_PRIO_NONE && (CDI = ConDesGetImport (I)) != 0) {
unsigned J; unsigned J;
/* Generate a new import and insert it */ /* Generate a new import, and add it to the module's import list. */
Import* Imp = InsertImport (GenImport (CDI->Name, CDI->AddrSize)); Import* Imp = GenImport (CDI->Name, CDI->AddrSize);
/* Add line info for the config file and for the export that is Imp->Obj = O;
* actually the condes that forces the import. CollAppend (&O->Imports, Imp);
/* Add line info for the export that is actually the condes that
* forces the import. Then, add line info for the config. file.
* The export's info is added first because the import pretends
* that it came from the object module instead of the config. file.
*/ */
CollAppend (&Imp->RefLines, GenLineInfo (&CDI->Pos));
for (J = 0; J < CollCount (&E->DefLines); ++J) { for (J = 0; J < CollCount (&E->DefLines); ++J) {
CollAppend (&Imp->RefLines, DupLineInfo (CollAt (&E->DefLines, J))); CollAppend (&Imp->RefLines, DupLineInfo (CollAt (&E->DefLines, J)));
} }
CollAppend (&Imp->RefLines, GenLineInfo (&CDI->Pos));
} }
} }