x86: cover a.out in recently added tests

Follow the pattern found elsewhere when relocations are involved. For
wrap32-data also drop a mistakenly left "ELF" from the test name. (Note
that Darwin, for which the wrap32 tests are also failing, is left as-is,
for there being numerous other failures already anyway, and it hence
being questionable whether that target is actually properly maintained.)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 935efaa24d2afbd66fb47df99a0587a3bf53588f..f07ece7ccac66ad624608de8bf6828f1cd35939f 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2021-06-08  Jan Beulich  <jbeulich@suse.com>
+
+       * testsuite/gas/i386/quoted.d, testsuite/gas/i386/wrap32-text.d:
+       Adjust expectations.
+       * testsuite/gas/i386/wrap32-data.d: Likewise. Correct name.
+
 2021-06-08  Jan Beulich  <jbeulich@suse.com>
 
        * config/tc-i386.c (optimize_imm): Use fits_in_unsigned_word

diff --git a/gas/testsuite/gas/i386/quoted.d b/gas/testsuite/gas/i386/quoted.d
index c73576a3f52245d4217debfc00406057b1588eed..d5986b65ea8202c62f363a20ff2cf50997601190 100644 (file)
--- a/gas/testsuite/gas/i386/quoted.d
+++ b/gas/testsuite/gas/i386/quoted.d
@@ -6,16 +6,16 @@
 Disassembly of section .text:
 
 0+ <quoted>:
