Fix #123: Be explicit that errors are such by printing "error:" at beginning

of error messages.

svn path=/trunk/yasm/; revision=2019

34 files changed, 211 insertions, 211 deletions

diff --git a/modules/arch/lc3b/tests/lc3b-ea-err.errwarn b/modules/arch/lc3b/tests/lc3b-ea-err.errwarn
index afc28697..e49df726 100644
--- a/modules/arch/lc3b/tests/lc3b-ea-err.errwarn
+++ b/modules/arch/lc3b/tests/lc3b-ea-err.errwarn
@@ -1 +1 @@
--:1: invalid combination of opcode and operands
+-:1: error: invalid combination of opcode and operands
diff --git a/modules/arch/x86/tests/addrop-err.errwarn b/modules/arch/x86/tests/addrop-err.errwarn
index 72040ee7..0bf0b548 100644
--- a/modules/arch/x86/tests/addrop-err.errwarn
+++ b/modules/arch/x86/tests/addrop-err.errwarn
@@ -1 +1 @@
--:2: invalid effective address (displacement size)
+-:2: error: invalid effective address (displacement size)
diff --git a/modules/arch/x86/tests/cpubasic-err.errwarn b/modules/arch/x86/tests/cpubasic-err.errwarn
index 917843e5..3c2b876c 100644
--- a/modules/arch/x86/tests/cpubasic-err.errwarn
+++ b/modules/arch/x86/tests/cpubasic-err.errwarn
@@ -1,6 +1,6 @@
 -:2: warning: `pause' is an instruction in CPU P4
--:4: requires CPU 186
+-:4: error: requires CPU 186
 -:7: warning: `fninit' is an instruction in CPU FPU
--:15: requires CPU 186
+-:15: error: requires CPU 186
 -:16: warning: `movsd' is an instruction in CPU 386
--:17: requires CPU 186
+-:17: error: requires CPU 186
diff --git a/modules/arch/x86/tests/div-err.errwarn b/modules/arch/x86/tests/div-err.errwarn
index 4b6340e7..af466252 100644
--- a/modules/arch/x86/tests/div-err.errwarn
+++ b/modules/arch/x86/tests/div-err.errwarn
@@ -1,4 +1,4 @@
--:1: cannot override register size
--:3: cannot override register size
--:4: cannot override register size
--:5: cannot override register size
+-:1: error: cannot override register size
+-:3: error: cannot override register size
+-:4: error: cannot override register size
+-:5: error: cannot override register size
diff --git a/modules/arch/x86/tests/lds-err.errwarn b/modules/arch/x86/tests/lds-err.errwarn
index cd07464a..e29dc728 100644
--- a/modules/arch/x86/tests/lds-err.errwarn
+++ b/modules/arch/x86/tests/lds-err.errwarn
@@ -1,4 +1,4 @@
--:2: invalid size for operand 2
--:3: invalid size for operand 2
--:5: invalid size for operand 2
--:6: invalid size for operand 2
+-:2: error: invalid size for operand 2
+-:3: error: invalid size for operand 2
+-:5: error: invalid size for operand 2
+-:6: error: invalid size for operand 2
diff --git a/modules/arch/x86/tests/mem64-err.errwarn b/modules/arch/x86/tests/mem64-err.errwarn
index c9b1943d..6f37650d 100644
--- a/modules/arch/x86/tests/mem64-err.errwarn
+++ b/modules/arch/x86/tests/mem64-err.errwarn
@@ -1,5 +1,5 @@
--:2: 16-bit addresses not supported in 64-bit mode
--:4: 16-bit addresses not supported in 64-bit mode
--:5: invalid effective address
--:6: invalid effective address
--:7: cannot use A/B/C/DH with instruction needing REX
+-:2: error: 16-bit addresses not supported in 64-bit mode
+-:4: error: 16-bit addresses not supported in 64-bit mode
+-:5: error: invalid effective address
+-:6: error: invalid effective address
+-:7: error: cannot use A/B/C/DH with instruction needing REX
diff --git a/modules/arch/x86/tests/nomem64-err.errwarn b/modules/arch/x86/tests/nomem64-err.errwarn
index 2694d2fb..73bfcf97 100644
--- a/modules/arch/x86/tests/nomem64-err.errwarn
+++ b/modules/arch/x86/tests/nomem64-err.errwarn
@@ -1,12 +1,12 @@
 -:2: warning: `es' segment register ignored in 64-bit mode
