binutils/:

	* binutils-all/m68k/objdump.exp: Add fnop test.
	* binutils-all/m68k/fnop.s: New file.

opcodes/:
	* m68k-opc.c (m68k_opcodes): Move fnop before fbf.

3 files changed, 33 insertions, 1 deletions

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 66977a8d3a..7cd27fce63 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-12  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* binutils-all/m68k/objdump.exp: Add fnop test.
+	* binutils-all/m68k/fnop.s: New file.
+
 2010-09-29  Alan Modra  <amodra@gmail.com>
 
 	* lib/utils-lib.exp (is_elf_format): Merge with gas and ld versions.
diff --git a/binutils/testsuite/binutils-all/m68k/fnop.s b/binutils/testsuite/binutils-all/m68k/fnop.s
new file mode 100644
index 0000000000..628e1989b0
--- /dev/null
+++ b/binutils/testsuite/binutils-all/m68k/fnop.s
@@ -0,0 +1 @@
+	fnop
diff --git a/binutils/testsuite/binutils-all/m68k/objdump.exp b/binutils/testsuite/binutils-all/m68k/objdump.exp
index ba0afe8c02..5043ef7e1d 100644
--- a/binutils/testsuite/binutils-all/m68k/objdump.exp
+++ b/binutils/testsuite/binutils-all/m68k/objdump.exp
@@ -1,4 +1,4 @@
-#   Copyright 2004, 2007, 2009
+#   Copyright 2004, 2007, 2009, 2010
 #   Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -51,3 +51,29 @@ if [regexp $want $got] then {
 } else {
     fail "movem test"
 }
+
+###########################
+# Set up the test of fnop.s
+###########################
+
+if {![binutils_assemble $srcdir/$subdir/fnop.s tmpdir/fnop.o]} then {
+    return
+}
+
+if [is_remote host] {
+    set objfile [remote_download host tmpdir/fnop.o]
+} else {
+    set objfile tmpdir/fnop.o
+}
+
+# Make sure that fnop is decoded as fnop, not fbf.
+
+set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS --disassemble $objfile"]
+
+set want "fnop *\[\r\n\]"
+
+if [regexp $want $got] then {
+    pass "fnop test"
+} else {
+    fail "fnop test"
+}