[binutils-gdb] MIPS: relax gas testsuite whitespace expectations
Jan Beulich
jbeulich@sourceware.org
Fri Aug 9 09:52:59 GMT 2024
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=eb2b444321416f5bb98286647ee9769dfee5995d
commit eb2b444321416f5bb98286647ee9769dfee5995d
Author: Jan Beulich <jbeulich@suse.com>
Date: Fri Aug 9 11:52:42 2024 +0200
MIPS: relax gas testsuite whitespace expectations
In a subsequent change the scrubber is going to be changed to retain
further whitespace. Test case expectations generally would better not
depend on the specific whitespace treatment by the scrubber, unless of
course a test is specifically about it. Adjust relevant test cases to
permit blanks where those will subsequently appear.
Diff:
---
gas/testsuite/gas/mips/micromips.l | 24 +++++++++++-----------
gas/testsuite/gas/mips/mips16-32@mips16-insn-e.l | 4 ++--
gas/testsuite/gas/mips/mips16-32@mips16-insn-t.l | 4 ++--
gas/testsuite/gas/mips/mips16e-32@mips16-insn-e.l | 4 ++--
gas/testsuite/gas/mips/mips16e-32@mips16-insn-t.l | 4 ++--
gas/testsuite/gas/mips/mips16e2-32@mips16-insn-e.l | 4 ++--
gas/testsuite/gas/mips/mips16e2-32@mips16-insn-t.l | 4 ++--
.../mips/mips16e2-interaptiv-mr2@mips16-insn-e.l | 4 ++--
.../mips/mips16e2-interaptiv-mr2@mips16-insn-t.l | 4 ++--
gas/testsuite/gas/mips/mips16e2@lui-2.l | 8 ++++----
10 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/gas/testsuite/gas/mips/micromips.l b/gas/testsuite/gas/mips/micromips.l
index 25112cdbd56..9236782b34f 100644
--- a/gas/testsuite/gas/mips/micromips.l
+++ b/gas/testsuite/gas/mips/micromips.l
@@ -64,18 +64,18 @@
.*:3133: Error: opcode not supported in the `insn32' mode `addiur2 \$17,\$17,16'
.*:3134: Error: opcode not supported in the `insn32' mode `addiur2 \$17,\$17,20'
.*:3135: Error: opcode not supported in the `insn32' mode `addiur2 \$17,\$17,24'
-.*:3137: Error: opcode not supported in the `insn32' mode `addiusp 2<<2'
-.*:3138: Error: opcode not supported in the `insn32' mode `addiusp 3<<2'
-.*:3139: Error: opcode not supported in the `insn32' mode `addiusp 254<<2'
-.*:3140: Error: opcode not supported in the `insn32' mode `addiusp 255<<2'
-.*:3141: Error: opcode not supported in the `insn32' mode `addiusp 256<<2'
-.*:3142: Error: opcode not supported in the `insn32' mode `addiusp 257<<2'
-.*:3143: Error: opcode not supported in the `insn32' mode `addiusp -3<<2'
-.*:3144: Error: opcode not supported in the `insn32' mode `addiusp -4<<2'
-.*:3145: Error: opcode not supported in the `insn32' mode `addiusp -255<<2'
-.*:3146: Error: opcode not supported in the `insn32' mode `addiusp -256<<2'
-.*:3147: Error: opcode not supported in the `insn32' mode `addiusp -257<<2'
-.*:3148: Error: opcode not supported in the `insn32' mode `addiusp -258<<2'
+.*:3137: Error: opcode not supported in the `insn32' mode `addiusp 2 ?<< ?2'
+.*:3138: Error: opcode not supported in the `insn32' mode `addiusp 3 ?<< ?2'
+.*:3139: Error: opcode not supported in the `insn32' mode `addiusp 254 ?<< ?2'
+.*:3140: Error: opcode not supported in the `insn32' mode `addiusp 255 ?<< ?2'
+.*:3141: Error: opcode not supported in the `insn32' mode `addiusp 256 ?<< ?2'
+.*:3142: Error: opcode not supported in the `insn32' mode `addiusp 257 ?<< ?2'
+.*:3143: Error: opcode not supported in the `insn32' mode `addiusp -3 ?<< ?2'
+.*:3144: Error: opcode not supported in the `insn32' mode `addiusp -4 ?<< ?2'
+.*:3145: Error: opcode not supported in the `insn32' mode `addiusp -255 ?<< ?2'
+.*:3146: Error: opcode not supported in the `insn32' mode `addiusp -256 ?<< ?2'
+.*:3147: Error: opcode not supported in the `insn32' mode `addiusp -257 ?<< ?2'
+.*:3148: Error: opcode not supported in the `insn32' mode `addiusp -258 ?<< ?2'
.*:3150: Error: opcode not supported in the `insn32' mode `addius5 \$0,0'
.*:3151: Error: opcode not supported in the `insn32' mode `addius5 \$2,0'
.*:3152: Error: opcode not supported in the `insn32' mode `addius5 \$3,0'
diff --git a/gas/testsuite/gas/mips/mips16-32@mips16-insn-e.l b/gas/testsuite/gas/mips/mips16-32@mips16-insn-e.l
index 45b31d6e4c5..28f8db49c7c 100644
--- a/gas/testsuite/gas/mips/mips16-32@mips16-insn-e.l
+++ b/gas/testsuite/gas/mips/mips16-32@mips16-insn-e.l
@@ -117,12 +117,12 @@
.*:171: Error: opcode not supported on this processor: mips1 \(mips1\) `daddu\.e \$29,0'
.*:172: Error: opcode not supported on this processor: mips1 \(mips1\) `daddu\.e \$29,\$29,0'
.*:174: Error: opcode not supported on this processor: mips1 \(mips1\) `ld\.e \$16,0\(\$pc\)'
-.*:175: Error: opcode not supported on this processor: mips1 \(mips1\) `ld\.e \$16,\.-3'
+.*:175: Error: opcode not supported on this processor: mips1 \(mips1\) `ld\.e \$16,\. ?- ?3'
.*:176: Error: opcode not supported on this processor: mips1 \(mips1\) `daddiu\.e \$16,0'
.*:177: Error: opcode not supported on this processor: mips1 \(mips1\) `daddu\.e \$16,0'
.*:179: Error: opcode not supported on this processor: mips1 \(mips1\) `daddiu\.e \$16,\$pc,0'
.*:180: Error: opcode not supported on this processor: mips1 \(mips1\) `daddu\.e \$16,\$pc,0'
-.*:181: Error: opcode not supported on this processor: mips1 \(mips1\) `dla\.e \$16,\.-1'
+.*:181: Error: opcode not supported on this processor: mips1 \(mips1\) `dla\.e \$16,\. ?- ?1'
.*:182: Error: opcode not supported on this processor: mips1 \(mips1\) `daddiu\.e \$16,\$sp,0'
.*:183: Error: opcode not supported on this processor: mips1 \(mips1\) `daddu\.e \$16,\$sp,0'
.*:10: Warning: extended operand requested but not required
diff --git a/gas/testsuite/gas/mips/mips16-32@mips16-insn-t.l b/gas/testsuite/gas/mips/mips16-32@mips16-insn-t.l
index a632d59574d..23c5d50ffdd 100644
--- a/gas/testsuite/gas/mips/mips16-32@mips16-insn-t.l
+++ b/gas/testsuite/gas/mips/mips16-32@mips16-insn-t.l
@@ -44,11 +44,11 @@
.*:171: Error: opcode not supported on this processor: mips1 \(mips1\) `daddu\.t \$29,0'
.*:172: Error: opcode not supported on this processor: mips1 \(mips1\) `daddu\.t \$29,\$29,0'
.*:174: Error: opcode not supported on this processor: mips1 \(mips1\) `ld\.t \$16,0\(\$pc\)'
-.*:175: Error: opcode not supported on this processor: mips1 \(mips1\) `ld\.t \$16,\.-3'
+.*:175: Error: opcode not supported on this processor: mips1 \(mips1\) `ld\.t \$16,\. ?- ?3'
.*:176: Error: opcode not supported on this processor: mips1 \(mips1\) `daddiu\.t \$16,0'
.*:177: Error: opcode not supported on this processor: mips1 \(mips1\) `daddu\.t \$16,0'
.*:179: Error: opcode not supported on this processor: mips1 \(mips1\) `daddiu\.t \$16,\$pc,0'
.*:180: Error: opcode not supported on this processor: mips1 \(mips1\) `daddu\.t \$16,\$pc,0'
-.*:181: Error: opcode not supported on this processor: mips1 \(mips1\) `dla\.t \$16,\.-1'
+.*:181: Error: opcode not supported on this processor: mips1 \(mips1\) `dla\.t \$16,\. ?- ?1'
.*:182: Error: opcode not supported on this processor: mips1 \(mips1\) `daddiu\.t \$16,\$sp,0'
.*:183: Error: opcode not supported on this processor: mips1 \(mips1\) `daddu\.t \$16,\$sp,0'
diff --git a/gas/testsuite/gas/mips/mips16e-32@mips16-insn-e.l b/gas/testsuite/gas/mips/mips16e-32@mips16-insn-e.l
index a66cc358af9..5bff2ef5d1a 100644
--- a/gas/testsuite/gas/mips/mips16e-32@mips16-insn-e.l
+++ b/gas/testsuite/gas/mips/mips16e-32@mips16-insn-e.l
@@ -115,12 +115,12 @@
.*:171: Error: opcode not supported on this processor: mips32 \(mips32\) `daddu\.e \$29,0'
.*:172: Error: opcode not supported on this processor: mips32 \(mips32\) `daddu\.e \$29,\$29,0'
.*:174: Error: opcode not supported on this processor: mips32 \(mips32\) `ld\.e \$16,0\(\$pc\)'
-.*:175: Error: opcode not supported on this processor: mips32 \(mips32\) `ld\.e \$16,\.-3'
+.*:175: Error: opcode not supported on this processor: mips32 \(mips32\) `ld\.e \$16,\. ?- ?3'
.*:176: Error: opcode not supported on this processor: mips32 \(mips32\) `daddiu\.e \$16,0'
.*:177: Error: opcode not supported on this processor: mips32 \(mips32\) `daddu\.e \$16,0'
.*:179: Error: opcode not supported on this processor: mips32 \(mips32\) `daddiu\.e \$16,\$pc,0'
.*:180: Error: opcode not supported on this processor: mips32 \(mips32\) `daddu\.e \$16,\$pc,0'
-.*:181: Error: opcode not supported on this processor: mips32 \(mips32\) `dla\.e \$16,\.-1'
+.*:181: Error: opcode not supported on this processor: mips32 \(mips32\) `dla\.e \$16,\. ?- ?1'
.*:182: Error: opcode not supported on this processor: mips32 \(mips32\) `daddiu\.e \$16,\$sp,0'
.*:183: Error: opcode not supported on this processor: mips32 \(mips32\) `daddu\.e \$16,\$sp,0'
.*:10: Warning: extended operand requested but not required
diff --git a/gas/testsuite/gas/mips/mips16e-32@mips16-insn-t.l b/gas/testsuite/gas/mips/mips16e-32@mips16-insn-t.l
index 69ce41115b4..48cc51d45f8 100644
--- a/gas/testsuite/gas/mips/mips16e-32@mips16-insn-t.l
+++ b/gas/testsuite/gas/mips/mips16e-32@mips16-insn-t.l
@@ -33,11 +33,11 @@
.*:171: Error: opcode not supported on this processor: mips32 \(mips32\) `daddu\.t \$29,0'
.*:172: Error: opcode not supported on this processor: mips32 \(mips32\) `daddu\.t \$29,\$29,0'
.*:174: Error: opcode not supported on this processor: mips32 \(mips32\) `ld\.t \$16,0\(\$pc\)'
-.*:175: Error: opcode not supported on this processor: mips32 \(mips32\) `ld\.t \$16,\.-3'
+.*:175: Error: opcode not supported on this processor: mips32 \(mips32\) `ld\.t \$16,\. ?- ?3'
.*:176: Error: opcode not supported on this processor: mips32 \(mips32\) `daddiu\.t \$16,0'
.*:177: Error: opcode not supported on this processor: mips32 \(mips32\) `daddu\.t \$16,0'
.*:179: Error: opcode not supported on this processor: mips32 \(mips32\) `daddiu\.t \$16,\$pc,0'
.*:180: Error: opcode not supported on this processor: mips32 \(mips32\) `daddu\.t \$16,\$pc,0'
-.*:181: Error: opcode not supported on this processor: mips32 \(mips32\) `dla\.t \$16,\.-1'
+.*:181: Error: opcode not supported on this processor: mips32 \(mips32\) `dla\.t \$16,\. ?- ?1'
.*:182: Error: opcode not supported on this processor: mips32 \(mips32\) `daddiu\.t \$16,\$sp,0'
.*:183: Error: opcode not supported on this processor: mips32 \(mips32\) `daddu\.t \$16,\$sp,0'
diff --git a/gas/testsuite/gas/mips/mips16e2-32@mips16-insn-e.l b/gas/testsuite/gas/mips/mips16e2-32@mips16-insn-e.l
index 095e0b00d4f..fe16cb2bd8f 100644
--- a/gas/testsuite/gas/mips/mips16e2-32@mips16-insn-e.l
+++ b/gas/testsuite/gas/mips/mips16e2-32@mips16-insn-e.l
@@ -115,12 +115,12 @@
.*:171: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `daddu\.e \$29,0'
.*:172: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `daddu\.e \$29,\$29,0'
.*:174: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `ld\.e \$16,0\(\$pc\)'
-.*:175: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `ld\.e \$16,\.-3'
+.*:175: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `ld\.e \$16,\. ?- ?3'
.*:176: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `daddiu\.e \$16,0'
.*:177: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `daddu\.e \$16,0'
.*:179: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `daddiu\.e \$16,\$pc,0'
.*:180: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `daddu\.e \$16,\$pc,0'
-.*:181: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `dla\.e \$16,\.-1'
+.*:181: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `dla\.e \$16,\. ?- ?1'
.*:182: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `daddiu\.e \$16,\$sp,0'
.*:183: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `daddu\.e \$16,\$sp,0'
.*:10: Warning: extended operand requested but not required
diff --git a/gas/testsuite/gas/mips/mips16e2-32@mips16-insn-t.l b/gas/testsuite/gas/mips/mips16e2-32@mips16-insn-t.l
index 0fd848d5f7d..57a6e3b7d02 100644
--- a/gas/testsuite/gas/mips/mips16e2-32@mips16-insn-t.l
+++ b/gas/testsuite/gas/mips/mips16e2-32@mips16-insn-t.l
@@ -33,11 +33,11 @@
.*:171: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `daddu\.t \$29,0'
.*:172: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `daddu\.t \$29,\$29,0'
.*:174: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `ld\.t \$16,0\(\$pc\)'
-.*:175: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `ld\.t \$16,\.-3'
+.*:175: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `ld\.t \$16,\. ?- ?3'
.*:176: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `daddiu\.t \$16,0'
.*:177: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `daddu\.t \$16,0'
.*:179: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `daddiu\.t \$16,\$pc,0'
.*:180: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `daddu\.t \$16,\$pc,0'
-.*:181: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `dla\.t \$16,\.-1'
+.*:181: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `dla\.t \$16,\. ?- ?1'
.*:182: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `daddiu\.t \$16,\$sp,0'
.*:183: Error: opcode not supported on this processor: mips32r2 \(mips32r2\) `daddu\.t \$16,\$sp,0'
diff --git a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-e.l b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-e.l
index a0c55dfd756..af9c5633b48 100644
--- a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-e.l
+++ b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-e.l
@@ -115,12 +115,12 @@
.*:171: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `daddu\.e \$29,0'
.*:172: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `daddu\.e \$29,\$29,0'
.*:174: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `ld\.e \$16,0\(\$pc\)'
-.*:175: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `ld\.e \$16,\.-3'
+.*:175: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `ld\.e \$16,\. ?- ?3'
.*:176: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `daddiu\.e \$16,0'
.*:177: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `daddu\.e \$16,0'
.*:179: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `daddiu\.e \$16,\$pc,0'
.*:180: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `daddu\.e \$16,\$pc,0'
-.*:181: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `dla\.e \$16,\.-1'
+.*:181: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `dla\.e \$16,\. ?- ?1'
.*:182: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `daddiu\.e \$16,\$sp,0'
.*:183: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `daddu\.e \$16,\$sp,0'
.*:10: Warning: extended operand requested but not required
diff --git a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-t.l b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-t.l
index 67330c5eadd..bd449f1ab5f 100644
--- a/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-t.l
+++ b/gas/testsuite/gas/mips/mips16e2-interaptiv-mr2@mips16-insn-t.l
@@ -33,11 +33,11 @@
.*:171: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `daddu\.t \$29,0'
.*:172: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `daddu\.t \$29,\$29,0'
.*:174: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `ld\.t \$16,0\(\$pc\)'
-.*:175: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `ld\.t \$16,\.-3'
+.*:175: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `ld\.t \$16,\. ?- ?3'
.*:176: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `daddiu\.t \$16,0'
.*:177: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `daddu\.t \$16,0'
.*:179: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `daddiu\.t \$16,\$pc,0'
.*:180: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `daddu\.t \$16,\$pc,0'
-.*:181: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `dla\.t \$16,\.-1'
+.*:181: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `dla\.t \$16,\. ?- ?1'
.*:182: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `daddiu\.t \$16,\$sp,0'
.*:183: Error: opcode not supported on this processor: interaptiv-mr2 \(mips32r3\) `daddu\.t \$16,\$sp,0'
diff --git a/gas/testsuite/gas/mips/mips16e2@lui-2.l b/gas/testsuite/gas/mips/mips16e2@lui-2.l
index f83b9c80be8..033bd17c509 100644
--- a/gas/testsuite/gas/mips/mips16e2@lui-2.l
+++ b/gas/testsuite/gas/mips/mips16e2@lui-2.l
@@ -1,5 +1,5 @@
.*: Assembler messages:
-.*:7: Error: operand 2 must be constant `lui \$2,bar-foo'
-.*:8: Error: operand 2 must be constant `lui \$2,baz-bar'
-.*:9: Error: operand 2 must be constant `lui \$2,foo-baz'
-.*:10: Error: operand 2 must be constant `lui \$2,bar/baz'
+.*:7: Error: operand 2 must be constant `lui \$2,bar ?- ?foo'
+.*:8: Error: operand 2 must be constant `lui \$2,baz ?- ?bar'
+.*:9: Error: operand 2 must be constant `lui \$2,foo ?- ?baz'
+.*:10: Error: operand 2 must be constant `lui \$2,bar ?/ ?baz'
More information about the Binutils-cvs
mailing list