Fixed a problem with .global: In some situations, exported symbols went
into the object files with an address size of ADDR_SIZE_DEFAULT, something which cannot be handled by the linker. git-svn-id: svn://svn.cc65.org/cc65/trunk@2980 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
/* */
|
||||
/* */
|
||||
/* */
|
||||
/* (C) 1998-2003 Ullrich von Bassewitz */
|
||||
/* (C) 1998-2004 Ullrich von Bassewitz */
|
||||
/* R<>merstra<72>e 52 */
|
||||
/* D-70794 Filderstadt */
|
||||
/* EMail: uz@cc65.org */
|
||||
@@ -520,11 +520,10 @@ void SymCheck (void)
|
||||
* already defined, otherwise mark it as import.
|
||||
*/
|
||||
if (S->Flags & SF_GLOBAL) {
|
||||
S->Flags &= ~SF_GLOBAL;
|
||||
if (S->Flags & SF_DEFINED) {
|
||||
S->Flags |= SF_EXPORT;
|
||||
SymExportFromGlobal (S);
|
||||
} else {
|
||||
S->Flags |= SF_IMPORT;
|
||||
SymImportFromGlobal (S);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -584,6 +583,18 @@ void SymCheck (void)
|
||||
ED_Init (&ED);
|
||||
StudyExpr (S->Expr, &ED);
|
||||
S->AddrSize = ED.AddrSize;
|
||||
if (SymIsExport (S)) {
|
||||
if (S->ExportSize == ADDR_SIZE_DEFAULT) {
|
||||
/* Use the real export size */
|
||||
S->ExportSize = S->AddrSize;
|
||||
} else if (S->AddrSize > S->ExportSize) {
|
||||
/* We're exporting a symbol smaller than it actually is */
|
||||
PWarning (&S->Pos, 1,
|
||||
"Symbol `%s' is %s but exported %s",
|
||||
GetSymName (S), AddrSizeToStr (S->AddrSize),
|
||||
AddrSizeToStr (S->ExportSize));
|
||||
}
|
||||
}
|
||||
ED_Done (&ED);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user