travis: update warning output

Update warning formatting after verifying that the new output is
indeed still correct.

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>

4 files changed, 111 insertions, 111 deletions

diff --git a/travis/test/imul-warn.stderr b/travis/test/imul-warn.stderr
index ba0b5c19..215fe142 100644
--- a/travis/test/imul-warn.stderr
+++ b/travis/test/imul-warn.stderr
@@ -1,76 +1,76 @@
 ./travis/test/imul.asm:111: warning: signed byte value exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:37: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:37: ... from macro `test' defined here
 ./travis/test/imul.asm:111: warning: signed byte value exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:41: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:41: ... from macro `test' defined here
 ./travis/test/imul.asm:111: warning: signed byte value exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:52: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:52: ... from macro `test' defined here
 ./travis/test/imul.asm:111: warning: signed byte value exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:54: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:54: ... from macro `test' defined here
 ./travis/test/imul.asm:112: warning: word data exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:36: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:36: ... from macro `test' defined here
 ./travis/test/imul.asm:112: warning: signed byte value exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:37: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:37: ... from macro `test' defined here
 ./travis/test/imul.asm:112: warning: word data exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:38: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:38: ... from macro `test' defined here
 ./travis/test/imul.asm:112: warning: word data exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:39: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:39: ... from macro `test' defined here
 ./travis/test/imul.asm:112: warning: signed byte value exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:41: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:41: ... from macro `test' defined here
 ./travis/test/imul.asm:112: warning: word data exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:51: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:51: ... from macro `test' defined here
 ./travis/test/imul.asm:112: warning: signed byte value exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:52: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:52: ... from macro `test' defined here
 ./travis/test/imul.asm:112: warning: signed byte value exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:54: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:54: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: word data exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:36: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:36: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: signed byte value exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:37: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:37: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: word data exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:38: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:38: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: word data exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:39: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:39: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: dword data exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:40: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:40: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: signed byte value exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:41: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:41: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: dword data exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:42: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:42: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: dword data exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:43: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:43: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: signed dword immediate exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:45: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:45: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: dword data exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:45: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:45: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: signed byte value exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:46: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:46: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: signed dword immediate exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:47: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:47: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: dword data exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:47: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:47: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: signed dword immediate exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:48: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:48: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: dword data exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:48: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:48: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: word data exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:51: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:51: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: signed byte value exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:52: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:52: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: dword data exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:53: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:53: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: signed byte value exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:54: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:54: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: signed dword immediate exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:56: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:56: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: dword data exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:56: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:56: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: signed byte value exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:57: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:57: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: signed dword value exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:91: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:91: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: signed dword value exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:92: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:92: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: signed dword value exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:93: ... from macro `test' defined here [-w+number-overflow]
