x86: Update assembler tests for non-ELF targets

evex-no-scale.s has ELF directive:

.section .probe, "", @progbits

and non-ELF targets may pad text sections.

	* testsuite/gas/i386/i386.exp: Run evex-no-scale-32 and
	evex-no-scale-64 only for ELF targets.
	* testsuite/gas/i386/prefix32.s: Append ".p2align 4,0".
	* testsuite/gas/i386/prefix64.s: Likewise.
	* testsuite/gas/i386/prefix32.l: Updated.
	* testsuite/gas/i386/prefix64.l: Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 94b496bce933b8a52f4de1828eacdc0c31f3324d..5959b11f15e84e538b41c985f579f0b98119db1d 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,12 @@
+2018-08-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * testsuite/gas/i386/i386.exp: Run evex-no-scale-32 and
+       evex-no-scale-64 only for ELF targets.
+       * testsuite/gas/i386/prefix32.s: Append ".p2align 4,0".
+       * testsuite/gas/i386/prefix64.s: Likewise.
+       * testsuite/gas/i386/prefix32.l: Updated.
+       * testsuite/gas/i386/prefix64.l: Likewise.
+
 2018-08-05  Alan Modra  <amodra@gmail.com>
 
        * config/tc-ppc.c (ppc_elf_suffix): Support @notoc.

diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index 3cf1aa33fca1728c8bda777e149d7ab5ad364372..6ea4deef3416f01899807d750a702227f7d7021d 100644 (file)
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -225,7 +225,6 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
     run_dump_test "evex-lig512-intel"
     run_dump_test "evex-wig1"
     run_dump_test "evex-wig1-intel"
-    run_dump_test "evex-no-scale-32"
     run_dump_test "sse2avx"
     run_list_test "inval-avx" "-al"
     run_list_test "inval-avx512f" "-al"
@@ -528,6 +527,8 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
        run_dump_test "nop-5"
        run_dump_test "nop-6"
 
+       run_dump_test "evex-no-scale-32"
+
        if { [gas_64_check] } then {
            run_dump_test "att-regs"
            run_dump_test "intel-regs"
@@ -738,7 +739,6 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t
     run_dump_test "x86-64-evex-lig512-intel"
     run_dump_test "x86-64-evex-wig1"
     run_dump_test "x86-64-evex-wig1-intel"
-    run_dump_test "evex-no-scale-64"
     run_dump_test "x86-64-sse2avx"
     run_list_test "x86-64-inval-avx" "-al"
     run_list_test "x86-64-inval-avx512f" "-al"
@@ -1023,6 +1023,8 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t
        run_dump_test "x86-64-nop-4"
        run_dump_test "x86-64-nop-5"
        run_dump_test "x86-64-nop-6"
+
+       run_dump_test "evex-no-scale-64"
     }
 
     set ASFLAGS "$old_ASFLAGS"

diff --git a/gas/testsuite/gas/i386/prefix32.l b/gas/testsuite/gas/i386/prefix32.l
index ea7f304e98035c390465a67d7a1efdbcd2a554b4..41c8d8801c06e1afd6d45a8b591a002697de4b3c 100644 (file)
--- a/gas/testsuite/gas/i386/prefix32.l
+++ b/gas/testsuite/gas/i386/prefix32.l
@@ -32,3 +32,5 @@ GAS LISTING .*
 \*\*\*\*  Error: .*
 [      ]*20[   ]+data16 vaddps %xmm0, %xmm0, %xmm0
 [      ]*21[   ]+data16 vaddpd %xmm0, %xmm0, %xmm0
+[      ]*22[   ]*
+[      ]*23[   ]*[\?]+ 0+[ \t]+\.p2align       4,0

diff --git a/gas/testsuite/gas/i386/prefix32.s b/gas/testsuite/gas/i386/prefix32.s
index d20cb472a4e63c921b546880825b91b24ee2958c..1ffdff1325035ec80d9c730b80a7636059da954f 100644 (file)
--- a/gas/testsuite/gas/i386/prefix32.s
+++ b/gas/testsuite/gas/i386/prefix32.s
@@ -19,3 +19,5 @@ prefix:
        data16 addpd    %xmm0, %xmm0
        data16 vaddps   %xmm0, %xmm0, %xmm0
        data16 vaddpd   %xmm0, %xmm0, %xmm0
+
+       .p2align        4,0

diff --git a/gas/testsuite/gas/i386/prefix64.l b/gas/testsuite/gas/i386/prefix64.l
index 0a5615acefaa509c9a836ae5f16cb8b0dbd2831a..0659d9c04dec09cb1d34297a52e5a8fea01a7400 100644 (file)
--- a/gas/testsuite/gas/i386/prefix64.l
+++ b/gas/testsuite/gas/i386/prefix64.l
@@ -32,3 +32,5 @@ GAS LISTING .*
 \*\*\*\*  Error: .*
 [      ]*20[   ]+data16 vaddps %xmm0, %xmm0, %xmm0
 [      ]*21[   ]+data16 vaddpd %xmm0, %xmm0, %xmm0
+[      ]*22[   ]*
+[      ]*23[   ]*[\?]+ 0+[ \t]+\.p2align       4,0

diff --git a/gas/testsuite/gas/i386/prefix64.s b/gas/testsuite/gas/i386/prefix64.s
index ca79f49ccdfc1a459bce562b46d759a5f0ce2b95..39fb4774357c43ce7838b33649dd6cc240cc6224 100644 (file)
--- a/gas/testsuite/gas/i386/prefix64.s
+++ b/gas/testsuite/gas/i386/prefix64.s
@@ -19,3 +19,5 @@ prefix:
        data16 addpd    %xmm0, %xmm0
        data16 vaddps   %xmm0, %xmm0, %xmm0
        data16 vaddpd   %xmm0, %xmm0, %xmm0
+
+       .p2align        4,0