5 files changed, 14 insertions, 7 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1bb4605..581e169 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,12 @@
 2020-07-14  Jan Beulich  <jbeulich@suse.com>
 
+	* testsuite/gas/i386/intel.s: Use dr<N> instead of db<N>.
+	* testsuite/gas/i386/intel-intel.d: Disambiguate name.
+	* testsuite/gas/i386/intel.d,
+	testsuite/gas/i386/opcode-intel.d: Adjust expectations.
+
+2020-07-14  Jan Beulich  <jbeulich@suse.com>
+
 	* testsuite/gas/i386/prefix.d: Adjust expectations.
 
 2020-07-14  Jan Beulich  <jbeulich@suse.com>
diff --git a/gas/testsuite/gas/i386/intel-intel.d b/gas/testsuite/gas/i386/intel-intel.d
index d9d9b8c..b2663dd 100644
--- a/gas/testsuite/gas/i386/intel-intel.d
+++ b/gas/testsuite/gas/i386/intel-intel.d
@@ -260,9 +260,9 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	0f 09 +	wbinvd *
 [ 	]*[a-f0-9]+:	0f 0b +	ud2 *
 [ 	]*[a-f0-9]+:	0f 20 d0 +	mov    eax,cr2
-[ 	]*[a-f0-9]+:	0f 21 d0 +	mov    eax,db2
+[ 	]*[a-f0-9]+:	0f 21 d0 +	mov    eax,dr2
 [ 	]*[a-f0-9]+:	0f 22 d0 +	mov    cr2,eax
-[ 	]*[a-f0-9]+:	0f 23 d0 +	mov    db2,eax
+[ 	]*[a-f0-9]+:	0f 23 d0 +	mov    dr2,eax
 [ 	]*[a-f0-9]+:	0f 24 d0 +	mov    eax,tr2
 [ 	]*[a-f0-9]+:	0f 26 d0 +	mov    tr2,eax
 [ 	]*[a-f0-9]+:	0f 30 +	wrmsr *
diff --git a/gas/testsuite/gas/i386/intel.d b/gas/testsuite/gas/i386/intel.d
index 309d264..c2c0551 100644
--- a/gas/testsuite/gas/i386/intel.d
+++ b/gas/testsuite/gas/i386/intel.d
@@ -1,6 +1,6 @@
 #as: -J
 #objdump: -dw
-#name: i386 intel
+#name: i386 intel (AT&T disassembly)
 #warning_output: intel.e
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/i386/intel.s b/gas/testsuite/gas/i386/intel.s
index 19c5eea..70fcf1c 100644
--- a/gas/testsuite/gas/i386/intel.s
+++ b/gas/testsuite/gas/i386/intel.s
@@ -252,9 +252,9 @@ foo:
  wbinvd
  ud2a
  mov    eax, cr2
- mov    eax, db2
+ mov    eax, dr2
  mov    cr2, eax
- mov    db2, eax
+ mov    dr2, eax
  mov    eax, tr2
  mov    tr2, eax
  wrmsr
diff --git a/gas/testsuite/gas/i386/opcode-intel.d b/gas/testsuite/gas/i386/opcode-intel.d
index 434b0e3..68e1e88 100644
--- a/gas/testsuite/gas/i386/opcode-intel.d
+++ b/gas/testsuite/gas/i386/opcode-intel.d
@@ -257,9 +257,9 @@ Disassembly of section .text:
  *[0-9a-f]+:	0f 09[ 	]+wbinvd[ 	]*
  *[0-9a-f]+:	0f 0b[ 	]+ud2[ 	]*
  *[0-9a-f]+:	0f 20 d0[ 	]+mov[ 	]+eax,cr2
- *[0-9a-f]+:	0f 21 d0[ 	]+mov[ 	]+eax,db2
+ *[0-9a-f]+:	0f 21 d0[ 	]+mov[ 	]+eax,dr2
  *[0-9a-f]+:	0f 22 d0[ 	]+mov[ 	]+cr2,eax
- *[0-9a-f]+:	0f 23 d0[ 	]+mov[ 	]+db2,eax
+ *[0-9a-f]+:	0f 23 d0[ 	]+mov[ 	]+dr2,eax
  *[0-9a-f]+:	0f 24 d0[ 	]+mov[ 	]+eax,tr2
  *[0-9a-f]+:	0f 26 d0[ 	]+mov[ 	]+tr2,eax
  *[0-9a-f]+:	0f 30[ 	]+wrmsr[ 	]*