diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2017-11-01 10:37:18 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2017-11-01 10:37:18 -0700 |
commit | ece809789eed9c488d19a2eb5704130ba6377cb9 (patch) | |
tree | bab0c9d9731169411f51d15f7e4290be99f39ad4 /asm/parser.c | |
parent | 120819e73c33b316bfe02e2bacdd22108763a12b (diff) | |
parent | 9b7ee09abfd426b99aa1ea81d19a3b2818eeabf9 (diff) | |
download | nasm-ece809789eed9c488d19a2eb5704130ba6377cb9.tar.gz |
Merge remote-tracking branch 'origin/nasm-2.13.xx'
Resolved conflicts:
version
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'asm/parser.c')
-rw-r--r-- | asm/parser.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/asm/parser.c b/asm/parser.c index 62104e12..2ad37ceb 100644 --- a/asm/parser.c +++ b/asm/parser.c @@ -515,9 +515,8 @@ restart_parse: result->times = 1L; } else { result->times = value->value; - if (value->value < 0 && pass0 == 2) { - nasm_error(ERR_NONFATAL, "TIMES value %"PRId64" is negative", - value->value); + if (value->value < 0) { + nasm_error(ERR_NONFATAL|ERR_PASS2, "TIMES value %"PRId64" is negative", value->value); result->times = 0; } } |