From 09124b3f56eedab35076d6c89b9d9b7d14caad14 Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@novell.com>
Date: Thu, 27 Jan 2005 09:12:51 +0000
Subject: [PATCH] gas/ 2005-01-27  Jan Beulich  <jbeulich@novell.com>

	* config/tc-ia64.c (emit_one_bundle): Change "?imbf??" to "?ibmfxx".

gas/testsuite/
2005-01-27  Jan Beulich  <jbeulich@novell.com>

	* gas/ia64/nop_x.[ds]: New.
	* gas/ia64/ia64.exp: Run new test.
---
 gas/ChangeLog                   |  6 +++++-
 gas/config/tc-ia64.c            |  2 +-
 gas/testsuite/ChangeLog         |  7 ++++++-
 gas/testsuite/gas/ia64/ia64.exp |  1 +
 gas/testsuite/gas/ia64/nop_x.d  | 11 +++++++++++
 gas/testsuite/gas/ia64/nop_x.s  |  5 +++++
 6 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 gas/testsuite/gas/ia64/nop_x.d
 create mode 100644 gas/testsuite/gas/ia64/nop_x.s

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5fe349fecea..36b50a8b554 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,4 +1,8 @@
-2005-01-25  Jan Beulich  <jbeulich@novell.com>
+2005-01-27  Jan Beulich  <jbeulich@novell.com>
+
+	* config/tc-ia64.c (emit_one_bundle): Change "?imbf??" to "?ibmfxx".
+
+2005-01-27  Jan Beulich  <jbeulich@novell.com>
 
 	* config/tc-ia64.c (emit_one_bundle): Add late resolution of move
 	to/from application registers dynamic insns.
diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index d065449638a..24fbadd5e35 100644
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -6387,7 +6387,7 @@ emit_one_bundle ()
 	  else
 	    as_fatal ("emit_one_bundle: unexpected dynamic op");
 
-	  sprintf (mnemonic, "%s.%c", idesc->name, "?imbf??"[insn_unit]);
+	  sprintf (mnemonic, "%s.%c", idesc->name, "?imbfxx"[insn_unit]);
 	  opnd1 = idesc->operands[0];
 	  opnd2 = idesc->operands[1];
 	  ia64_free_opcode (idesc);
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 71a656706e0..0e637365758 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,4 +1,9 @@
-2005-01-25  Jan Beulich  <jbeulich@novell.com>
+2005-01-27  Jan Beulich  <jbeulich@novell.com>
+
+	* gas/ia64/nop_x.[ds]: New.
+	* gas/ia64/ia64.exp: Run new test.
+
+2005-01-27  Jan Beulich  <jbeulich@novell.com>
 
 	* gas/ia64/dv-waw-err.l: Don't expect ar112 move warning to refer to
 	M-unit.
diff --git a/gas/testsuite/gas/ia64/ia64.exp b/gas/testsuite/gas/ia64/ia64.exp
index 89d3965e767..d004bc2cf81 100644
--- a/gas/testsuite/gas/ia64/ia64.exp
+++ b/gas/testsuite/gas/ia64/ia64.exp
@@ -24,6 +24,7 @@ if [istarget "ia64-*"] then {
     run_dump_test "opc-i"
     run_dump_test "opc-m"
     run_dump_test "opc-x"
+    run_dump_test "nop_x"
     run_dump_test "mov-ar"
 
     run_list_test "dv-raw-err" ""
diff --git a/gas/testsuite/gas/ia64/nop_x.d b/gas/testsuite/gas/ia64/nop_x.d
new file mode 100644
index 00000000000..add14148857
--- /dev/null
+++ b/gas/testsuite/gas/ia64/nop_x.d
@@ -0,0 +1,11 @@
+# objdump: -d
+# name: ia64 nop.x pseudo
+
+.*: +file format .*
+
+Disassembly of section \.text:
+
+0+0 <_start>:
+[[:space:]]*[[:xdigit:]]*:[[:space:][:xdigit:]]+\[MLX][[:space:]]+nop.m 0x0
+[[:space:]]*[[:xdigit:]]*:[[:space:][:xdigit:]]+nop.x 0x0;;
+[[:space:]]*[[:xdigit:]]*:[[:space:][:xdigit:]]+
diff --git a/gas/testsuite/gas/ia64/nop_x.s b/gas/testsuite/gas/ia64/nop_x.s
new file mode 100644
index 00000000000..33c7e0c536a
--- /dev/null
+++ b/gas/testsuite/gas/ia64/nop_x.s
@@ -0,0 +1,5 @@
+_start:
+{.mlx
+	nop	0
+	nop	0
+} ;;
-- 
GitLab