x86: Update notrackbad tests for non-ELF targets

	* gas/testsuite/gas/i386/notrackbad.l: Updated for non-ELF
	targets.
	* gas/testsuite/gas/i386/x86-64-notrackbad.l: Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index d332c1e..2e7bb8d 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * gas/testsuite/gas/i386/notrackbad.l: Updated for non-ELF
+       targets.
+       * gas/testsuite/gas/i386/x86-64-notrackbad.l: Likewise.
+
 2017-05-23  Claudiu Zissulescu <claziss@synopsys.com>
 
        * config/tc-arc.c (md_apply_fix): Use as_bad_where.

diff --git a/gas/testsuite/gas/i386/notrackbad.l b/gas/testsuite/gas/i386/notrackbad.l
index b092ab2..0f8cf7d 100644 (file)
--- a/gas/testsuite/gas/i386/notrackbad.l
+++ b/gas/testsuite/gas/i386/notrackbad.l
@@ -23,14 +23,14 @@ GAS LISTING .*
 [      ]*3[    ]+\.allow_index_reg
 [      ]*4[    ]+\.text
 [      ]*5[    ]+_start:
-[      ]*6[    ]+\?\?\?\? E8FCFFFF             notrack call foo
+[      ]*6[    ]+\?\?\?\? [0-9A-F]*            notrack call foo
 \*\*\*\*  Error: expecting register indirect branch instruction after `notrack'
 \*\*\*\*  Warning: skipping prefixes on this instruction
-[      ]*6[    ]+FF
-[      ]*7[    ]+\?\?\?\? E9FCFFFF             notrack jmp foo
+[      ]*6[    ]+[0-9A-F]*
+[      ]*7[    ]+\?\?\?\? [0-9A-F]*            notrack jmp foo
 \*\*\*\*  Error: expecting register indirect branch instruction after `notrack'
 \*\*\*\*  Warning: skipping prefixes on this instruction
-[      ]*7[    ]+FF
+[      ]*7[    ]+[0-9A-F]*
 [      ]*8[    ]+
 [      ]*9[    ]+\?\?\?\? 3EFF10               notrack call \*\(%eax\)
 \*\*\*\*  Error: expecting register indirect branch instruction after `notrack'
@@ -49,4 +49,5 @@ GAS LISTING .*
 [      ]*19[   ]+fs notrack call eax
 [      ]*20[   ]+notrack fs call eax
 [      ]*21[   ]+notrack bnd call eax
-[      ]*22[   ]+notrack data16 call eax
+[      ]*22.*[         ]+notrack data16 call eax
+#pass

diff --git a/gas/testsuite/gas/i386/x86-64-notrackbad.l b/gas/testsuite/gas/i386/x86-64-notrackbad.l
index a72e37d..f76c7e5 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-notrackbad.l
+++ b/gas/testsuite/gas/i386/x86-64-notrackbad.l
@@ -23,14 +23,14 @@ GAS LISTING .*
 [      ]*3[    ]+\.allow_index_reg
 [      ]*4[    ]+\.text
 [      ]*5[    ]+_start:
-[      ]*6[    ]+\?\?\?\? E8000000             notrack call foo
+[      ]*6[    ]+\?\?\?\? [0-9A-F]*            notrack call foo
 \*\*\*\*  Error: expecting register indirect branch instruction after `notrack'
 \*\*\*\*  Warning: skipping prefixes on this instruction
-[      ]*6[    ]+00
-[      ]*7[    ]+\?\?\?\? E9000000             notrack jmp foo
+[      ]*6[    ]+[0-9A-F]*
+[      ]*7[    ]+\?\?\?\? [0-9A-F]*            notrack jmp foo
 \*\*\*\*  Error: expecting register indirect branch instruction after `notrack'
 \*\*\*\*  Warning: skipping prefixes on this instruction
-[      ]*7[    ]+00
+[      ]*7[    ]+[0-9A-F]*
 [      ]*8[    ]+
 [      ]*9[    ]+\?\?\?\? 3EFF10               notrack call \*\(%rax\)
 \*\*\*\*  Error: expecting register indirect branch instruction after `notrack'
@@ -49,4 +49,5 @@ GAS LISTING .*
 [      ]*19[   ]+fs notrack call rax
 [      ]*20[   ]+notrack fs call rax
 [      ]*21[   ]+notrack bnd call rax
-[      ]*22[   ]+notrack data16 call rax
+[      ]*22.*[         ]+notrack data16 call rax
+#pass