+./travis/test/imul.asm:93: ... from macro `test' defined here
 ./travis/test/imul.asm:113: warning: signed dword value exceeds bounds [-w+number-overflow]
-./travis/test/imul.asm:102: ... from macro `test' defined here [-w+number-overflow]
\ No newline at end of file
+./travis/test/imul.asm:102: ... from macro `test' defined here
diff --git a/travis/test/macro-defaults-nowarn.stderr b/travis/test/macro-defaults-nowarn.stderr
index 34811633..496cd7ed 100644
--- a/travis/test/macro-defaults-nowarn.stderr
+++ b/travis/test/macro-defaults-nowarn.stderr
@@ -1,36 +1,36 @@
-./travis/test/macro-defaults.asm:9: warning: (mmac_fix:3) 2 one a  [-w+user]
-./travis/test/macro-defaults.asm:7: ... from macro `mmac_fix' defined here [-w+user]
-./travis/test/macro-defaults.asm:16: warning: (mmac_var:3) 3 one a b  [-w+user]
-./travis/test/macro-defaults.asm:14: ... from macro `mmac_var' defined here [-w+user]
-./travis/test/macro-defaults.asm:17: warning: (mmac_var:3) 3 one two b  [-w+user]
-./travis/test/macro-defaults.asm:14: ... from macro `mmac_var' defined here [-w+user]
-./travis/test/macro-defaults.asm:27: warning: (mmac_plus:5) 2 one a,b  [-w+user]
-./travis/test/macro-defaults.asm:24: ... from macro `mmac_plus' defined here [-w+user]
-./travis/test/macro-defaults.asm:28: warning: (mmac_plus:5) 2 one two  [-w+user]
-./travis/test/macro-defaults.asm:24: ... from macro `mmac_plus' defined here [-w+user]
-./travis/test/macro-defaults.asm:29: warning: (mmac_plus:5) 2 one two,three  [-w+user]
-./travis/test/macro-defaults.asm:24: ... from macro `mmac_plus' defined here [-w+user]
-./travis/test/macro-defaults.asm:37: warning: (mmac_star:4) 3 one a b  [-w+user]
-./travis/test/macro-defaults.asm:35: ... from macro `mmac_star' defined here [-w+user]
-./travis/test/macro-defaults.asm:38: warning: (mmac_star:4) 3 one two b  [-w+user]
-./travis/test/macro-defaults.asm:35: ... from macro `mmac_star' defined here [-w+user]
-./travis/test/macro-defaults.asm:39: warning: (mmac_star:4) 3 one two three  [-w+user]
-./travis/test/macro-defaults.asm:35: ... from macro `mmac_star' defined here [-w+user]
-./travis/test/macro-defaults.asm:47: warning: (mmac_rotate:1) 2 a b  [-w+user]
-./travis/test/macro-defaults.asm:42: ... from macro `mmac_rotate' defined here [-w+user]
-./travis/test/macro-defaults.asm:47: warning: (mmac_rotate:4) 2 b a  [-w+user]
-./travis/test/macro-defaults.asm:45: ... from macro `mmac_rotate' defined here [-w+user]
-./travis/test/macro-defaults.asm:48: warning: (mmac_rotate:1) 2 one b  [-w+user]
-./travis/test/macro-defaults.asm:42: ... from macro `mmac_rotate' defined here [-w+user]
-./travis/test/macro-defaults.asm:48: warning: (mmac_rotate:4) 2 b one  [-w+user]
-./travis/test/macro-defaults.asm:45: ... from macro `mmac_rotate' defined here [-w+user]
-./travis/test/macro-defaults.asm:49: warning: (mmac_rotate:1) 2 one two  [-w+user]
-./travis/test/macro-defaults.asm:42: ... from macro `mmac_rotate' defined here [-w+user]
-./travis/test/macro-defaults.asm:49: warning: (mmac_rotate:4) 2 two one  [-w+user]
-./travis/test/macro-defaults.asm:45: ... from macro `mmac_rotate' defined here [-w+user]
-./travis/test/macro-defaults.asm:50: warning: (mmac_rotate:1) 3 one two three  [-w+user]
-./travis/test/macro-defaults.asm:42: ... from macro `mmac_rotate' defined here [-w+user]
-./travis/test/macro-defaults.asm:50: warning: (mmac_rotate:4) 3 two three one  [-w+user]
-./travis/test/macro-defaults.asm:45: ... from macro `mmac_rotate' defined here [-w+user]
-./travis/test/macro-defaults.asm:64: warning: (mmac_scope:1) 0 0 0  [-w+user]
-./travis/test/macro-defaults.asm:58: ... from macro `mmac_scope' defined here [-w+user]
\ No newline at end of file
+./travis/test/macro-defaults.asm:9: warning: 2 one a  [-w+user]
+./travis/test/macro-defaults.asm:7: ... from macro `mmac_fix' defined here
+./travis/test/macro-defaults.asm:16: warning: 3 one a b  [-w+user]
+./travis/test/macro-defaults.asm:14: ... from macro `mmac_var' defined here
+./travis/test/macro-defaults.asm:17: warning: 3 one two b  [-w+user]
+./travis/test/macro-defaults.asm:14: ... from macro `mmac_var' defined here
+./travis/test/macro-defaults.asm:27: warning: 2 one a,b  [-w+user]
+./travis/test/macro-defaults.asm:24: ... from macro `mmac_plus' defined here
+./travis/test/macro-defaults.asm:28: warning: 2 one two  [-w+user]
+./travis/test/macro-defaults.asm:24: ... from macro `mmac_plus' defined here
+./travis/test/macro-defaults.asm:29: warning: 2 one two,three  [-w+user]
+./travis/test/macro-defaults.asm:24: ... from macro `mmac_plus' defined here
+./travis/test/macro-defaults.asm:37: warning: 3 one a b  [-w+user]
+./travis/test/macro-defaults.asm:35: ... from macro `mmac_star' defined here
+./travis/test/macro-defaults.asm:38: warning: 3 one two b  [-w+user]
+./travis/test/macro-defaults.asm:35: ... from macro `mmac_star' defined here
+./travis/test/macro-defaults.asm:39: warning: 3 one two three  [-w+user]
+./travis/test/macro-defaults.asm:35: ... from macro `mmac_star' defined here
+./travis/test/macro-defaults.asm:47: warning: 2 a b  [-w+user]
+./travis/test/macro-defaults.asm:42: ... from macro `mmac_rotate' defined here
+./travis/test/macro-defaults.asm:47: warning: 2 b a  [-w+user]
+./travis/test/macro-defaults.asm:45: ... from macro `mmac_rotate' defined here
+./travis/test/macro-defaults.asm:48: warning: 2 one b  [-w+user]
+./travis/test/macro-defaults.asm:42: ... from macro `mmac_rotate' defined here
+./travis/test/macro-defaults.asm:48: warning: 2 b one  [-w+user]
+./travis/test/macro-defaults.asm:45: ... from macro `mmac_rotate' defined here
+./travis/test/macro-defaults.asm:49: warning: 2 one two  [-w+user]
+./travis/test/macro-defaults.asm:42: ... from macro `mmac_rotate' defined here
+./travis/test/macro-defaults.asm:49: warning: 2 two one  [-w+user]
+./travis/test/macro-defaults.asm:45: ... from macro `mmac_rotate' defined here
+./travis/test/macro-defaults.asm:50: warning: 3 one two three  [-w+user]
+./travis/test/macro-defaults.asm:42: ... from macro `mmac_rotate' defined here
+./travis/test/macro-defaults.asm:50: warning: 3 two three one  [-w+user]
+./travis/test/macro-defaults.asm:45: ... from macro `mmac_rotate' defined here
+./travis/test/macro-defaults.asm:64: warning: 0 0 0  [-w+user]
+./travis/test/macro-defaults.asm:58: ... from macro `mmac_scope' defined here
diff --git a/travis/test/macro-defaults-warn.stderr b/travis/test/macro-defaults-warn.stderr
index 24a9d420..4f932a61 100644
--- a/travis/test/macro-defaults-warn.stderr
+++ b/travis/test/macro-defaults-warn.stderr
@@ -1,39 +1,39 @@
 ./travis/test/macro-defaults.asm:4: warning: too many default macro parameters in macro `mmac_fix' [-w+macro-defaults]
