From a677307de8fab7c7a558fb523148698a16cc5727 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 17 Nov 2010 10:16:06 +0100
Subject: [PATCH] nop.h: New file.
* gcc.dg/guality/nop.h: New file.
* gcc.dg/guality/asm-1.c: Include it and use NOP macro instead of
"nop". Adjust line numbers in gdb-test.
* gcc.dg/guality/pr43329-1.c: Likewise.
From-SVN: r166859
---
gcc/testsuite/ChangeLog | 7 +++++++
gcc/testsuite/gcc.dg/guality/asm-1.c | 6 ++++--
gcc/testsuite/gcc.dg/guality/nop.h | 7 +++++++
gcc/testsuite/gcc.dg/guality/pr43329-1.c | 6 ++++--
4 files changed, 22 insertions(+), 4 deletions(-)
create mode 100644 gcc/testsuite/gcc.dg/guality/nop.h
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 76540df89d5a..c664f95af559 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-17 Jakub Jelinek <jakub@redhat.com>
+
+ * gcc.dg/guality/nop.h: New file.
+ * gcc.dg/guality/asm-1.c: Include it and use NOP macro instead of
+ "nop". Adjust line numbers in gdb-test.
+ * gcc.dg/guality/pr43329-1.c: Likewise.
+
2010-11-16 Jason Merrill <jason@redhat.com>
* g++.dg/cpp0x/defaulted20.C: New.
diff --git a/gcc/testsuite/gcc.dg/guality/asm-1.c b/gcc/testsuite/gcc.dg/guality/asm-1.c
index 5279722c0942..1112bf7a7c94 100644
--- a/gcc/testsuite/gcc.dg/guality/asm-1.c
+++ b/gcc/testsuite/gcc.dg/guality/asm-1.c
@@ -1,14 +1,16 @@
/* { dg-do run } */
/* { dg-options "-g" } */
+#include "nop.h"
+
struct A { int x; unsigned short y; char z[64]; };
void __attribute__((noinline))
foo (struct A *p, char *q)
{
int f = &p->z[p->y] - q;
- asm volatile ("nop");
- asm volatile ("nop" : : "g" (f)); /* { dg-final { gdb-test 12 "f" "14" } } */
+ asm volatile (NOP);
+ asm volatile (NOP : : "g" (f)); /* { dg-final { gdb-test 14 "f" "14" } } */
asm volatile ("" : : "g" (p), "g" (q));
}
diff --git a/gcc/testsuite/gcc.dg/guality/nop.h b/gcc/testsuite/gcc.dg/guality/nop.h
new file mode 100644
index 000000000000..a0c19a344141
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/guality/nop.h
@@ -0,0 +1,7 @@
+#if defined (__ia64__) || defined (__s390__) || defined (__s390x__)
+#define NOP "nop 0"
+#elif defined (__MMIX__)
+#define NOP "swym 0"
+#else
+#define NOP "nop"
+#endif
diff --git a/gcc/testsuite/gcc.dg/guality/pr43329-1.c b/gcc/testsuite/gcc.dg/guality/pr43329-1.c
index e80888e40e57..7820727e9784 100644
--- a/gcc/testsuite/gcc.dg/guality/pr43329-1.c
+++ b/gcc/testsuite/gcc.dg/guality/pr43329-1.c
@@ -2,12 +2,14 @@
/* { dg-do run } */
/* { dg-options "-g" } */
+#include "nop.h"
+
static inline void
foo (int argx)
{
int varx = argx;
- __asm__ volatile ("nop"); /* { dg-final { gdb-test 10 "argx" "25" } } */
- __asm__ volatile ("nop" : : "g" (varx)); /* { dg-final { gdb-test 10 "varx" "25" } } */
+ __asm__ volatile (NOP); /* { dg-final { gdb-test 12 "argx" "25" } } */
+ __asm__ volatile (NOP : : "g" (varx)); /* { dg-final { gdb-test 12 "varx" "25" } } */
}
int i;
--
GitLab