empathicqubit/cc65
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a bug

Browse source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@3558 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz 2005-07-29 20:33:25 +00:00
parent 33e86250ea
commit b6ac59be03
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ld65/config.c
View file

@ -55,6 +55,7 @@
#include "exports.h" #include "exports.h"
#include "global.h" #include "global.h"
#include "o65.h" #include "o65.h"
#include "objdata.h"
#include "scanner.h" #include "scanner.h"
#include "spool.h" #include "spool.h"
@ -1355,6 +1356,7 @@ static void ParseSymbols (void)
long Val = 0L; long Val = 0L;
int Weak = 0; int Weak = 0;
Export* E;
/* Remember the name */ /* Remember the name */
unsigned Name = GetStringId (CfgSVal); unsigned Name = GetStringId (CfgSVal);
@ -1446,7 +1448,7 @@ static void ParseSymbols (void)
} }
/* Check if the symbol is already defined */ /* Check if the symbol is already defined */
if (FindExport (Name) != 0) { if ((E = FindExport (Name)) != 0 && !IsUnresolvedExport (E)) {
/* If the symbol is not marked as weak, this is an error. /* If the symbol is not marked as weak, this is an error.
* Otherwise ignore the symbol from the config. * Otherwise ignore the symbol from the config.
*/ */
@ -1458,8 +1460,8 @@ static void ParseSymbols (void)
CreateConstExport (Name, Val); CreateConstExport (Name, Val);
} }
/* Skip the semicolon */ /* Skip the semicolon */
CfgConsumeSemi (); CfgConsumeSemi ();
} }
/* Remember we had this section */ /* Remember we had this section */