qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-14 00:40:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Preserve any relocs when converting a def from extern to otherwise.

Browse source
This commit is contained in:
Bill Currie 2011-02-15 10:47:16 +09:00
parent 62456dc1e9
commit 6bd63f811f
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/qfcc/source/symtab.c
View file

@ -188,6 +188,7 @@ make_symbol (const char *name, type_t *type, defspace_t *space,
storage_class_t storage) storage_class_t storage)
{ {
symbol_t *sym; symbol_t *sym;
struct reloc_s *relocs = 0;
if (storage != st_extern && storage != st_global && storage != st_static) if (storage != st_extern && storage != st_global && storage != st_static)
internal_error (0, "invalid storage class for %s", __FUNCTION__); internal_error (0, "invalid storage class for %s", __FUNCTION__);
@ -202,10 +203,13 @@ make_symbol (const char *name, type_t *type, defspace_t *space,
sym = new_symbol_type (name, type); sym = new_symbol_type (name, type);
} }
if (sym->s.def && sym->s.def->external && storage != st_extern) { if (sym->s.def && sym->s.def->external && storage != st_extern) {
relocs = sym->s.def->relocs;
free_def (sym->s.def); free_def (sym->s.def);
sym->s.def = 0; sym->s.def = 0;
} }
if (!sym->s.def) if (!sym->s.def) {
sym->s.def = new_def (name, type, space, storage); sym->s.def = new_def (name, type, space, storage);
sym->s.def->relocs = relocs;
}
return sym; return sym;
} }