From: Nick Clifton <nickc@redhat.com>
Date: Fri, 29 Jul 2011 11:02:40 +0000 (+0000)
Subject: 	* gas/elf/warn-2.s: Add other types of NOP insn.
X-Git-Tag: sid-snapshot-20110801~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c9461a4ded07f261a0563831500870f259fb59e;p=external%2Fbinutils.git

	* gas/elf/warn-2.s: Add other types of NOP insn.
---

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 568b104..eb5ce65 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-29  Nick Clifton  <nickc@redhat.com>
+
+	* gas/elf/warn-2.s: Add other types of NOP insn.
+
 2011-07-27  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* gas/elf/warn-2.s: New.
diff --git a/gas/testsuite/gas/elf/warn-2.s b/gas/testsuite/gas/elf/warn-2.s
index 0d69f10..12b7139 100644
--- a/gas/testsuite/gas/elf/warn-2.s
+++ b/gas/testsuite/gas/elf/warn-2.s
@@ -1,12 +1,23 @@
 ;# { dg-do assemble }
-;# { dg-skip-if "DWARF2 output not supported" { mcore-*-* mn10*-*-* moxie-*-* v850-*-* } }
-;# { dg-skip-if "no NOP opcode" { mmix-*-* openrisc-*-* or32-*-* } }
-;# { dg-options "--gdwarf2 --defsym ia64=0" }
-;# { dg-options "--gdwarf2 --defsym ia64=1" { target ia64-*-* i370-*-* } }
+;# { dg-options "--gdwarf2 --defsym nop_type=0" }
+;# { dg-options "--gdwarf2 --defsym nop_type=1" { target ia64-*-* } }
+;# { dg-options "--gdwarf2 --defsym nop_type=2" { target or32-*-* openrisc-*-* } }
+;# { dg-options "--gdwarf2 --defsym nop_type=3" { target i370-*-* } }
+
 	.offset 40
-.ifeq ia64 - 1
+	
+.ifeq nop_type - 1
 	nop 0
 .else
+.ifeq nop_type - 2
+	l.nop 0
+.else
+.ifeq nop_type - 3
+	nopr 1
+.else
 	nop
 .endif
-;# { dg-warning "Warning: dwarf line number information for .* ignored" "" { target *-*-* } 0 }
+.endif
+.endif
+
+;# { dg-warning "Warning: dwarf line number information for .* ignored" "" { xfail i370-*-* mcore-*-* mn10200-*-* moxie-*-* openrisc-*-* or32-*-* v850-*-* } 0 }