1 files changed, 110 insertions, 55 deletions
diff --git a/gas/testsuite/gas/arm/shift-bad-pc.l b/gas/testsuite/gas/arm/shift-bad-pc.l
index 55a3295e3d6..f07f7aa11a2 100644
--- a/gas/testsuite/gas/arm/shift-bad-pc.l
+++ b/gas/testsuite/gas/arm/shift-bad-pc.l
@@ -1,56 +1,111 @@
 .*shift-bad-pc.s: Assembler messages:
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:20: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:21: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:21: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:21: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:21: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:21: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:21: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:21: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:21: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:21: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:21: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:21: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:21: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:21: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:21: Warning: using r15 results in unpredictable behaviour
-.*shift-bad-pc.s:21: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:5: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:6: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:7: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:8: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:5: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:6: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:7: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:8: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:5: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:6: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:7: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:8: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:5: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:6: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:7: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:8: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:5: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:6: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:7: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:8: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:5: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:6: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:7: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:8: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:5: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:6: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:7: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:8: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:5: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:6: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:7: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:8: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:5: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:6: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:7: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:8: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:5: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:6: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:7: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:8: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:20: *Info: macro .*
+.*shift-bad-pc.s:14: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:21: *Info: macro .*
+.*shift-bad-pc.s:15: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:21: *Info: macro .*
+.*shift-bad-pc.s:16: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:21: *Info: macro .*
+.*shift-bad-pc.s:14: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:21: *Info: macro .*
+.*shift-bad-pc.s:15: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:21: *Info: macro .*
+.*shift-bad-pc.s:16: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:21: *Info: macro .*
+.*shift-bad-pc.s:14: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:21: *Info: macro .*
+.*shift-bad-pc.s:15: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:21: *Info: macro .*
+.*shift-bad-pc.s:16: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:21: *Info: macro .*
+.*shift-bad-pc.s:14: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:21: *Info: macro .*
+.*shift-bad-pc.s:15: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:21: *Info: macro .*
+.*shift-bad-pc.s:16: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:21: *Info: macro .*
+.*shift-bad-pc.s:14: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:21: *Info: macro .*
+.*shift-bad-pc.s:15: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:21: *Info: macro .*
+.*shift-bad-pc.s:16: Warning: using r15 results in unpredictable behaviour
+.*shift-bad-pc.s:21: *Info: macro .*