diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2016-03-07 12:15:40 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2016-03-07 12:15:40 -0800 |
| commit | 6224033738437c4d61a54b9142f82728288ecdfb (patch) | |
| tree | fdef91ebe5d53341929b98820ffe63b24aff5d16 /output/outas86.c | |
| parent | 0b7969e9a95f2ed7c791ddde87a0a8ab2bb9d5d4 (diff) | |
| parent | 172b840aa35d7018509036a3a7d3c467b331f73c (diff) | |
| download | nasm-6224033738437c4d61a54b9142f82728288ecdfb.tar.gz | |
Merge remote-tracking branch 'origin/nasm-2.12.xx'
Resolved Conflicts:
.gitignore
Makefile.in
assemble.c
configure.in
eval.c
float.c
listing.c
nasm.c
nasmlib.c
output/outform.h
preproc.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'output/outas86.c')
| -rw-r--r-- | output/outas86.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/output/outas86.c b/output/outas86.c index ac3628f7..3dc17c30 100644 --- a/output/outas86.c +++ b/output/outas86.c @@ -343,7 +343,7 @@ static void as86_out(int32_t segto, const void *data, bsslen += size; } else if (type == OUT_RAWDATA) { if (segment != NO_SEG) - nasm_error(ERR_PANIC, "OUT_RAWDATA with other than NO_SEG"); + nasm_panic(0, "OUT_RAWDATA with other than NO_SEG"); as86_sect_write(s, data, size); as86_add_piece(s, 0, 0L, 0L, size, 0); } else if (type == OUT_ADDRESS) { @@ -364,7 +364,7 @@ static void as86_out(int32_t segto, const void *data, } } else if (type == OUT_REL2ADR) { if (segment == segto) - nasm_error(ERR_PANIC, "intra-segment OUT_REL2ADR"); + nasm_panic(0, "intra-segment OUT_REL2ADR"); if (segment != NO_SEG) { if (segment % 2) { nasm_error(ERR_NONFATAL, "as86 format does not support" @@ -377,7 +377,7 @@ static void as86_out(int32_t segto, const void *data, } } else if (type == OUT_REL4ADR) { if (segment == segto) - nasm_error(ERR_PANIC, "intra-segment OUT_REL4ADR"); + nasm_panic(0, "intra-segment OUT_REL4ADR"); if (segment != NO_SEG) { if (segment % 2) { nasm_error(ERR_NONFATAL, "as86 format does not support" @@ -518,7 +518,7 @@ static void as86_set_rsize(int size) fputc(0x03, ofile); break; default: - nasm_error(ERR_PANIC, "bizarre relocation size %d", size); + nasm_panic(0, "bizarre relocation size %d", size); break; } } |