diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2018-11-28 12:45:06 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2018-11-28 12:47:25 -0800 |
| commit | c77f5079e5b1d241e820885051137eed84a1eab2 (patch) | |
| tree | a337c55dbf92e8501f5430d9e88790258e7caa08 /output | |
| parent | a0743398543202cc4fee33921820e33a2b5a4c3d (diff) | |
| parent | 3475462ee87fdd59af715fa0c28eecc4672466fb (diff) | |
| download | nasm-c77f5079e5b1d241e820885051137eed84a1eab2.tar.gz | |
Merge remote-tracking branch 'origin/nasm-2.14.xx'
Resolved Conflicts:
asm/nasm.c
version
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'output')
| -rw-r--r-- | output/outobj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/output/outobj.c b/output/outobj.c index 1caaf200..f649cad7 100644 --- a/output/outobj.c +++ b/output/outobj.c @@ -1900,8 +1900,8 @@ static int32_t obj_segbase(int32_t segment) if (eb) { e = eb->exts[i]; if (!e) { - nasm_assert(pass0 == 0); - /* Not available - can happen during optimization */ + /* Not available yet, probably a forward reference */ + nasm_assert(pass0 < 2); /* Convergence failure */ return NO_SEG; } |