aniani/nasm
0
0
Fork 1
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-10-10 00:25:06 -04:00
Code Activity

Merge tag 'nasm-2.14.03rc1'

Browse Source 
NASM 2.14.03rc1

Resolved Conflicts:
	asm/labels.c
	include/error.h

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin
2018-12-27 11:37:22 -08:00
parent 2f0f5b0189 81f98fe79b
commit bd2803964e
4 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
asm/labels.c
View File

@@ -538,7 +538,7 @@ void define_label(const char *label, int32_t segment,
* Note: As a special case, LBL_SPECIAL symbols are allowed
* to be changed even during the last pass.
*/
nasm_warn(WARN_LABEL_REDEF_LATE,
nasm_warn(WARN_LABEL_REDEF_LATE|ERR_UNDEAD,
"label `%s' %s during code generation",
lptr->defn.label, created ? "defined" : "changed");
}

7
asm/nasm.c
View File

@@ -1681,8 +1681,13 @@ static bool skip_this_pass(errflags severity)
*/
static bool is_suppressed(errflags severity)
{
/* Fatal errors must never be suppressed */
if ((severity & ERR_MASK) >= ERR_FATAL)
return false; /* Fatal errors can never be suppressed */
return false;
/* This error/warning is pointless if we are dead anyway */
if ((severity & ERR_UNDEAD) && terminate_after_phase)
return true;
return !(warning_state[warn_index(severity)] & WARN_ST_ENABLED);
}