-[      ]*[a-f0-9]+:[   ]*a1 00 00 00 00[        ]+mov    0x0,%eax      [a-f0-9]+: (R_386_|dir)32       x\(y\)
-[      ]*[a-f0-9]+:[   ]*8b 80 00 00 00 00[     ]+mov    0x0\(%eax\),%eax      [a-f0-9]+: (R_386_|dir)32       x\(y\)
-[      ]*[a-f0-9]+:[   ]*26 a1 00 00 00 00[     ]+mov    %es:0x0,%eax  [a-f0-9]+: (R_386_|dir)32       x\(y\)
-[      ]*[a-f0-9]+:[   ]*26 8b 80 00 00 00 00[  ]+mov    %es:0x0\(%eax\),%eax  [a-f0-9]+: (R_386_|dir)32       x\(y\)
-[      ]*[a-f0-9]+:[   ]*a1 00 00 00 00[        ]+mov    0x0,%eax      [a-f0-9]+: (R_386_|dir)32       x\(y
-[      ]*[a-f0-9]+:[   ]*a1 00 00 00 00[        ]+mov    0x0,%eax      [a-f0-9]+: (R_386_|dir)32       x\)y
-[      ]*[a-f0-9]+:[   ]*a1 00 00 00 00[        ]+mov    0x0,%eax      [a-f0-9]+: (R_386_|dir)32       x\?y
-[      ]*[a-f0-9]+:[   ]*a1 00 00 00 00[        ]+mov    0x0,%eax      [a-f0-9]+: (R_386_|dir)32       x\{y
-[      ]*[a-f0-9]+:[   ]*a1 00 00 00 00[        ]+mov    0x0,%eax      [a-f0-9]+: (R_386_|dir)32       x\{z\}
-[      ]*[a-f0-9]+:[   ]*ff 15 00 00 00 00[     ]+call   \*0x0 [a-f0-9]+: (R_386_|dir)32       x\(y\)
-[      ]*[a-f0-9]+:[   ]*26 ff 15 00 00 00 00[  ]+call   \*%es:0x0     [a-f0-9]+: (R_386_|dir)32       x\(y\)
-[      ]*[a-f0-9]+:[   ]*26 ff 15 00 00 00 00[  ]+call   \*%es:0x0     [a-f0-9]+: (R_386_|dir)32       x\(y\)
+[      ]*[a-f0-9]+:[   ]*a1 00 00 00 00[        ]+mov    0x0,%eax      [a-f0-9]+: (R_386_|dir)?32      x\(y\)
+[      ]*[a-f0-9]+:[   ]*8b 80 00 00 00 00[     ]+mov    0x0\(%eax\),%eax      [a-f0-9]+: (R_386_|dir)?32      x\(y\)
+[      ]*[a-f0-9]+:[   ]*26 a1 00 00 00 00[     ]+mov    %es:0x0,%eax  [a-f0-9]+: (R_386_|dir)?32      x\(y\)
+[      ]*[a-f0-9]+:[   ]*26 8b 80 00 00 00 00[  ]+mov    %es:0x0\(%eax\),%eax  [a-f0-9]+: (R_386_|dir)?32      x\(y\)
+[      ]*[a-f0-9]+:[   ]*a1 00 00 00 00[        ]+mov    0x0,%eax      [a-f0-9]+: (R_386_|dir)?32      x\(y
+[      ]*[a-f0-9]+:[   ]*a1 00 00 00 00[        ]+mov    0x0,%eax      [a-f0-9]+: (R_386_|dir)?32      x\)y
+[      ]*[a-f0-9]+:[   ]*a1 00 00 00 00[        ]+mov    0x0,%eax      [a-f0-9]+: (R_386_|dir)?32      x\?y
+[      ]*[a-f0-9]+:[   ]*a1 00 00 00 00[        ]+mov    0x0,%eax      [a-f0-9]+: (R_386_|dir)?32      x\{y
+[      ]*[a-f0-9]+:[   ]*a1 00 00 00 00[        ]+mov    0x0,%eax      [a-f0-9]+: (R_386_|dir)?32      x\{z\}
+[      ]*[a-f0-9]+:[   ]*ff 15 00 00 00 00[     ]+call   \*0x0 [a-f0-9]+: (R_386_|dir)?32      x\(y\)
+[      ]*[a-f0-9]+:[   ]*26 ff 15 00 00 00 00[  ]+call   \*%es:0x0     [a-f0-9]+: (R_386_|dir)?32      x\(y\)
+[      ]*[a-f0-9]+:[   ]*26 ff 15 00 00 00 00[  ]+call   \*%es:0x0     [a-f0-9]+: (R_386_|dir)?32      x\(y\)
 #pass

diff --git a/gas/testsuite/gas/i386/wrap32-data.d b/gas/testsuite/gas/i386/wrap32-data.d
index bebec98933a0fbb5fd1aef3cc18015cf35309c6a..a58f349ceef25f8ebb106a7a3ed5976578ddbe41 100644 (file)
--- a/gas/testsuite/gas/i386/wrap32-data.d
+++ b/gas/testsuite/gas/i386/wrap32-data.d
@@ -1,4 +1,4 @@
-#name: i386 32-bit wrapping calculations (data/ELF)
+#name: i386 32-bit wrapping calculations (data)
 #source: wrap32.s
 #objdump: -rsj .data
 
@@ -7,17 +7,17 @@
 RELOCATION RECORDS FOR \[\.data\]:
 
 OFFSET +TYPE +VALUE *
-0*10 (R_386_32|dir32) *sym
-0*14 (R_386_32|dir32) *sym
-0*18 (R_386_32|dir32) *sym
-0*1c (R_386_32|dir32) *sym
-0*30 (R_386_32|dir32) *sym
-0*34 (R_386_32|dir32) *sym
-0*38 (R_386_32|dir32) *sym
-0*3c (R_386_32|dir32) *sym
+0*10 (R_386_|dir)?32 *sym
+0*14 (R_386_|dir)?32 *sym
+0*18 (R_386_|dir)?32 *sym
+0*1c (R_386_|dir)?32 *sym
+0*30 (R_386_|dir)?32 *sym
+0*34 (R_386_|dir)?32 *sym
+0*38 (R_386_|dir)?32 *sym
+0*3c (R_386_|dir)?32 *sym
 
 Contents of section .data:
- 0+00 f4 ?00 ?00 ?00 f4 ?00 ?00 ?00 90 ?00 ?00 ?00 90 ?00 ?00 ?00 .*
- 0+10 00 ?ff ?ff ?ff 00 ?ff ?ff ?ff f4 ?00 ?00 ?00 f4 ?00 ?00 ?00 .*
- 0+20 f4 ?02 ?00 ?70 f4 ?00 ?00 ?80 90 ?02 ?00 ?70 90 ?00 ?00 ?80 .*
- 0+30 00 ?01 ?00 ?70 00 ?ff ?ff ?7f f4 ?02 ?00 ?70 f4 ?00 ?00 ?80 .*
+ 0+.0 f4 ?00 ?00 ?00 f4 ?00 ?00 ?00 90 ?00 ?00 ?00 90 ?00 ?00 ?00 .*
+ 0+.0 00 ?ff ?ff ?ff 00 ?ff ?ff ?ff f4 ?00 ?00 ?00 f4 ?00 ?00 ?00 .*
+ 0+.0 f4 ?02 ?00 ?70 f4 ?00 ?00 ?80 90 ?02 ?00 ?70 90 ?00 ?00 ?80 .*
+ 0+.0 00 ?01 ?00 ?70 00 ?ff ?ff ?7f f4 ?02 ?00 ?70 f4 ?00 ?00 ?80 .*

diff --git a/gas/testsuite/gas/i386/wrap32-text.d b/gas/testsuite/gas/i386/wrap32-text.d
index 3ebbd8582e2063780c0d27e3cf6cd1dca8093c8d..03776f7e203395fddee3fc68ad216123b499fd85 100644 (file)
--- a/gas/testsuite/gas/i386/wrap32-text.d
+++ b/gas/testsuite/gas/i386/wrap32-text.d
@@ -11,33 +11,33 @@ Disassembly of section .text:
 [      ]*[0-9a-f]+:[   ]+ba f4 00 00 00        mov    \$0xf4,%edx
 [      ]*[0-9a-f]+:[   ]+b8 90 00 00 00        mov    \$0x90,%eax
 [      ]*[0-9a-f]+:[   ]+ba 90 00 00 00        mov    \$0x90,%edx
-[      ]*[0-9a-f]+:[   ]+b8 00 ff ff ff        mov    \$0xffffff00,%eax[       ]+[0-9a-f]+: (R_386_32|dir32)[  ]+sym
-[      ]*[0-9a-f]+:[   ]+ba 00 ff ff ff        mov    \$0xffffff00,%edx[       ]+[0-9a-f]+: (R_386_32|dir32)[  ]+sym
-[      ]*[0-9a-f]+:[   ]+b8 f4 00 00 00        mov    \$0xf4,%eax[     ]+[0-9a-f]+: (R_386_32|dir32)[  ]+sym
-[      ]*[0-9a-f]+:[   ]+ba f4 00 00 00        mov    \$0xf4,%edx[     ]+[0-9a-f]+: (R_386_32|dir32)[  ]+sym
+[      ]*[0-9a-f]+:[   ]+b8 00 ff ff ff        mov    \$0xffffff00,%eax[       ]+[0-9a-f]+: (R_386_|dir)?32[   ]+sym
+[      ]*[0-9a-f]+:[   ]+ba 00 ff ff ff        mov    \$0xffffff00,%edx[       ]+[0-9a-f]+: (R_386_|dir)?32[   ]+sym
+[      ]*[0-9a-f]+:[   ]+b8 f4 00 00 00        mov    \$0xf4,%eax[     ]+[0-9a-f]+: (R_386_|dir)?32[   ]+sym
+[      ]*[0-9a-f]+:[   ]+ba f4 00 00 00        mov    \$0xf4,%edx[     ]+[0-9a-f]+: (R_386_|dir)?32[   ]+sym
 [      ]*[0-9a-f]+:[   ]+c7 00 f4 00 00 00     movl   \$0xf4,\(%eax\)
 [      ]*[0-9a-f]+:[   ]+c7 02 f4 00 00 00     movl   \$0xf4,\(%edx\)
 [      ]*[0-9a-f]+:[   ]+c7 00 90 00 00 00     movl   \$0x90,\(%eax\)
 [      ]*[0-9a-f]+:[   ]+c7 02 90 00 00 00     movl   \$0x90,\(%edx\)
-[      ]*[0-9a-f]+:[   ]+c7 00 00 ff ff ff     movl   \$0xffffff00,\(%eax\)[   ]+[0-9a-f]+: (R_386_32|dir32)[  ]+sym
-[      ]*[0-9a-f]+:[   ]+c7 02 00 ff ff ff     movl   \$0xffffff00,\(%edx\)[   ]+[0-9a-f]+: (R_386_32|dir32)[  ]+sym
-[      ]*[0-9a-f]+:[   ]+c7 00 f4 00 00 00     movl   \$0xf4,\(%eax\)[         ]+[0-9a-f]+: (R_386_32|dir32)[  ]+sym
-[      ]*[0-9a-f]+:[   ]+c7 02 f4 00 00 00     movl   \$0xf4,\(%edx\)[         ]+[0-9a-f]+: (R_386_32|dir32)[  ]+sym
+[      ]*[0-9a-f]+:[   ]+c7 00 00 ff ff ff     movl   \$0xffffff00,\(%eax\)[   ]+[0-9a-f]+: (R_386_|dir)?32[   ]+sym
+[      ]*[0-9a-f]+:[   ]+c7 02 00 ff ff ff     movl   \$0xffffff00,\(%edx\)[   ]+[0-9a-f]+: (R_386_|dir)?32[   ]+sym
+[      ]*[0-9a-f]+:[   ]+c7 00 f4 00 00 00     movl   \$0xf4,\(%eax\)[         ]+[0-9a-f]+: (R_386_|dir)?32[   ]+sym
+[      ]*[0-9a-f]+:[   ]+c7 02 f4 00 00 00     movl   \$0xf4,\(%edx\)[         ]+[0-9a-f]+: (R_386_|dir)?32[   ]+sym
 [      ]*[0-9a-f]+:[   ]+81 c1 f4 00 00 00     add    \$0xf4,%ecx
 [      ]*[0-9a-f]+:[   ]+81 c2 f4 00 00 00     add    \$0xf4,%edx
 [      ]*[0-9a-f]+:[   ]+81 c1 90 00 00 00     add    \$0x90,%ecx
 [      ]*[0-9a-f]+:[   ]+81 c2 90 00 00 00     add    \$0x90,%edx
-[      ]*[0-9a-f]+:[   ]+81 c1 00 ff ff ff     add    \$0xffffff00,%ecx[       ]+[0-9a-f]+: (R_386_32|dir32)[  ]+sym
-[      ]*[0-9a-f]+:[   ]+81 c2 00 ff ff ff     add    \$0xffffff00,%edx[       ]+[0-9a-f]+: (R_386_32|dir32)[  ]+sym
-[      ]*[0-9a-f]+:[   ]+81 c1 f4 00 00 00     add    \$0xf4,%ecx[     ]+[0-9a-f]+: (R_386_32|dir32)[  ]+sym
-[      ]*[0-9a-f]+:[   ]+81 c2 f4 00 00 00     add    \$0xf4,%edx[     ]+[0-9a-f]+: (R_386_32|dir32)[  ]+sym
+[      ]*[0-9a-f]+:[   ]+81 c1 00 ff ff ff     add    \$0xffffff00,%ecx[       ]+[0-9a-f]+: (R_386_|dir)?32[   ]+sym
+[      ]*[0-9a-f]+:[   ]+81 c2 00 ff ff ff     add    \$0xffffff00,%edx[       ]+[0-9a-f]+: (R_386_|dir)?32[   ]+sym
+[      ]*[0-9a-f]+:[   ]+81 c1 f4 00 00 00     add    \$0xf4,%ecx[     ]+[0-9a-f]+: (R_386_|dir)?32[   ]+sym
+[      ]*[0-9a-f]+:[   ]+81 c2 f4 00 00 00     add    \$0xf4,%edx[     ]+[0-9a-f]+: (R_386_|dir)?32[   ]+sym
 [      ]*[0-9a-f]+:[   ]+81 00 f4 00 00 00     addl   \$0xf4,\(%eax\)
 [      ]*[0-9a-f]+:[   ]+81 02 f4 00 00 00     addl   \$0xf4,\(%edx\)
 [      ]*[0-9a-f]+:[   ]+81 00 90 00 00 00     addl   \$0x90,\(%eax\)
 [      ]*[0-9a-f]+:[   ]+81 02 90 00 00 00     addl   \$0x90,\(%edx\)
-[      ]*[0-9a-f]+:[   ]+81 00 00 ff ff ff     addl   \$0xffffff00,\(%eax\)[   ]+[0-9a-f]+: (R_386_32|dir32)[  ]+sym
-[      ]*[0-9a-f]+:[   ]+81 02 00 ff ff ff     addl   \$0xffffff00,\(%edx\)[   ]+[0-9a-f]+: (R_386_32|dir32)[  ]+sym
-[      ]*[0-9a-f]+:[   ]+81 00 f4 00 00 00     addl   \$0xf4,\(%eax\)[         ]+[0-9a-f]+: (R_386_32|dir32)[  ]+sym
-[      ]*[0-9a-f]+:[   ]+81 02 f4 00 00 00     addl   \$0xf4,\(%edx\)[         ]+[0-9a-f]+: (R_386_32|dir32)[  ]+sym
+[      ]*[0-9a-f]+:[   ]+81 00 00 ff ff ff     addl   \$0xffffff00,\(%eax\)[   ]+[0-9a-f]+: (R_386_|dir)?32[   ]+sym
+[      ]*[0-9a-f]+:[   ]+81 02 00 ff ff ff     addl   \$0xffffff00,\(%edx\)[   ]+[0-9a-f]+: (R_386_|dir)?32[   ]+sym
+[      ]*[0-9a-f]+:[   ]+81 00 f4 00 00 00     addl   \$0xf4,\(%eax\)[         ]+[0-9a-f]+: (R_386_|dir)?32[   ]+sym
+[      ]*[0-9a-f]+:[   ]+81 02 f4 00 00 00     addl   \$0xf4,\(%edx\)[         ]+[0-9a-f]+: (R_386_|dir)?32[   ]+sym
 [      ]*[0-9a-f]+:[   ]+c3                    ret *
 #pass