mirror of
https://github.com/cc65/cc65.git
synced 2024-12-25 02:29:52 +00:00
ca65: .constructor after .export fails
The actor directives (.constructor, .destructor, .interruptor, and .condes) can't handle a symbol that's already exported. The relevant code does the checks in the wrong order. For example, the following correct snippet does not assemble: .export C C: .constructor C, 5 The assembler outputs: test.s:2: Error: Address size mismatch for symbol 'C' Exchanging both lines makes it work. This fixes #1647; the patch is provided by 'kugelfuhr' and taken from there.
This commit is contained in:
parent
bfaa2b37e0
commit
77fa71994f
@ -546,6 +546,18 @@ void SymConDes (SymEntry* S, unsigned char AddrSize, unsigned Type, unsigned Pri
|
||||
return;
|
||||
}
|
||||
|
||||
/* If the symbol is already defined, check symbol size against the
|
||||
** exported size.
|
||||
*/
|
||||
if (S->Flags & SF_DEFINED) {
|
||||
if (AddrSize == ADDR_SIZE_DEFAULT) {
|
||||
/* Use the real size of the symbol */
|
||||
AddrSize = S->AddrSize;
|
||||
} else if (S->AddrSize != AddrSize) {
|
||||
Error ("Address size mismatch for symbol '%m%p'", GetSymName (S));
|
||||
}
|
||||
}
|
||||
|
||||
/* If the symbol was already marked as an export or global, check if
|
||||
** this was done specifiying the same address size. In case of a global
|
||||
** declaration, silently remove the global flag.
|
||||
@ -558,18 +570,6 @@ void SymConDes (SymEntry* S, unsigned char AddrSize, unsigned Type, unsigned Pri
|
||||
}
|
||||
S->ExportSize = AddrSize;
|
||||
|
||||
/* If the symbol is already defined, check symbol size against the
|
||||
** exported size.
|
||||
*/
|
||||
if (S->Flags & SF_DEFINED) {
|
||||
if (S->ExportSize == ADDR_SIZE_DEFAULT) {
|
||||
/* Use the real size of the symbol */
|
||||
S->ExportSize = S->AddrSize;
|
||||
} else if (S->AddrSize != S->ExportSize) {
|
||||
Error ("Address size mismatch for symbol '%m%p'", GetSymName (S));
|
||||
}
|
||||
}
|
||||
|
||||
/* If the symbol already was declared as a condes of this type,
|
||||
** check if the new priority value is the same as the old one.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user