Use 2-byte instead of 4-byte NOP on S390 in 'bp-permanent' test case

[thirdparty/binutils-gdb.git] / gdb / testsuite / gdb.base / bp-permanent.c

diff --git a/gdb/testsuite/gdb.base/bp-permanent.c b/gdb/testsuite/gdb.base/bp-permanent.c
index a45a922e8f34c8e5dc5575c49b2a6c964fbeef2d..64cfb4db43e8bbc393496a99333ff2441ffb298f 100644 (file)
--- a/gdb/testsuite/gdb.base/bp-permanent.c
+++ b/gdb/testsuite/gdb.base/bp-permanent.c
@@ -21,7 +21,14 @@
 #include <unistd.h>
 #endif
 
+/* NOP instruction: must have the same size as the breakpoint
+   instruction.  */
+
+#if defined(__s390__) || defined(__s390x__)
+#define NOP asm("nopr 0")
+#else
 #define NOP asm("nop")
+#endif
 
 /* Buffer holding the breakpoint instruction.  */
 unsigned char buffer[16];