--:4: `pushaw' invalid in 64-bit mode
--:5: `popa' invalid in 64-bit mode
--:6: `lds' invalid in 64-bit mode
--:7: `aas' invalid in 64-bit mode
--:8: `das' invalid in 64-bit mode
--:9: `aad' invalid in 64-bit mode
--:10: `into' invalid in 64-bit mode
--:11: `salc' invalid in 64-bit mode
+-:4: error: `pushaw' invalid in 64-bit mode
+-:5: error: `popa' invalid in 64-bit mode
+-:6: error: `lds' invalid in 64-bit mode
+-:7: error: `aas' invalid in 64-bit mode
+-:8: error: `das' invalid in 64-bit mode
+-:9: error: `aad' invalid in 64-bit mode
+-:10: error: `into' invalid in 64-bit mode
+-:11: error: `salc' invalid in 64-bit mode
 -:13: warning: `xmm9' is a register in 64-bit mode
 -:14: warning: `rax' is a register in 64-bit mode
 -:15: warning: `rdx' is a register in 64-bit mode
diff --git a/modules/arch/x86/tests/nomem64-err2.errwarn b/modules/arch/x86/tests/nomem64-err2.errwarn
index b26a14d1..8a785392 100644
--- a/modules/arch/x86/tests/nomem64-err2.errwarn
+++ b/modules/arch/x86/tests/nomem64-err2.errwarn
@@ -1,2 +1,2 @@
--:2: cannot use A/B/C/DH with instruction needing REX
--:3: cannot use A/B/C/DH with instruction needing REX
+-:2: error: cannot use A/B/C/DH with instruction needing REX
+-:3: error: cannot use A/B/C/DH with instruction needing REX
diff --git a/modules/arch/x86/tests/opsize-err.errwarn b/modules/arch/x86/tests/opsize-err.errwarn
index da7bf083..f515f51e 100644
--- a/modules/arch/x86/tests/opsize-err.errwarn
+++ b/modules/arch/x86/tests/opsize-err.errwarn
@@ -1 +1 @@
--:3: invalid size for operand 2
+-:3: error: invalid size for operand 2
diff --git a/modules/arch/x86/tests/pushf-err.errwarn b/modules/arch/x86/tests/pushf-err.errwarn
index 79f3177a..498610ba 100644
--- a/modules/arch/x86/tests/pushf-err.errwarn
+++ b/modules/arch/x86/tests/pushf-err.errwarn
@@ -1,10 +1,10 @@
 -:5: warning: `pushfq' is an instruction in 64-bit mode
 -:9: warning: `popfq' is an instruction in 64-bit mode
 -:15: warning: `pushfq' is an instruction in 64-bit mode
