mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-01-30 16:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

labels: allocation of a segment number counts as a change

Browse Source 
If we allocate a new segment number, that has to cause
global_offset_changed to be incremented.  Thus, we should not update
lptr->defn.segment until that would ordinarily be done.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
H. Peter Anvin 2018-06-14 20:00:07 -07:00
parent af5f918a92
commit 46c839a03d
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
asm/labels.c
View File

@ -424,11 +424,8 @@ void define_label(const char *label, int32_t segment,
nasm_error(ERR_WARNING, "label `%s' defined on pass two", label); nasm_error(ERR_WARNING, "label `%s' defined on pass two", label);
} }
if (!segment) {
segment = lptr->defn.segment;
if (!segment) if (!segment)
segment = lptr->defn.segment = seg_alloc(); segment = lptr->defn.segment ? lptr->defn.segment : seg_alloc();
}
if (lptr->defn.defined || lptr->defn.type == LBL_BACKEND) { if (lptr->defn.defined || lptr->defn.type == LBL_BACKEND) {
/* We have seen this on at least one previous pass */ /* We have seen this on at least one previous pass */