From e3ed17f3930f014c24d8445682b46d329461fc2f Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@suse.com>
Date: Tue, 21 Jan 2020 14:41:05 +0100
Subject: [PATCH] x86: testsuite adjustments after commit 1a0351246a5c

The odd behavior of certain COFF/PE targets makes necessary some
mechanical adjustments.
---
 gas/ChangeLog                               | 7 +++++++
 gas/testsuite/gas/i386/inval-crc32.l        | 2 ++
 gas/testsuite/gas/i386/inval-crc32.s        | 2 ++
 gas/testsuite/gas/i386/x86-64-inval-crc32.l | 2 ++
 gas/testsuite/gas/i386/x86-64-inval-crc32.s | 2 ++
 5 files changed, 15 insertions(+)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 37d73faba08..8f414396f59 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2020-01-21  Jan Beulich  <jbeulich@suse.com>
+
+	* testsuite/gas/i386/inval-crc32.s,
+	testsuite/gas/i386/x86-64-inval-crc32.s: Add alignment directive.
+	* testsuite/gas/i386/inval-crc32.l,
+	testsuite/gas/i386/x86-64-inval-crc32.l: Adjust expectations.
+
 2020-01-21  Jan Beulich  <jbeulich@suse.com>
 
 	* config/tc-i386.c (process_suffix): Merge CRC32 handling into
diff --git a/gas/testsuite/gas/i386/inval-crc32.l b/gas/testsuite/gas/i386/inval-crc32.l
index 5afc35c8a52..028dc81b1aa 100644
--- a/gas/testsuite/gas/i386/inval-crc32.l
+++ b/gas/testsuite/gas/i386/inval-crc32.l
@@ -43,3 +43,5 @@ GAS LISTING .*
 [ 	]*21[ 	]+crc32  eax, \[esi\]
 [ 	]*22[ 	]+crc32  al,al
 [ 	]*23[ 	]+crc32  ax, ax
+[ 	]*24[ 	]*
+#pass
diff --git a/gas/testsuite/gas/i386/inval-crc32.s b/gas/testsuite/gas/i386/inval-crc32.s
index 5232fb0ae98..ababdf6fed0 100644
--- a/gas/testsuite/gas/i386/inval-crc32.s
+++ b/gas/testsuite/gas/i386/inval-crc32.s
@@ -21,3 +21,5 @@ crc32  ax, [esi]
 crc32  eax, [esi]
 crc32  al,al
 crc32  ax, ax
+
+.p2align 4
diff --git a/gas/testsuite/gas/i386/x86-64-inval-crc32.l b/gas/testsuite/gas/i386/x86-64-inval-crc32.l
index e30e82f7ead..4c3d418275e 100644
--- a/gas/testsuite/gas/i386/x86-64-inval-crc32.l
+++ b/gas/testsuite/gas/i386/x86-64-inval-crc32.l
@@ -67,3 +67,5 @@ GAS LISTING .*
 [ 	]*32[ 	]+crc32  al,al
 [ 	]*33[ 	]+crc32  ax, ax
 [ 	]*34[ 	]+crc32  rax,eax
+[ 	]*35[ 	]*
+#pass
diff --git a/gas/testsuite/gas/i386/x86-64-inval-crc32.s b/gas/testsuite/gas/i386/x86-64-inval-crc32.s
index 77408118ba7..8f05c57ac5e 100644
--- a/gas/testsuite/gas/i386/x86-64-inval-crc32.s
+++ b/gas/testsuite/gas/i386/x86-64-inval-crc32.s
@@ -32,3 +32,5 @@ crc32  rax,[rsi]
 crc32  al,al
 crc32  ax, ax
 crc32  rax,eax
+
+.p2align 4
-- 
2.30.2