--:15: redefinition of `pushfq'
--:5: `pushfq' previously defined here
+-:15: error: redefinition of `pushfq'
+-:5: error: `pushfq' previously defined here
 -:19: warning: `popfq' is an instruction in 64-bit mode
--:19: redefinition of `popfq'
--:9: `popfq' previously defined here
--:24: `pushfd' invalid in 64-bit mode
--:28: `popfd' invalid in 64-bit mode
+-:19: error: redefinition of `popfq'
+-:9: error: `popfq' previously defined here
+-:24: error: `pushfd' invalid in 64-bit mode
+-:28: error: `popfd' invalid in 64-bit mode
diff --git a/modules/arch/x86/tests/sse4-err.errwarn b/modules/arch/x86/tests/sse4-err.errwarn
index b26a14d1..8a785392 100644
--- a/modules/arch/x86/tests/sse4-err.errwarn
+++ b/modules/arch/x86/tests/sse4-err.errwarn
@@ -1,2 +1,2 @@
--:2: cannot use A/B/C/DH with instruction needing REX
--:3: cannot use A/B/C/DH with instruction needing REX
+-:2: error: cannot use A/B/C/DH with instruction needing REX
+-:3: error: cannot use A/B/C/DH with instruction needing REX
diff --git a/modules/arch/x86/tests/sse5-err.errwarn b/modules/arch/x86/tests/sse5-err.errwarn
index 19df6e09..3c76880e 100644
--- a/modules/arch/x86/tests/sse5-err.errwarn
+++ b/modules/arch/x86/tests/sse5-err.errwarn
@@ -1,84 +1,84 @@
--:1: one of source operand 1 or 3 must match dest operand
--:2: one of source operand 1 or 3 must match dest operand
--:3: one of source operand 1 or 3 must match dest operand
--:5: one of source operand 1 or 3 must match dest operand
--:6: one of source operand 1 or 3 must match dest operand
--:7: one of source operand 1 or 3 must match dest operand
--:9: one of source operand 1 or 3 must match dest operand
--:10: one of source operand 1 or 3 must match dest operand
--:11: one of source operand 1 or 3 must match dest operand
--:13: one of source operand 1 or 3 must match dest operand
--:14: one of source operand 1 or 3 must match dest operand
--:15: one of source operand 1 or 3 must match dest operand
--:17: one of source operand 1 or 3 must match dest operand
--:18: one of source operand 1 or 3 must match dest operand
--:19: one of source operand 1 or 3 must match dest operand
--:21: one of source operand 1 or 3 must match dest operand
--:22: one of source operand 1 or 3 must match dest operand
--:23: one of source operand 1 or 3 must match dest operand
--:25: one of source operand 1 or 3 must match dest operand
--:26: one of source operand 1 or 3 must match dest operand
--:27: one of source operand 1 or 3 must match dest operand
--:29: one of source operand 1 or 3 must match dest operand
--:30: one of source operand 1 or 3 must match dest operand
--:31: one of source operand 1 or 3 must match dest operand
--:33: one of source operand 1 or 3 must match dest operand
--:34: one of source operand 1 or 3 must match dest operand
--:35: one of source operand 1 or 3 must match dest operand
--:37: one of source operand 1 or 3 must match dest operand
--:38: one of source operand 1 or 3 must match dest operand
--:39: one of source operand 1 or 3 must match dest operand
--:41: one of source operand 1 or 3 must match dest operand
--:42: one of source operand 1 or 3 must match dest operand
--:43: one of source operand 1 or 3 must match dest operand
--:45: one of source operand 1 or 3 must match dest operand
--:46: one of source operand 1 or 3 must match dest operand
--:47: one of source operand 1 or 3 must match dest operand
--:49: one of source operand 1 or 3 must match dest operand
--:50: one of source operand 1 or 3 must match dest operand
--:51: one of source operand 1 or 3 must match dest operand
--:53: one of source operand 1 or 3 must match dest operand
--:54: one of source operand 1 or 3 must match dest operand
--:55: one of source operand 1 or 3 must match dest operand
--:57: one of source operand 1 or 3 must match dest operand
--:58: one of source operand 1 or 3 must match dest operand
--:59: one of source operand 1 or 3 must match dest operand
--:61: one of source operand 1 or 3 must match dest operand
--:62: one of source operand 1 or 3 must match dest operand
--:63: one of source operand 1 or 3 must match dest operand
--:65: one of source operand 1 or 3 must match dest operand
--:66: one of source operand 1 or 3 must match dest operand
--:67: one of source operand 1 or 3 must match dest operand
--:69: one of source operand 1 or 3 must match dest operand
--:70: one of source operand 1 or 3 must match dest operand
--:71: one of source operand 1 or 3 must match dest operand
--:73: one of source operand 1 or 3 must match dest operand
--:74: one of source operand 1 or 3 must match dest operand
--:75: one of source operand 1 or 3 must match dest operand
--:77: one of source operand 1 or 3 must match dest operand
--:78: one of source operand 1 or 3 must match dest operand
--:80: one of source operand 1 or 3 must match dest operand
--:81: one of source operand 1 or 3 must match dest operand
--:83: one of source operand 1 or 3 must match dest operand
--:84: one of source operand 1 or 3 must match dest operand
--:86: one of source operand 1 or 3 must match dest operand
--:87: one of source operand 1 or 3 must match dest operand
--:89: one of source operand 1 or 3 must match dest operand
--:90: one of source operand 1 or 3 must match dest operand
--:92: one of source operand 1 or 3 must match dest operand
--:93: one of source operand 1 or 3 must match dest operand
--:95: one of source operand 1 or 3 must match dest operand
--:96: one of source operand 1 or 3 must match dest operand
--:98: one of source operand 1 or 3 must match dest operand
--:99: one of source operand 1 or 3 must match dest operand
--:101: one of source operand 1 or 3 must match dest operand
--:102: one of source operand 1 or 3 must match dest operand
--:104: one of source operand 1 or 3 must match dest operand
--:105: one of source operand 1 or 3 must match dest operand
--:107: one of source operand 1 or 3 must match dest operand
--:108: one of source operand 1 or 3 must match dest operand
--:110: one of source operand 1 or 3 must match dest operand
--:111: one of source operand 1 or 3 must match dest operand
--:113: one of source operand 1 or 3 must match dest operand
--:114: one of source operand 1 or 3 must match dest operand
--:115: one of source operand 1 or 3 must match dest operand
+-:1: error: one of source operand 1 or 3 must match dest operand
+-:2: error: one of source operand 1 or 3 must match dest operand
+-:3: error: one of source operand 1 or 3 must match dest operand
+-:5: error: one of source operand 1 or 3 must match dest operand
+-:6: error: one of source operand 1 or 3 must match dest operand
+-:7: error: one of source operand 1 or 3 must match dest operand
+-:9: error: one of source operand 1 or 3 must match dest operand
+-:10: error: one of source operand 1 or 3 must match dest operand
+-:11: error: one of source operand 1 or 3 must match dest operand
+-:13: error: one of source operand 1 or 3 must match dest operand
+-:14: error: one of source operand 1 or 3 must match dest operand
+-:15: error: one of source operand 1 or 3 must match dest operand
+-:17: error: one of source operand 1 or 3 must match dest operand
+-:18: error: one of source operand 1 or 3 must match dest operand
+-:19: error: one of source operand 1 or 3 must match dest operand
+-:21: error: one of source operand 1 or 3 must match dest operand
+-:22: error: one of source operand 1 or 3 must match dest operand
+-:23: error: one of source operand 1 or 3 must match dest operand
+-:25: error: one of source operand 1 or 3 must match dest operand
+-:26: error: one of source operand 1 or 3 must match dest operand
+-:27: error: one of source operand 1 or 3 must match dest operand
+-:29: error: one of source operand 1 or 3 must match dest operand
+-:30: error: one of source operand 1 or 3 must match dest operand
+-:31: error: one of source operand 1 or 3 must match dest operand
+-:33: error: one of source operand 1 or 3 must match dest operand
+-:34: error: one of source operand 1 or 3 must match dest operand
+-:35: error: one of source operand 1 or 3 must match dest operand
+-:37: error: one of source operand 1 or 3 must match dest operand
+-:38: error: one of source operand 1 or 3 must match dest operand
+-:39: error: one of source operand 1 or 3 must match dest operand
+-:41: error: one of source operand 1 or 3 must match dest operand
+-:42: error: one of source operand 1 or 3 must match dest operand
+-:43: error: one of source operand 1 or 3 must match dest operand
+-:45: error: one of source operand 1 or 3 must match dest operand
+-:46: error: one of source operand 1 or 3 must match dest operand
+-:47: error: one of source operand 1 or 3 must match dest operand
+-:49: error: one of source operand 1 or 3 must match dest operand
+-:50: error: one of source operand 1 or 3 must match dest operand
+-:51: error: one of source operand 1 or 3 must match dest operand
+-:53: error: one of source operand 1 or 3 must match dest operand
+-:54: error: one of source operand 1 or 3 must match dest operand
+-:55: error: one of source operand 1 or 3 must match dest operand
+-:57: error: one of source operand 1 or 3 must match dest operand
+-:58: error: one of source operand 1 or 3 must match dest operand
+-:59: error: one of source operand 1 or 3 must match dest operand
+-:61: error: one of source operand 1 or 3 must match dest operand
+-:62: error: one of source operand 1 or 3 must match dest operand
+-:63: error: one of source operand 1 or 3 must match dest operand
+-:65: error: one of source operand 1 or 3 must match dest operand
+-:66: error: one of source operand 1 or 3 must match dest operand
+-:67: error: one of source operand 1 or 3 must match dest operand
+-:69: error: one of source operand 1 or 3 must match dest operand
+-:70: error: one of source operand 1 or 3 must match dest operand
+-:71: error: one of source operand 1 or 3 must match dest operand
+-:73: error: one of source operand 1 or 3 must match dest operand
+-:74: error: one of source operand 1 or 3 must match dest operand
+-:75: error: one of source operand 1 or 3 must match dest operand
+-:77: error: one of source operand 1 or 3 must match dest operand
+-:78: error: one of source operand 1 or 3 must match dest operand
+-:80: error: one of source operand 1 or 3 must match dest operand
+-:81: error: one of source operand 1 or 3 must match dest operand
+-:83: error: one of source operand 1 or 3 must match dest operand
+-:84: error: one of source operand 1 or 3 must match dest operand
+-:86: error: one of source operand 1 or 3 must match dest operand
+-:87: error: one of source operand 1 or 3 must match dest operand
+-:89: error: one of source operand 1 or 3 must match dest operand
+-:90: error: one of source operand 1 or 3 must match dest operand
+-:92: error: one of source operand 1 or 3 must match dest operand
+-:93: error: one of source operand 1 or 3 must match dest operand
+-:95: error: one of source operand 1 or 3 must match dest operand
+-:96: error: one of source operand 1 or 3 must match dest operand
+-:98: error: one of source operand 1 or 3 must match dest operand
+-:99: error: one of source operand 1 or 3 must match dest operand
+-:101: error: one of source operand 1 or 3 must match dest operand
+-:102: error: one of source operand 1 or 3 must match dest operand
+-:104: error: one of source operand 1 or 3 must match dest operand
+-:105: error: one of source operand 1 or 3 must match dest operand
+-:107: error: one of source operand 1 or 3 must match dest operand
+-:108: error: one of source operand 1 or 3 must match dest operand
+-:110: error: one of source operand 1 or 3 must match dest operand
+-:111: error: one of source operand 1 or 3 must match dest operand
+-:113: error: one of source operand 1 or 3 must match dest operand
+-:114: error: one of source operand 1 or 3 must match dest operand
+-:115: error: one of source operand 1 or 3 must match dest operand
diff --git a/modules/arch/x86/tests/strict-err.errwarn b/modules/arch/x86/tests/strict-err.errwarn
index 62ebb456..ac3b21b8 100644
--- a/modules/arch/x86/tests/strict-err.errwarn
+++ b/modules/arch/x86/tests/strict-err.errwarn
@@ -1,4 +1,4 @@
--:2: invalid size for operand 1
--:3: invalid size for operand 1
--:4: invalid size for operand 2
--:5: invalid size for operand 2
+-:2: error: invalid size for operand 1
+-:3: error: invalid size for operand 1
+-:4: error: invalid size for operand 2
+-:5: error: invalid size for operand 2
diff --git a/modules/arch/x86/tests/vmx-err.errwarn b/modules/arch/x86/tests/vmx-err.errwarn
index 6faab0a7..7db4b3cb 100644
--- a/modules/arch/x86/tests/vmx-err.errwarn
+++ b/modules/arch/x86/tests/vmx-err.errwarn
@@ -1,2 +1,2 @@
--:6: invalid size for operand 2
--:7: invalid size for operand 1
+-:6: error: invalid size for operand 2
+-:7: error: invalid size for operand 1
diff --git a/modules/dbgfmts/dwarf2/tests/pass32/dwarf32-err.errwarn b/modules/dbgfmts/dwarf2/tests/pass32/dwarf32-err.errwarn
index d22fdf91..9c333565 100644
--- a/modules/dbgfmts/dwarf2/tests/pass32/dwarf32-err.errwarn
+++ b/modules/dbgfmts/dwarf2/tests/pass32/dwarf32-err.errwarn
@@ -1,22 +1,22 @@
--:1: directive `.loc' requires an argument
--:2: file number required
--:3: file number required
--:4: file number less than one
--:6: line number required
--:7: line number required
--:8: line number required
--:11: line number required
+-:1: error: directive `.loc' requires an argument
+-:2: error: file number required
+-:3: error: file number required
+-:4: error: file number less than one
+-:6: error: line number required
+-:7: error: line number required
+-:8: error: line number required
+-:11: error: line number required
 -:12: warning: unrecognized numeric qualifier
--:13: column number is not a constant
--:14: is_stmt requires value
--:17: is_stmt value is not a constant
--:19: is_stmt value is not a constant
--:20: is_stmt value is not a constant
--:22: is_stmt value not 0 or 1
--:23: isa requires value
--:26: isa value is not a constant
--:28: isa value is not a constant
--:30: isa value less than zero
--:31: column number is not a constant
+-:13: error: column number is not a constant
+-:14: error: is_stmt requires value
+-:17: error: is_stmt value is not a constant
+-:19: error: is_stmt value is not a constant
+-:20: error: is_stmt value is not a constant
+-:22: error: is_stmt value not 0 or 1
+-:23: error: isa requires value
+-:26: error: isa value is not a constant
+-:28: error: isa value is not a constant
+-:30: error: isa value less than zero
+-:31: error: column number is not a constant
 -:33: warning: unrecognized loc option `foo'
 -:33: warning: unrecognized numeric qualifier
