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

Merge remote-tracking branch 'origin/nasm-2.14.xx'

Browse Source
This commit is contained in:
H. Peter Anvin 2018-06-14 20:24:21 -07:00
commit 155bc4cfbf
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/directiv.c
View File

@ -369,7 +369,7 @@ bool process_directives(char *directive)
break;
if (type == LBL_COMMON || type == LBL_EXTERN)
define_label(value, seg_alloc(), size, false);
define_label(value, 0, size, false);
break;
}

5
asm/labels.c
View File

@ -77,7 +77,6 @@ static bool ismagic(const char *l)
#define END_LIST -3 /* don't clash with NO_SEG! */
#define END_BLOCK -2
#define BOGUS_VALUE -4
#define PERMTS_SIZE 16384 /* size of text blocks */
#if (PERMTS_SIZE < IDLEN_MAX)
@ -230,7 +229,6 @@ static union label *find_label(const char *label, bool create, bool *created)
*created = true;
nasm_zero(*lfree);
lfree->admin.movingon = BOGUS_VALUE;
lfree->defn.label = perm_copy(label);
lfree->defn.subsection = NO_SEG;
if (label_str)
@ -426,6 +424,9 @@ void define_label(const char *label, int32_t segment,
nasm_error(ERR_WARNING, "label `%s' defined on pass two", label);
}
if (!segment)
segment = lptr->defn.segment ? lptr->defn.segment : seg_alloc();
if (lptr->defn.defined || lptr->defn.type == LBL_BACKEND) {
/* We have seen this on at least one previous pass */
mangle_label_name(lptr);

2
version
View File

@ -1 +1 @@
2.14rc3
2.14rc4