-./travis/test/macro-defaults.asm:9: warning: (mmac_fix:3) 2 one a  [-w+user]
-./travis/test/macro-defaults.asm:7: ... from macro `mmac_fix' defined here [-w+user]
+./travis/test/macro-defaults.asm:9: warning: 2 one a  [-w+user]
+./travis/test/macro-defaults.asm:7: ... from macro `mmac_fix' defined here
 ./travis/test/macro-defaults.asm:11: warning: too many default macro parameters in macro `mmac_var' [-w+macro-defaults]
-./travis/test/macro-defaults.asm:16: warning: (mmac_var:3) 3 one a b  [-w+user]
-./travis/test/macro-defaults.asm:14: ... from macro `mmac_var' defined here [-w+user]
-./travis/test/macro-defaults.asm:17: warning: (mmac_var:3) 3 one two b  [-w+user]
-./travis/test/macro-defaults.asm:14: ... from macro `mmac_var' defined here [-w+user]
-./travis/test/macro-defaults.asm:27: warning: (mmac_plus:5) 2 one a,b  [-w+user]
-./travis/test/macro-defaults.asm:24: ... from macro `mmac_plus' defined here [-w+user]
-./travis/test/macro-defaults.asm:28: warning: (mmac_plus:5) 2 one two  [-w+user]
-./travis/test/macro-defaults.asm:24: ... from macro `mmac_plus' defined here [-w+user]
-./travis/test/macro-defaults.asm:29: warning: (mmac_plus:5) 2 one two,three  [-w+user]
-./travis/test/macro-defaults.asm:24: ... from macro `mmac_plus' defined here [-w+user]
-./travis/test/macro-defaults.asm:37: warning: (mmac_star:4) 3 one a b  [-w+user]
-./travis/test/macro-defaults.asm:35: ... from macro `mmac_star' defined here [-w+user]
-./travis/test/macro-defaults.asm:38: warning: (mmac_star:4) 3 one two b  [-w+user]
-./travis/test/macro-defaults.asm:35: ... from macro `mmac_star' defined here [-w+user]
-./travis/test/macro-defaults.asm:39: warning: (mmac_star:4) 3 one two three  [-w+user]
-./travis/test/macro-defaults.asm:35: ... from macro `mmac_star' defined here [-w+user]
-./travis/test/macro-defaults.asm:47: warning: (mmac_rotate:1) 2 a b  [-w+user]
-./travis/test/macro-defaults.asm:42: ... from macro `mmac_rotate' defined here [-w+user]
-./travis/test/macro-defaults.asm:47: warning: (mmac_rotate:4) 2 b a  [-w+user]
-./travis/test/macro-defaults.asm:45: ... from macro `mmac_rotate' defined here [-w+user]
-./travis/test/macro-defaults.asm:48: warning: (mmac_rotate:1) 2 one b  [-w+user]
-./travis/test/macro-defaults.asm:42: ... from macro `mmac_rotate' defined here [-w+user]
-./travis/test/macro-defaults.asm:48: warning: (mmac_rotate:4) 2 b one  [-w+user]
-./travis/test/macro-defaults.asm:45: ... from macro `mmac_rotate' defined here [-w+user]
-./travis/test/macro-defaults.asm:49: warning: (mmac_rotate:1) 2 one two  [-w+user]
-./travis/test/macro-defaults.asm:42: ... from macro `mmac_rotate' defined here [-w+user]
-./travis/test/macro-defaults.asm:49: warning: (mmac_rotate:4) 2 two one  [-w+user]
-./travis/test/macro-defaults.asm:45: ... from macro `mmac_rotate' defined here [-w+user]
-./travis/test/macro-defaults.asm:50: warning: (mmac_rotate:1) 3 one two three  [-w+user]
-./travis/test/macro-defaults.asm:42: ... from macro `mmac_rotate' defined here [-w+user]
-./travis/test/macro-defaults.asm:50: warning: (mmac_rotate:4) 3 two three one  [-w+user]
-./travis/test/macro-defaults.asm:45: ... from macro `mmac_rotate' defined here [-w+user]
+./travis/test/macro-defaults.asm:16: warning: 3 one a b  [-w+user]
+./travis/test/macro-defaults.asm:14: ... from macro `mmac_var' defined here
+./travis/test/macro-defaults.asm:17: warning: 3 one two b  [-w+user]
+./travis/test/macro-defaults.asm:14: ... from macro `mmac_var' defined here
+./travis/test/macro-defaults.asm:27: warning: 2 one a,b  [-w+user]
+./travis/test/macro-defaults.asm:24: ... from macro `mmac_plus' defined here
+./travis/test/macro-defaults.asm:28: warning: 2 one two  [-w+user]
+./travis/test/macro-defaults.asm:24: ... from macro `mmac_plus' defined here
+./travis/test/macro-defaults.asm:29: warning: 2 one two,three  [-w+user]
+./travis/test/macro-defaults.asm:24: ... from macro `mmac_plus' defined here
+./travis/test/macro-defaults.asm:37: warning: 3 one a b  [-w+user]
+./travis/test/macro-defaults.asm:35: ... from macro `mmac_star' defined here
+./travis/test/macro-defaults.asm:38: warning: 3 one two b  [-w+user]
+./travis/test/macro-defaults.asm:35: ... from macro `mmac_star' defined here
+./travis/test/macro-defaults.asm:39: warning: 3 one two three  [-w+user]
+./travis/test/macro-defaults.asm:35: ... from macro `mmac_star' defined here
+./travis/test/macro-defaults.asm:47: warning: 2 a b  [-w+user]
+./travis/test/macro-defaults.asm:42: ... from macro `mmac_rotate' defined here
+./travis/test/macro-defaults.asm:47: warning: 2 b a  [-w+user]
+./travis/test/macro-defaults.asm:45: ... from macro `mmac_rotate' defined here
+./travis/test/macro-defaults.asm:48: warning: 2 one b  [-w+user]
+./travis/test/macro-defaults.asm:42: ... from macro `mmac_rotate' defined here
+./travis/test/macro-defaults.asm:48: warning: 2 b one  [-w+user]
+./travis/test/macro-defaults.asm:45: ... from macro `mmac_rotate' defined here
+./travis/test/macro-defaults.asm:49: warning: 2 one two  [-w+user]
+./travis/test/macro-defaults.asm:42: ... from macro `mmac_rotate' defined here
+./travis/test/macro-defaults.asm:49: warning: 2 two one  [-w+user]
+./travis/test/macro-defaults.asm:45: ... from macro `mmac_rotate' defined here
+./travis/test/macro-defaults.asm:50: warning: 3 one two three  [-w+user]
+./travis/test/macro-defaults.asm:42: ... from macro `mmac_rotate' defined here
+./travis/test/macro-defaults.asm:50: warning: 3 two three one  [-w+user]
+./travis/test/macro-defaults.asm:45: ... from macro `mmac_rotate' defined here
 ./travis/test/macro-defaults.asm:57: warning: too many default macro parameters in macro `mmac_scope' [-w+macro-defaults]
-./travis/test/macro-defaults.asm:64: warning: (mmac_scope:1) 0 0 0  [-w+user]
-./travis/test/macro-defaults.asm:58: ... from macro `mmac_scope' defined here [-w+user]
\ No newline at end of file
+./travis/test/macro-defaults.asm:64: warning: 0 0 0  [-w+user]
+./travis/test/macro-defaults.asm:58: ... from macro `mmac_scope' defined here
diff --git a/travis/test/pushseg.stderr b/travis/test/pushseg.stderr
index 2bf22630..58aa8f2f 100644
--- a/travis/test/pushseg.stderr
+++ b/travis/test/pushseg.stderr
@@ -1 +1 @@
-./travis/test/pushseg.asm:17: warning: obsolete instruction invalid on the target CPU [-w+obsolete]
+./travis/test/pushseg.asm:17: warning: instruction obsolete and removed from the target CPU [-w+obsolete-removed]