diff --git a/modules/objfmts/bin/tests/float-err.errwarn b/modules/objfmts/bin/tests/float-err.errwarn
index 33fcebec..4aaa9402 100644
--- a/modules/objfmts/bin/tests/float-err.errwarn
+++ b/modules/objfmts/bin/tests/float-err.errwarn
@@ -1,8 +1,8 @@
--:2: invalid floating point constant size
+-:2: error: invalid floating point constant size
 -:3: warning: overflow in floating point expression
 -:4: warning: overflow in floating point expression
 -:5: warning: underflow in floating point expression
--:8: invalid floating point constant size
+-:8: error: invalid floating point constant size
 -:9: warning: overflow in floating point expression
 -:11: warning: overflow in floating point expression
 -:12: warning: underflow in floating point expression
diff --git a/modules/objfmts/bin/tests/multisect/follows-loop1-err.errwarn b/modules/objfmts/bin/tests/multisect/follows-loop1-err.errwarn
index c7ba6a5a..613280e9 100644
--- a/modules/objfmts/bin/tests/multisect/follows-loop1-err.errwarn
+++ b/modules/objfmts/bin/tests/multisect/follows-loop1-err.errwarn
@@ -1 +1 @@
--: follows loop between section `sect2' and section `sect1'
+-: error: follows loop between section `sect2' and section `sect1'
diff --git a/modules/objfmts/bin/tests/multisect/follows-loop2-err.errwarn b/modules/objfmts/bin/tests/multisect/follows-loop2-err.errwarn
index f4f46dd9..bc832e00 100644
--- a/modules/objfmts/bin/tests/multisect/follows-loop2-err.errwarn
+++ b/modules/objfmts/bin/tests/multisect/follows-loop2-err.errwarn
@@ -1 +1 @@
--: follows loop between section `sect' and section `sect'
+-: error: follows loop between section `sect' and section `sect'
diff --git a/modules/objfmts/bin/tests/multisect/follows-notfound-err.errwarn b/modules/objfmts/bin/tests/multisect/follows-notfound-err.errwarn
index 85234767..53d29d80 100644
--- a/modules/objfmts/bin/tests/multisect/follows-notfound-err.errwarn
+++ b/modules/objfmts/bin/tests/multisect/follows-notfound-err.errwarn
@@ -1 +1 @@
--: section `foo' follows an invalid or unknown section `bar'
+-: error: section `foo' follows an invalid or unknown section `bar'
diff --git a/modules/objfmts/bin/tests/multisect/vfollows-loop1-err.errwarn b/modules/objfmts/bin/tests/multisect/vfollows-loop1-err.errwarn
index b7a9006d..3965e589 100644
--- a/modules/objfmts/bin/tests/multisect/vfollows-loop1-err.errwarn
+++ b/modules/objfmts/bin/tests/multisect/vfollows-loop1-err.errwarn
@@ -1 +1 @@
--: vfollows loop between section `sect2' and section `sect1'
+-: error: vfollows loop between section `sect2' and section `sect1'
diff --git a/modules/objfmts/bin/tests/multisect/vfollows-loop2-err.errwarn b/modules/objfmts/bin/tests/multisect/vfollows-loop2-err.errwarn
index d48bbc85..4f252b42 100644
--- a/modules/objfmts/bin/tests/multisect/vfollows-loop2-err.errwarn
+++ b/modules/objfmts/bin/tests/multisect/vfollows-loop2-err.errwarn
@@ -1 +1 @@
--: vfollows loop between section `sect' and section `sect'
+-: error: vfollows loop between section `sect' and section `sect'
diff --git a/modules/objfmts/bin/tests/multisect/vfollows-notfound-err.errwarn b/modules/objfmts/bin/tests/multisect/vfollows-notfound-err.errwarn
index ecbc97d4..93b44d08 100644
--- a/modules/objfmts/bin/tests/multisect/vfollows-notfound-err.errwarn
+++ b/modules/objfmts/bin/tests/multisect/vfollows-notfound-err.errwarn
@@ -1 +1 @@
--: section `foo' vfollows an invalid or unknown section `bar'
+-: error: section `foo' vfollows an invalid or unknown section `bar'
diff --git a/modules/objfmts/elf/tests/curpos-err.errwarn b/modules/objfmts/elf/tests/curpos-err.errwarn
index fb6f65d7..efe6b093 100644
--- a/modules/objfmts/elf/tests/curpos-err.errwarn
+++ b/modules/objfmts/elf/tests/curpos-err.errwarn
@@ -1,2 +1,2 @@
--:15: data expression too complex
--:21: data expression too complex
+-:15: error: data expression too complex
+-:21: error: data expression too complex
diff --git a/modules/objfmts/macho/tests/nasm64/macho-reloc64-err.errwarn b/modules/objfmts/macho/tests/nasm64/macho-reloc64-err.errwarn
index 3d4e5d97..8297a5bb 100644
--- a/modules/objfmts/macho/tests/nasm64/macho-reloc64-err.errwarn
+++ b/modules/objfmts/macho/tests/nasm64/macho-reloc64-err.errwarn
@@ -1,8 +1,8 @@
--:20: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
--:21: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
--:23: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
--:24: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
--:25: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
--:26: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
--:27: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
--:29: macho: WRT not supported
+-:20: error: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
+-:21: error: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
+-:23: error: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
+-:24: error: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
+-:25: error: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
+-:26: error: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
+-:27: error: macho: sorry, cannot apply 32 bit absolute relocations in 64 bit mode, consider "[_symbol wrt rip]" for mem access, "qword" and "dq _foo" for pointers.
+-:29: error: macho: WRT not supported
diff --git a/modules/objfmts/win64/tests/sce1-err.errwarn b/modules/objfmts/win64/tests/sce1-err.errwarn
index f5b67933..bfb88c14 100644
--- a/modules/objfmts/win64/tests/sce1-err.errwarn
+++ b/modules/objfmts/win64/tests/sce1-err.errwarn
@@ -1,8 +1,8 @@
--:9: ended procedure without ending prologue
--:1: procedure started here
--:20: nested procedures not supported (didn't use [ENDPROC_FRAME]?)
--:11: previous procedure started here
--:27: [SAVEREG] after end of prologue
--:26: prologue ended here
--:31: [ENDPROLOG] without preceding [PROC_FRAME]
--:32: [SAVEREG] without preceding [PROC_FRAME]
+-:9: error: ended procedure without ending prologue
+-:1: error: procedure started here
+-:20: error: nested procedures not supported (didn't use [ENDPROC_FRAME]?)
+-:11: error: previous procedure started here
+-:27: error: [SAVEREG] after end of prologue
+-:26: error: prologue ended here
+-:31: error: [ENDPROLOG] without preceding [PROC_FRAME]
+-:32: error: [SAVEREG] without preceding [PROC_FRAME]
diff --git a/modules/objfmts/win64/tests/sce2-err.errwarn b/modules/objfmts/win64/tests/sce2-err.errwarn
index d7f0d290..73e18652 100644
--- a/modules/objfmts/win64/tests/sce2-err.errwarn
+++ b/modules/objfmts/win64/tests/sce2-err.errwarn
@@ -1,2 +1,2 @@
--: end of file in procedure frame
--:1: procedure started here
+-: error: end of file in procedure frame
+-:1: error: procedure started here
diff --git a/modules/objfmts/win64/tests/sce4-err.errwarn b/modules/objfmts/win64/tests/sce4-err.errwarn
index 92d9cb02..b477ceb7 100644
--- a/modules/objfmts/win64/tests/sce4-err.errwarn
+++ b/modules/objfmts/win64/tests/sce4-err.errwarn
@@ -1,9 +1,9 @@
--:2: frame offset of -4 bytes, must be between 0 and 240
--:3: negative offset not allowed
--:5: negative offset not allowed
--:6: negative offset not allowed
--:11: frame offset of 248 bytes, must be between 0 and 240
--:17: frame offset of 236 is not a multiple of 16
--:18: offset of 124 is not a multiple of 8
--:20: offset of 1032 is not a multiple of 16
--:21: offset of 1028 is not a multiple of 8
+-:2: error: frame offset of -4 bytes, must be between 0 and 240
+-:3: error: negative offset not allowed
+-:5: error: negative offset not allowed
+-:6: error: negative offset not allowed
+-:11: error: frame offset of 248 bytes, must be between 0 and 240
+-:17: error: frame offset of 236 is not a multiple of 16
+-:18: error: offset of 124 is not a multiple of 8
+-:20: error: offset of 1032 is not a multiple of 16
+-:21: error: offset of 1028 is not a multiple of 8
diff --git a/modules/objfmts/xdf/tests/xdfsect-err.errwarn b/modules/objfmts/xdf/tests/xdfsect-err.errwarn
index 4a9d5b3a..84acc4c1 100644
--- a/modules/objfmts/xdf/tests/xdfsect-err.errwarn
+++ b/modules/objfmts/xdf/tests/xdfsect-err.errwarn
@@ -1,4 +1,4 @@
--:1: directive `section' requires an argument
+-:1: error: directive `section' requires an argument
 -:2: warning: Unrecognized qualifier `use16'
 -:3: warning: Unrecognized qualifier `use32'
 -:4: warning: Unrecognized qualifier `use64'
@@ -6,15 +6,15 @@
 -:6: warning: Unrecognized qualifier `flat'
 -:7: warning: Unrecognized qualifier `foo'
 -:8: warning: Unrecognized qualifier `foo'
--:9: argument to `absolute' is not an integer
--:9: undefined symbol `foo' (first use)
--:9:  (Each undefined symbol is reported only once.)
--:10: argument to `absolute' is not an integer
+-:9: error: argument to `absolute' is not an integer
+-:9: error: undefined symbol `foo' (first use)
+-:9: error:  (Each undefined symbol is reported only once.)
+-:10: error: argument to `absolute' is not an integer
 -:11: warning: Unrecognized qualifier `absolute'
--:12: argument to `virtual' is not an integer
--:13: argument to `virtual' is not an integer
+-:12: error: argument to `virtual' is not an integer
+-:13: error: argument to `virtual' is not an integer
 -:14: warning: Unrecognized qualifier `virtual'
--:15: argument to `align' is not an integer
--:16: argument to `align' is not an integer
+-:15: error: argument to `align' is not an integer
+-:16: error: argument to `align' is not an integer
 -:17: warning: Unrecognized qualifier `align'
 -:18: warning: Unrecognized string qualifier
diff --git a/modules/parsers/gas/tests/bin/rept-err.errwarn b/modules/parsers/gas/tests/bin/rept-err.errwarn
index 050398c2..3f64c8eb 100644
--- a/modules/parsers/gas/tests/bin/rept-err.errwarn
+++ b/modules/parsers/gas/tests/bin/rept-err.errwarn
@@ -1 +1 @@
--:1: rept without matching endr
+-:1: error: rept without matching endr
diff --git a/modules/parsers/gas/tests/bin/reptnested-err.errwarn b/modules/parsers/gas/tests/bin/reptnested-err.errwarn
index 016b13e9..d7ac0b71 100644
--- a/modules/parsers/gas/tests/bin/reptnested-err.errwarn
+++ b/modules/parsers/gas/tests/bin/reptnested-err.errwarn
@@ -1,7 +1,7 @@
--:2: nested rept not supported
--:3: rept without matching endr
--:4: nested rept not supported
--:4: nested rept not supported
--:4: nested rept not supported
--:4: nested rept not supported
--:4: nested rept not supported
+-:2: error: nested rept not supported
+-:3: error: rept without matching endr
+-:4: error: nested rept not supported
+-:4: error: nested rept not supported
+-:4: error: nested rept not supported
+-:4: error: nested rept not supported
+-:4: error: nested rept not supported
diff --git a/modules/parsers/gas/tests/gas-line-err.errwarn b/modules/parsers/gas/tests/gas-line-err.errwarn
index 8f92ad62..f08f8be8 100644
--- a/modules/parsers/gas/tests/gas-line-err.errwarn
+++ b/modules/parsers/gas/tests/gas-line-err.errwarn
@@ -1,6 +1,6 @@
--:1: invalid number of operands
--:3: invalid number of operands
-bar1.s:601: invalid number of operands
-bar1.s:201: invalid number of operands
-bar2.s:203: invalid number of operands
-bar2.s:205: invalid number of operands
+-:1: error: invalid number of operands
+-:3: error: invalid number of operands
+bar1.s:601: error: invalid number of operands
+bar1.s:201: error: invalid number of operands
+bar2.s:203: error: invalid number of operands
+bar2.s:205: error: invalid number of operands
diff --git a/modules/parsers/gas/tests/gas-line2-err.errwarn b/modules/parsers/gas/tests/gas-line2-err.errwarn
index 4cfc626f..5cd6b05b 100644
--- a/modules/parsers/gas/tests/gas-line2-err.errwarn
+++ b/modules/parsers/gas/tests/gas-line2-err.errwarn
@@ -1,3 +1,3 @@
--:1: invalid number of operands
--:3: invalid number of operands
-bar1.s:603: invalid number of operands
+-:1: error: invalid number of operands
+-:3: error: invalid number of operands
+bar1.s:603: error: invalid number of operands
diff --git a/modules/parsers/gas/tests/reggroup-err.errwarn b/modules/parsers/gas/tests/reggroup-err.errwarn
index 1b6d02b7..3f428a79 100644
--- a/modules/parsers/gas/tests/reggroup-err.errwarn
+++ b/modules/parsers/gas/tests/reggroup-err.errwarn
@@ -1 +1 @@
--:5: bad register index `8'
+-:5: error: bad register index `8'
diff --git a/modules/preprocs/nasm/tests/ifcritical-err.errwarn b/modules/preprocs/nasm/tests/ifcritical-err.errwarn
index 55b237a3..73ca327c 100644
--- a/modules/preprocs/nasm/tests/ifcritical-err.errwarn
+++ b/modules/preprocs/nasm/tests/ifcritical-err.errwarn
@@ -1 +1 @@
--:5: non-constant value given to `%if'
+-:5: error: non-constant value given to `%if'